initscripts/sysconfig/network-scripts/ifdown-aliases, branch r7-52 Mageia fork of Fedora's Init Scripts change i18n stuff around; don't call gettext explicitly, just do echo $"some string" 2001-01-23T19:59:11+00:00 Bill Nottingham notting@redhat.com 2001-01-23T19:59:11+00:00 a4a25465cd2844d72bf518188b813c009450f505 






fix more ifconfig greps (patch from Conectiva)
2000-12-12T05:31:49+00:00

Bill Nottingham
notting@redhat.com

2000-12-12T05:31:49+00:00

7598f8cb5a31d96c26090cadda678c1ea1a5dc37












speedup fixes for ifup-aliases from David Harris (dharris@drh.net)
1999-07-26T14:52:05+00:00

Bill Nottingham
notting@redhat.com

1999-07-26T14:52:05+00:00

6ebf4ab2cf081ed78d86b42a6ae61bc35edf6814












er






































 
Mageia Installer and base platform for many utilitiesThierry Vignaud [tv]


summaryrefslogtreecommitdiffstats









path: root/perl-install/share/po
diff options
context:
space:
mode:


authorPablo Saratxaga <pablo@mandriva.com>2004-03-23 09:00:21 +0000


committerPablo Saratxaga <pablo@mandriva.com>2004-03-23 09:00:21 +0000


commitb4f641721706292a9f7d46783089a22b5db438f5 (patch)


tree91862835e813e39f0008c5e80b7813019f02a428 /perl-install/share/po


parent1e2e95896d66d535127aa8b9dc7d7fe4a471ab53 (diff)
downloaddrakx-b4f641721706292a9f7d46783089a22b5db438f5.tar
drakx-b4f641721706292a9f7d46783089a22b5db438f5.tar.gz
drakx-b4f641721706292a9f7d46783089a22b5db438f5.tar.bz2
drakx-b4f641721706292a9f7d46783089a22b5db438f5.tar.xz
drakx-b4f641721706292a9f7d46783089a22b5db438f5.zip


corrected "default:LTR" translations
Diffstat (limited to 'perl-install/share/po')
-rw-r--r--perl-install/share/po/de.po6583


-rw-r--r--perl-install/share/po/et.po6688


-rw-r--r--perl-install/share/po/fa.po11650


-rw-r--r--perl-install/share/po/is.po5851


-rw-r--r--perl-install/share/po/ja.po7523


-rw-r--r--perl-install/share/po/mk.po5945


-rw-r--r--perl-install/share/po/nn.po21404


-rw-r--r--perl-install/share/po/sq.po6002


-rw-r--r--perl-install/share/po/sv.po6003


-rw-r--r--perl-install/share/po/uk.po6550


10 files changed, 53283 insertions, 30916 deletions
diff --git a/perl-install/share/po/de.po b/perl-install/share/po/de.po
index 3f8e8638a..ee2f91cad 100644
--- a/perl-install/share/po/de.po
+++ b/perl-install/share/po/de.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-de\n"
-"POT-Creation-Date: 2004-02-19 18:02+0100\n"
+"POT-Creation-Date: 2004-03-19 14:32+0100\n"
 "PO-Revision-Date: 2004-01-30 14:25+0100\n"
 "Last-Translator: Sebastian Deutscher <sebastian_deutscher@web.de>\n"
 "Language-Team: german <cooker-i18n@linux-mandrake.com>\n"
@@ -108,7 +108,7 @@ msgstr ""
 "Starten Sie den Rechner neu, entfernen Sie den USB-Stick, deaktivieren Sie\n"
 "den Schreibschutz und starten Sie Mandrake Move erneut."
 
-#: ../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 "Neustart"
@@ -161,44 +161,51 @@ msgstr "Bitte warten, erkenne und konfiguriere Geräte..."
 #: 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"
@@ -395,7 +402,7 @@ msgstr "Xinerama-Erweiterung verwenden"
 #: Xconfig/card.pm:440
 #, c-format
 msgid "Configure only card \"%s\"%s"
-msgstr "Nur Karte \"%s\" (%s) konfigurieren"
+msgstr "Nur Karte „%s“ (%s) konfigurieren"
 
 #: Xconfig/card.pm:454 Xconfig/card.pm:456 Xconfig/various.pm:23
 #, c-format
@@ -455,15 +462,16 @@ msgstr ""
 msgid "Xpmac (installation display driver)"
 msgstr "Xpmac (Installations-Bildschirmtreiber)"
 
-#: 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 "Benutzerdefiniert"
 
 #: 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 "Verlassen"
@@ -490,11 +498,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 "Optionen"
@@ -527,7 +535,7 @@ msgstr "Plug'n'Play"
 msgid "Generic"
 msgstr "Generisch"
 
-#: 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"
@@ -611,52 +619,51 @@ msgid "Graphics card: %s"
 msgstr "Grafikkarte: %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 "OK"
 
-#: 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 "Abbrechen"
 
 #: 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 "Hilfe"
@@ -790,7 +797,7 @@ msgstr ""
 "\n"
 "Wenn Sie das wünschen, schließen Sie bitte Ihren Fernseher an die "
 "Grafikkarte an, bevor Sie den Rechner neu starten.\n"
-"Wählen Sie \"TV-Ausgang\" im Bootloader.\n"
+"Wählen Sie „TV-Ausgang“ im Bootloader.\n"
 "\n"
 "Haben Sie einen solchen Ausgang und wollen Sie ihn verwenden?"
 
@@ -799,19 +806,20 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "Um welche Fernsehnorm handelt es sich?"
 
-#: 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 "Bitte warten"
 
-#: any.pm:98
+#: any.pm:103
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "Installation des Bootloaders ..."
 
-#: any.pm:137
+#: any.pm:142
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -826,271 +834,271 @@ msgstr ""
 "\n"
 "Von welchem Laufwerk wollen Sie booten?"
 
-#: 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 "Erster Sektor der Platte (MBR)"
 
-#: any.pm:161
+#: any.pm:166
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Erster Sektor der Root-Partition"
 
-#: any.pm:163
+#: any.pm:168
 #, c-format
 msgid "On Floppy"
 msgstr "Auf Diskette"
 
-#: 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 "Überspringen"
 
-#: any.pm:170
+#: any.pm:175
 #, c-format
 msgid "SILO Installation"
 msgstr "SILO-Installation"
 
-#: any.pm:170
+#: any.pm:175
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "LILO/Grub-Installation"
 
-#: any.pm:171
+#: any.pm:176
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "Wo soll der Bootloader installiert werden?"
 
-#: any.pm:192
+#: any.pm:197
 #, c-format
 msgid "First sector of boot partition"
 msgstr "Erster Sektor der Boot-Partition"
 
-#: any.pm:204 any.pm:239
-#, c-format
-msgid "Bootloader main options"
-msgstr "Haupt-Optionen des Bootloaders"
-
-#: any.pm:205
+#: any.pm:208
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Konfiguration der Boot-Einstellungen"
 
-#: any.pm:209
+#: any.pm:210 any.pm:244
+#, c-format
+msgid "Bootloader main options"
+msgstr "Haupt-Optionen des Bootloaders"
+
+#: any.pm:214
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "Geben Sie die RAM-Größe in MB an"
 
-#: any.pm:211
+#: any.pm:216
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
-"Die Option \"Gebrauch der Kommandozeilen-Parameter einschränken\" ist ohne \n"
+"Die Option „Gebrauch der Kommandozeilen-Parameter einschränken“ ist ohne \n"
 "Angabe eines Passwortes wirkungslos."
 
-#: 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 "Die Passwörter stimmen nicht überein"
 
-#: 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 "Bitte versuchen Sie es erneut"
 
-#: 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 "Zu verwendender Bootloader"
 
-#: any.pm:219
+#: any.pm:224
 #, c-format
 msgid "Bootloader installation"
 msgstr "Installation des Bootloaders"
 
-#: any.pm:221 any.pm:244 help.pm:768
+#: any.pm:226 any.pm:249 help.pm:768
 #, c-format
 msgid "Boot device"
 msgstr "Boot-Gerät"
 
-#: any.pm:223
+#: any.pm:228
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Wartezeit vor dem Starten des Betriebssystems"
 
-#: any.pm:224 help.pm:768
+#: any.pm:229 help.pm:768
 #, c-format
 msgid "Enable ACPI"
 msgstr "ACPI aktivieren"
 
-#: any.pm:225
+#: any.pm:230
 #, c-format
 msgid "Force No APIC"
-msgstr "\"Kein APIC\" erzwingen"
+msgstr "„Kein APIC“ erzwingen"
 
-#: 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 "Passwort"
 
-#: 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 "Passwort (erneut)"
 
-#: any.pm:229
+#: any.pm:234
 #, c-format
 msgid "Restrict command line options"
 msgstr "Gebrauch der Kommandozeilen-Parameter einschränken"
 
-#: any.pm:229
+#: any.pm:234
 #, c-format
 msgid "restrict"
 msgstr "einschränken"
 
-#: any.pm:231
+#: any.pm:236
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr " '/tmp' bei jedem Systemstart säubern"
 
-#: any.pm:232
+#: any.pm:237
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Genaue RAM-Größe, falls nötig (%d MB gefunden)"
 
-#: any.pm:234
+#: any.pm:239
 #, c-format
 msgid "Enable multiple profiles"
 msgstr "Mehrere Profile erlauben"
 
-#: any.pm:243
+#: any.pm:248
 #, c-format
 msgid "Init Message"
 msgstr "Init-Nachricht"
 
-#: any.pm:245
+#: any.pm:250
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "Open-Firmware-Verzögerung"
 
-#: any.pm:246
+#: any.pm:251
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Kernel-Start-Wartezeit"
 
-#: any.pm:247
+#: any.pm:252
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "Booten von CD erlauben?"
 
-#: any.pm:248
+#: any.pm:253
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "Open-Firmware-Start erlauben?"
 
-#: any.pm:249
+#: any.pm:254
 #, c-format
 msgid "Default OS?"
 msgstr "Standard-OS?"
 
-#: any.pm:290
+#: any.pm:295
 #, c-format
 msgid "Image"
 msgstr "Image"
 
-#: any.pm:291 any.pm:300
+#: any.pm:296 any.pm:305
 #, c-format
 msgid "Root"
 msgstr "Root"
 
-#: any.pm:292 any.pm:313
+#: any.pm:297 any.pm:318
 #, c-format
 msgid "Append"
 msgstr "Übergeben"
 
-#: any.pm:294
+#: any.pm:299
 #, c-format
 msgid "Video mode"
 msgstr "Video-Modus"
 
-#: any.pm:296
+#: any.pm:301
 #, c-format
 msgid "Initrd"
 msgstr "Init-RamDisk"
 
-#: any.pm:305 any.pm:310 any.pm:312
+#: any.pm:310 any.pm:315 any.pm:317
 #, c-format
 msgid "Label"
 msgstr "Bezeichnung"
 
-#: 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 "Standard"
 
-#: any.pm:314
+#: any.pm:319
 #, c-format
 msgid "Initrd-size"
 msgstr "Größe der Init-RamDisk"
 
-#: 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 "Leere Einträge sind nicht erlaubt"
 
-#: any.pm:328
+#: any.pm:333
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Sie müssen ein Kernel-Image angeben"
 
-#: any.pm:328
+#: any.pm:333
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Sie müssen die Root-Partition festlegen"
 
-#: any.pm:329
+#: any.pm:334
 #, c-format
 msgid "This label is already used"
 msgstr "Dieser Eintrag existiert bereits"
 
-#: any.pm:342
+#: any.pm:347
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Welche Art Eintrag wollen Sie hinzufügen?"
 
-#: 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 "Anderes OS (SunOS...)"
 
-#: any.pm:344
+#: any.pm:349
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "Anderes OS (MacOS ...)"
 
-#: any.pm:344
+#: any.pm:349
 #, c-format
 msgid "Other OS (windows...)"
 msgstr "Anderes OS (Windows ...)"
 
-#: any.pm:372
+#: any.pm:377
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1099,75 +1107,75 @@ msgstr ""
 "Hier sind die verschiedenen Einträge.\n"
 "Sie können weitere hinzufügen oder existierende ändern."
 
-#: any.pm:504
+#: any.pm:509
 #, c-format
 msgid "access to X programs"
 msgstr "Zugriff auf X-Programme"
 
-#: any.pm:505
+#: any.pm:510
 #, c-format
 msgid "access to rpm tools"
 msgstr "Zugriff auf RPM-Werkzeuge"
 
-#: any.pm:506
+#: any.pm:511
 #, c-format
 msgid "allow \"su\""
-msgstr "\"su\" erlauben"
+msgstr "„su“ erlauben"
 
-#: any.pm:507
+#: any.pm:512
 #, c-format
 msgid "access to administrative files"
 msgstr "Zugriff auf Verwaltungsdateien"
 
-#: any.pm:508
+#: any.pm:513
 #, c-format
 msgid "access to network tools"
 msgstr "Zugriff auf Netzwerk-Werkzeuge"
 
-#: any.pm:509
+#: any.pm:514
 #, c-format
 msgid "access to compilation tools"
 msgstr "Zugriff auf Compilier-Werkzeuge"
 
-#: any.pm:515
+#: any.pm:520
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s wurde bereits hinzugefügt)"
 
-#: any.pm:520
+#: any.pm:525
 #, c-format
 msgid "This password is too simple"
 msgstr "Dieses Passwort ist zu einfach"
 
-#: any.pm:521
+#: any.pm:526
 #, c-format
 msgid "Please give a user name"
 msgstr "Bitte geben Sie einen Benutzernamen an"
 
-#: any.pm:522
+#: any.pm:527
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "Der Benutzername sollte nur aus Kleinbuchstaben, Ziffern, \n"
-"\"-\" und \"_\" bestehen"
+"„-“ und „_“ bestehen"
 
-#: any.pm:523
+#: any.pm:528
 #, c-format
 msgid "The user name is too long"
 msgstr "Dieser Benutzername ist zu lang"
 
-#: any.pm:524
+#: any.pm:529
 #, c-format
 msgid "This user name has already been added"
 msgstr "Dieser Benutzername existiert bereits"
 
-#: any.pm:528
+#: any.pm:533
 #, c-format
 msgid "Add user"
 msgstr "Benutzer hinzufügen"
 
-#: any.pm:529
+#: any.pm:534
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1176,128 +1184,128 @@ msgstr ""
 "Benutzer einrichten\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 "Fertig"
 
-#: any.pm:533 help.pm:52
+#: any.pm:538 help.pm:52
 #, c-format
 msgid "Accept user"
 msgstr "Benutzer akzeptieren"
 
-#: any.pm:544
+#: any.pm:549
 #, c-format
 msgid "Real name"
 msgstr "Vollständiger Name"
 
-#: 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 "Benutzername"
 
-#: any.pm:548
+#: any.pm:553
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: any.pm:550
+#: any.pm:555
 #, c-format
 msgid "Icon"
 msgstr "Symbol"
 
-#: any.pm:591 security/l10n.pm:14
+#: any.pm:596 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Automatisch anmelden"
 
-#: any.pm:592
+#: any.pm:597
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr ""
 "Ich kann Ihren Computer so einrichten, dass ein Benutzer automatisch "
 "angemeldet wird."
 
-#: any.pm:593 help.pm:52
+#: any.pm:598 help.pm:52
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Möchten Sie diese Möglichkeit nutzen?"
 
-#: any.pm:594
+#: any.pm:599
 #, c-format
 msgid "Choose the default user:"
 msgstr "Wählen Sie den Standard-Nutzer:"
 
-#: any.pm:595
+#: any.pm:600
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Wählen Sie den Window-Manager, den Sie verwenden wollen:"
 
-#: any.pm:607
+#: any.pm:612
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Bitte wählen Sie die zu verwendende Sprache."
 
-#: 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 unterstützt verschiedene Sprachen. Wählen\n"
+"Mandrakelinux unterstützt verschiedene Sprachen. Wählen\n"
 "Sie die Sprachen, die Sie installieren wollen.Diese stehen Ihnen zur\n"
 "Verfügung, nachdem die Installation fertig ist und Sie einen Neustart\n"
 "durchgeführt haben."
 
-#: any.pm:646 help.pm:660
+#: any.pm:651 help.pm:660
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Standardmäßig Unicode verwenden"
 
-#: any.pm:647 help.pm:660
+#: any.pm:652 help.pm:660
 #, c-format
 msgid "All languages"
 msgstr "Alle Sprachen"
 
-#: 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 "Staat / Region"
 
-#: any.pm:684
+#: any.pm:689
 #, c-format
 msgid "Please choose your country."
 msgstr "Bitte wählen Sie Ihren Staat."
 
-#: any.pm:686
+#: any.pm:691
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Hier ist die komplette Liste aller Staaten"
 
-#: 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 "Mehr"
 
-#: any.pm:818
+#: any.pm:823
 #, c-format
 msgid "No sharing"
 msgstr "Keine Freigaben"
 
-#: any.pm:818
+#: any.pm:823
 #, c-format
 msgid "Allow all users"
 msgstr "Allen Benutzern erlauben"
 
-#: any.pm:822
+#: any.pm:827
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1310,10 +1318,9 @@ msgstr ""
 "Wenn Sie das erlauben, können die Anwender Verzeichnisse in Konqueror oder "
 "Nautilus im Kontextmenü des entsprechenden Verzeichnisses freigeben.\n"
 "\n"
-"Mit \"Benutzerdefiniert\" können Sie eine Einstellung pro Benutzer "
-"vornehmen.\n"
+"Mit „Benutzerdefiniert“ können Sie eine Einstellung pro Benutzer vornehmen.\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."
@@ -1321,23 +1328,23 @@ msgstr ""
 "Sie können die Dateien mittels Samba oder NFS anbieten. Welche Variante "
 "wollen Sie?"
 
-#: any.pm:846
+#: any.pm:851
 #, fuzzy, c-format
 msgid "The package %s is going to be removed."
 msgstr "Die folgenden Pakete werden entfernt"
 
-#: any.pm:858
+#: any.pm:863
 #, c-format
 msgid "Launch userdrake"
 msgstr "UserDrake starten"
 
-#: any.pm:860
+#: any.pm:865
 #, fuzzy, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
 "You can use userdrake to add a user to this group."
 msgstr ""
-"Die Freigaben zwischen Benutzern verwendet die Gruppe \"fileshare\".\n"
+"Die Freigaben zwischen Benutzern verwendet die Gruppe „fileshare“.\n"
 "Sie können UserDrake verwenden, um Benutzer in diese Gruppe aufzunehmen."
 
 #: authentication.pm:12
@@ -1407,21 +1414,21 @@ msgid ""
 "good."
 msgstr ""
 "Damit dies mit einem Windows 2000-Domänen-Controller funktioniert, muss der "
-"Administrator folgendes ausführen: \"C:\\>net localgroup \"Pre-Windows 2000 "
-"Compatible Access\" everyone /add\". Anschließend muss der Server neu "
+"Administrator folgendes ausführen: „C:\\>net localgroup \"Pre-Windows 2000 "
+"Compatible Access\" everyone /add“. Anschließend muss der Server neu "
 "gestartet werden.\n"
-"Damit Sie Ihren Mandrake Linux-Rechner zur Windows(TM)-Domäne hinzufügen "
+"Damit Sie Ihren Mandrakelinux-Rechner zur Windows(TM)-Domäne hinzufügen "
 "können, benötigen Sie noch Benutzername und Passwort eines Domänen-"
 "Administrators.\n"
 "Sollte das Netzwerk noch nicht aktiv sein, wird DrakX nach der "
 "Netzwerkkonfiguration versuchen, sich in die Domäne zu integrieren.\n"
 "Sollte dies schief gehen, und die Domänenauthentifizierung funktioniert "
-"nicht, verwenden Sie nach der Installation von Mandrake Linux folgenden "
-"Befehl: \"smbpasswd -j DOMÄNE -U BENUTZER%%PASSWORT\", wobei \"DOMÄNE\" die "
-"Windows(TM)-Domäne ist, \"BENUTZER\" und \"PASSWORT\" der Benutzername und "
-"das Passwort des Domänen-Administrators.\n"
-"Mit \"wbinfo -t\" können Sie anschließend testen, ob die Anmeldung "
-"erfolgreich war."
+"nicht, verwenden Sie nach der Installation von Mandrakelinux folgenden "
+"Befehl: „smbpasswd -j DOMÄNE -U BENUTZER%%PASSWORT“, wobei „DOMÄNE“ die "
+"Windows(TM)-Domäne ist, „BENUTZER“ und „PASSWORT“ der Benutzername und das "
+"Passwort des Domänen-Administrators.\n"
+"Mit „wbinfo -t“ können Sie anschließend testen, ob die Anmeldung erfolgreich "
+"war."
 
 #: authentication.pm:49
 #, c-format
@@ -1450,7 +1457,7 @@ msgstr ""
 # so use only 7bit for this message (and do transliteration or
 # leave it in English, as it is the best for your language)
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:542
+#: bootloader.pm:533
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1465,58 +1472,58 @@ msgstr ""
 "oder warten Sie auf das Starten des Standard-OS.\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 mit grafischem Menü"
 
-#: bootloader.pm:677 help.pm:768
+#: bootloader.pm:670 help.pm:768
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO mit Textmenü"
 
-#: 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 "Sie haben nicht genug Platz in \"/boot\""
+msgstr "Sie haben nicht genug Platz in „/boot“"
 
-#: bootloader.pm:1178
+#: bootloader.pm:1175
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr ""
 "Sie können den Bootloader\n"
 "nicht auf einer %s Partition installieren!\n"
 
-#: bootloader.pm:1218
+#: bootloader.pm:1219
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr ""
 
-#: 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 ""
 
-#: bootloader.pm:1226
+#: bootloader.pm:1227
 #, fuzzy, c-format
 msgid "Re-install Boot Loader"
 msgstr "BS-Starter installieren"
@@ -1556,90 +1563,91 @@ msgstr "1 Minute"
 msgid "%d seconds"
 msgstr "%d Sekunden"
 
-#: common.pm:196
+#: common.pm:197
 #, c-format
 msgid "Can't make screenshots before partitioning"
 msgstr "Vor der Partitionierung kann ich keine Screenshots machen."
 
-#: common.pm:203
+#: common.pm:204
 #, c-format
 msgid "Screenshots will be available after install in %s"
-msgstr "Die Screenshots liegen nach der Installation unter \"%s\""
+msgstr "Die Screenshots liegen nach der Installation unter „%s“"
 
-#: common.pm:268
+#: common.pm:269
 #, c-format
 msgid "kdesu missing"
-msgstr "\"kdesu\" fehlt!"
+msgstr "„kdesu“ fehlt!"
 
-#: common.pm:271
+#: common.pm:272
 #, c-format
 msgid "consolehelper missing"
-msgstr "\"consolehelper\" fehlt!"
+msgstr "„consolehelper“ fehlt!"
 
-#: 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 "Frankreich"
 
-#: 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 "Belgien"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:212
+#: crypto.pm:17 crypto.pm:30 lang.pm:217
 #, c-format
 msgid "Czech Republic"
 msgstr "Tschechische Republik"
 
-#: 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 "Deutschland"
 
-#: crypto.pm:19 crypto.pm:32 lang.pm:244
+#: crypto.pm:19 crypto.pm:32 lang.pm:249
 #, c-format
 msgid "Greece"
 msgstr "Griechenland"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:317
+#: crypto.pm:20 crypto.pm:33 lang.pm:322
 #, c-format
 msgid "Norway"
 msgstr "Norwegen"
 
-#: 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 "Schweden"
 
-#: 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 "Niederlande"
 
-#: 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 "Italien"
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:172
+#: crypto.pm:24 crypto.pm:38 lang.pm:177
 #, c-format
 msgid "Austria"
 msgstr "Österreich"
 
-#: 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 "Vereinigte Staaten von Amerika"
@@ -1656,7 +1664,7 @@ msgstr ""
 "einzuhängen, sodass Sie diese wie bei lokalen Dateisystemen verwenden\n"
 "können (sofern der Webserver als WebDAV-Server eingerichtet wurde). \n"
 "Falls Sie Einhängepunkte für WebDAV hinzufügen wollen, wählen Sie\n"
-"\"Neu\"."
+"„Neu“."
 
 #: diskdrake/dav.pm:27
 #, c-format
@@ -1693,7 +1701,7 @@ msgstr "Bitte geben Sie die WebDAV-Server-URL an"
 #: diskdrake/dav.pm:89
 #, c-format
 msgid "The URL must begin with http:// or https://"
-msgstr "Die URL muss mit \"http://\" oder \"https://\" beginnen!"
+msgstr "Die URL muss mit „http://“ oder „https://“ beginnen!"
 
 #: diskdrake/dav.pm:111
 #, c-format
@@ -1725,7 +1733,7 @@ msgstr "Bitte machen Sie erst eine Sicherheitskopie Ihrer Daten!"
 #: 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 ""
@@ -1752,7 +1760,7 @@ msgstr ""
 "Sie haben nur eine große FAT-Partition \n"
 "(diese enthält häufig nur Microsoft DOS/Windows).\n"
 "Ich rate Ihnen, diese Partition erst zu verkleinern\n"
-"(Wählen Sie sie an und drücken Sie dann \"Größe ändern\")"
+"(Wählen Sie sie an und drücken Sie dann „Größe ändern“)"
 
 #: diskdrake/hd_gtk.pm:195
 #, c-format
@@ -1760,6 +1768,7 @@ msgid "Please click on a partition"
 msgstr "Bitte klicken Sie auf eine Partition"
 
 #: 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 "Details"
@@ -1800,7 +1809,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 "Andere"
@@ -1818,7 +1827,7 @@ msgstr "Dateisystemtypen:"
 #: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:350 diskdrake/hd_gtk.pm:353
 #, c-format
 msgid "Use ``%s'' instead"
-msgstr "Stattdessen \"%s\" verwenden"
+msgstr "Stattdessen „%s“ verwenden"
 
 #: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:353
 #: diskdrake/interactive.pm:409 diskdrake/interactive.pm:569
@@ -1842,7 +1851,7 @@ msgstr "Löschen"
 #: diskdrake/hd_gtk.pm:353
 #, c-format
 msgid "Use ``Unmount'' first"
-msgstr "Verwenden Sie erst \"Aushängen\""
+msgstr "Verwenden Sie erst „Aushängen“"
 
 #: diskdrake/interactive.pm:179
 #, c-format
@@ -1892,7 +1901,7 @@ msgstr "Beenden ohne die Partitionstabelle zu speichern?"
 #: diskdrake/interactive.pm:270
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
-msgstr "Möchten Sie die vorgenommenen Änderungen in \"/etc/fstab\" speichern?"
+msgstr "Möchten Sie die vorgenommenen Änderungen in „/etc/fstab“ speichern?"
 
 #: diskdrake/interactive.pm:277 install_steps_interactive.pm:301
 #, c-format
@@ -1923,7 +1932,7 @@ msgstr "Alle Primärpartitionen sind in Gebrauch"
 
 #: diskdrake/interactive.pm:330
 #, c-format
-msgid "I can't add any more partition"
+msgid "I can't add any more partitions"
 msgstr "Ich kann keinen weiteren Partitionen hinzufügen"
 
 #: diskdrake/interactive.pm:331
@@ -1974,13 +1983,19 @@ msgstr ""
 "Die gesicherte Partitionstabelle hat nicht dieselbe Größe.\n"
 "Soll trotzdem fortgefahren werden?"
 
-#: 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 "Warnung"
@@ -2141,7 +2156,7 @@ msgstr ""
 #: diskdrake/interactive.pm:634
 #, c-format
 msgid "Where do you want to mount %s?"
-msgstr "Wo wollen Sie \"%s\" einhängen?"
+msgstr "Wo wollen Sie „%s“ einhängen?"
 
 #: diskdrake/interactive.pm:658 diskdrake/interactive.pm:738
 #: install_interactive.pm:156 install_interactive.pm:186
@@ -2317,7 +2332,7 @@ msgstr ""
 #: diskdrake/interactive.pm:1065
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "Die Partitionstabelle der Platte \"%s\" wird gespeichert!"
+msgstr "Die Partitionstabelle der Platte „%s“ wird gespeichert!"
 
 #: diskdrake/interactive.pm:1078
 #, c-format
@@ -2341,7 +2356,7 @@ msgid ""
 "Directory %s already contains data\n"
 "(%s)"
 msgstr ""
-"Das Verzeichnis \"%s\" enthält bereits Daten\n"
+"Das Verzeichnis „%s“ enthält bereits Daten\n"
 "(%s)"
 
 #: diskdrake/interactive.pm:1107
@@ -2553,8 +2568,8 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Die Passwörter stimmen nicht überein"
 
-#: 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 "Schlüssel"
@@ -2572,7 +2587,7 @@ msgstr "Typ ändern"
 #: diskdrake/smbnfs_gtk.pm:163
 #, c-format
 msgid "Can't login using username %s (bad password?)"
-msgstr "Ich kann mich unter \"%s\" nicht anmelden! Stimmt das Passwort?"
+msgstr "Ich kann mich unter „%s“ nicht anmelden! Stimmt das Passwort?"
 
 #: diskdrake/smbnfs_gtk.pm:167 diskdrake/smbnfs_gtk.pm:176
 #, c-format
@@ -2595,7 +2610,7 @@ msgid ""
 "Please enter your username, password and domain name to access this host."
 msgstr "Bitte geben Sie Benutzername, Passwort und Domäne des Rechners an."
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3874
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3591
 #, c-format
 msgid "Username"
 msgstr "Benutzername"
@@ -2623,40 +2638,40 @@ msgstr "Das Paket %s muss installiert sein. Soll ich es installieren?"
 #: do_pkgs.pm:26
 #, c-format
 msgid "Mandatory package %s is missing"
-msgstr "Das zwingend benötigte Paket \"%s\" fehlt."
+msgstr "Das zwingend benötigte Paket „%s“ fehlt."
 
-#: do_pkgs.pm:136
+#: do_pkgs.pm:143
 #, c-format
 msgid "Installing packages..."
 msgstr "Installiere Pakete..."
 
-#: do_pkgs.pm:210
+#: do_pkgs.pm:217
 #, fuzzy, c-format
 msgid "Removing packages..."
 msgstr "Entferne %s ..."
 
-#: fs.pm:399
+#: fs.pm:409
 #, fuzzy, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
 "(e.g, for faster access on the news spool to speed up news servers)."
 msgstr "An file system An news news."
 
-#: fs.pm:402
+#: fs.pm:412
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
 "the -a option will not cause the file system to be mounted)."
 msgstr ""
 "Kann nur explizit eingehängt werden (so wird\n"
-"etwa das Dateisystem nicht bei \"-a\" eingehängt)."
+"etwa das Dateisystem nicht bei „-a“ eingehängt)."
 
-#: fs.pm:405
+#: fs.pm:415
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 
-#: fs.pm:407
+#: fs.pm:417
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2664,7 +2679,7 @@ msgid ""
 "containing binaries for architectures other than its own."
 msgstr ""
 
-#: fs.pm:411
+#: fs.pm:421
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2672,17 +2687,17 @@ msgid ""
 "have suidperl(1) installed.)"
 msgstr ""
 
-#: fs.pm:415
+#: fs.pm:425
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "Das Dateisystem read only einhängen/mounten"
 
-#: fs.pm:417
+#: fs.pm:427
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr ""
 
-#: fs.pm:421
+#: fs.pm:431
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2693,57 +2708,62 @@ msgid ""
 "user,exec,dev,suid )."
 msgstr ""
 
-#: fs.pm:429
+#: fs.pm:439
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "Schreib Zugriff für den normalen Benutzer"
 
-#: fs.pm:565 fs.pm:575 fs.pm:579 fs.pm:583 fs.pm:587 fs.pm:591 swap.pm:12
+#: fs.pm:441
+#, fuzzy, c-format
+msgid "Give read-only access to ordinary users"
+msgstr "Schreib Zugriff für den normalen Benutzer"
+
+#: 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 formatieren von %s schlug fehl"
 
-#: fs.pm:628
+#: fs.pm:647
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr ""
 "Ich bin nicht in der Lage, %s mit einem Dateisystem vom Typ %s zu "
 "formatieren."
 
-#: fs.pm:635 fs.pm:642
+#: fs.pm:654 fs.pm:661
 #, c-format
 msgid "Formatting partition %s"
-msgstr "Formatiere Partition \"%s\""
+msgstr "Formatiere Partition „%s“"
 
-#: fs.pm:639
+#: fs.pm:658
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Erzeugen und Formatieren der Datei %s"
 
-#: fs.pm:705 fs.pm:758
+#: fs.pm:718 fs.pm:771
 #, c-format
 msgid "Mounting partition %s"
-msgstr "Partition \"%s\" einhängen"
+msgstr "Partition „%s“ einhängen"
 
-#: fs.pm:706 fs.pm:759
+#: fs.pm:719 fs.pm:772
 #, c-format
 msgid "mounting partition %s in directory %s failed"
 msgstr "Das Einhängen der Partition %s in das Verzeichnis %s schlug fehl."
 
-#: fs.pm:726 fs.pm:734
+#: fs.pm:739 fs.pm:747
 #, c-format
 msgid "Checking %s"
 msgstr "Überprüfung von %s"
 
-#: fs.pm:775 partition_table.pm:636
+#: fs.pm:788 partition_table.pm:638
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "Fehler beim Aushängen von %s: %s"
 
-#: fs.pm:807
+#: fs.pm:820
 #, c-format
 msgid "Enabling swap partition %s"
-msgstr "Swap Partition \"%s\" aktivieren"
+msgstr "Swap Partition „%s“ aktivieren"
 
 #: fsedit.pm:21
 #, c-format
@@ -2753,7 +2773,7 @@ msgstr "Einfach"
 #: fsedit.pm:25
 #, c-format
 msgid "with /usr"
-msgstr "mit \"/usr\""
+msgstr "mit „/usr“"
 
 #: fsedit.pm:30
 #, c-format
@@ -2770,46 +2790,46 @@ msgid ""
 "\n"
 "Do you agree to lose all the partitions?\n"
 msgstr ""
-"Ich kann die Partitionstabelle von \"%s\" nicht lesen. Sie scheint \n"
+"Ich kann die Partitionstabelle von „%s“ nicht lesen. Sie scheint \n"
 "fehlerhaft zu sein :-(\n"
 "Ich kann fortfahren, indem ich die fehlerhaften Partitionen lösche \n"
 "(dabei gehen ALLE darauf vorhandenen DATEN VERLOREN!). Alternativ können \n"
 "Sie mir jedoch auch verbieten, die Partitionstabelle zu verändern.\n"
-"(Folgender Fehler trat auf: \"%s\").\n"
+"(Folgender Fehler trat auf: „%s“).\n"
 "\n"
 "Sind Sie einverstanden, dass ich die problematischen Partitionen lösche?\n"
 
-#: fsedit.pm:514
+#: fsedit.pm:513
 #, c-format
 msgid "You can't use JFS for partitions smaller than 16MB"
 msgstr ""
 "Sie können JFS nicht für Partitionen verwenden, die kleiner als 16MB sind!"
 
-#: fsedit.pm:515
+#: fsedit.pm:514
 #, c-format
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr ""
 "Sie können ReiserFS nicht für Partitionen verwenden, die kleiner als 32MB "
 "sind!"
 
-#: fsedit.pm:534
+#: fsedit.pm:533
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Einhängepunkte müssen mit einem / beginnen."
 
-#: fsedit.pm:535
+#: fsedit.pm:534
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr ""
 "Einhängepunkte sollten nur Buchstaben, Ziffern und den Unterstrich "
 "unterhalten"
 
-#: fsedit.pm:536
+#: fsedit.pm:535
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Es gibt bereits eine Partition, mit dem Einhängepunkt %s\n"
 
-#: fsedit.pm:538
+#: fsedit.pm:537
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2819,28 +2839,41 @@ msgstr ""
 "Sie haben eine Software-RAID-Partition als Wurzelverzeichnis (/)"
 "ausgewählt. \n"
 "Zur Zeit kann kein Bootloader damit ohne Verwendung einer \n"
-"\"/boot\"-Partition arbeiten. Stellen Sie sicher, dass Sie eine solche \n"
+"„/boot“-Partition arbeiten. Stellen Sie sicher, dass Sie eine solche \n"
 "Partition erstellen."
 
-#: fsedit.pm:541
+#: fsedit.pm:540
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr ""
 "Sie können kein logisches LVM-Medium für den Einhängepunkt %s verwenden."
 
-#: fsedit.pm:543
+#: fsedit.pm:542
+#, fuzzy, 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 ""
+"Sie haben eine Software-RAID-Partition als Wurzelverzeichnis (/)"
+"ausgewählt. \n"
+"Zur Zeit kann kein Bootloader damit ohne Verwendung einer \n"
+"„/boot“-Partition arbeiten. Stellen Sie sicher, dass Sie eine solche \n"
+"Partition erstellen."
+
+#: fsedit.pm:545
 #, c-format
 msgid ""
 "You may not be able to install lilo (since lilo doesn't handle a LV on "
 "multiple PVs)"
 msgstr ""
 
-#: fsedit.pm:546 fsedit.pm:548
+#: fsedit.pm:548 fsedit.pm:550
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "Dieses Verzeichnis muss innerhalb des Wurzelverzeichnisses bleiben"
 
-#: fsedit.pm:550
+#: fsedit.pm:552
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
@@ -2849,25 +2882,25 @@ msgstr ""
 "Sie benötigen ein echtes GNU/Linux-Dateisystem (ext2/ext3, reiserfs, xfs "
 "oder jfs) für diesen Einhängepunkt.\n"
 
-#: fsedit.pm:552
+#: fsedit.pm:554
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr ""
 "Sie können kein verschlüsseltes Medium für den Einhängepunkt %s verwenden."
 
 # ../../diskdrak1
-#: fsedit.pm:613
+#: fsedit.pm:615
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr ""
 "Nicht genug freier Platz, damit ich selbst eine Partition anlegen kann."
 
-#: fsedit.pm:615
+#: fsedit.pm:617
 #, c-format
 msgid "Nothing to do"
 msgstr "Nichts zu tun."
 
-#: fsedit.pm:711
+#: fsedit.pm:713
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Fehler beim Öffnen von %s zum Schreiben: %s"
@@ -2902,7 +2935,7 @@ msgstr "CD/DVD-Brenner"
 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 "Bandlaufwerke"
@@ -2942,36 +2975,41 @@ msgstr "Prozessoren"
 msgid "ISDN adapters"
 msgstr "ISDN Karten"
 
-#: harddrake/data.pm:71
+#: harddrake/data.pm:70
 #, c-format
 msgid "Ethernetcard"
 msgstr "Netzwerkkarten"
 
-#: 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 Adapter"
 
+#: harddrake/data.pm:81
+#, fuzzy, c-format
+msgid "AGP controllers"
+msgstr "USB-Controller"
+
 #: harddrake/data.pm:82
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "Brücken und System-Controller"
 
 #: 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 "Drucker"
 
-#: 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 "Maus"
@@ -2986,66 +3024,66 @@ msgstr "Joystick"
 msgid "(E)IDE/ATA controllers"
 msgstr "(E)IDE/ATA-Controller"
 
-#: harddrake/data.pm:93
+#: harddrake/data.pm:94
 #, c-format
 msgid "Firewire controllers"
 msgstr "Firewire-Controller"
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:95
 #, c-format
 msgid "SCSI controllers"
 msgstr "SCSI-Controller"
 
-#: harddrake/data.pm:95
+#: harddrake/data.pm:96
 #, c-format
 msgid "USB controllers"
 msgstr "USB-Controller"
 
-#: harddrake/data.pm:96
+#: harddrake/data.pm:97
 #, c-format
 msgid "SMBus controllers"
 msgstr "SMBus-Controller"
 
-#: harddrake/data.pm:97
+#: harddrake/data.pm:98
 #, c-format
 msgid "Scanner"
 msgstr "Scanner"
 
-#: harddrake/data.pm:99 standalone/harddrake2:315
+#: harddrake/data.pm:100 standalone/harddrake2:319
 #, c-format
 msgid "Unknown/Others"
 msgstr "Unbekannt/Andere"
 
-#: 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 "Einen Moment ... Ich richte die Konfiguration ein"
 
-#: harddrake/sound.pm:182
+#: harddrake/sound.pm:186
 #, c-format
 msgid "No alternative driver"
 msgstr "Kein alternativer Treiber"
 
-#: 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 ""
 "Es existiert kein alternativer OSS/ALSA-Treiber für Ihre Soundkarte (%s), "
-"die momentan \"%s\" verwendet."
+"die momentan „%s“ verwendet."
 
-#: harddrake/sound.pm:189
+#: harddrake/sound.pm:193
 #, c-format
 msgid "Sound configuration"
 msgstr "Sound-Konfiguration"
 
-#: harddrake/sound.pm:191
+#: harddrake/sound.pm:195
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -3054,7 +3092,7 @@ msgstr ""
 "Hier können Sie einen alternativen Treiber (entweder OSS oder ALSA) für Ihre "
 "Soundkarte (%s) auswählen"
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:197
 #, c-format
 msgid ""
 "\n"
@@ -3064,10 +3102,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Ihre Karte verwendet momentan den %s \"%s\" Treiber (Voreinstellung für Ihre "
-"Karte ist \"%s\")"
+"Ihre Karte verwendet momentan den %s „%s“ Treiber (Voreinstellung für Ihre "
+"Karte ist „%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 "
@@ -3087,17 +3125,17 @@ msgid ""
 "the ALSA library.\n"
 msgstr ""
 
-#: harddrake/sound.pm:209 harddrake/sound.pm:289
+#: harddrake/sound.pm:213 harddrake/sound.pm:293 standalone/drakups:134
 #, c-format
 msgid "Driver:"
 msgstr "Treiber:"
 
-#: harddrake/sound.pm:214
+#: harddrake/sound.pm:218
 #, c-format
 msgid "Trouble shooting"
 msgstr "Fehlerbehandlung"
 
-#: harddrake/sound.pm:222
+#: harddrake/sound.pm:226
 #, fuzzy, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
@@ -3106,52 +3144,52 @@ msgid ""
 "\n"
 "The new \"%s\" driver'll only be used on next bootstrap."
 msgstr ""
-"Der alte \"%s\" Treiber steht auf einer Schwarzen Liste.\n"
+"Der alte „%s“ Treiber steht auf einer Schwarzen Liste.\n"
 "\n"
 "Der Treiber soll Fehlfunktionen verursachen.\n"
 "\n"
-"Der neue \"%s\" Treiber steht nach einem Neustart zur Verfügung."
+"Der neue „%s“ Treiber steht nach einem Neustart zur Verfügung."
 
-#: harddrake/sound.pm:230
+#: harddrake/sound.pm:234
 #, c-format
 msgid "No open source driver"
 msgstr "Kein OpenSource-Treiber"
 
-#: 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 ""
 "Es existiert kein freier Treiber für Ihre Soundkarte (%s), aber es gibt "
-"einen proprietären Treiber unter  \"%s\"."
+"einen proprietären Treiber unter  „%s“."
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:238
 #, c-format
 msgid "No known driver"
 msgstr "Kein bekannter Treiber"
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:239
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "Es gibt keinen bekannten Treiber für Ihre Soundkarte (%s)"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:243
 #, c-format
 msgid "Unknown driver"
 msgstr "Unbekannter Treiber"
 
-#: harddrake/sound.pm:240
+#: harddrake/sound.pm:244
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "Fehler: Es gibt keinen bekannten Treiber für Ihre Soundkarte (%s)"
 
-#: harddrake/sound.pm:253
+#: harddrake/sound.pm:257
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Sound-Fehlerbehandlung"
 
-#: harddrake/sound.pm:254
+#: harddrake/sound.pm:258
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3175,17 +3213,17 @@ msgid ""
 "- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound card.\n"
 msgstr ""
 
-#: harddrake/sound.pm:280
+#: harddrake/sound.pm:284
 #, c-format
 msgid "Let me pick any driver"
 msgstr "Lassen Sie mich irgendeinen Treiber auswählen"
 
-#: harddrake/sound.pm:283
+#: harddrake/sound.pm:287
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "Ich wähle einen willkürlichen Treiber"
 
-#: 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 "
@@ -3197,7 +3235,7 @@ msgstr ""
 "Wenn Sie wirklich wissen, welcher Treiber der Richtige für Ihre Karte ist,\n"
 "wählen Sie einen aus der Liste aus.\n"
 "\n"
-"Der gerade verwendete Treiber für Ihre \"%s\" Soundkarte ist \"%s\" "
+"Der gerade verwendete Treiber für Ihre „%s“ Soundkarte ist „%s“ "
 
 #: harddrake/v4l.pm:14 harddrake/v4l.pm:66
 #, c-format
@@ -3273,18 +3311,18 @@ msgstr "Radio Unterstützung aktivieren"
 #, 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 ""
 "Lesen Sie bitte aufmerksam die Lizenz, bevor Sie fortfahren. Sie umfasst\n"
-"die gesamte Mandrake Linux Distribution. Sollten Sie nicht in allen Punkten\n"
+"die gesamte Mandrakelinux Distribution. Sollten Sie nicht in allen Punkten\n"
 "zustimmen, betätigen Sie bitte die Schaltfläche „%s“, um die Installation\n"
 "abzubrechen. Um mit der Installation fortzufahren, betätigen Sie die\n"
 "Schaltfläche „%s“."
 
 #: 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 "Akzeptieren"
@@ -3373,10 +3411,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 "Weiter"
@@ -3458,11 +3495,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 ""
-"Da die Mandrake Linux-Distribution stetig wächst, wurde sie in mehrere\n"
+"Da die Mandrakelinux-Distribution stetig wächst, wurde sie in mehrere\n"
 "CD-ROMs unterteilt. Es kann daher vorkommen, dass DrakX Pakete von anderen,\n"
 "als der Installations-CD-ROM installieren will. In diesem Fall wird es die\n"
 "aktuelle CD auswerfen und nach einer anderen fragen."
@@ -3473,12 +3510,12 @@ msgstr ""
 #, fuzzy, 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"
@@ -3521,7 +3558,7 @@ msgid ""
 "updating an existing system."
 msgstr ""
 "Nun ist es Zeit sich zu entscheiden, welche Programme Sie auf Ihrem Rechner\n"
-"installieren wollen. Es gibt tausende von Paketen für Mandrake Linux, und\n"
+"installieren wollen. Es gibt tausende von Paketen für Mandrakelinux, und\n"
 "Sie müssen sie nicht alle auswendig kennen.\n"
 "\n"
 "Die Pakete sind nach ihrer Verwendung in vier Kategorien eingeteilt. Sie\n"
@@ -3622,10 +3659,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"
@@ -3660,7 +3697,7 @@ msgstr ""
 "!! Es kommt vor, dass Server- und Dienst-Pakete angewählt wurden - entweder\n"
 "absichtlich, oder als Paket einer ganzen Gruppe; sollte das der Fall sein,\n"
 "werden Sie nun gefragt, ob Sie diese wirklich installiert haben wollen.\n"
-"Unter Mandrake Linux werden installierte Server und Dienste automatisch\n"
+"Unter Mandrakelinux werden installierte Server und Dienste automatisch\n"
 "beim Betriebssystemstart gestartet. Selbst wenn zum Zeitpunkt, als die\n"
 "Distribution zusammengestellt wurde, keine Sicherheitslücken oder Fehler in\n"
 "diesen Paketen bekannt waren, ist natürlich nicht auszuschließen, dass\n"
@@ -3681,17 +3718,17 @@ msgstr ""
 "erstellen, lesen Sie bitte den zweiten Tipp des vorangegangenen\n"
 "Installationsschrittes."
 
-#: 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 "Nein"
 
-#: 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 "Ja"
@@ -3708,7 +3745,7 @@ msgstr "Automatische Abhängigkeiten"
 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"
@@ -3723,7 +3760,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"
@@ -3750,7 +3787,7 @@ msgstr ""
 "Verwendung von Winmodems Winmodems sind eigentlich keine Modems, die den\n"
 "Namen verdienen, da sie die CPU Ihres Rechners benötigen, um funktionieren\n"
 "zu können, was die Rechenleistung für anderen Prozesse vermindert. Einige\n"
-"dieser Modems können Sie mittlerweile unter Mandrake Linux zum\n"
+"dieser Modems können Sie mittlerweile unter Mandrakelinux zum\n"
 "Funktionieren bewegen, die Mehrzahl jedoch nicht. Unter LinModems finden\n"
 "Sie eine Liste.\n"
 "\n"
@@ -3780,8 +3817,8 @@ msgstr ""
 "während der Installation angebotenen."
 
 #: 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 "Konfigurieren"
@@ -3857,7 +3894,7 @@ msgstr ""
 "Server in Ihrer Nähe. Damit die funktioniert benötigen Sie eine ständige\n"
 "Internetverbindung."
 
-#: 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 "Hardware Uhr gestellt auf GMT"
@@ -3899,7 +3936,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"
@@ -3953,7 +3990,7 @@ msgid ""
 msgstr ""
 "X (das X Window System) ist das Herz der grafischen Benutzeroberfläche von\n"
 "GNU/Linux. Es bildet die Grundlage für die Vielzahl grafischer\n"
-"Benutzerumgebungen, die Mandrake Linux Ihnen anbietet (wie etwa KDE, GNOME,\n"
+"Benutzerumgebungen, die Mandrakelinux Ihnen anbietet (wie etwa KDE, GNOME,\n"
 "AfterStep oder WindowMaker). Auch hier wird DrakX die Konfiguration soweit\n"
 "wie möglich selbstständig vollziehen.\n"
 "\n"
@@ -4091,7 +4128,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"
@@ -4118,7 +4155,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"
@@ -4127,7 +4164,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"
@@ -4145,11 +4182,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 ""
-"Sie müssen nun entscheiden, wo auf Ihrer/n Festplatte(n) Ihr Mandrake Linux\n"
+"Sie müssen nun entscheiden, wo auf Ihrer/n Festplatte(n) Ihr Mandrakelinux\n"
 "System installiert werden soll. Sofern alles leer ist bzw. ein\n"
 "Betriebssystem alles belegt, müssen die Platte(n) neu partitioniert werden.\n"
 "Prinzipiell besteht das Partitionieren der Platte(n) darin, den\n"
-"Plattenplatz so aufzuteilen, dass Ihr Mandrake Linux darauf installiert\n"
+"Plattenplatz so aufzuteilen, dass Ihr Mandrakelinux darauf installiert\n"
 "werden kann.\n"
 "\n"
 "Da dieser Schritt normalerweise irreversibel ist, kann das Partitionieren\n"
@@ -4180,7 +4217,7 @@ msgstr ""
 "defragmentiert. Dennoch sollten Sie vor diesem Schritt eine Sicherungskopie\n"
 "Ihrer Daten auf einem anderem Medium als der zu verändernden Festplatte\n"
 "vornehmen. Sie sollten diese Variante wählen, falls Sie beide\n"
-"Betriebssysteme (Microsoft Windows und Mandrake Linux) nebeneinander nutzen\n"
+"Betriebssysteme (Microsoft Windows und Mandrakelinux) nebeneinander nutzen\n"
 "wollen.\n"
 "\n"
 "   Bevor Sie sich für diese Variante entscheiden, sei hier noch einmal\n"
@@ -4188,7 +4225,7 @@ msgstr ""
 "als momentan.\n"
 "\n"
 " * „%s“: Falls Sie alle Daten Ihrer Platte verlieren, und sie durch Ihr\n"
-"neues Mandrake Linux System ersetzen wollen, wählen Sie diese Schaltfläche.\n"
+"neues Mandrakelinux System ersetzen wollen, wählen Sie diese Schaltfläche.\n"
 "Beachten Sie, dass dieser Schritt nicht rückgängig gemacht werden kann.\n"
 "\n"
 "   !! Wenn Sie diese Variante wählen, werden alle Ihre Daten auf der Platte\n"
@@ -4206,7 +4243,7 @@ msgstr ""
 "vornehmen, aber gleichzeitig auch sehr leicht Daten verlieren können. Diese\n"
 "Option ist nur geeignet, wenn Sie wissen, was Sie tun. Um zu erfahren, wie\n"
 "Sie DiskDrake verwenden können, lesen Sie bitte das Kapitel „Ihre\n"
-"Partitionen verwalten“ im „Starter Handbuch“\n"
+"Partitionen verwalten„ im „Starter Handbuch“\n"
 "\n"
 "(*) In Deutschland ist es quasi unmöglich, Komplettrechner mit leeren\n"
 "Festplatten zu erhalten, da laut Gesetz nur Rechner mit BS verkauft werden\n"
@@ -4315,17 +4352,17 @@ msgstr ""
 msgid "Generate auto-install floppy"
 msgstr "Erstellen einer Auto-Installationsdiskette"
 
-#: help.pm:418 install_steps_interactive.pm:1320
+#: help.pm:418 install_steps_interactive.pm:1329
 #, c-format
 msgid "Replay"
 msgstr "Erneut abspielen"
 
-#: help.pm:418 install_steps_interactive.pm:1320
+#: help.pm:418 install_steps_interactive.pm:1329
 #, c-format
 msgid "Automated"
 msgstr "Automatisiert"
 
-#: help.pm:418 install_steps_interactive.pm:1323
+#: help.pm:418 install_steps_interactive.pm:1332
 #, c-format
 msgid "Save packages selection"
 msgstr "Paketauswahl speichern"
@@ -4355,7 +4392,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."
@@ -4387,12 +4424,12 @@ msgstr ""
 "Blöcke untersuchen wollen."
 
 #: 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 "Zurück"
@@ -4402,7 +4439,7 @@ msgstr "Zurück"
 #: 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"
@@ -4414,7 +4451,7 @@ msgid ""
 "appear: review the selection, and press \"%s\" to retrieve and install the\n"
 "selected package(s), or \"%s\" to abort."
 msgstr ""
-"Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandrake Linux\n"
+"Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandrakelinux\n"
 "Installation bereits einige Pakete aktualisiert wurden, etwa da noch Fehler\n"
 "entdeckt und beseitigt wurden oder da in Paketen Sicherheitslücken entdeckt\n"
 "wurden, für die bereits Lösungen existieren. Um von diesen aktualisierten\n"
@@ -4432,7 +4469,7 @@ msgstr ""
 "betätigen Sie einfach die Schaltfläche „%s“."
 
 #: 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 "Installation"
@@ -4482,7 +4519,7 @@ msgstr "Sicherheitsadministrator (Benutzername oder E-Mail):"
 #, 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"
@@ -4646,7 +4683,7 @@ msgstr "In den Normal-Modus wechseln"
 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"
@@ -4675,7 +4712,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Es wurde mehr als eine Windows-Partition gefunden. Wählen Sie bitte, welche\n"
-"Sie verkleinern wollen, um Platz für Ihr neues Mandrake Linux zu schaffen.\n"
+"Sie verkleinern wollen, um Platz für Ihr neues Mandrakelinux zu schaffen.\n"
 "\n"
 "Die Partitionen werden folgendermaßen aufgelistet: „Linux-Name“,\n"
 "„Windows-Name“, „Kapazität“.\n"
@@ -4728,7 +4765,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"
@@ -4736,13 +4773,13 @@ 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 ""
 "Dieser Schritt wird nur aufgerufen, wenn mindestens eine GNU/Linux\n"
 "Partition auf Ihren Festplatten gefunden wird.\n"
@@ -4751,18 +4788,18 @@ msgstr ""
 "Wahl zwischen einer Aktualisierung einer bereits vorhandenen Mandrake\n"
 "Linux-Version oder einer kompletten Neuinstallation:\n"
 "\n"
-" * „%s“: Entfernt komplett ältere Versionen von Mandrake Linux, die noch\n"
+" * „%s“: Entfernt komplett ältere Versionen von Mandrakelinux, die noch\n"
 "installiert sind - um genau zu sein, können Sie je nach aktuellem Inhalt\n"
 "Ihrer Platte auch einige ältere Linux- oder anderweitige Partitionen\n"
 "unangetastet behalten.\n"
 "\n"
-" * „%s“: Mit dieser Variante können Sie eine existierende Mandrake Linux\n"
+" * „%s“: Mit dieser Variante können Sie eine existierende Mandrakelinux\n"
 "Version aktualisieren. Die Partitionstabellen sowie die persönlichen\n"
 "Verzeichnisse der Anwender bleiben erhalten. Alle anderen\n"
 "Installationsschritte werden wie bei einer Installation ausgeführt.\n"
 "\n"
-"Aktualisierungen von Mandrake Linux „8.1“ oder neueren Systemen sollten\n"
-"problemlos funktionieren. Ältere Versionen von Mandrake Linux sollten Sie\n"
+"Aktualisierungen von Mandrakelinux „8.1“ oder neueren Systemen sollten\n"
+"problemlos funktionieren. Ältere Versionen von Mandrakelinux sollten Sie\n"
 "nicht zu aktualisieren versuchen."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -4823,7 +4860,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"
@@ -4862,7 +4899,7 @@ msgstr ""
 "Über UTF-8 (Unicode) Unterstützung: Unicode ist ein Zeichenkodierung, die\n"
 "die existierenden Kodierungen ablösen soll und die Zeichen aller\n"
 "existierender Sprachen beinhalten. Komplette Unterstützung in GNU/Linux ist\n"
-"leider immer noch nicht gegeben. Daher verwendet Mandrake Linux diese\n"
+"leider immer noch nicht gegeben. Daher verwendet Mandrakelinux diese\n"
 "Kodierung je nach Wahl des Anwenders:\n"
 "\n"
 " * Falls Sie eine Sprache nutzen, die eine gut unterstütztes Kodierung\n"
@@ -5011,7 +5048,7 @@ msgid ""
 "will never be connected to the Internet and you absolutely trust everybody\n"
 "who uses your computer, you can choose to have \"%s\"."
 msgstr ""
-"Sie können nun das »root« Passwort für Ihr Mandrake Linux System eingeben.\n"
+"Sie können nun das »root« Passwort für Ihr Mandrakelinux System eingeben.\n"
 "\n"
 "»root« ist das Benutzerkennzeichen des Systemadministrators. Er ist der\n"
 "einzige der berechtigt ist, neue Software zu installieren, Systemdateien zu\n"
@@ -5059,7 +5096,7 @@ msgid "authentication"
 msgstr "Authentifizierung"
 
 #. -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 "Kein Passwort"
@@ -5096,7 +5133,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"
@@ -5132,7 +5169,7 @@ msgstr ""
 "versuchen, APIC zu deaktivieren, indem Sie diese Markierung löschen.\n"
 "\n"
 "!! Machen Sie sich klar, dass Sie sich selbst darum kümmern müssen,\n"
-"irgendwie Ihr Mandrake Linux-System zu starten, wenn Sie hier keinen\n"
+"irgendwie Ihr Mandrakelinux-System zu starten, wenn Sie hier keinen\n"
 "Betriebssystemstarter installieren (durch Auswahl von „%s“). Stellen Sie\n"
 "auch sicher, dass Sie wissen was Sie tun, wenn Sie hier Einstellungen\n"
 "verändern ... !!\n"
@@ -5168,7 +5205,7 @@ msgstr "Wartezeit vor dem Starten des Standard-Betriebssystems"
 #: help.pm:768
 #, fuzzy, c-format
 msgid "Force no APIC"
-msgstr "\"Kein APIC\" erzwingen"
+msgstr "„Kein APIC“ erzwingen"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
@@ -5208,8 +5245,9 @@ msgstr ""
 "Startdisketten sorgen, um diese Systeme erreichen zu können!"
 
 #: 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 "Hinzufügen"
@@ -5220,7 +5258,8 @@ msgid "Modify"
 msgstr "Ändern"
 
 #: 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 "Entfernen"
@@ -5269,7 +5308,7 @@ msgstr ""
 #, fuzzy, 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"
@@ -5294,7 +5333,7 @@ msgid ""
 "Center and clicking the expert button."
 msgstr ""
 "Hier können Sie das Drucksystem für Ihren Rechner wählen. Andere\n"
-"Betriebssysteme bieten Ihnen nur eines, bei Mandrake Linux können Sie\n"
+"Betriebssysteme bieten Ihnen nur eines, bei Mandrakelinux können Sie\n"
 "zwischen zwei verschiedenen wählen.\n"
 "\n"
 " * „%s“ - Es steht für „print, don't queue“ (engl. für „Drucken ohne\n"
@@ -5322,7 +5361,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"
@@ -5552,8 +5591,8 @@ msgstr ""
 "angezeigt. Sollte die von DrakX getroffene Auswahl nicht korrekt sein,\n"
 "betätigen Sie einfach die Schaltfläche, um sie zu korrigieren."
 
-#: 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 "Soundkarte"
@@ -5685,17 +5724,17 @@ msgstr ""
 "wählen Sie diese Schaltfläche. Es sei angemerkt, dass dieser Punkt sich an\n"
 "fortgeschrittenere Nutzer richtet.\n"
 "\n"
-" * Sie können hier die Dienste wählen, die ab dem Start von Mandrake Linux\n"
+" * Sie können hier die Dienste wählen, die ab dem Start von Mandrakelinux\n"
 "zur Verfügung gestellt werden sollen. Wollen Sie den Rechner als Server\n"
 "verwenden, sollten Sie unbedingt einen Blick auf diese Liste werfen."
 
 #: 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 "Tastatur"
 
-#: help.pm:991 install_steps_interactive.pm:921
+#: help.pm:991 install_steps_interactive.pm:926
 #, c-format
 msgid "Timezone"
 msgstr "Zeitzone"
@@ -5705,7 +5744,7 @@ msgstr "Zeitzone"
 msgid "Graphical Interface"
 msgstr "Grafikumgebung"
 
-#: help.pm:991 install_steps_interactive.pm:995
+#: help.pm:991 install_steps_interactive.pm:1000
 #, c-format
 msgid "TV card"
 msgstr "TV-Karte"
@@ -5715,27 +5754,27 @@ msgstr "TV-Karte"
 msgid "ISDN card"
 msgstr "ISDN-Karte"
 
-#: 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 "Netzwerk"
 
-#: help.pm:991 install_steps_interactive.pm:1039
+#: help.pm:991 install_steps_interactive.pm:1044
 #, c-format
 msgid "Security Level"
 msgstr "Sicherheitsebene"
 
-#: help.pm:991 install_steps_interactive.pm:1053
+#: help.pm:991 install_steps_interactive.pm:1058
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: help.pm:991 install_steps_interactive.pm:1067
+#: help.pm:991 install_steps_interactive.pm:1072
 #, c-format
 msgid "Bootloader"
 msgstr "Bootloader"
 
-#: 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 "Dienste"
@@ -5746,11 +5785,11 @@ msgstr "Dienste"
 #, 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 ""
 "Bitte wählen Sie die Festplatte, die Sie löschen wollen, um Ihr neues\n"
-"Mandrake Linux zu installieren. Bedenken Sie dabei, dass alle Daten auf\n"
+"Mandrakelinux zu installieren. Bedenken Sie dabei, dass alle Daten auf\n"
 "dieser Platte nach diesem Schritt unwiederbringlich verloren sind!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -5790,7 +5829,7 @@ msgstr ""
 msgid "You must also format %s"
 msgstr "Sie müssen auch %s formatieren."
 
-#: install_any.pm:413
+#: install_any.pm:411
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -5814,7 +5853,7 @@ msgstr ""
 "\n"
 "Wollen Sie diese Server wirklich installieren?\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"
@@ -5828,31 +5867,31 @@ msgstr ""
 "\n"
 "Wollen Sie diese Pakete wirklich entfernen?\n"
 
-#: install_any.pm:812
+#: install_any.pm:827
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Legen Sie eine FAT-formatierte Diskette in Laufwerk %s ein."
 
-#: install_any.pm:816
+#: install_any.pm:831
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "Diese Diskette ist nicht FAT-formatiert"
 
-#: install_any.pm:828
+#: install_any.pm:843
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 msgstr ""
 "Um diese gespeicherte Paketauswahl zu verwenden, starten Sie die \n"
-"Installation bitte mit: \"boot defcfg=floppy\""
+"Installation bitte mit: „boot 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 "Fehler beim Lesen der Datei %s"
 
-#: install_any.pm:973
+#: install_any.pm:995
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5878,7 +5917,7 @@ msgid ""
 "Some hardware on your computer needs ``proprietary'' drivers to work.\n"
 "You can find some information about them at: %s"
 msgstr ""
-"Einige Hardware-Komponenten Ihres Rechners benötigen \"proprietäre\"\n"
+"Einige Hardware-Komponenten Ihres Rechners benötigen „proprietäre“\n"
 "Treiber. Weitere Infos hierzu finden Sie unter: %s"
 
 #: install_interactive.pm:62
@@ -5890,7 +5929,7 @@ msgid ""
 msgstr ""
 "Sie brauchen eine root-Partition.\n"
 "Erzeugen Sie eine Partition (oder klicken Sie auf eine existierende).\n"
-"Wählen Sie \"Einhängepunkt\" und setzen Sie ihn auf \"/\""
+"Wählen Sie „Einhängepunkt“ und setzen Sie ihn auf „/“"
 
 #: install_interactive.pm:67
 #, c-format
@@ -5906,7 +5945,7 @@ msgstr ""
 #: install_interactive.pm:70 install_steps.pm:206
 #, c-format
 msgid "You must have a FAT partition mounted in /boot/efi"
-msgstr "Sie müssen eine FAT-Partition in \"/boot/efi\" eingehängt haben."
+msgstr "Sie müssen eine FAT-Partition in „/boot/efi“ eingehängt haben."
 
 #: install_interactive.pm:97
 #, c-format
@@ -5979,11 +6018,11 @@ msgstr "Berechne die Größe der Windows-Partition"
 #, 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 ""
 "Ihre Windows-Partition ist zu sehr fragmentiert.\n"
-"Starten Sie bitte erst \"defrag\" unter Windows."
+"Starten Sie bitte erst „defrag“ unter Windows."
 
 #: install_interactive.pm:164
 #, c-format
@@ -6004,9 +6043,9 @@ msgstr ""
 "DrakX wird nun die Größe Ihrer Windows-Partition verändern.\n"
 "Seien Sie vorsichtig: Diese Aktion ist gefährlich. Falls Sie es noch\n"
 "nicht getan haben, sollten Sie nun die Installation abbrechen, um\n"
-"\"chkdsk c:\" von einem DOS Prompt unter Windows auf die\n"
+"„chkdsk c:“ von einem DOS Prompt unter Windows auf die\n"
 "Partition anzuwenden (Achtung:scandisk unter der grafischen\n"
-"Windows Oberfläche reicht nicht aus, bitte \"chkdsk\" in einem DOS Prompt "
+"Windows Oberfläche reicht nicht aus, bitte „chkdsk“ in einem DOS Prompt "
 "ausführen!)\n"
 "Defragmentieren. Anschließend können Sie die Installation erneut starten.\n"
 "Sie sollten natürlich generell Sicherheitskopien Ihrer Daten angelegt\n"
@@ -6071,7 +6110,7 @@ msgid ""
 "When you are done, don't forget to save using `w'"
 msgstr ""
 "Sie können nun %s partitionieren.\n"
-"Vergessen Sie nicht die Einstellungen mittels ,w` zu speichern, \n"
+"Vergessen Sie nicht die Einstellungen mittels ‚w‘ zu speichern, \n"
 "sobald Sie fertig sind."
 
 #: install_interactive.pm:269
@@ -6100,17 +6139,17 @@ msgid "Bringing down the network"
 msgstr "Netzwerkverbindung trennen"
 
 #: install_messages.pm:9
-#, c-format
+#, fuzzy, c-format
 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"
@@ -6164,7 +6203,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"
@@ -6201,7 +6240,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"
@@ -6221,21 +6260,21 @@ msgid ""
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 msgstr ""
 "Bei dieser Übersetzung handelt es sich um eine inoffizielle Übersetzung\n"
-"der Mandrake Linux-Lizenz in die deutsche Sprache. Sie ist keine\n"
+"der Mandrakelinux-Lizenz in die deutsche Sprache. Sie ist keine\n"
 "rechtsverbindliche Darstellung der Lizenzbedingungen der Software in\n"
 "dieser Distribution - nur der ursprüngliche französische Text der\n"
-"Mandrake Linux-Lizenz ist rechtsverbindlich. Wir hoffen aber, dass diese\n"
+"Mandrakelinux-Lizenz ist rechtsverbindlich. Wir hoffen aber, dass diese\n"
 "Übersetzung den deutschsprechenden Benutzern das Verständnis dieser\n"
 "Lizenz erleichtert.\n"
 "\n"
 "\n"
 "Einführung\n"
 "\n"
-"Das Betriebssystem und die anderen Komponenten, die in Mandrake Linux\n"
-"enthalten sind, werden hier \"Software-Produkte\" genannt. Die\n"
+"Das Betriebssystem und die anderen Komponenten, die in Mandrakelinux\n"
+"enthalten sind, werden hier „Software-Produkte“ genannt. Die\n"
 "Software-Produkte umfassen, aber sind nicht beschränkt auf, die\n"
 "Gesamtheit der Programme, Methoden, Regeln, und Dokumentation, welche\n"
-"zum Betriebssystem und den anderen Komponenten der Mandrake Linux\n"
+"zum Betriebssystem und den anderen Komponenten der Mandrakelinux\n"
 "Distribution gehören.\n"
 "\n"
 "\n"
@@ -6296,7 +6335,7 @@ msgstr ""
 "Die Software-Produkte bestehen aus Komponenten, die von verschiedenen\n"
 "Personen und Einrichtungen erstellt wurden. Die meisten Komponenten\n"
 "unterliegen den Bedingungen der GNU General Public License, im folgenden\n"
-"\"GPL\" genannt, oder ähnlichen Lizenzen. Die meisten dieser Lizenzen\n"
+"„GPL“ genannt, oder ähnlichen Lizenzen. Die meisten dieser Lizenzen\n"
 "erlauben es, die Komponenten, die diesen Lizenzen unterliegen, zu\n"
 "benutzen, zu duplizieren, anzupassen, und weiterzugeben. Bitte lesen sie\n"
 "sorgfältig die Bedingungen der Lizenzabkommen von jeder Komponente,\n"
@@ -6315,7 +6354,7 @@ msgstr ""
 "Softwareprodukte geschützt.\n"
 "MandrakeSoft S. A. behält sich das Recht vor, die Software-Produkte zu\n"
 "modifizieren und anzupassen.\n"
-"\"Mandrake\", \"Mandrake Linux\" und entsprechende Logos sind eingetragene\n"
+"„Mandrake“, „Mandrakelinux“ und entsprechende Logos sind eingetragene\n"
 "Warenzeichen der MandrakeSoft S. A..\n"
 "\n"
 "\n"
@@ -6340,11 +6379,11 @@ msgstr ""
 "Introduction\n"
 "\n"
 "Le système d'exploitation et les divers composants disponibles dans la \n"
-"distribution Mandrake Linux sont ci-après dénommés ensemble les \n"
+"distribution Mandrakelinux sont ci-après dénommés ensemble les \n"
 "« Logiciels ». Les Logiciels comprennent notamment, mais de façon non \n"
 "limitative, l'ensemble des programmes, procédés, règles et documentations \n"
 "relatifs au système d'exploitation et aux divers composants de la \n"
-"distribution Mandrake Linux.\n"
+"distribution Mandrakelinux.\n"
 "\n"
 "\n"
 "1. Licence\n"
@@ -6366,7 +6405,7 @@ msgstr ""
 "et \n"
 "toute copie de tous programmes et de toutes documentations qui constituent \n"
 "le système d'exploitation et les divers composants disponibles dans la \n"
-"distribution Mandrake Linux.\n"
+"distribution Mandrakelinux.\n"
 "\n"
 "\n"
 "2. Garantie et limitations de garantie\n"
@@ -6395,7 +6434,7 @@ msgstr ""
 "des éventuelles condamnations et indemnités devant être versées par suite \n"
 "d'une décision de justice) qui ferait suite à l'utilisation, la détention \n"
 "ou au simple téléchargement depuis l'un des sites de téléchargement de \n"
-"Mandrake Linux de logiciels prohibés par la législation à laquelle vous \n"
+"Mandrakelinux de logiciels prohibés par la législation à laquelle vous \n"
 "êtes soumis. Cet avertissement concerne notamment certains logiciels de \n"
 "cryptographie fournis avec les Logiciels.\n"
 "\n"
@@ -6422,8 +6461,7 @@ msgstr ""
 "Tous les droits, titres et intérêts des différents Logiciels sont la \n"
 "propriété exclusive de leurs auteurs respectifs et sont protégés au titre \n"
 "des droits de propriété intellectuelle et autres lois régissant le droit \n"
-"des Logiciels. Les marques « Mandrake » et « Mandrake Linux » ainsi que "
-"les \n"
+"des Logiciels. Les marques « Mandrake » et « Mandrakelinux » ainsi que les \n"
 "logotypes associés sont déposés par MandrakeSoft S.A. \n"
 "\n"
 "\n"
@@ -6488,7 +6526,7 @@ msgstr ""
 "\n"
 "Bitte lesen Sie die nachfolgenden Ausführungen sorgfältig. Wenn Sie mit\n"
 "irgendeinem Teil nicht einverstanden sind, dürfen Sie nicht den Inhalt\n"
-"der folgenden CDs installieren. Klicken Sie auf \"Zurückweisen\", um die\n"
+"der folgenden CDs installieren. Klicken Sie auf „Zurückweisen“, um die\n"
 "Installation ohne Verwendung dieser CDs fortzusetzen.\n"
 "\n"
 "\n"
@@ -6516,14 +6554,14 @@ msgstr ""
 "Softwareprodukte geschützt.\n"
 
 #: install_messages.pm:128
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of Mandrake "
-"Linux,\n"
+"For information on fixes which are available for this release of "
+"Mandrakelinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6531,7 +6569,7 @@ 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 ""
 "Herzlichen Glückwunsch, die Installation ist abgeschlossen.\n"
 "Entfernen Sie die Startmedien (CD-ROMs / Disketten) und drücken Sie die "
@@ -6542,8 +6580,8 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"Wie Sie Ihr System warten können, erfahren Sie im Kapitel \"Nach der "
-"Installation\" im offiziellen Benutzerhandbuch von Mandrake Linux."
+"Wie Sie Ihr System warten können, erfahren Sie im Kapitel „Nach der "
+"Installation“ im offiziellen Benutzerhandbuch von Mandrakelinux."
 
 #: install_messages.pm:141
 #, c-format
@@ -6555,7 +6593,7 @@ msgstr "http://www.mandrakelinux.com/en/100errata.php3"
 msgid "Duplicate mount point %s"
 msgstr "Den Einhängepunkt %s kopieren"
 
-#: install_steps.pm:410
+#: install_steps.pm:406
 #, c-format
 msgid ""
 "Some important packages didn't get installed properly.\n"
@@ -6565,10 +6603,10 @@ msgid ""
 msgstr ""
 "Einige wichtige Pakete wurden nicht richtig installiert. \n"
 "Entweder ist Ihr CD-ROM-Laufwerk oder Ihre CD-ROM defekt. \n"
-"Testen Sie die CD-ROM auf einem Linux-Rechner mittels \"rpm -qpl \n"
-"Mandrake/rpms/*.rpm\"\n"
+"Testen Sie die CD-ROM auf einem Linux-Rechner mittels „rpm -qpl \n"
+"Mandrake/rpms/*.rpm“\n"
 
-#: install_steps.pm:541
+#: install_steps.pm:535
 #, c-format
 msgid "No floppy drive available"
 msgstr "Kein Disketten-Laufwerk verfügbar"
@@ -6576,20 +6614,20 @@ msgstr "Kein Disketten-Laufwerk verfügbar"
 #: install_steps_auto_install.pm:76 install_steps_stdio.pm:27
 #, c-format
 msgid "Entering step `%s'\n"
-msgstr "Beginn von Schritt \"%s\"\n"
+msgstr "Beginn von Schritt „%s“\n"
 
 #: install_steps_gtk.pm:178
 #, 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 ""
 "Ihr Rechner hat nicht genug Ressourcen. Vermutlich werden bei der \n"
 "Installation Probleme auftreten. In diesem Fall sollten Sie eine \n"
 "Text-Installation versuchen. Drücken Sie dafür <F1> während dem \n"
-"Installationsstart und geben Sie \"text\" an der Eingabeaufforderung \n"
+"Installationsstart und geben Sie „text“ an der Eingabeaufforderung \n"
 "ein."
 
 #: install_steps_gtk.pm:232 install_steps_interactive.pm:587
@@ -6635,7 +6673,7 @@ msgstr "Sie können dieses Paket nicht auswählen/abwählen."
 #: install_steps_gtk.pm:379
 #, fuzzy, c-format
 msgid "due to missing %s"
-msgstr "Ich kann \"kdesu\" nicht finden!"
+msgstr "Ich kann „kdesu“ nicht finden!"
 
 #: install_steps_gtk.pm:380
 #, c-format
@@ -6775,9 +6813,9 @@ msgid ""
 msgstr ""
 "Bitte wechseln Sie die CD!\n"
 "\n"
-"Bitte legen Sie die CD-ROM \"%s\" in Ihr Laufwerk,\n"
+"Bitte legen Sie die CD-ROM „%s“ in Ihr Laufwerk,\n"
 "dann drücken Sie OK.\n"
-"Falls Sie sie nicht vorliegen haben, drücken Sie \"Abbrechen\"."
+"Falls Sie sie nicht vorliegen haben, drücken Sie „Abbrechen“."
 
 #: install_steps_gtk.pm:612 install_steps_interactive.pm:710
 #, c-format
@@ -6795,8 +6833,8 @@ msgstr "Wollen Sie trotzdem fortfahren?"
 msgid "There was an error installing packages:"
 msgstr "Bei der Installation der Pakete trat ein Fehler auf:"
 
-#: 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 "Nicht eingerichtet"
@@ -6891,7 +6929,7 @@ msgstr "IDE"
 msgid "Configuring IDE"
 msgstr "IDE konfigurieren"
 
-#: 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 "Keine Partition verfügbar"
@@ -6979,7 +7017,7 @@ msgid ""
 msgstr ""
 "Bitte wählen Sie, ob die Paketauswahl von Diskette geladen \n"
 "oder darauf gespeichert werden soll. Es handelt sich um das \n"
-"selbe Format, wie die unter \"auto_install\" erzeugten Disketten."
+"selbe Format, wie die unter „auto_install“ erzeugten Disketten."
 
 #: install_steps_interactive.pm:441
 #, c-format
@@ -7042,7 +7080,7 @@ msgstr "Mit minimaler Dokumentation (Empfohlen)"
 #: install_steps_interactive.pm:561
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
-msgstr "Extrem minimale Installation (ohne \"urpmi\")"
+msgstr "Extrem minimale Installation (ohne „urpmi“)"
 
 #: install_steps_interactive.pm:604 standalone/drakxtv:53
 #, c-format
@@ -7056,15 +7094,15 @@ msgid ""
 "If you have none of those CDs, click Cancel.\n"
 "If only some CDs are missing, unselect them, then click Ok."
 msgstr ""
-"Falls Sie alle aufgeführten CDs haben, wählen Sie \"OK\", \n"
-"falls Sie keine der aufgeführten CDs haben, wählen Sie \"Abbrechen\",\n"
+"Falls Sie alle aufgeführten CDs haben, wählen Sie „OK“, \n"
+"falls Sie keine der aufgeführten CDs haben, wählen Sie „Abbrechen“,\n"
 "falls nur einige der aufgeführten CDs fehlen, entfernen Sie die \n"
-"entsprechende Markierung und wählen Sie dann \"OK\"."
+"entsprechende Markierung und wählen Sie dann „OK“."
 
 #: install_steps_interactive.pm:653
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
-msgstr "CD-ROM \"%s\""
+msgstr "CD-ROM „%s“"
 
 #: install_steps_interactive.pm:673
 #, c-format
@@ -7120,153 +7158,153 @@ 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 ""
-"Kontaktiere Mandrake Linux Web-Server, um eine Liste verfügbarer Pakete zu "
+"Kontaktiere Mandrakelinux Web-Server, um eine Liste verfügbarer Pakete zu "
 "erhalten..."
 
-#: install_steps_interactive.pm:786
+#: install_steps_interactive.pm:787
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Bitte wählen Sie einen Mirror, von dem Sie die Pakete holen wollen."
 
-#: install_steps_interactive.pm:800
+#: install_steps_interactive.pm:801
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "Kontaktiere Mirror, um eine Liste verfügbarer Pakete zu erhalten..."
 
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:805
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Mirror %s nicht erreichbar"
 
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:805
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Wollen Sie es nochmal versuchen?"
 
-#: install_steps_interactive.pm:830 standalone/drakclock:42
+#: install_steps_interactive.pm:831 standalone/drakclock:42
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Wählen Sie Ihre Zeitzone"
 
-#: install_steps_interactive.pm:835
+#: install_steps_interactive.pm:836
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Automatische Zeit-Synchronisation (durch NTP)"
 
-#: 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 "Zusammenfassung"
 
-#: 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 "System"
 
-#: 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 "Hardware"
 
-#: 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-Server im Netzwerkbetrieb"
 
-#: install_steps_interactive.pm:940
+#: install_steps_interactive.pm:945
 #, c-format
 msgid "No printer"
 msgstr "Kein Drucker"
 
-#: install_steps_interactive.pm:982
+#: install_steps_interactive.pm:987
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Verfügen Sie über eine ISA-Soundkarte?"
 
-#: install_steps_interactive.pm:984
+#: install_steps_interactive.pm:989
 #, c-format
 msgid "Run \"sndconfig\" after installation to configure your sound card"
 msgstr ""
-"Starten Sie \"sndconfig\" nach der Installation, um Ihre Soundkarte "
+"Starten Sie „sndconfig“ nach der Installation, um Ihre Soundkarte "
 "einzurichten."
 
-#: install_steps_interactive.pm:986
+#: install_steps_interactive.pm:991
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
-"Es wurde keine Soundkarte gefunden. Versuchen Sie \"harddrake\" nach der "
+"Es wurde keine Soundkarte gefunden. Versuchen Sie „harddrake“ nach der "
 "Installation."
 
-#: install_steps_interactive.pm:1006
+#: install_steps_interactive.pm:1011
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafikumgebung"
 
-#: 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 "Netzwerk & Internet"
 
-#: install_steps_interactive.pm:1028
+#: install_steps_interactive.pm:1033
 #, fuzzy, c-format
 msgid "Proxies"
 msgstr "Profil "
 
-#: install_steps_interactive.pm:1029
+#: install_steps_interactive.pm:1034
 #, fuzzy, c-format
 msgid "configured"
 msgstr "neu konfigurieren"
 
-#: 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 "Sicherheit"
 
-#: install_steps_interactive.pm:1057
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "activated"
 msgstr "aktiviert"
 
-#: install_steps_interactive.pm:1057
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: install_steps_interactive.pm:1066
+#: install_steps_interactive.pm:1071
 #, c-format
 msgid "Boot"
 msgstr "Start"
 
 #. -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 auf %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 "Dienste: %d aktiviert von %d registrierten"
 
-#: 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 "Sie haben X nicht konfiguriert. Sind Sie sicher?"
 
-#: install_steps_interactive.pm:1149
+#: install_steps_interactive.pm:1154
 #, fuzzy, c-format
 msgid "Set root password and network authentication methods"
 msgstr ""
@@ -7274,30 +7312,29 @@ msgstr ""
 "\n"
 "Benutzer müssen sich mit einem Passwort authentifizieren."
 
-#: install_steps_interactive.pm:1150
+#: install_steps_interactive.pm:1155
 #, c-format
 msgid "Set root password"
 msgstr "Root-Passwort setzen"
 
-#: 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 ""
 "Dieses Passwort ist zu einfach (es muss mindestens %d Zeichen lang sein)!"
 
-#: 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 "Authentifizierung"
 
-#: install_steps_interactive.pm:1196
+#: install_steps_interactive.pm:1201
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Bereite Bootloader vor ..."
 
-#: install_steps_interactive.pm:1206
+#: install_steps_interactive.pm:1211
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -7305,19 +7342,19 @@ msgid ""
 "The install will continue, but you'll\n"
 " need to use BootX or some other means to boot your machine"
 msgstr ""
-"Sie scheinen einen \"OldWorld\" oder unbekannten\n"
+"Sie scheinen einen „OldWorld“ oder unbekannten\n"
 "Rechner zu verwenden. Der Bootloader\n"
-"\"yaboot\" wird daher leider nicht funktionieren.\n"
+"„yaboot“ wird daher leider nicht funktionieren.\n"
 "Die Installation wird fortgesetzt, sie werden jedoch \n"
-"\"BootX\" verwenden müssen um LINUX auf Ihrem Rechner\n"
+"„BootX“ verwenden müssen um LINUX auf Ihrem Rechner\n"
 "zu starten."
 
-#: install_steps_interactive.pm:1212
+#: install_steps_interactive.pm:1217
 #, c-format
 msgid "Do you want to use aboot?"
-msgstr "Möchten Sie \"aboot\" verwenden?"
+msgstr "Möchten Sie „aboot“ verwenden?"
 
-#: install_steps_interactive.pm:1215
+#: install_steps_interactive.pm:1220
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7327,19 +7364,19 @@ msgstr ""
 "mit Gewalt versuchen, auch wenn dies die Zerstörung der ersten \n"
 "Partition verursachen kann?"
 
-#: install_steps_interactive.pm:1226
+#: install_steps_interactive.pm:1231
 #, c-format
 msgid "Installing bootloader"
 msgstr "Installiere Bootloader"
 
-#: install_steps_interactive.pm:1233
+#: install_steps_interactive.pm:1238
 #, c-format
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 "Die Installation des Betriebssytemstarters schlug fehl. Folgender Fehler "
 "trat auf:"
 
-#: 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"
@@ -7357,24 +7394,29 @@ msgstr ""
 "Tippen Sie dann: shut-down\n"
 "Beim darauffolgenden Neustart sollte Sie die Eingabeaufforderung sehen."
 
-#: 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 ""
 
-#: 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 "Legen Sie eine leere Diskette in das %s ein."
 
-#: install_steps_interactive.pm:1287
+#: install_steps_interactive.pm:1293
+#, fuzzy, c-format
+msgid "Please insert another floppy for drivers disk"
+msgstr "Bitte legen Sie die Startdiskette in Laufwerk %s ein."
+
+#: install_steps_interactive.pm:1295
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Erstelle eine Auto-Installationsdiskette"
 
-#: install_steps_interactive.pm:1298
+#: install_steps_interactive.pm:1307
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7385,12 +7427,12 @@ msgstr ""
 "\n"
 "Wollen Sie DrakX wirklich beenden?"
 
-#: install_steps_interactive.pm:1313
+#: install_steps_interactive.pm:1322
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Erstellen einer Auto-Installationsdiskette"
 
-#: install_steps_interactive.pm:1315
+#: install_steps_interactive.pm:1324
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7410,8 +7452,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrake Linux Installation %s"
-msgstr "Mandrake Linux-Installation %s"
+msgid "Mandrakelinux Installation %s"
+msgstr "Mandrakelinux-Installation %s"
 
 #: install_steps_newt.pm:33
 #, c-format
@@ -7430,7 +7472,7 @@ msgstr "Wählen Sie eine Datei"
 msgid "Basic"
 msgstr "Einfach"
 
-#: 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 "Assistent beenden"
@@ -7467,7 +7509,7 @@ msgstr "Ihre Wahl? (0/1, Standard ‚%s‘) "
 #: interactive/stdio.pm:94
 #, c-format
 msgid "Button `%s': %s"
-msgstr "Schaltfläche \"%s\": %s"
+msgstr "Schaltfläche „%s“: %s"
 
 #: interactive/stdio.pm:95
 #, c-format
@@ -7477,12 +7519,12 @@ msgstr "Möchten Sie diese Schaltfläche betätigen?"
 #: interactive/stdio.pm:104
 #, c-format
 msgid "Your choice? (default `%s'%s) "
-msgstr "Ihre Wahl? (Standard \"%s\" %s) "
+msgstr "Ihre Wahl? (Standard „%s“ %s) "
 
 #: interactive/stdio.pm:104
 #, c-format
 msgid " enter `void' for void entry"
-msgstr "Geben Sie \"void\" für einen leeren Eintrag an"
+msgstr "Geben Sie „void“ für einen leeren Eintrag an"
 
 #: interactive/stdio.pm:122
 #, c-format
@@ -7543,7 +7585,7 @@ msgstr "Finnland"
 msgid "French"
 msgstr "Frankreich"
 
-#: keyboard.pm:143 keyboard.pm:217
+#: keyboard.pm:143 keyboard.pm:220
 #, c-format
 msgid "Norwegian"
 msgstr "Norwegen"
@@ -7553,22 +7595,22 @@ msgstr "Norwegen"
 msgid "Polish"
 msgstr "Polen"
 
-#: keyboard.pm:145 keyboard.pm:226
+#: keyboard.pm:145 keyboard.pm:229
 #, c-format
 msgid "Russian"
 msgstr "Russland"
 
-#: keyboard.pm:147 keyboard.pm:230
+#: keyboard.pm:147 keyboard.pm:233
 #, c-format
 msgid "Swedish"
 msgstr "Schweden"
 
-#: keyboard.pm:148 keyboard.pm:249
+#: keyboard.pm:148 keyboard.pm:252
 #, c-format
 msgid "UK keyboard"
 msgstr "Großbritannien"
 
-#: keyboard.pm:149 keyboard.pm:250
+#: keyboard.pm:149 keyboard.pm:253
 #, c-format
 msgid "US keyboard"
 msgstr "US Tastatur"
@@ -7763,313 +7805,313 @@ msgstr "Italien"
 msgid "Inuktitut"
 msgstr "Grönland (Inuktitut)"
 
-#: keyboard.pm:197
+#: keyboard.pm:200
 #, c-format
 msgid "Japanese 106 keys"
 msgstr "Japan (106 Tasten)"
 
-#: keyboard.pm:198
+#: keyboard.pm:201
 #, c-format
 msgid "Kannada"
 msgstr "Kanada"
 
-#: 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 "Lateinamerika"
 
-#: keyboard.pm:203
+#: keyboard.pm:206
 #, c-format
 msgid "Laotian"
 msgstr "Laos"
 
-#: keyboard.pm:204
+#: keyboard.pm:207
 #, c-format
 msgid "Lithuanian AZERTY (old)"
 msgstr "Litauen (AZERTY - alt)"
 
-#: keyboard.pm:206
+#: keyboard.pm:209
 #, c-format
 msgid "Lithuanian AZERTY (new)"
 msgstr "Litauen (AZERTY - neu)"
 
-#: keyboard.pm:207
+#: keyboard.pm:210
 #, c-format
 msgid "Lithuanian \"number row\" QWERTY"
-msgstr "Litauen (QWERTY - \"number row\")"
+msgstr "Litauen (QWERTY - „number row“)"
 
-#: keyboard.pm:208
+#: keyboard.pm:211
 #, c-format
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Litauen (QWERTY - Phonetisch)"
 
-#: keyboard.pm:209
+#: keyboard.pm:212
 #, c-format
 msgid "Latvian"
 msgstr "Lettland"
 
-#: keyboard.pm:210
+#: keyboard.pm:213
 #, c-format
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: keyboard.pm:211
+#: keyboard.pm:214
 #, c-format
 msgid "Macedonian"
 msgstr "Mazedonien"
 
-#: keyboard.pm:212
+#: keyboard.pm:215
 #, c-format
 msgid "Myanmar (Burmese)"
 msgstr "Myanmar (Burmesien)"
 
-#: keyboard.pm:213
+#: keyboard.pm:216
 #, c-format
 msgid "Mongolian (cyrillic)"
 msgstr "Mongolei (Kyrillisches Layout)"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
 msgid "Maltese (UK)"
 msgstr "Malta (GB)"
 
-#: 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 "Niederlande"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
 msgid "Oriya"
 msgstr "Orissa"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
 msgid "Polish (qwerty layout)"
 msgstr "Polen (QWERTY Layout)"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
 msgid "Polish (qwertz layout)"
 msgstr "Polen (QWERTZ Layout)"
 
-#: keyboard.pm:221
+#: keyboard.pm:224
 #, c-format
 msgid "Portuguese"
 msgstr "Portugal"
 
-#: keyboard.pm:222
+#: keyboard.pm:225
 #, c-format
 msgid "Canadian (Quebec)"
 msgstr "Kanada (Québec)"
 
-#: keyboard.pm:224
+#: keyboard.pm:227
 #, c-format
 msgid "Romanian (qwertz)"
 msgstr "Rumänien (QWERTZ)"
 
-#: keyboard.pm:225
+#: keyboard.pm:228
 #, c-format
 msgid "Romanian (qwerty)"
 msgstr "Rumänien (QWERTY)"
 
-#: keyboard.pm:227
+#: keyboard.pm:230
 #, c-format
 msgid "Russian (Phonetic)"
 msgstr "Russland (Phonetisch)"
 
-#: keyboard.pm:228
+#: keyboard.pm:231
 #, c-format
 msgid "Saami (norwegian)"
 msgstr "Saamen (Norwegen)"
 
-#: keyboard.pm:229
+#: keyboard.pm:232
 #, c-format
 msgid "Saami (swedish/finnish)"
 msgstr "Saamen (schwedisch/finnisch)"
 
-#: keyboard.pm:231
+#: keyboard.pm:234
 #, c-format
 msgid "Slovenian"
 msgstr "Slowenien"
 
-#: keyboard.pm:232
+#: keyboard.pm:235
 #, c-format
 msgid "Slovakian (QWERTZ)"
 msgstr "Slowakei (QWERTZ)"
 
-#: keyboard.pm:233
+#: keyboard.pm:236
 #, c-format
 msgid "Slovakian (QWERTY)"
 msgstr "Slowakei (QWERTY)"
 
-#: keyboard.pm:235
+#: keyboard.pm:238
 #, c-format
 msgid "Serbian (cyrillic)"
 msgstr "Serbien (Kyrillisches Layout)"
 
-#: keyboard.pm:236
+#: keyboard.pm:239
 #, c-format
 msgid "Syriac"
 msgstr "Syrien"
 
-#: keyboard.pm:237
+#: keyboard.pm:240
 #, c-format
 msgid "Syriac (phonetic)"
 msgstr "Syrien (Phonetisch)"
 
 # drakfw:278 (Neuse
-#: 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 "Tamilisch (TSCII Layout)"
 
-#: keyboard.pm:241
+#: keyboard.pm:244
 #, c-format
 msgid "Tamil (Typewriter-layout)"
 msgstr "Tamilisch (Schreibmaschine)"
 
-#: keyboard.pm:242
+#: keyboard.pm:245
 #, c-format
 msgid "Thai keyboard"
 msgstr "Thailändisch"
 
-#: keyboard.pm:244
+#: keyboard.pm:247
 #, c-format
 msgid "Tajik keyboard"
 msgstr "Tadschikistan"
 
-#: keyboard.pm:245
+#: keyboard.pm:248
 #, c-format
 msgid "Turkish (traditional \"F\" model)"
-msgstr "Türkei (traditionelles \"F\" Modell)"
+msgstr "Türkei (traditionelles „F“ Modell)"
 
-#: keyboard.pm:246
+#: keyboard.pm:249
 #, c-format
 msgid "Turkish (modern \"Q\" model)"
-msgstr "Türkei (modernes \"Q\" Modell)"
+msgstr "Türkei (modernes „Q“ Modell)"
 
-#: keyboard.pm:248
+#: keyboard.pm:251
 #, c-format
 msgid "Ukrainian"
 msgstr "Ukraine"
 
-#: keyboard.pm:251
+#: keyboard.pm:254
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Vereinigte Staaten von Amerika (international)"
 
-#: keyboard.pm:252
+#: keyboard.pm:255
 #, c-format
 msgid "Uzbek (cyrillic)"
 msgstr "Usbekistan (Kyrillisches Layout)"
 
-#: keyboard.pm:253
+#: keyboard.pm:256
 #, c-format
 msgid "Vietnamese \"numeric row\" QWERTY"
-msgstr "Vietnam QWERTY (\"number row\")"
+msgstr "Vietnam QWERTY („number row“)"
 
-#: keyboard.pm:254
+#: keyboard.pm:257
 #, c-format
 msgid "Yugoslavian (latin)"
 msgstr "Jugoslawien (Lateinisches Layout)"
 
-#: keyboard.pm:261
+#: keyboard.pm:264
 #, c-format
 msgid "Right Alt key"
 msgstr "AltGr-Taste"
 
-#: keyboard.pm:262
+#: keyboard.pm:265
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Beide Umschalttasten gleichzeitig"
 
-#: keyboard.pm:263
+#: keyboard.pm:266
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Strg und Umschalttaste gleichzeitig"
 
-#: keyboard.pm:264
+#: keyboard.pm:267
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock Taste"
 
-#: keyboard.pm:265
+#: keyboard.pm:268
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Strg und Alt gleichzeitig"
 
-#: keyboard.pm:266
+#: keyboard.pm:269
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt und Umschalttaste gleichzeitig"
 
-#: keyboard.pm:267
+#: keyboard.pm:270
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Menütaste"
 
-#: keyboard.pm:268
+#: keyboard.pm:271
 #, c-format
 msgid "Left \"Windows\" key"
-msgstr "Linke \"Windows\"-Taste"
+msgstr "Linke „Windows“-Taste"
 
-#: keyboard.pm:269
+#: keyboard.pm:272
 #, c-format
 msgid "Right \"Windows\" key"
-msgstr "Rechte \"Windows\"-Taste"
+msgstr "Rechte „Windows“-Taste"
 
-#: keyboard.pm:270
+#: keyboard.pm:273
 #, fuzzy, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Beide Umschalttasten gleichzeitig"
 
-#: keyboard.pm:271
+#: keyboard.pm:274
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Beide ALT-Tasten gleichzeitig"
 
-#: keyboard.pm:272
+#: keyboard.pm:275
 #, c-format
 msgid "Left Shift key"
 msgstr "Linke Umschalt-Taste"
 
-#: keyboard.pm:273
+#: keyboard.pm:276
 #, c-format
 msgid "Right Shift key"
 msgstr "Rechte Shift-Taste"
 
-#: keyboard.pm:274
+#: keyboard.pm:277
 #, c-format
 msgid "Left Alt key"
 msgstr "Linke Alt-Taste"
 
-#: keyboard.pm:275
+#: keyboard.pm:278
 #, c-format
 msgid "Left Control key"
 msgstr "Linke STRG Taste"
 
-#: keyboard.pm:276
+#: keyboard.pm:279
 #, c-format
 msgid "Right Control key"
 msgstr "Rechte STRG-Taste"
 
-#: keyboard.pm:307
+#: keyboard.pm:310
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -8080,7 +8122,7 @@ msgstr ""
 "mit der Sie zwischen verschiedenen Tastaturbelegungen \n"
 "umschalten können, etwa zwischen deutschem und US-Layout."
 
-#: keyboard.pm:312
+#: keyboard.pm:315
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -8091,1145 +8133,1145 @@ msgstr ""
 "Während der Installation, benutzen Sie die rechte STRG-Taste,\n"
 "um zwischen den verschiedenen Tastatur Layouts zu wechseln."
 
-#: lang.pm:144
+#: lang.pm:149
 #, c-format
 msgid "default:LTR"
-msgstr "Standard:LTR"
+msgstr "default:LTR"
 
-#: lang.pm:160
+#: lang.pm:165
 #, c-format
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: 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 "Vereinigte arabische Emirate"
 
-#: lang.pm:163
+#: lang.pm:168
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Antigua und Barbuda"
 
-#: lang.pm:164
+#: lang.pm:169
 #, c-format
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: lang.pm:165
+#: lang.pm:170
 #, c-format
 msgid "Albania"
 msgstr "Albanien"
 
-#: lang.pm:166
+#: lang.pm:171
 #, c-format
 msgid "Armenia"
 msgstr "Armenien"
 
-#: lang.pm:167
+#: lang.pm:172
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "Niederländische Antillen"
 
-#: lang.pm:168
+#: lang.pm:173
 #, c-format
 msgid "Angola"
 msgstr "Angola"
 
-#: lang.pm:169
+#: lang.pm:174
 #, c-format
 msgid "Antarctica"
 msgstr "Antarktis"
 
-#: lang.pm:170 standalone/drakxtv:51
+#: lang.pm:175 standalone/drakxtv:51
 #, c-format
 msgid "Argentina"
 msgstr "Argentinien"
 
-#: lang.pm:171
+#: lang.pm:176
 #, c-format
 msgid "American Samoa"
 msgstr "Samoa"
 
-#: lang.pm:173 standalone/drakxtv:49
+#: lang.pm:178 network/adsl_consts.pm:20 standalone/drakxtv:49
 #, c-format
 msgid "Australia"
 msgstr "Australien"
 
-#: lang.pm:174
+#: lang.pm:179
 #, c-format
 msgid "Aruba"
 msgstr "Aruba"
 
-#: lang.pm:175
+#: lang.pm:180
 #, c-format
 msgid "Azerbaijan"
 msgstr "Aserbaidschan"
 
-#: lang.pm:176
+#: lang.pm:181
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnien-Herzegovina"
 
-#: lang.pm:177
+#: lang.pm:182
 #, c-format
 msgid "Barbados"
 msgstr "Barbados"
 
-#: lang.pm:178
+#: lang.pm:183
 #, c-format
 msgid "Bangladesh"
 msgstr "Bangladesch"
 
-#: 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 "Bulgarien"
 
-#: lang.pm:182
+#: lang.pm:187
 #, c-format
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: 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 "Bolivien"
 
-#: lang.pm:188
+#: lang.pm:193
 #, c-format
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: lang.pm:189
+#: lang.pm:194
 #, c-format
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: lang.pm:190
+#: lang.pm:195
 #, c-format
 msgid "Bhutan"
 msgstr "Butan"
 
-#: lang.pm:191
+#: lang.pm:196
 #, c-format
 msgid "Bouvet Island"
 msgstr "Bouvet-Insel"
 
-#: lang.pm:192
+#: lang.pm:197
 #, c-format
 msgid "Botswana"
 msgstr "Botswana"
 
-#: lang.pm:193
+#: lang.pm:198
 #, c-format
 msgid "Belarus"
 msgstr "Weißrussland"
 
-#: 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 "Cocos (Keeling) Inseln"
 
-#: 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 "Zentralafrikanische Republik"
 
-#: 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 "Schweiz"
 
-#: lang.pm:201
+#: lang.pm:206
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Elfenbeinküste"
 
-#: lang.pm:202
+#: lang.pm:207
 #, c-format
 msgid "Cook Islands"
 msgstr "Cook-Inseln"
 
-#: lang.pm:203
+#: lang.pm:208
 #, c-format
 msgid "Chile"
 msgstr "Chile"
 
-#: lang.pm:204
+#: lang.pm:209
 #, c-format
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: lang.pm:205
+#: lang.pm:210
 #, c-format
 msgid "China"
 msgstr "China"
 
-#: lang.pm:206
+#: lang.pm:211
 #, c-format
 msgid "Colombia"
 msgstr "Kolumbien"
 
-#: lang.pm:208
+#: lang.pm:213
 #, c-format
 msgid "Cuba"
 msgstr "Kuba"
 
-#: lang.pm:209
+#: lang.pm:214
 #, c-format
 msgid "Cape Verde"
 msgstr "Kap Verde"
 
-#: lang.pm:210
+#: lang.pm:215
 #, c-format
 msgid "Christmas Island"
 msgstr "Osterinsel"
 
-#: lang.pm:211
+#: lang.pm:216
 #, c-format
 msgid "Cyprus"
 msgstr "Zypern"
 
-#: lang.pm:214
+#: lang.pm:219
 #, c-format
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: lang.pm:215
+#: lang.pm:220
 #, c-format
 msgid "Denmark"
 msgstr "Dänemark"
 
-#: lang.pm:216
+#: lang.pm:221
 #, c-format
 msgid "Dominica"
 msgstr "Dominikanische Republik"
 
-#: lang.pm:217
+#: lang.pm:222
 #, c-format
 msgid "Dominican Republic"
 msgstr "Dominikanische Republik"
 
-#: lang.pm:218
+#: lang.pm:223
 #, c-format
 msgid "Algeria"
 msgstr "Algerien"
 
-#: lang.pm:219
+#: lang.pm:224
 #, c-format
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: lang.pm:220
+#: lang.pm:225
 #, c-format
 msgid "Estonia"
 msgstr "Estland"
 
-#: lang.pm:221
+#: lang.pm:226
 #, c-format
 msgid "Egypt"
 msgstr "Ägypten"
 
-#: lang.pm:222
+#: lang.pm:227
 #, c-format
 msgid "Western Sahara"
 msgstr "Westsahara"
 
-#: 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 "Spanien"
 
-#: lang.pm:225
+#: lang.pm:230
 #, c-format
 msgid "Ethiopia"
 msgstr "Äthiopien"
 
-#: lang.pm:226 network/adsl_consts.pm:119
+#: lang.pm:231 network/adsl_consts.pm:127
 #, c-format
 msgid "Finland"
 msgstr "Finnland"
 
-#: lang.pm:227
+#: lang.pm:232
 #, c-format
 msgid "Fiji"
 msgstr "Fidschi"
 
-#: lang.pm:228
+#: lang.pm:233
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "Falkland Inseln"
 
-#: lang.pm:229
+#: lang.pm:234
 #, c-format
 msgid "Micronesia"
 msgstr "Mikronesien"
 
-#: lang.pm:230
+#: lang.pm:235
 #, c-format
 msgid "Faroe Islands"
 msgstr "Faröische Inseln"
 
-#: lang.pm:232
+#: lang.pm:237
 #, c-format
 msgid "Gabon"
 msgstr "Gabun"
 
-#: 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 "Großbritannien"
 
-#: lang.pm:234
+#: lang.pm:239
 #, c-format
 msgid "Grenada"
 msgstr "Grenada"
 
-#: lang.pm:235
+#: lang.pm:240
 #, c-format
 msgid "Georgia"
 msgstr "Georgien"
 
-#: lang.pm:236
+#: lang.pm:241
 #, c-format
 msgid "French Guiana"
 msgstr "Französisch-Guiana"
 
-#: 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önland"
 
-#: 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 "Gouadeloupe"
 
-#: lang.pm:243
+#: lang.pm:248
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Äquatorial-Guinea"
 
-#: lang.pm:245
+#: lang.pm:250
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "South Georgia und die South Sandwich Islands"
 
-#: 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
 #, fuzzy, c-format
 msgid "China (Hong Kong)"
 msgstr "Hong Kong"
 
-#: lang.pm:251
+#: lang.pm:256
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Heard Island und McDonald Island"
 
-#: lang.pm:252
+#: lang.pm:257
 #, c-format
 msgid "Honduras"
 msgstr "Honduras"
 
-#: lang.pm:253
+#: lang.pm:258
 #, c-format
 msgid "Croatia"
 msgstr "Kroatien"
 
-#: 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 "Ungarn"
 
-#: lang.pm:256
+#: lang.pm:261
 #, c-format
 msgid "Indonesia"
 msgstr "Indonesien"
 
-#: lang.pm:257 standalone/drakxtv:48
+#: lang.pm:262 standalone/drakxtv:48
 #, c-format
 msgid "Ireland"
 msgstr "Irland"
 
-#: lang.pm:258
+#: lang.pm:263
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: lang.pm:259
+#: lang.pm:264
 #, c-format
 msgid "India"
 msgstr "Indien"
 
-#: lang.pm:260
+#: lang.pm:265
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "Britisches Territorium im Indischen Ozean"
 
-#: lang.pm:261
+#: lang.pm:266
 #, c-format
 msgid "Iraq"
 msgstr "Irak"
 
-#: lang.pm:262
+#: lang.pm:267
 #, c-format
 msgid "Iran"
 msgstr "Iran"
 
-#: lang.pm:263
+#: lang.pm:268
 #, c-format
 msgid "Iceland"
 msgstr "Island"
 
-#: lang.pm:265
+#: lang.pm:270
 #, c-format
 msgid "Jamaica"
 msgstr "Jamaika"
 
-#: lang.pm:266
+#: lang.pm:271
 #, c-format
 msgid "Jordan"
 msgstr "Jordanien"
 
-#: lang.pm:267
+#: lang.pm:272
 #, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: lang.pm:268
+#: lang.pm:273
 #, c-format
 msgid "Kenya"
 msgstr "Kenia"
 
-#: lang.pm:269
+#: lang.pm:274
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Kirgisistan"
 
-#: lang.pm:270
+#: lang.pm:275
 #, c-format
 msgid "Cambodia"
 msgstr "Kambodscha"
 
-#: lang.pm:271
+#: lang.pm:276
 #, c-format
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: lang.pm:272
+#: lang.pm:277
 #, c-format
 msgid "Comoros"
 msgstr "Komoren"
 
-#: lang.pm:273
+#: lang.pm:278
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "St. Kitts und Nevis"
 
-#: lang.pm:274
+#: lang.pm:279
 #, c-format
 msgid "Korea (North)"
 msgstr "Nordkorea"
 
-#: lang.pm:275
+#: lang.pm:280
 #, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: lang.pm:276
+#: lang.pm:281
 #, c-format
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: lang.pm:277
+#: lang.pm:282
 #, c-format
 msgid "Cayman Islands"
 msgstr "Cayman-Inseln"
 
-#: lang.pm:278
+#: lang.pm:283
 #, c-format
 msgid "Kazakhstan"
 msgstr "Kasachstan"
 
-#: lang.pm:279
+#: lang.pm:284
 #, c-format
 msgid "Laos"
 msgstr "Laos"
 
-#: lang.pm:280
+#: lang.pm:285
 #, c-format
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: lang.pm:281
+#: lang.pm:286
 #, c-format
 msgid "Saint Lucia"
 msgstr "St. 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 "Liberia"
 
-#: lang.pm:285
+#: lang.pm:290
 #, c-format
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: lang.pm:286
+#: lang.pm:291
 #, c-format
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: lang.pm:287
+#: lang.pm:292
 #, c-format
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: lang.pm:288
+#: lang.pm:293
 #, c-format
 msgid "Latvia"
 msgstr "Litauen"
 
-#: lang.pm:289
+#: lang.pm:294
 #, c-format
 msgid "Libya"
 msgstr "Lybien"
 
-#: lang.pm:290
+#: lang.pm:295
 #, c-format
 msgid "Morocco"
 msgstr "Marokko"
 
-#: lang.pm:291
+#: lang.pm:296
 #, c-format
 msgid "Monaco"
 msgstr "Monaco"
 
-#: lang.pm:292
+#: lang.pm:297
 #, c-format
 msgid "Moldova"
 msgstr "Moldawien"
 
-#: lang.pm:293
+#: lang.pm:298
 #, c-format
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: lang.pm:294
+#: lang.pm:299
 #, c-format
 msgid "Marshall Islands"
 msgstr "Marshall Inseln"
 
-#: lang.pm:295
+#: lang.pm:300
 #, c-format
 msgid "Macedonia"
 msgstr "Mazedonien"
 
-#: lang.pm:296
+#: lang.pm:301
 #, c-format
 msgid "Mali"
 msgstr "Mali"
 
-#: lang.pm:297
+#: lang.pm:302
 #, c-format
 msgid "Myanmar"
 msgstr "Burma"
 
-#: lang.pm:298
+#: lang.pm:303
 #, c-format
 msgid "Mongolia"
 msgstr "Mongolei"
 
-#: lang.pm:299
+#: lang.pm:304
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "Nördliche Mariannen-Inseln"
 
-#: lang.pm:300
+#: lang.pm:305
 #, c-format
 msgid "Martinique"
 msgstr "Martinique"
 
-#: lang.pm:301
+#: lang.pm:306
 #, c-format
 msgid "Mauritania"
 msgstr "Mauretanien"
 
-#: 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 "Malediven"
 
-#: lang.pm:306
+#: lang.pm:311
 #, c-format
 msgid "Malawi"
 msgstr "Malawi"
 
-#: lang.pm:307
+#: lang.pm:312
 #, c-format
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: lang.pm:308
+#: lang.pm:313
 #, c-format
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: lang.pm:309
+#: lang.pm:314
 #, c-format
 msgid "Mozambique"
 msgstr "Mosambik"
 
-#: lang.pm:310
+#: lang.pm:315
 #, c-format
 msgid "Namibia"
 msgstr "Namibia"
 
-#: lang.pm:311
+#: lang.pm:316
 #, c-format
 msgid "New Caledonia"
 msgstr "Neukaledonien"
 
-#: lang.pm:312
+#: lang.pm:317
 #, c-format
 msgid "Niger"
 msgstr "Niger"
 
-#: lang.pm:313
+#: lang.pm:318
 #, c-format
 msgid "Norfolk Island"
 msgstr "Norfolkinsel"
 
-#: lang.pm:314
+#: lang.pm:319
 #, c-format
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: 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 "Neuseeland"
 
-#: lang.pm:322
+#: lang.pm:327
 #, c-format
 msgid "Oman"
 msgstr "Oman"
 
-#: lang.pm:323
+#: lang.pm:328
 #, c-format
 msgid "Panama"
 msgstr "Panama"
 
-#: lang.pm:324
+#: lang.pm:329
 #, c-format
 msgid "Peru"
 msgstr "Peru"
 
-#: lang.pm:325
+#: lang.pm:330
 #, c-format
 msgid "French Polynesia"
 msgstr "Französisch Polinesien"
 
-#: lang.pm:326
+#: lang.pm:331
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Papua-Neuguinea"
 
-#: lang.pm:327
+#: lang.pm:332
 #, c-format
 msgid "Philippines"
 msgstr "Philippinen"
 
-#: 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 "Polen"
 
-#: lang.pm:330
+#: lang.pm:335
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "St. Pierre und 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 "Palästina"
 
-#: 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 "Palau"
 
-#: lang.pm:337
+#: lang.pm:342
 #, c-format
 msgid "Qatar"
 msgstr "Quatar"
 
-#: lang.pm:338
+#: lang.pm:343
 #, c-format
 msgid "Reunion"
 msgstr "Réunion"
 
-#: lang.pm:339
+#: lang.pm:344
 #, c-format
 msgid "Romania"
 msgstr "Rumänien"
 
-#: lang.pm:340
+#: lang.pm:345
 #, c-format
 msgid "Russia"
 msgstr "Russland"
 
-#: lang.pm:341
+#: lang.pm:346
 #, c-format
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: lang.pm:342
+#: lang.pm:347
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Saudi Arabien"
 
-#: lang.pm:343
+#: lang.pm:348
 #, c-format
 msgid "Solomon Islands"
 msgstr "Solomon-Inseln"
 
-#: lang.pm:344
+#: lang.pm:349
 #, c-format
 msgid "Seychelles"
 msgstr "Seychellen"
 
-#: lang.pm:345
+#: lang.pm:350
 #, c-format
 msgid "Sudan"
 msgstr "Sudan"
 
-#: lang.pm:347
+#: lang.pm:352
 #, c-format
 msgid "Singapore"
 msgstr "Singapur"
 
-#: lang.pm:348
+#: lang.pm:353
 #, c-format
 msgid "Saint Helena"
 msgstr "Sankt Helena"
 
-#: lang.pm:349
+#: lang.pm:354
 #, c-format
 msgid "Slovenia"
 msgstr "Slowenien"
 
-#: lang.pm:350
+#: lang.pm:355
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Svalbard and Jan Mayen Islands (Norwegen)"
 
-#: lang.pm:351
+#: lang.pm:356
 #, c-format
 msgid "Slovakia"
 msgstr "Slowakei"
 
-#: 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 "Somalia"
 
-#: lang.pm:356
+#: lang.pm:361
 #, c-format
 msgid "Suriname"
 msgstr "Surinam"
 
-#: lang.pm:357
+#: lang.pm:362
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "Sao Tome und 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 "Syrien"
 
-#: lang.pm:360
+#: lang.pm:365
 #, c-format
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: lang.pm:361
+#: lang.pm:366
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Turks und Caicos Inseln"
 
-#: lang.pm:362
+#: lang.pm:367
 #, c-format
 msgid "Chad"
 msgstr "Tschad"
 
-#: lang.pm:363
+#: lang.pm:368
 #, c-format
 msgid "French Southern Territories"
 msgstr "French Southern Territories"
 
-#: lang.pm:364
+#: lang.pm:369
 #, c-format
 msgid "Togo"
 msgstr "Togo"
 
-#: lang.pm:365
+#: lang.pm:370
 #, c-format
 msgid "Thailand"
 msgstr "Thailand"
 
-#: lang.pm:366
+#: lang.pm:371
 #, c-format
 msgid "Tajikistan"
 msgstr "Tadschikistan"
 
 # drakfw:278 (Neuse
-#: lang.pm:367
+#: lang.pm:372
 #, c-format
 msgid "Tokelau"
 msgstr "Tokelau (Neuseeland)"
 
-#: lang.pm:368
+#: lang.pm:373
 #, c-format
 msgid "East Timor"
 msgstr "Ost Timor"
 
-#: lang.pm:369
+#: lang.pm:374
 #, c-format
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: lang.pm:370
+#: lang.pm:375
 #, c-format
 msgid "Tunisia"
 msgstr "Tunesien"
 
-#: lang.pm:371
+#: lang.pm:376
 #, c-format
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:372
+#: lang.pm:377
 #, c-format
 msgid "Turkey"
 msgstr "Türkei"
 
-#: lang.pm:373
+#: lang.pm:378
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Trinidad und 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 "Tansania"
 
-#: lang.pm:377
+#: lang.pm:382
 #, c-format
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: 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 "United States Minor Outlying Islands"
 
-#: 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 "St. Vincent und die Grenadinen"
 
-#: 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 "Jungferninseln (britisch)"
 
-#: lang.pm:387
+#: lang.pm:392
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Jungfern-Inseln (U.S.)"
 
-#: 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 und Futuna"
 
-#: lang.pm:391
+#: lang.pm:396
 #, c-format
 msgid "Samoa"
 msgstr "Samoa"
 
-#: lang.pm:392
+#: lang.pm:397
 #, c-format
 msgid "Yemen"
 msgstr "Yemen"
 
-#: lang.pm:393
+#: lang.pm:398
 #, c-format
 msgid "Mayotte"
 msgstr "Mayotte (Frankreich)"
 
-#: lang.pm:394
+#: lang.pm:399
 #, c-format
 msgid "Serbia & Montenegro"
 msgstr ""
 
-#: lang.pm:395 standalone/drakxtv:50
+#: lang.pm:400 standalone/drakxtv:50
 #, c-format
 msgid "South Africa"
 msgstr "Südafrika"
 
-#: lang.pm:396
+#: lang.pm:401
 #, c-format
 msgid "Zambia"
 msgstr "Sambia"
 
-#: lang.pm:397
+#: lang.pm:402
 #, c-format
 msgid "Zimbabwe"
 msgstr "Simbabwe"
 
-#: lang.pm:966
+#: lang.pm:983
 #, c-format
 msgid "Welcome to %s"
 msgstr "Willkommen zu %s"
@@ -9244,7 +9286,7 @@ msgstr "Schleife bei den Einhängepunkten %s\n"
 msgid "Remove the logical volumes first\n"
 msgstr "Entfernen Sie erst die Logischen Medien\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:962
+#: modules/interactive.pm:21 standalone/drakconnect:959
 #, c-format
 msgid "Parameters"
 msgstr "Parameter"
@@ -9303,7 +9345,7 @@ msgid ""
 "Note that any address should be entered with the prefix 0x like '0x123'"
 msgstr ""
 "Sie können nun die Optionen für Modul %s angeben.\n"
-"Denken Sie daran, dass Adressen mit \"0x\" beginnen müssen, etwa \"0x300\""
+"Denken Sie daran, dass Adressen mit „0x“ beginnen müssen, etwa „0x300“"
 
 #: modules/interactive.pm:104
 #, c-format
@@ -9313,8 +9355,8 @@ msgid ""
 "For instance, ``io=0x300 irq=7''"
 msgstr ""
 "Sie müssen nun die Optionen für Modul %s angeben.\n"
-"Optionen haben die Form \"name=wert name2=wert2\".\n"
-"Beispielsweise: \"io=0x300 irq=7\""
+"Optionen haben die Form „name=wert name2=wert2“.\n"
+"Beispielsweise: „io=0x300 irq=7“"
 
 #: modules/interactive.pm:106
 #, c-format
@@ -9338,12 +9380,12 @@ msgid ""
 "should\n"
 "not cause any damage."
 msgstr ""
-"In einigen Fällen benötigt der \"%s\" Treiber zusätzliche Informationen,\n"
+"In einigen Fällen benötigt der „%s“ Treiber zusätzliche Informationen,\n"
 "um korrekt zu funktionieren, meistens sollte er jedoch auch ohne \n"
 "funktionieren. Wollen Sie solche Informationen angeben oder es dem Treiber "
 "überlassen, nach geeigneten Parametern zu suchen? (Das Austesten durch den "
-"Treiber kann in seltenen Fällen zum \"Hängenbleiben\" des Rechners führen, "
-"was jedoch keine Hardwareschäden nach sich ziehen sollte.)"
+"Treiber kann in seltenen Fällen zum „Hängenbleiben“ des Rechners führen, was "
+"jedoch keine Hardwareschäden nach sich ziehen sollte.)"
 
 #: modules/interactive.pm:131
 #, c-format
@@ -9414,12 +9456,11 @@ msgstr "Generische PS2 Rad-Maus"
 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
 #, fuzzy, c-format
 msgid "Automatic"
 msgstr "Automatische IP-Adressen-Zuweisung"
@@ -9564,7 +9605,7 @@ msgstr "Nach dem Entfernen"
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: mouse.pm:92
+#: mouse.pm:92 standalone/drakvpn:1138
 #, c-format
 msgid "none"
 msgstr "keine"
@@ -9624,12 +9665,12 @@ msgstr "Sagem-USB (verwendet pppoa)"
 msgid "Sagem (using dhcp) usb"
 msgstr "Sagem-USB (verwendet dhcp)"
 
-#: network/adsl.pm:35 network/netconnect.pm:679
+#: network/adsl.pm:35 network/netconnect.pm:754
 #, c-format
 msgid "Connect to the Internet"
 msgstr "Internetverbindung"
 
-#: 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"
@@ -9638,9 +9679,9 @@ msgid ""
 msgstr ""
 "Der gebräuchlichste Weg mit ADSL eine Verbindung aufzubauen ist pppoe.\n"
 "Einige Verbindungen benutzen jedoch pptp, andere dhcp.\n"
-"Wenn Sie nicht wissen was Sie brauchen, wählen Sie \"pppoe verwenden\""
+"Wenn Sie nicht wissen was Sie brauchen, wählen Sie „pppoe verwenden“"
 
-#: network/adsl.pm:41 network/netconnect.pm:684
+#: network/adsl.pm:41 network/netconnect.pm:759
 #, c-format
 msgid "ADSL connection type :"
 msgstr "Art der ADSL-Verbindung:"
@@ -9705,14 +9746,14 @@ msgstr "Keine Netzwerkkarte"
 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 ""
 "DrakFirewall-Konfigurator\n"
 "\n"
 "Hiermit konfigurieren Sie eine persönliche Firewall für diesen\n"
-"Mandrake Linux-Rechner. Sollten Sie an einer speziellen ausgereiften\n"
+"Mandrakelinux-Rechner. Sollten Sie an einer speziellen ausgereiften\n"
 "Firewall-Lösung interessiert sein, schauen Sie sich nach der speziell\n"
 "dafür entwickelten MandrakeSecurity-Firewall-Distribution um."
 
@@ -9738,12 +9779,12 @@ msgstr "Auf welche Dienste darf aus dem Internet zugegeriffen werden?"
 #, 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 ""
 "Sie können verschiedene Ports angeben. \n"
-"Korrekte Beispiele sind: 139/tcp 139/udp.\n"
-"Für weitere Informationen schauen Sie in \"/etc/services\"."
+"Korrekte Beispiele sind: 139/tcp 139/udp 600:610/tcp 600:610/udp.\n"
+"Für weitere Informationen schauen Sie in „/etc/services“."
 
 #: network/drakfirewall.pm:176
 #, fuzzy, c-format
@@ -9754,8 +9795,8 @@ msgid ""
 "\n"
 "You can also give a range of ports (eg: 24300:24350/udp)"
 msgstr ""
-"Angabe eines ungültigen Ports: \"%s\".\n"
-"Das Format lautet: \"port/tcp\" oder \"port/udp\", \n"
+"Angabe eines ungültigen Ports: „%s“.\n"
+"Das Format lautet: „port/tcp“ oder „port/udp“, \n"
 "wobei Port eine Zahl zwischen 1 und 65535 ist."
 
 #: network/drakfirewall.pm:186
@@ -9768,323 +9809,272 @@ msgstr "Alles (Keine Firewall)"
 msgid "Other ports"
 msgstr "Andere Ports"
 
-#: 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
+#: network/isdn.pm:113 network/netconnect.pm:424
 #, c-format
-msgid "ISDN Configuration"
-msgstr "ISDN-Konfiguration"
-
-#: network/isdn.pm:127
-#, c-format
-msgid ""
-"Select your provider.\n"
-"If it isn't listed, choose Unlisted."
-msgstr ""
-"Wählen Sie Ihren Netzanbieter.\n"
-"Sollte er nicht aufgeführt sein, wählen Sie \"Nicht aufgeführt\""
-
-#: network/isdn.pm:140 standalone/drakconnect:503
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Europäisches Protokoll (EDSS1)"
-
-#: network/isdn.pm:140
-#, c-format
-msgid "European protocol"
-msgstr "Europäisches Protokoll"
-
-#: network/isdn.pm:142 standalone/drakconnect:504
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
+msgid "Unlisted - edit manually"
 msgstr ""
-"Protokoll für den Rest der Welt \n"
-"ohne D-Kanal (Leased Lines)"
-
-#: network/isdn.pm:142
-#, c-format
-msgid "Protocol for the rest of the world"
-msgstr "Protokoll für den Rest der Welt"
 
-#: network/isdn.pm:146
-#, c-format
-msgid "Which protocol do you want to use?"
-msgstr "Welches Protokoll wollen Sie verwenden?"
-
-#: network/isdn.pm:157
-#, c-format
-msgid "Found \"%s\" interface do you want to use it ?"
-msgstr "Schnittstelle \"%s\" gefunden. Wollen Sie sie verwenden?"
-
-#: network/isdn.pm:164
-#, c-format
-msgid "What kind of card do you have?"
-msgstr "Welchen Kartentyp haben Sie?"
-
-#: 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 "Keine Ahnung"
+
+#: 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
 #, fuzzy, c-format
 msgid "USB"
 msgstr "Linux Standard Base (LSB)"
 
-#: network/isdn.pm:165
-#, c-format
-msgid "I don't know"
-msgstr "Keine Ahnung"
-
-#: 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"
-"Falls Sie eine ISA-Karte besitzen, sollten die Einstellungen auf dem "
-"nächsten Schirm korrekt sein.\n"
-"\n"
-"Falls Sie eine PCMCIA-Karte besitzen, müssen Sie IRQ und E/A-Bereich Ihrer "
-"Karte kennen.\n"
-
-#: network/isdn.pm:178
-#, c-format
-msgid "Continue"
-msgstr "Fortfahren"
+#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
+#: network/netconnect.pm:579 network/netconnect.pm:596
+#: network/netconnect.pm:612
+#, fuzzy, c-format
+msgid "Manual"
+msgstr "manuell"
 
-#: network/isdn.pm:178
-#, c-format
-msgid "Abort"
-msgstr "Abbruch"
+#: network/netconnect.pm:88 network/netconnect.pm:453
+#: network/netconnect.pm:463 network/netconnect.pm:822
+#: network/netconnect.pm:827
+#, fuzzy, c-format
+msgid "Manual choice"
+msgstr "manuell"
 
-#: network/isdn.pm:184
+#: network/netconnect.pm:88
 #, c-format
-msgid "Which of the following is your ISDN card?"
-msgstr "Welche der folgenden ist Ihre ISDN-Karte?"
+msgid "Internal ISDN card"
+msgstr "Interne ISDN-Karte"
 
-#: network/netconnect.pm:95
+#: network/netconnect.pm:97
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: network/netconnect.pm:96
+#: network/netconnect.pm:98
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "Sprache auswählen"
 
-#: network/netconnect.pm:97
+#: network/netconnect.pm:99
 #, fuzzy, c-format
 msgid "Master"
 msgstr "Mayotte (Frankreich)"
 
-#: network/netconnect.pm:98
+#: network/netconnect.pm:100
 #, fuzzy, c-format
 msgid "Repeater"
 msgstr "Wiederholen"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:101
 #, fuzzy, c-format
 msgid "Secondary"
 msgstr "sekundär"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:102
 #, c-format
 msgid "Auto"
 msgstr "Automatisch"
 
-#: 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 "Manuelle Konfiguration"
 
-#: network/netconnect.pm:104
+#: network/netconnect.pm:106
 #, fuzzy, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "Automatische IP-Adressen-Zuweisung"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:108
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr ""
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:111
+#, c-format
+msgid "Protocol for the rest of the world"
+msgstr "Protokoll für den Rest der Welt"
+
+#: network/netconnect.pm:113 standalone/drakconnect:528
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Europäisches 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 für den Rest der Welt \n"
+"ohne D-Kanal (Leased Lines)"
+
+#: network/netconnect.pm:146
 #, fuzzy, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Alcatel speedtouch USB"
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:147
 #, fuzzy, c-format
 msgid "Sagem USB modem"
 msgstr "System-Modus"
 
-#: network/netconnect.pm:158
-#, c-format
-msgid "Bewan USB modem"
-msgstr ""
-
-#: network/netconnect.pm:159
+#: network/netconnect.pm:148
 #, c-format
-msgid "Bewan PCI modem"
+msgid "Bewan modem"
 msgstr ""
 
-#: network/netconnect.pm:160
+#: network/netconnect.pm:149
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr ""
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:153
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr ""
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:154
 #, fuzzy, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "Manuelle Konfiguration"
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:155
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr ""
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:156
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr ""
 
-#: network/netconnect.pm:168
+#: network/netconnect.pm:157
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr ""
 
-#: network/netconnect.pm:172
+#: network/netconnect.pm:161
 #, fuzzy, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Netzwerkkarte"
 
-#: network/netconnect.pm:173
+#: network/netconnect.pm:162
 #, fuzzy, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Netzwerkkarte"
 
-#: network/netconnect.pm:174
+#: network/netconnect.pm:163
 #, c-format
 msgid "Routed IP LLC"
 msgstr ""
 
-#: network/netconnect.pm:175
+#: network/netconnect.pm:164
 #, c-format
 msgid "Routed IP VC"
 msgstr ""
 
-#: network/netconnect.pm:176
+#: network/netconnect.pm:165
 #, c-format
 msgid "PPPOA LLC"
 msgstr ""
 
-#: network/netconnect.pm:177
+#: network/netconnect.pm:166
 #, c-format
 msgid "PPPOA VC"
 msgstr ""
 
-#: network/netconnect.pm:181 standalone/drakconnect:443
-#: standalone/drakconnect:917
+#: network/netconnect.pm:170 standalone/drakconnect:466
 #, c-format
 msgid "Script-based"
 msgstr "Skript-basiert"
 
-#: 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 "Terminal-basiert"
 
-#: 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
 #, fuzzy, c-format
 msgid "PAP/CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:199 standalone/drakconnect:54
+#: network/netconnect.pm:219 standalone/drakconnect:55
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "Netzwerk & Internet konfigurieren"
 
-#: network/netconnect.pm:205
+#: network/netconnect.pm:225
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(gefunden an Port %s)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:207
+#: network/netconnect.pm:227
 #, fuzzy, c-format
 msgid "(detected %s)"
 msgstr "%s gefunden"
 
-#: network/netconnect.pm:207
+#: network/netconnect.pm:227
 #, fuzzy, c-format
 msgid "(detected)"
 msgstr "gefunden"
 
-#: network/netconnect.pm:209
+#: network/netconnect.pm:229
 #, fuzzy, c-format
 msgid "Modem connection"
 msgstr "Winmodem-Verbindung"
 
-#: network/netconnect.pm:210
+#: network/netconnect.pm:230
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN-Verbindung"
 
-#: network/netconnect.pm:211
+#: network/netconnect.pm:231
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL-Verbindung"
 
-#: network/netconnect.pm:212
+#: network/netconnect.pm:232
 #, c-format
 msgid "Cable connection"
 msgstr "Kabel-Verbindung"
 
-#: network/netconnect.pm:213
+#: network/netconnect.pm:233
 #, c-format
 msgid "LAN connection"
 msgstr "LAN-Verbindung"
 
-#: network/netconnect.pm:214 network/netconnect.pm:228
+#: network/netconnect.pm:234 network/netconnect.pm:248
 #, c-format
 msgid "Wireless connection"
 msgstr "Wireless Verbindung"
 
-#: network/netconnect.pm:224
+#: network/netconnect.pm:244
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Wählen Sie die Verbindung, die Sie konfigurieren wollen"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:261
 #, fuzzy, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -10095,145 +10085,198 @@ msgstr ""
 "Wir werden nun die Verbindung %s  konfigurieren.\n"
 "\n"
 "\n"
-"Wählen Sie\"%s\" , um fortzufahren."
+"Wählen Sie „%s“, um fortzufahren."
 
-#: network/netconnect.pm:249 network/netconnect.pm:710
+#: network/netconnect.pm:269 network/netconnect.pm:781
 #, c-format
 msgid "Connection Configuration"
 msgstr "Verbindungskonfiguration"
 
-#: 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 ""
 "Bitte füllen Sie die folgen Felder aus \n"
 "bzw. makieren Sie die korrekten Angaben"
 
-#: network/netconnect.pm:256 standalone/drakconnect:494
-#: standalone/drakconnect:899
+#: network/netconnect.pm:277 standalone/drakconnect:519
 #, c-format
 msgid "Card IRQ"
 msgstr "Karten-IRQ"
 
 # Speicher ?
-#: network/netconnect.pm:257 standalone/drakconnect:495
-#: standalone/drakconnect:900
+#: network/netconnect.pm:278 standalone/drakconnect:520
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Karten Mem (DMA)"
 
-#: network/netconnect.pm:258 standalone/drakconnect:496
-#: standalone/drakconnect:901
+#: network/netconnect.pm:279 standalone/drakconnect:521
 #, c-format
 msgid "Card IO"
 msgstr "Karten-E/A"
 
-#: network/netconnect.pm:259 standalone/drakconnect:497
-#: standalone/drakconnect:902
+#: network/netconnect.pm:280 standalone/drakconnect:522
 #, c-format
 msgid "Card IO_0"
 msgstr "Karten-E/A_0"
 
-#: network/netconnect.pm:260 standalone/drakconnect:903
+#: network/netconnect.pm:281
 #, c-format
 msgid "Card IO_1"
 msgstr "Karten-E/A_1"
 
-#: network/netconnect.pm:261 standalone/drakconnect:904
+#: network/netconnect.pm:282
 #, c-format
 msgid "Your personal phone number"
 msgstr "Ihre eigene Telefonnummer"
 
-#: 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 "Name des Providers (z.B. provider.net) "
 
-#: network/netconnect.pm:263 standalone/drakconnect:440
-#: standalone/drakconnect:906
+#: network/netconnect.pm:284 standalone/drakconnect:463
 #, c-format
 msgid "Provider phone number"
 msgstr "Telefonnummer des Providers"
 
-#: network/netconnect.pm:264
+#: network/netconnect.pm:285
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "Erster DNS des Providers (optional)"
 
-#: network/netconnect.pm:265
+#: network/netconnect.pm:286
 #, fuzzy, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "Zweiter DNS des Providers (optional)"
 
-#: 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 "Wählmodus"
 
-#: 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 "Verbindungsgeschwindigkeit"
 
-#: 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 "Verbindungs-Timeout (in Sec)"
 
-#: 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 "Benutzername (Login)"
 
-#: 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 "Passwort"
 
-#: 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 "Um welchen Typ ISDN-Verbindung handelt es sich?"
+msgid "Select the network interface to configure:"
+msgstr "Wählen Sie die Netzwerkkarte zum konfigurieren"
+
+#: network/netconnect.pm:323 network/netconnect.pm:457
+#: network/netconnect.pm:641 standalone/drakgw:113 standalone/drakvpn:49
+#, fuzzy, c-format
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "Tja, wir unterstützen nur 2.4-Kernel."
 
-#: 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 "Internal ISDN card"
-msgstr "Interne ISDN-Karte"
+msgid "Net Device"
+msgstr "Netz-Gerät:"
 
-#: network/netconnect.pm:301
+#: network/netconnect.pm:326 network/netconnect.pm:334
 #, c-format
 msgid "External ISDN modem"
 msgstr "Externes ISDN-Modem"
 
-#: network/netconnect.pm:332
+#: network/netconnect.pm:365 standalone/harddrake2:115
 #, c-format
-msgid "Do you want to start a new configuration ?"
-msgstr "Möchten Sie eine neue Einstellung vornehmen?"
+msgid "Select a device !"
+msgstr "Wählen Sie ein Gerät!"
+
+#: 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-Konfiguration"
 
-#: network/netconnect.pm:335
+#: network/netconnect.pm:375
+#, c-format
+msgid "What kind of card do you have?"
+msgstr "Welchen Kartentyp haben Sie?"
+
+#: network/netconnect.pm:385
 #, 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."
+"\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 ""
-"Ich habe eine PCI-ISDN-Karte gefunden, kenne sie jedoch nicht. Bitte helfen "
-"Sie mir, indem Sie im nächsten Menü eine auswählen."
+"\n"
+"Falls Sie eine ISA-Karte besitzen, sollten die Einstellungen auf dem "
+"nächsten Schirm korrekt sein.\n"
+"\n"
+"Falls Sie eine PCMCIA-Karte besitzen, müssen Sie IRQ und E/A-Bereich Ihrer "
+"Karte kennen.\n"
 
-#: network/netconnect.pm:344
+#: network/netconnect.pm:389
 #, c-format
-msgid "No ISDN PCI card found. Please select one on the next screen."
+msgid "Continue"
+msgstr "Fortfahren"
+
+#: network/netconnect.pm:389
+#, c-format
+msgid "Abort"
+msgstr "Abbruch"
+
+#: network/netconnect.pm:395
+#, c-format
+msgid "Which of the following is your ISDN card?"
+msgstr "Welche der folgenden ist Ihre ISDN-Karte?"
+
+#: network/netconnect.pm:410
+#, c-format
+msgid "Which protocol do you want to use?"
+msgstr "Welches Protokoll wollen Sie verwenden?"
+
+#: network/netconnect.pm:412 standalone/drakconnect:116
+#: standalone/drakconnect:527 standalone/drakvpn:1140
+#, c-format
+msgid "Protocol"
+msgstr "Protokoll"
+
+#: network/netconnect.pm:421
+#, c-format
+msgid ""
+"Select your provider.\n"
+"If it isn't listed, choose Unlisted."
 msgstr ""
-"Ich konnte keine PCI-ISDN-Karte finden.\n"
-"Bitte wählen Sie im nächsten Menü eine aus."
+"Wählen Sie Ihren Netzanbieter.\n"
+"Sollte er nicht aufgeführt sein, wählen Sie „Nicht aufgeführt“"
+
+#: network/netconnect.pm:423 network/netconnect.pm:529
+#: network/netconnect.pm:675
+#, fuzzy, c-format
+msgid "Provider:"
+msgstr "Profil: "
 
-#: network/netconnect.pm:353
+#: network/netconnect.pm:438
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -10242,140 +10285,117 @@ msgstr ""
 "Ihr Modem wird nicht durch das System unterstützt.\n"
 "Schauen Sie unter http://www.linmodems.org"
 
-#: network/netconnect.pm:364
+#: network/netconnect.pm:450
 #, fuzzy, c-format
 msgid "Select the modem to configure:"
 msgstr "Wählen Sie die Netzwerkkarte zum konfigurieren"
 
-#: network/netconnect.pm:403
+#: network/netconnect.pm:498
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Bitte wählen Sie den seriellen Anschluss, an dem Ihr Modem hängt."
 
-#: network/netconnect.pm:427
+#: network/netconnect.pm:527
 #, fuzzy, c-format
 msgid "Select your provider:"
 msgstr "Wählen Sie das Drucksystem"
 
-#: network/netconnect.pm:429 network/netconnect.pm:599
-#, fuzzy, c-format
-msgid "Provider:"
-msgstr "Profil: "
-
-#: network/netconnect.pm:481 network/netconnect.pm:482
-#: network/netconnect.pm:483 network/netconnect.pm:508
-#: network/netconnect.pm:525 network/netconnect.pm:541
-#, fuzzy, c-format
-msgid "Manual"
-msgstr "manuell"
-
-#: network/netconnect.pm:485
+#: network/netconnect.pm:556
 #, fuzzy, c-format
 msgid "Dialup: account options"
 msgstr "Einwahl-Parameter"
 
-#: network/netconnect.pm:488 standalone/drakconnect:913
+#: network/netconnect.pm:559
 #, c-format
 msgid "Connection name"
 msgstr "Name der Verbindung"
 
-#: network/netconnect.pm:489 standalone/drakconnect:914
+#: network/netconnect.pm:560
 #, c-format
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: network/netconnect.pm:490 standalone/drakconnect:915
+#: network/netconnect.pm:561
 #, c-format
 msgid "Login ID"
 msgstr "Login ID"
 
-#: network/netconnect.pm:505 network/netconnect.pm:538
+#: network/netconnect.pm:576 network/netconnect.pm:609
 #, fuzzy, c-format
 msgid "Dialup: IP parameters"
 msgstr "Parameter"
 
-#: network/netconnect.pm:508
+#: network/netconnect.pm:579
 #, fuzzy, c-format
 msgid "IP parameters"
 msgstr "Parameter"
 
-#: 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-Adresse"
 
-#: network/netconnect.pm:510
+#: network/netconnect.pm:581
 #, fuzzy, c-format
 msgid "Subnet mask"
 msgstr "Subnetzmaske:"
 
-#: network/netconnect.pm:522
+#: network/netconnect.pm:593
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr ""
 
-#: network/netconnect.pm:525
+#: network/netconnect.pm:596
 #, fuzzy, c-format
 msgid "DNS"
 msgstr "NIS"
 
-#: network/netconnect.pm:526 standalone/drakconnect:918
+#: network/netconnect.pm:597
 #, c-format
 msgid "Domain name"
 msgstr "Name der Domäne"
 
-#: 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 "Erster DNS-Server (optional)"
 
-#: 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 "Zweiter DNS-Server (optional)"
 
-#: network/netconnect.pm:529
+#: network/netconnect.pm:600
 #, fuzzy, c-format
 msgid "Set hostname from IP"
 msgstr "Rechnername/IP des Druckers"
 
-#: network/netconnect.pm:541 standalone/drakconnect:317
-#: standalone/drakconnect:912
+#: network/netconnect.pm:612 standalone/drakconnect:336
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
-#: network/netconnect.pm:542
+#: network/netconnect.pm:613
 #, fuzzy, c-format
 msgid "Gateway IP address"
 msgstr "IP-Adresse"
 
-#: network/netconnect.pm:567
+#: network/netconnect.pm:637
 #, fuzzy, c-format
 msgid "ADSL configuration"
 msgstr "LAN-Konfiguration"
 
-#: network/netconnect.pm:567 network/netconnect.pm:746
-#, c-format
-msgid "Select the network interface to configure:"
-msgstr "Wählen Sie die Netzwerkkarte zum konfigurieren"
-
-#: 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 "Netz-Gerät:"
-
-#: network/netconnect.pm:597
+#: network/netconnect.pm:673
 #, fuzzy, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Bitte wählen Sie Ihr Land."
 
-#: network/netconnect.pm:616
+#: network/netconnect.pm:691
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10386,32 +10406,32 @@ msgstr ""
 "Sie können diesen jetzt von Diskette oder einer Windows Partition laden\n"
 "oder diesen Schritt überspringen und es später machen."
 
-#: network/netconnect.pm:620 network/netconnect.pm:625
+#: network/netconnect.pm:695 network/netconnect.pm:700
 #, c-format
 msgid "Use a floppy"
 msgstr "Benutze eine Diskette"
 
-#: network/netconnect.pm:620 network/netconnect.pm:629
+#: network/netconnect.pm:695 network/netconnect.pm:704
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Windows-Partition benutzen"
 
-#: network/netconnect.pm:620 network/netconnect.pm:633
+#: network/netconnect.pm:695 network/netconnect.pm:708
 #, c-format
 msgid "Do it later"
 msgstr "Später"
 
-#: network/netconnect.pm:640
+#: network/netconnect.pm:715
 #, fuzzy, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr "Kopieren der Firmware fehlgeschlagen, Datei %s nicht gefunden"
 
-#: network/netconnect.pm:647
+#: network/netconnect.pm:722
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "Kopieren der Firmware erfolgreich"
 
-#: network/netconnect.pm:662
+#: network/netconnect.pm:737
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10422,25 +10442,25 @@ msgstr ""
 "Sie brauchen den Alcatel-Mikrocode.\n"
 "Laden Sie es sich von\n"
 "%s\n"
-"herunter und kopieren Sie die Datei \"mgmt.o\"\n"
-"nach \"/usr/share/speedtouch\""
+"herunter und kopieren Sie die Datei „mgmt.o“\n"
+"nach „/usr/share/speedtouch“"
 
-#: network/netconnect.pm:719
+#: network/netconnect.pm:790
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr ""
 
-#: network/netconnect.pm:720
+#: network/netconnect.pm:791
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr ""
 
-#: network/netconnect.pm:721
+#: network/netconnect.pm:793
 #, fuzzy, c-format
 msgid "Encapsulation :"
 msgstr "Schlüssel"
 
-#: network/netconnect.pm:736
+#: network/netconnect.pm:810
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10449,17 +10469,7 @@ msgid ""
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
 
-#: network/netconnect.pm:753
-#, fuzzy, c-format
-msgid "No wireless network adapter on your system!"
-msgstr "Sie haben keine Netzwerkkarte!"
-
-#: network/netconnect.pm:754 standalone/drakgw:240 standalone/drakpxe:137
-#, c-format
-msgid "No network adapter on your system!"
-msgstr "Sie haben keine Netzwerkkarte!"
-
-#: network/netconnect.pm:766
+#: network/netconnect.pm:837
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
@@ -10469,27 +10479,36 @@ msgid ""
 msgstr ""
 "WARNUNG: Dieses Gerät wurde bereits zum Herstellen einer Internetverbindung "
 "konfiguriert.\n"
-"Drücken Sie einfach \"OK\", um die Einstellungen zu behalten.\n"
+"Drücken Sie einfach „OK“, um die Einstellungen zu behalten.\n"
 "Fall Sie Felder verändern, wird die Konfiguration überschrieben."
 
-#: 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 ""
+"Herzlichen Glückwunsch, die Netzwerk-/Internet-Einrichtung ist beendet.\n"
+"\n"
+
+#: network/netconnect.pm:864
 #, fuzzy, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconf-Rechnername"
 
-#: network/netconnect.pm:785 network/netconnect.pm:816
+#: network/netconnect.pm:865 network/netconnect.pm:899
 #, fuzzy, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "Konfigurieren der Netzwerkkarte %s"
 
-#: network/netconnect.pm:786
+#: network/netconnect.pm:866
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
 "Please choose the one you want to use"
 msgstr ""
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:900
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10498,115 +10517,115 @@ msgid ""
 msgstr ""
 "Bitte geben Sie die IP-Parameter dieser Maschine ein.\n"
 "Jeder Eintrag muss als dezimale IP-Adresse in Punktschreibweise \n"
-"angegeben werden (etwa  \"192.168.1.42\")."
+"angegeben werden (etwa  „192.168.1.42“)."
 
-#: network/netconnect.pm:824
+#: network/netconnect.pm:907
 #, fuzzy, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Sie müssen einen Rechnernamen oder eine IP eingeben.\n"
 
-#: network/netconnect.pm:825
+#: network/netconnect.pm:908
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP-Rechnername"
 
-#: 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 "Netzmaske"
 
-#: 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 "Netzwerkkarten-ID überwachen (sinnvoll für Laptops)"
 
-#: network/netconnect.pm:833 standalone/drakconnect:390
+#: network/netconnect.pm:916 standalone/drakconnect:413
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Netzwerk Hotplugging"
 
-#: network/netconnect.pm:834 standalone/drakconnect:384
+#: network/netconnect.pm:917 standalone/drakconnect:407
 #, c-format
 msgid "Start at boot"
 msgstr "Beim Systemstart aktivieren"
 
-#: network/netconnect.pm:836 standalone/drakconnect:768
+#: network/netconnect.pm:919 standalone/drakconnect:810
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP-Client"
 
-#: 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 "Die IP-Adresse sollte etwa die Form \"192.168.1.42\" haben!"
+msgstr "Die IP-Adresse sollte etwa die Form „192.168.1.42“ haben!"
 
-#: network/netconnect.pm:849
+#: network/netconnect.pm:932
 #, c-format
 msgid "Warning : IP address %s is usually reserved !"
 msgstr "Warnung : IP address %s ist üblicherweise reserviert !"
 
-#: 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 ""
 
-#: network/netconnect.pm:882 standalone/drakconnect:355
+#: network/netconnect.pm:965 standalone/drakconnect:378
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "Expertenmodus"
 
-#: network/netconnect.pm:884 standalone/drakconnect:356
+#: network/netconnect.pm:967 standalone/drakconnect:379
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: network/netconnect.pm:885 standalone/drakconnect:357
+#: network/netconnect.pm:968 standalone/drakconnect:380
 #, c-format
 msgid "Network ID"
 msgstr "Netzwerk ID"
 
-#: network/netconnect.pm:886 standalone/drakconnect:358
+#: network/netconnect.pm:969 standalone/drakconnect:381
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: network/netconnect.pm:887 standalone/drakconnect:359
+#: network/netconnect.pm:970 standalone/drakconnect:382
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: network/netconnect.pm:888 standalone/drakconnect:360
+#: network/netconnect.pm:971 standalone/drakconnect:383
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: 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 "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 "Die Frequenz sollte entweder eine Mengeneinheit aus ‚K‘, ‚M‘ und ‚G‘ nutzen "
-"(etwa \"2.46G\" für 2,46GHz) oder die entsprechende Anzahl Nullen angehängt "
+"(etwa „2.46G“ für 2,46GHz) oder die entsprechende Anzahl Nullen angehängt "
 "werden."
 
-#: 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 "
 "enough '0' (zeroes)."
 msgstr ""
 "Die Rate sollte entweder eine Mengeneinheit aus ‚K‘, ‚M‘ und ‚G‘ nutzen "
-"(etwa \"11M\" für 11M) oder die entsprechende Anzahl Nullen angehängt werden."
+"(etwa „11M“ für 11M) oder die entsprechende Anzahl Nullen angehängt werden."
 
-#: network/netconnect.pm:911 standalone/drakconnect:371
+#: network/netconnect.pm:994 standalone/drakconnect:394
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: network/netconnect.pm:912
+#: network/netconnect.pm:995
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10620,17 +10639,17 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:919 standalone/drakconnect:372
+#: network/netconnect.pm:1002 standalone/drakconnect:395
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Spiele-Station"
 
-#: network/netconnect.pm:920 standalone/drakconnect:373
+#: network/netconnect.pm:1003 standalone/drakconnect:396
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:921
+#: network/netconnect.pm:1004
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -10641,12 +10660,12 @@ msgid ""
 msgstr ""
 
 #. -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 ""
 
-#: 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"
@@ -10658,12 +10677,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:937 standalone/drakconnect:375
+#: network/netconnect.pm:1020 standalone/drakconnect:398
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:938
+#: network/netconnect.pm:1021
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10681,7 +10700,7 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:965
+#: network/netconnect.pm:1048
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system.\n"
@@ -10690,12 +10709,12 @@ msgstr ""
 "Ich habe keine Ethernet-Netzwerkkarte finden können, daher kann dieser "
 "Verbindungstyp nicht konfiguriert werden."
 
-#: 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 "Wählen Sie die Netzwerkkarte"
 
-#: network/netconnect.pm:970
+#: network/netconnect.pm:1053
 #, c-format
 msgid ""
 "Please choose which network adapter you want to use to connect to Internet."
@@ -10703,7 +10722,7 @@ msgstr ""
 "Bitte wählen Sie, über welches Netzwerkgerät Sie die \n"
 "Internetverbindung herstellen wollen."
 
-#: network/netconnect.pm:991
+#: network/netconnect.pm:1074
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10713,89 +10732,88 @@ msgid ""
 msgstr ""
 "Bitte geben Sie ihren Rechnernamen an.\n"
 "Ihr Rechnername sollte auch die Domäne beinhalten,\n"
-"etwa \"meinrechner.meineabteilung.meinefirma.de\".\n"
+"etwa „meinrechner.meineabteilung.meinefirma.de“.\n"
 "Falls Sie ein Gateway verwenden, sollten Sie auch dessen IP-Adresse angeben."
 
-#: 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 ""
 
-#: network/netconnect.pm:997
+#: network/netconnect.pm:1080 standalone/drakconnect:923
 #, fuzzy, c-format
 msgid "Host name (optional)"
 msgstr "Erster DNS-Server (optional)"
 
-#: network/netconnect.pm:997
+#: network/netconnect.pm:1080
 #, c-format
 msgid "Host name"
 msgstr "Rechnername"
 
-#: network/netconnect.pm:998
+#: network/netconnect.pm:1082
 #, fuzzy, c-format
 msgid "DNS server 1"
 msgstr "DNS-Server"
 
-#: network/netconnect.pm:999
+#: network/netconnect.pm:1083
 #, fuzzy, c-format
 msgid "DNS server 2"
 msgstr "DNS-Server"
 
-#: network/netconnect.pm:1000
+#: network/netconnect.pm:1084
 #, fuzzy, c-format
 msgid "DNS server 3"
 msgstr "DNS-Server"
 
-#: network/netconnect.pm:1001
+#: network/netconnect.pm:1085
 #, fuzzy, c-format
 msgid "Search domain"
 msgstr "NIS-Domain"
 
-#: 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 ""
 
-#: network/netconnect.pm:1003
+#: network/netconnect.pm:1087
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Gateway (etwa %s)"
 
-#: network/netconnect.pm:1005
+#: network/netconnect.pm:1089
 #, c-format
 msgid "Gateway device"
 msgstr "Gateway-Gerät"
 
-#: network/netconnect.pm:1014
+#: network/netconnect.pm:1098
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr ""
-"Die IP-Adresse des DNS-Servers sollte etwa die Form \"192.168.1.42\" haben!"
+"Die IP-Adresse des DNS-Servers sollte etwa die Form „192.168.1.42“ haben!"
 
-#: 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 ""
-"Die IP-Adresse des Gateways sollte etwa die Form \"192.168.1.42\" haben!"
+msgstr "Die IP-Adresse des Gateways sollte etwa die Form „192.168.1.42“ haben!"
 
-#: 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 "
 "back to other machines on the network:"
 msgstr ""
 
-#: network/netconnect.pm:1031
+#: network/netconnect.pm:1115
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf-Rechnername"
 
-#: network/netconnect.pm:1034
+#: network/netconnect.pm:1118
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr ""
 
-#: network/netconnect.pm:1044
+#: network/netconnect.pm:1128
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10806,32 +10824,32 @@ msgstr ""
 "Internet zu verbinden. Bitte wählen Sie eine aus.\n"
 "\n"
 
-#: network/netconnect.pm:1046
+#: network/netconnect.pm:1130
 #, c-format
 msgid "Internet connection"
 msgstr "Internet-Verbindung"
 
-#: network/netconnect.pm:1054
+#: network/netconnect.pm:1144
 #, c-format
 msgid "Configuration is complete, do you want to apply settings ?"
 msgstr "Konfiguration ist vollständig, wollen Sie diese jetzt anwenden ?"
 
-#: network/netconnect.pm:1070
+#: network/netconnect.pm:1154
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "Möchten Sie die Verbindung beim Systemstart herstellen?"
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1166
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it ?"
 msgstr "Das Netzwerk muss neu gestartet werden. Soll ich es neu starten?"
 
-#: network/netconnect.pm:1100 network/netconnect.pm:1165
+#: network/netconnect.pm:1173 network/netconnect.pm:1238
 #, c-format
 msgid "Network Configuration"
 msgstr "Netzwerk konfigurieren"
 
-#: network/netconnect.pm:1101
+#: network/netconnect.pm:1174
 #, c-format
 msgid ""
 "A problem occured while restarting the network: \n"
@@ -10842,27 +10860,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 "Möchten Sie jetzt versuchen eine Internetverbindung aufzubauen?"
 
-#: network/netconnect.pm:1118 standalone/drakconnect:958
+#: network/netconnect.pm:1190 standalone/drakconnect:955
 #, c-format
 msgid "Testing your connection..."
 msgstr "Ich teste gerade Ihre Verbindung..."
 
-#: network/netconnect.pm:1134
+#: network/netconnect.pm:1206
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "Das System ist jetzt mit dem Internet verbunden."
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1207
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "Aus Sicherheitsgründen wird die Verbindung nun unterbrochen."
 
-#: network/netconnect.pm:1136
+#: network/netconnect.pm:1208
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -10871,16 +10889,7 @@ msgstr ""
 "Das System scheint nicht mit dem Internet verbunden zu sein.\n"
 "Versuchen Sie noch einmal Ihre Verbindung zu konfigurieren."
 
-#: network/netconnect.pm:1150
-#, c-format
-msgid ""
-"Congratulations, the network and Internet configuration is finished.\n"
-"\n"
-msgstr ""
-"Herzlichen Glückwunsch, die Netzwerk-/Internet-Einrichtung ist beendet.\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 "
@@ -10890,7 +10899,7 @@ msgstr ""
 "neu zu starten, um Probleme, die durch die Änderung des\n"
 "Rechnernamens hervorgerufen werden, zu vermeiden."
 
-#: network/netconnect.pm:1154
+#: network/netconnect.pm:1226
 #, c-format
 msgid ""
 "Problems occured during configuration.\n"
@@ -10898,11 +10907,11 @@ msgid ""
 "work, you might want to relaunch the configuration."
 msgstr ""
 "Während der Konfiguration traten Fehler auf.\n"
-"Kontrollieren Sie Ihre Verbindung mit \"net_monitor\" oder dem Mandrake "
+"Kontrollieren Sie Ihre Verbindung mit „net_monitor“ oder dem Mandrake "
 "Kontrollzentrum. Falls die Verbindung nicht funktioniert, sollten Sie erneut "
 "die Konfiguration starten."
 
-#: network/netconnect.pm:1166
+#: network/netconnect.pm:1239
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10911,41 +10920,48 @@ msgid ""
 "Internet & Network connection.\n"
 msgstr ""
 "Da Sie eine Netzwerkinstallation durchführen, ist Ihr Netzwerk bereits\n"
-"konfiguriert. Wählen Sie \"OK\", um diese Einstellung beizubehalten oder\n"
-"\"Abbrechen\", um Ihre Internet- und Netzwerk-Konfiguration neu zu\n"
+"konfiguriert. Wählen Sie „OK“, um diese Einstellung beizubehalten oder\n"
+"„Abbrechen“, um Ihre Internet- und Netzwerk-Konfiguration neu zu\n"
 "konfigurieren.\n"
 
-#: network/network.pm:314
+#: network/netconnect.pm:1327
+#, c-format
+msgid ""
+"An unexpected error has happened:\n"
+"%s"
+msgstr "Ein unerwarteter Fehler ist aufgetreten:/n %s"
+
+#: network/network.pm:315
 #, c-format
 msgid "Proxies configuration"
 msgstr "Proxies einstellen"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP-Proxy"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP-Proxy"
 
-#: network/network.pm:319
+#: network/network.pm:320
 #, c-format
 msgid "Proxy should be http://..."
-msgstr "Proxy muss \"http://...\" sein"
+msgstr "Proxy muss „http://...“ sein"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
-msgstr "Die URL muss mit \"http://\" oder \"ftp://\" beginnen"
+msgstr "Die URL muss mit „http://“ oder „ftp://“ beginnen"
 
-#: network/shorewall.pm:26
+#: network/shorewall.pm:28
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "Ich habe eine Firewall-Konfiguration gefunden!"
 
-#: network/shorewall.pm:27
+#: network/shorewall.pm:29
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
@@ -10955,16 +10971,15 @@ msgstr ""
 "Möglicherweise müssen Sie nach der Installation einige Einstellungen \n"
 "von Hand vornehmen."
 
-#: network/shorewall.pm:70
-#, fuzzy, c-format
+#: 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 ""
 "Bitte geben Sie den Namen der Schnittstelle ein, über die Sie ins Internet "
 "gehen.\n"
@@ -10974,12 +10989,12 @@ msgstr ""
 "\t\teth0, oder eth1 für eine Kabel-Verbindung, \n"
 "\t\tippp+ für eine ISDN-Verbindung.\n"
 
-#: network/tools.pm:207
+#: network/tools.pm:205
 #, c-format
 msgid "Insert floppy"
 msgstr "Bitte Diskette einlegen"
 
-#: 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 "
@@ -10988,22 +11003,22 @@ msgstr ""
 "Legen Sie eine FAT-formatierte Diskette in Laufwerk %s mit %s im "
 "Wurzelverzeichnis ein und drücken %s"
 
-#: network/tools.pm:209
+#: network/tools.pm:207
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "Fehler beim Zugriff auf Diskette, kann Gerät %s nicht einbinden"
 
-#: partition_table.pm:642
+#: partition_table.pm:644
 #, c-format
 msgid "mount failed: "
 msgstr "Fehler beim Einhängen: "
 
-#: partition_table.pm:747
+#: partition_table.pm:749
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "Diese Rechnerarchitektur kennt keine erweiterten Partitionen"
 
-#: 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"
@@ -11015,22 +11030,22 @@ msgstr ""
 "Ihre primären Partitionen so verschieben, dass der Bereich direkt \n"
 "neben der erweiterten Partition zu liegen kommt."
 
-#: partition_table.pm:852
+#: partition_table.pm:854
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Restaurieren aus der Datei %s schlug fehl: %s"
 
-#: partition_table.pm:854
+#: partition_table.pm:856
 #, c-format
 msgid "Bad backup file"
 msgstr "Fehlerhafte Backup-Datei"
 
-#: partition_table.pm:874
+#: partition_table.pm:876
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Fehler beim Schreiben in Datei %s"
 
-#: partition_table/raw.pm:181
+#: partition_table/raw.pm:187
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -11068,70 +11083,70 @@ msgstr "angenehm"
 msgid "maybe"
 msgstr "eventuell"
 
-#: printer/cups.pm:87
+#: printer/cups.pm:103
 #, c-format
 msgid "(on %s)"
 msgstr "(an %s)"
 
-#: printer/cups.pm:87
+#: printer/cups.pm:103
 #, c-format
 msgid "(on this machine)"
 msgstr "(an diesem Rechner)"
 
-#: printer/cups.pm:99 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:197
 #, c-format
 msgid "Configured on other machines"
 msgstr "Auf anderen Rechnern konfiguriert"
 
-#: printer/cups.pm:101
+#: printer/cups.pm:117
 #, c-format
 msgid "On CUPS server \"%s\""
-msgstr "Auf CUPS-Server \"%s\""
+msgstr "Auf CUPS-Server „%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 " (Standard)"
 
-#: printer/data.pm:21
+#: printer/data.pm:22
 #, c-format
 msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - Print, Don't Queue"
 
-#: 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 "LPD - Line Printer Daemon"
 
-#: 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 New Generation"
 
-#: 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 - Common Unix Printing System"
 
 #: 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 "Unbekanntes Modell"
@@ -11151,7 +11166,7 @@ msgstr "Entfernter Drucker"
 msgid "Printer on remote CUPS server"
 msgstr "Drucker an CUPS-Server auf der Gegenseite"
 
-#: 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 "Drucker an LPD-Server im Netzwerk"
@@ -11171,7 +11186,7 @@ msgstr "Drucker an SMB/Windows 9x/ME/NT"
 msgid "Printer on NetWare server"
 msgstr "Drucker an NetWare-Server"
 
-#: 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 "Druckeranschluss URI"
@@ -11182,8 +11197,8 @@ msgid "Pipe job into a command"
 msgstr "Den Auftrag an ein Kommando weiterleiten"
 
 #: 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 "Unbekanntes Modell"
@@ -11193,12 +11208,12 @@ msgstr "Unbekanntes Modell"
 msgid "Configured on this machine"
 msgstr "(an diesem Rechner)"
 
-#: printer/main.pm:337 printer/printerdrake.pm:948
+#: printer/main.pm:337 printer/printerdrake.pm:963
 #, c-format
 msgid " on parallel port #%s"
 msgstr " an Parallelport \\#%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-Drucker #%s"
@@ -11241,35 +11256,35 @@ msgstr ", drucken auf %s"
 #: printer/main.pm:361
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
-msgstr "auf LDP-Server \"%s\", Drucker \"%s\""
+msgstr "auf LDP-Server „%s“, Drucker „%s“"
 
 #: printer/main.pm:363
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
-msgstr ", TCP/IP-Rechner \"%s\", Port %s"
+msgstr ", TCP/IP-Rechner „%s“, Port %s"
 
 #: printer/main.pm:367
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
-msgstr "auf SMB/Windows-Server \"%s\", Freigabe \"%s\""
+msgstr "auf SMB/Windows-Server „%s“, Freigabe „%s“"
 
 #: printer/main.pm:371
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
-msgstr "auf dem Novell-Server \"%s\", Drucker \"%s\""
+msgstr "auf dem Novell-Server „%s“, Drucker „%s“"
 
 #: printer/main.pm:373
 #, c-format
 msgid ", using command %s"
-msgstr ", mittels Kommando \"%s\""
+msgstr ", mittels Kommando „%s“"
 
 #: printer/main.pm:388
 #, fuzzy, c-format
 msgid "Parallel port #%s"
 msgstr "Parallelport#%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-Drucker #%s"
@@ -11312,35 +11327,35 @@ msgstr ", drucken auf %s"
 #: printer/main.pm:412
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
-msgstr "LDP-Server \"%s\", Drucker \"%s\""
+msgstr "LDP-Server „%s“, Drucker „%s“"
 
 #: printer/main.pm:414
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
-msgstr ", TCP/IP-Rechner \"%s\", Port %s"
+msgstr ", TCP/IP-Rechner „%s“, Port %s"
 
 #: printer/main.pm:418
 #, fuzzy, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
-msgstr "auf SMB/Windows-Server \"%s\", Freigabe \"%s\""
+msgstr "auf SMB/Windows-Server „%s“, Freigabe „%s“"
 
 #: printer/main.pm:422
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
-msgstr "Novell Server \"%s\", Drucker \"%s\""
+msgstr "Novell Server „%s“, Drucker „%s“"
 
 #: printer/main.pm:424
 #, c-format
 msgid "Uses command %s"
-msgstr "benutzt Kommando \"%s\""
+msgstr "benutzt Kommando „%s“"
 
 #: printer/main.pm:426
 #, c-format
 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 "Rohdaten-Drucker (kein Treiber)"
@@ -11354,7 +11369,7 @@ msgstr "Lokale Netzwerke"
 #: printer/main.pm:1087 printer/printerdrake.pm:195
 #, c-format
 msgid "Interface \"%s\""
-msgstr "Schnittstelle \"%s\""
+msgstr "Schnittstelle „%s“"
 
 #: printer/main.pm:1089
 #, c-format
@@ -11392,7 +11407,7 @@ msgstr "CUPS-Drucker-Konfiguration"
 #, 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 ""
 "Hier können Sie einstellen, ob die Drucker, die an diesem Rechner hängen, "
 "für andere Rechner nutzbar sein sollen und falls ja, für welche."
@@ -11426,8 +11441,8 @@ msgstr "Gemeinsamer Druckerzugriff auf Rechnern/Netzwerken:"
 msgid "Custom configuration"
 msgstr "Angepasste Konfiguration"
 
-#: 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 "Keine Netzwerkrechner"
@@ -11475,7 +11490,7 @@ msgstr ""
 "Sprache zu drucken. Benutzen Sie diese Funktion nur, wenn Sie wirklich "
 "japanischen Text drucken wollen, wenn diese Funktion aktiviert ist, können "
 "Sie keine Akzente in Latin Schriftarten mehr drucken und auch die Abstände, "
-"die Buchstaben Grösse , etc. nicht mehr anpassen. Diese Einstellung betrifft "
+"die Buchstaben Grösse, etc. nicht mehr anpassen. Diese Einstellung betrifft "
 "nur Drucker auf diesem Rechner. Wenn Sie japanischen Text auf einem Drucker "
 "an einem entfernten Computer drucken wolllen, müssen Sie diese Funktion auf "
 "diesem Computer aktivieren."
@@ -11622,7 +11637,7 @@ msgstr "Die Server-IP fehlt!"
 msgid "The entered IP is not correct.\n"
 msgstr "Die eingegebene IP ist nicht korrekt.\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 "Die Port Nummer muss eine ganze Zahl sein!"
@@ -11634,36 +11649,37 @@ msgstr ""
 "Der Server ist bereits in der Liste, er kann nicht erneut hinzugefügt "
 "werden.\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"
@@ -11694,7 +11710,7 @@ msgstr ""
 "Drucker an entfernten CUPS-Servern müssen hier nicht konfiguriert werden; "
 "diese Drucker werden automatisch erkannt."
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:3807
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
 #, c-format
 msgid ""
 "\n"
@@ -11703,8 +11719,9 @@ msgid ""
 msgstr ""
 
 #: printer/printerdrake.pm:515
-#, c-format
-msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
+#, fuzzy, c-format
+msgid ""
+"Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
 msgstr "Autoerkennung von Druckern (Lokal, TCP/Socket und SMB-Drucker)"
 
 #: printer/printerdrake.pm:545
@@ -11712,17 +11729,17 @@ msgstr "Autoerkennung von Druckern (Lokal, TCP/Socket und SMB-Drucker)"
 msgid "Checking your system..."
 msgstr "Untersuchung Ihres Rechners ..."
 
-#: printer/printerdrake.pm:560
+#: printer/printerdrake.pm:561
 #, c-format
 msgid "and one unknown printer"
 msgstr "und ein unbekannter Drucker"
 
-#: printer/printerdrake.pm:562
+#: printer/printerdrake.pm:563
 #, c-format
 msgid "and %d unknown printers"
 msgstr "und %d unbekannte Drucker"
 
-#: printer/printerdrake.pm:566
+#: printer/printerdrake.pm:567
 #, c-format
 msgid ""
 "The following printers\n"
@@ -11735,7 +11752,7 @@ msgstr ""
 "%s%s\n"
 "sind direkt an Ihr System angeschlossen."
 
-#: printer/printerdrake.pm:568
+#: printer/printerdrake.pm:569
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11748,7 +11765,7 @@ msgstr ""
 "%s%s\n"
 "sind direkt an Ihr System angeschlossen."
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:570
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11761,7 +11778,7 @@ msgstr ""
 "%s%s\n"
 "ist direkt an Ihr System angeschlossen"
 
-#: printer/printerdrake.pm:573
+#: printer/printerdrake.pm:574
 #, c-format
 msgid ""
 "\n"
@@ -11770,7 +11787,7 @@ msgstr ""
 "\n"
 "Ich konnte einen unbekannten Drucker direkt an Ihrem Rechner finden."
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:575
 #, c-format
 msgid ""
 "\n"
@@ -11779,20 +11796,20 @@ msgstr ""
 "\n"
 "Ich konnte %d unbekannte Drucker direkt an Ihrem Rechner finden."
 
-#: printer/printerdrake.pm:577
+#: printer/printerdrake.pm:578
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr "Ich konnte keine Drucker direkt an Ihrem Rechner finden."
 
-#: printer/printerdrake.pm:580
+#: printer/printerdrake.pm:581
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr ""
 "(Stellen Sie bitte sicher, dass alle Drucker angeschlossen und eingeschaltet "
 "sind).\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 "
@@ -11801,22 +11818,22 @@ msgstr ""
 "Wollen Sie oben aufgeführte Drucker oder Drucker im lokalen Netzwerk zum "
 "Drucken konfigurieren?\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 "Wollen Sie Drucker im lokalen Netzwerk zum Drucken konfigurieren?\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 "Wollen Sie oben aufgeführte Drucker zum Drucken konfigurieren?\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 "Sind Sie sicher, dass Sie mit diesem Rechner drucken wollen?\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 "
@@ -11825,48 +11842,48 @@ msgstr ""
 "ANMERKUNG: Je nach Drucker und Drucksystem werden bis zu %d MB zusätzlicher "
 "Software auf Ihrem Rechner installiert."
 
-#: printer/printerdrake.pm:622
+#: printer/printerdrake.pm:629
 #, c-format
 msgid "Searching for new printers..."
 msgstr "Suche nach neuen Druckern..."
 
-#: printer/printerdrake.pm:706
+#: printer/printerdrake.pm:713
 #, c-format
 msgid "Configuring printer ..."
 msgstr "Konfiguriere Drucker ..."
 
-#: 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 "Konfiguriere Drucker \"%s\"..."
+msgstr "Konfiguriere Drucker „%s“..."
 
-#: 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 " auf "
 
-#: 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 "Auswahl des Druckermodells"
 
-#: 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 "Welches Druckermodell haben Sie?"
 
-#: printer/printerdrake.pm:736
+#: printer/printerdrake.pm:743
 #, c-format
 msgid ""
 "\n"
@@ -11879,7 +11896,7 @@ msgstr ""
 "PrinterDrake konnte Ihr Druckermodell %s nicht bestimmen. Bitte wählen Sie "
 "das richtige Modell aus der Liste aus."
 
-#: 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 "
@@ -11888,21 +11905,21 @@ msgstr ""
 "Falls Ihr Drucker nicht aufgeführt ist wählen Sie bitte ein kompatibles bzw "
 "ähnliches Modell (Für Einzelheiten schauen Sie bitte in Ihr Druckerhandbuch)."
 
-#: 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 "Konfiguriere Anwendungen ..."
 
-#: 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 "Drucker hinzufügen"
 
-#: printer/printerdrake.pm:825
+#: printer/printerdrake.pm:832
 #, c-format
 msgid ""
 "\n"
@@ -11924,7 +11941,7 @@ msgstr ""
 "Sie werden nun nach den nötigen Informationen über den Drucker gefragt, um "
 "dann Zugriff auf Treiber,  Druckoptionen und Anschlussart zu erhalten."
 
-#: printer/printerdrake.pm:838
+#: printer/printerdrake.pm:845
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -11960,10 +11977,10 @@ msgstr ""
 "sollten daher diesen Punkt ausschalten, sofern Sie nur direkt am Rechner "
 "hängende Drucker verwenden wollen.\n"
 "\n"
-"Betätigen Sie die Schaltfläche \"Weiter\", wenn Sie soweit sind, bzw. "
-"\"Abbrechen\", wenn Sie keine Drucker konfigurieren wollen."
+"Betätigen Sie die Schaltfläche „Weiter“, wenn Sie soweit sind, bzw. "
+"„Abbrechen“, wenn Sie keine Drucker konfigurieren wollen."
 
-#: printer/printerdrake.pm:847
+#: printer/printerdrake.pm:854
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -11987,10 +12004,10 @@ msgstr ""
 "Falls Sie Drucker haben, die direkt mit dem Rechner verbunden sind, stellen "
 "Sie sicher, dass diese richtig angeschlossen und eingeschaltet sind.\n"
 "\n"
-"Betätigen Sie die Schaltfläche \"Weiter\", wenn Sie soweit sind, bzw. "
-"\"Abbrechen\", wenn Sie keine Drucker konfigurieren wollen."
+"Betätigen Sie die Schaltfläche „Weiter“, wenn Sie soweit sind, bzw. "
+"„Abbrechen“, wenn Sie keine Drucker konfigurieren wollen."
 
-#: printer/printerdrake.pm:855
+#: printer/printerdrake.pm:862
 #, c-format
 msgid ""
 "\n"
@@ -12025,10 +12042,10 @@ msgstr ""
 "sollten daher diesen Punkt ausschalten, sofern Sie nur direkt am Rechner "
 "hängende Drucker verwenden wollen.\n"
 "\n"
-"Betätigen Sie die Schaltfläche \"Weiter\", wenn Sie soweit sind, bzw. "
-"\"Abbrechen\", wenn Sie keine Drucker konfigurieren wollen."
+"Betätigen Sie die Schaltfläche „Weiter“, wenn Sie soweit sind, bzw. "
+"„Abbrechen“, wenn Sie keine Drucker konfigurieren wollen."
 
-#: printer/printerdrake.pm:864
+#: printer/printerdrake.pm:871
 #, c-format
 msgid ""
 "\n"
@@ -12052,25 +12069,25 @@ msgstr ""
 "Falls Sie Drucker haben, die direkt mit dem Rechner verbunden sind, stellen "
 "Sie sicher, dass diese richtig angeschlossen und eingeschaltet sind.\n"
 "\n"
-"Betätigen Sie die Schaltfläche \"Weiter\", wenn Sie soweit sind, bzw. "
-"\"Abbrechen\", wenn Sie keine Drucker konfigurieren wollen."
+"Betätigen Sie die Schaltfläche „Weiter“, wenn Sie soweit sind, bzw. "
+"„Abbrechen“, wenn Sie keine Drucker konfigurieren wollen."
 
-#: printer/printerdrake.pm:873
+#: printer/printerdrake.pm:880
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "Selbsterkennung von direkt am Rechner angeschlossenen Druckern"
 
-#: printer/printerdrake.pm:876
+#: printer/printerdrake.pm:883
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "Drucker automatisch erkennen, die im lokalen Netzwerk hängen"
 
-#: printer/printerdrake.pm:879
+#: printer/printerdrake.pm:886
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr "Selbsterkennung von Druckern, die an Windows-Rechnern hängen"
 
-#: printer/printerdrake.pm:895
+#: printer/printerdrake.pm:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12086,62 +12103,78 @@ msgstr ""
 "\n"
 "Herzlichen Glückwunsch, Ihr Drucker ist nun installiert und eingerichtet!\n"
 "\n"
-"Sie können nun mit dem \"Drucken\" Befehl Ihrer Anwendungen (meistens im "
-"\"Datei\"-Menü zu finden) drucken.\n"
+"Sie können nun mit dem „Drucken“ Befehl Ihrer Anwendungen (meistens im "
+"„Datei“-Menü zu finden) drucken.\n"
 "\n"
 "Falls Sie einen Drucker hinzufügen, entfernen oder umbenennen wollen,\n"
 "oder wenn Sie die Standardeinstellungen wie Papierschacht oder \n"
-"Druckqualität) anpassen wollen, wählen Sie \"Drucker\" im \"Hardware\"\n"
+"Druckqualität) anpassen wollen, wählen Sie „Drucker“ im „Hardware“\n"
 "Bereich des Mandrake Kontrollzentrums."
 
-#: 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
+#, fuzzy, c-format
+msgid "Could not install the %s packages!"
+msgstr "Installation des Paketes %s"
+
+#: printer/printerdrake.pm:939
+#, c-format
+msgid "Skipping Windows/SMB server auto-detection"
+msgstr ""
+
+#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
 #, c-format
 msgid "Printer auto-detection"
 msgstr "Autoerkennung von Druckern"
 
-#: printer/printerdrake.pm:930
+#: printer/printerdrake.pm:945
 #, c-format
 msgid "Detecting devices..."
 msgstr "Geräteerkennung..."
 
-#: printer/printerdrake.pm:952
+#: printer/printerdrake.pm:967
 #, c-format
 msgid ", network printer \"%s\", port %s"
-msgstr ", Netzwerkdrucker \"%s\", Port %s"
+msgstr ", Netzwerkdrucker „%s“, Port %s"
 
-#: printer/printerdrake.pm:954
+#: printer/printerdrake.pm:969
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
-msgstr ", Drucker \"%s\" an SMB/Windows-Server \"%s\""
+msgstr ", Drucker „%s“ an SMB/Windows-Server „%s“"
 
-#: printer/printerdrake.pm:958
+#: printer/printerdrake.pm:973
 #, c-format
 msgid "Detected %s"
 msgstr "%s gefunden"
 
-#: 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 "Drucker an Parallelport #%s"
 
-#: printer/printerdrake.pm:966
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Network printer \"%s\", port %s"
-msgstr "Netzwerkdrucker \"%s\", Port %s"
+msgstr "Netzwerkdrucker „%s“, Port %s"
 
-#: printer/printerdrake.pm:968
+#: printer/printerdrake.pm:983
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
-msgstr "Drucker \"%s\" am SMB/Windows-Server \"%s\""
+msgstr "Drucker „%s“ am SMB/Windows-Server „%s“"
 
-#: printer/printerdrake.pm:1047
+#: printer/printerdrake.pm:1062
 #, c-format
 msgid "Local Printer"
 msgstr "Lokaler Drucker"
 
-#: printer/printerdrake.pm:1048
+#: printer/printerdrake.pm:1063
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -12154,32 +12187,32 @@ msgstr ""
 "Anschlüsse: /dev/lp0, /dev/lp1, ..., äquivalent zu LPT1:, LPT2:, ...; Erster "
 "USB Drucker: /dev/usb/lp0, zweier USB Drucker: /dev/usb/lp1, ...)."
 
-#: printer/printerdrake.pm:1052
+#: printer/printerdrake.pm:1067
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "Sie müssen einen Geräte- oder Dateinamen eingeben!"
 
-#: printer/printerdrake.pm:1061
+#: printer/printerdrake.pm:1076
 #, c-format
 msgid "No printer found!"
 msgstr "Kein Drucker erkannt!"
 
-#: printer/printerdrake.pm:1069
+#: printer/printerdrake.pm:1084
 #, c-format
 msgid "Local Printers"
 msgstr "Lokale Drucker"
 
-#: printer/printerdrake.pm:1070
+#: printer/printerdrake.pm:1085
 #, c-format
 msgid "Available printers"
 msgstr "Vorhandene Drucker"
 
-#: 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 "Der folgende Drucker wurde automatisch erkannt."
 
-#: 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 "
@@ -12188,7 +12221,7 @@ msgstr ""
 "Falls das nicht der Drucker ist, den Sie einrichten wollen, geben Sie einen "
 "Geräte- oder Dateinamen in der Eingabezeile an."
 
-#: printer/printerdrake.pm:1077
+#: printer/printerdrake.pm:1092
 #, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
@@ -12196,12 +12229,12 @@ msgstr ""
 "Alternativ können Sie einen Geräte- oder Dateinamen in der Eingabezeile "
 "angeben"
 
-#: 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 "Hier ist eine Liste aller automatisch erkannten Drucker."
 
-#: 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 "
@@ -12210,7 +12243,7 @@ msgstr ""
 "Bitte wählen Sie den Drucker den sie einrichten wollen oder geben Sie einen "
 "Geräte- oder Dateinamen in der Eingabezeile an."
 
-#: 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 "
@@ -12219,7 +12252,7 @@ msgstr ""
 "Bitte wählen Sie den Drucker, an den die Druckaufträge gehen sollen oder "
 "geben Sie einen Geräte- oder Dateinamen in der Eingabezeile an."
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1100
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -12228,14 +12261,14 @@ msgid ""
 msgstr ""
 "Die Einrichtung des Druckers wird vollautomatisch erfolgen. Sollte Ihr "
 "Drucker nicht richtig erkannt worden sein oder wollen Sie die Einrichtung "
-"selbst vornehmen, wählen Sie \"Manuelle Konfiguration\"."
+"selbst vornehmen, wählen Sie „Manuelle Konfiguration“."
 
-#: printer/printerdrake.pm:1086
+#: printer/printerdrake.pm:1101
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "Im Moment ist keine alternative Möglichkeit verfügbar."
 
-#: printer/printerdrake.pm:1089
+#: printer/printerdrake.pm:1104
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -12246,14 +12279,14 @@ msgstr ""
 "Bitte wählen Sie den Drucker, den Sie einrichten wollen. Die Einrichtung "
 "wird vollautomatisch erfolgen. Sollte Ihr Drucker nicht richtig erkannt "
 "worden sein oder wollen Sie die Einrichtung selbst vornehmen, wählen Sie "
-"\"Manuelle Konfiguration\"."
+"„Manuelle Konfiguration“."
 
-#: printer/printerdrake.pm:1090
+#: printer/printerdrake.pm:1105
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "Bitte wählen Sie den Drucker, an den die Druckaufträge gehen sollen."
 
-#: 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 "
@@ -12262,12 +12295,12 @@ msgstr ""
 "Bitte wählen Sie den Anschluss, an dem der Drucker hängt oder geben Sie "
 "einen Geräte- oder Dateinamen in der Eingabezeile an."
 
-#: printer/printerdrake.pm:1093
+#: printer/printerdrake.pm:1108
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "Bitte wählen Sie den Anschluss, an dem Ihr Drucker hängt."
 
-#: printer/printerdrake.pm:1095
+#: printer/printerdrake.pm:1110
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -12277,17 +12310,26 @@ msgstr ""
 "LPT2:, ..., Erster USB-Drucker: /dev/usb/lp0, zweiter USB-Drucker: /dev/usb/"
 "lp1, ...)."
 
-#: printer/printerdrake.pm:1099
+#: printer/printerdrake.pm:1114
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "Sie müssen einen Drucker wählen/ein Gerät eingeben!"
 
-#: 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
+#, fuzzy, c-format
+msgid "Aborting"
+msgstr "Abbruch"
+
+#: printer/printerdrake.pm:1189
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "Optionen für Netzwerk-Druckerspooler"
 
-#: 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 "
@@ -12297,66 +12339,65 @@ msgstr ""
 "des Drucker-Servers sowie den Druckernamen auf diesem Server angeben, an den "
 "die Aufträge übertragen werden sollen."
 
-#: printer/printerdrake.pm:1170
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "Remote host name"
 msgstr "Name des Netzwerkrechners"
 
-#: printer/printerdrake.pm:1171
+#: printer/printerdrake.pm:1192
 #, c-format
 msgid "Remote printer name"
 msgstr "Name des entfernten Druckers"
 
-#: printer/printerdrake.pm:1174
+#: printer/printerdrake.pm:1195
 #, c-format
 msgid "Remote host name missing!"
 msgstr "Der Name des Netzwerkrechners fehlt!"
 
-#: printer/printerdrake.pm:1178
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "Der Name des Netzwerkdruckers fehlt!"
 
-#: 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 "Informationen"
 
-#: printer/printerdrake.pm:1200 printer/printerdrake.pm:1714
+#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Gefundendenes Modell: %s %s"
 
-#: printer/printerdrake.pm:1276 printer/printerdrake.pm:1516
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
 #, c-format
 msgid "Scanning network..."
 msgstr "Durchsuche Netzwerk..."
 
-#: 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 ", Drucker \"%s\", auf Server \"%s\""
+msgstr ", Drucker „%s“, auf Server „%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 "Drucker \"%s\", auf Server \"%s\""
+msgstr "Drucker „%s“, auf Server „%s“"
 
-#: printer/printerdrake.pm:1332
+#: printer/printerdrake.pm:1366
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) Drucker-Parameter"
 
-#: 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 "
@@ -12370,7 +12411,7 @@ msgstr ""
 "für den Drucker, auf den Sie zugreifen möchten, sowie entsprechender "
 "Benutzername, Passwort und Arbeitsgruppe."
 
-#: printer/printerdrake.pm:1334
+#: printer/printerdrake.pm:1368
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -12380,47 +12421,47 @@ msgstr ""
 "aus der Liste unten aus und geben Sie - falls notwendig - Name, Passwort und/"
 "oder Domäne an."
 
-#: printer/printerdrake.pm:1336
+#: printer/printerdrake.pm:1370
 #, c-format
 msgid "SMB server host"
 msgstr "SMB-Server"
 
-#: printer/printerdrake.pm:1337
+#: printer/printerdrake.pm:1371
 #, c-format
 msgid "SMB server IP"
 msgstr "SMB-Server-IP"
 
-#: printer/printerdrake.pm:1338
+#: printer/printerdrake.pm:1372
 #, c-format
 msgid "Share name"
 msgstr "Freigabename"
 
-#: printer/printerdrake.pm:1341
+#: printer/printerdrake.pm:1375
 #, c-format
 msgid "Workgroup"
 msgstr "Arbeitsgruppe"
 
-#: printer/printerdrake.pm:1343
+#: printer/printerdrake.pm:1377
 #, c-format
 msgid "Auto-detected"
 msgstr "Selbst gefunden"
 
-#: printer/printerdrake.pm:1353
+#: printer/printerdrake.pm:1387
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "Sie müssen entweder den Servernamen oder seine IP-Adresse angeben!"
 
-#: printer/printerdrake.pm:1357
+#: printer/printerdrake.pm:1391
 #, c-format
 msgid "Samba share name missing!"
 msgstr "Der Name der Samba-Freigabe fehlt!"
 
-#: printer/printerdrake.pm:1363
+#: printer/printerdrake.pm:1397
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "SICHERHEITSWARNUNG!"
 
-#: 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 "
@@ -12448,8 +12489,8 @@ msgstr ""
 "der Samba-Client-Software wird das Passwort im Klartext in die Kommandozeile "
 "der Samba-Komponente eingefügt, welche die zu druckenden Daten auf den "
 "Windows-Server überträgt. So ist es für jeden Benutzer möglich, das Passwort "
-"auf dem Bildschirm anzuzeigen, indem er Kommandos wie zum Beispiel \"ps "
-"auxwww\" ausführt.\n"
+"auf dem Bildschirm anzuzeigen, indem er Kommandos wie zum Beispiel „ps "
+"auxwww“ ausführt.\n"
 "\n"
 "Wir empfehlen von einer der folgenden Alternativen Gebrauch zu machen (in "
 "allen Fällen muss sichergestellt werden dass nur Maschinen des lokalen "
@@ -12457,16 +12498,16 @@ msgstr ""
 "einer Firewall):\n"
 "\n"
 "Drucken Sie über ein Benutzerkonto ohne Passwort auf Ihrem Windows-Server, "
-"zum Beispiel über das \"GAST\"-Benutzerkonto oder über ein speziell zum "
+"zum Beispiel über das „GAST“-Benutzerkonto oder über ein speziell zum "
 "Drucken eingerichtetes Benutzerkonto. Entfernen Sie nicht den Passwortschutz "
 "von einem persönlichen Benutzerkonto oder vom Administratorkonto.\n"
 "\n"
 "Richten Sie Ihren Windows-Server so ein, dass der Drucker unter dem LPD-"
 "Protokoll erreichbar ist. Dann richten sie den Drucker auf dieser Maschine "
-"mit dem Verbindungstyp \"%s\" ein.\n"
+"mit dem Verbindungstyp „%s“ ein.\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 "
@@ -12476,10 +12517,10 @@ msgid ""
 msgstr ""
 "Richten Sie Ihren Windows-Server so ein, dass Ihr Drucker über das IPP-"
 "Protokoll erreichbar ist und konfigurieren sie ihn auf dieser Maschine mit "
-"dem Verbindungstyp \"%s\" in PrinterDrake.\n"
+"dem Verbindungstyp „%s“ in PrinterDrake.\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) "
@@ -12492,12 +12533,12 @@ msgstr ""
 " \n"
 "Möchten Sie Ihren Drucker wirklich so einrichten, wie Sie es jetzt tun?"
 
-#: printer/printerdrake.pm:1449
+#: printer/printerdrake.pm:1489
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "Optionen für NetWare-Drucker"
 
-#: 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 "
@@ -12510,42 +12551,42 @@ msgstr ""
 "Rechnernamen des Computers), Name der Drucker-Warteschlange, sowie falls "
 "notwendig, den entsprechenden Benutzernamen samt Passwort."
 
-#: printer/printerdrake.pm:1451
+#: printer/printerdrake.pm:1491
 #, c-format
 msgid "Printer Server"
 msgstr "Drucker-Server"
 
-#: printer/printerdrake.pm:1452
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Print Queue Name"
 msgstr "Name der Druckerwarteschlange"
 
-#: printer/printerdrake.pm:1457
+#: printer/printerdrake.pm:1497
 #, c-format
 msgid "NCP server name missing!"
 msgstr "Der NCP-Servername fehlt!"
 
-#: printer/printerdrake.pm:1461
+#: printer/printerdrake.pm:1501
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "Der NCP-Warteschlangen-Name fehlt!"
 
-#: printer/printerdrake.pm:1527 printer/printerdrake.pm:1547
+#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
 #, c-format
 msgid ", host \"%s\", port %s"
-msgstr ", Rechner \"%s\", Port %s"
+msgstr ", Rechner „%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 "Rechner \"%s\", Port %s"
+msgstr "Rechner „%s“, Port %s"
 
-#: printer/printerdrake.pm:1571
+#: printer/printerdrake.pm:1618
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "Optionen für TCP/Socket-Drucker"
 
-#: 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 "
@@ -12555,7 +12596,7 @@ msgstr ""
 "Sie den Hostnamen oder die IP-Adresse und optional die Portnummer (wenn Port "
 "nicht angegeben, wird 9100 verwendet) ein."
 
-#: 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 "
@@ -12569,22 +12610,27 @@ msgstr ""
 "9100, bei anderen Servern kann es eine andere sein. Schauen Sie im "
 "Zweifelsfall in die Unterlagen des Herstellers."
 
-#: printer/printerdrake.pm:1578
+#: printer/printerdrake.pm:1625
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "Der Rechnername, bzw die IP-Adresse des Druckers fehlt!"
 
-#: printer/printerdrake.pm:1601
+#: printer/printerdrake.pm:1648
 #, c-format
 msgid "Printer host name or IP"
 msgstr "Rechnername/IP des Druckers"
 
-#: printer/printerdrake.pm:1649 printer/printerdrake.pm:1651
+#: printer/printerdrake.pm:1704
+#, fuzzy, c-format
+msgid "Refreshing Device URI list..."
+msgstr "Aktualisieren der Druckerdaten ..."
+
+#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
 #, c-format
 msgid "Printer Device URI"
 msgstr "Druckeranschluss 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 "
@@ -12595,34 +12641,34 @@ msgstr ""
 "bzw. den Foomatic-Spezifikationen genügen. Es sei hier noch angemerkt, dass "
 "nicht alle URI-Typen von allen Drucksystemem unterstützt werden."
 
-#: printer/printerdrake.pm:1668
+#: printer/printerdrake.pm:1731
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "Sie müssen eine gültige URI eingeben!"
 
-#: printer/printerdrake.pm:1749
+#: printer/printerdrake.pm:1834
 #, c-format
 msgid "Pipe into command"
 msgstr "An ein Kommando weiterleiten"
 
-#: printer/printerdrake.pm:1750
+#: printer/printerdrake.pm:1835
 #, fuzzy, 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 "command line."
 
-#: printer/printerdrake.pm:1751
+#: printer/printerdrake.pm:1836
 #, c-format
 msgid "Command line"
 msgstr "Kommandozeile"
 
-#: printer/printerdrake.pm:1755
+#: printer/printerdrake.pm:1840
 #, c-format
 msgid "A command line must be entered!"
 msgstr "Eine Kommandozeile muss eingegeben werden!"
 
-#: printer/printerdrake.pm:1788
+#: printer/printerdrake.pm:1873
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -12633,106 +12679,121 @@ msgstr ""
 "LaserJet 1100/1200/1220/3200/3300 mit Scanner, DeskJet 450, Sony IJP-V100), "
 "ein HP PhotoSmart oder ein HP LaserJet 2200?"
 
-#: printer/printerdrake.pm:1801
+#: printer/printerdrake.pm:1887
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "Installiere HPOJ-Paket..."
 
-#: printer/printerdrake.pm:1809 printer/printerdrake.pm:1893
+#: printer/printerdrake.pm:1894
+#, c-format
+msgid "Only printing will be possible on the %s."
+msgstr ""
+
+#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
 #, c-format
 msgid "Checking device and configuring HPOJ..."
 msgstr "Überprüfe Gerät und konfiguriere HPOJ..."
 
-#: printer/printerdrake.pm:1831
+#: printer/printerdrake.pm:1946
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "Installiere SANE-Pakete..."
 
-#: printer/printerdrake.pm:1858
+#: printer/printerdrake.pm:1956
+#, c-format
+msgid "Scanning on the %s will not be possible."
+msgstr ""
+
+#: printer/printerdrake.pm:1983
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "Installiere mtools-Pakete..."
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1990
+#, fuzzy, c-format
+msgid "Photo memory card access on the %s will not be possible."
+msgstr "Photo Speicherkarten Zugriff auf Ihrem HP Multifunktionsgerät"
+
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "Scannen auf Ihrem HP-Multifunktionsgerät"
 
-#: printer/printerdrake.pm:1881
+#: printer/printerdrake.pm:2013
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr "Photo Speicherkarten Zugriff auf Ihrem HP Multifunktionsgerät"
 
-#: printer/printerdrake.pm:1930
+#: printer/printerdrake.pm:2062
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "Bereite Druckerport für CUPS vor..."
 
-#: 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 "Lesen der Drucker-Datenbank ..."
 
-#: printer/printerdrake.pm:2149
+#: printer/printerdrake.pm:2281
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "Geben Sie Druckername und Kommentare ein"
 
-#: 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 ""
 "Druckernamen sollten nur Buchstaben, Ziffern und den Unterstrich unterhalten"
 
-#: 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"
 "do you really want to overwrite its configuration?"
 msgstr ""
-"Der Drucker \"%s\" existiert bereits. Wollen Sie ihn wirklich \n"
+"Der Drucker „%s“ existiert bereits. Wollen Sie ihn wirklich \n"
 "ersetzen?"
 
-#: printer/printerdrake.pm:2168
+#: printer/printerdrake.pm:2300
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
 "Location fields do not need to be filled in. They are comments for the users."
 msgstr ""
-"Jeder Drucker benötigt einen Namen (etwa \"Drucker\").\n"
+"Jeder Drucker benötigt einen Namen (etwa „Drucker“).\n"
 "Beschreibung und Standort müssen nicht ausgefüllt werden.\n"
 "Sie dienen nur als Kommentare für den Anwender."
 
-#: printer/printerdrake.pm:2169
+#: printer/printerdrake.pm:2301
 #, c-format
 msgid "Name of printer"
 msgstr "Druckername"
 
-#: 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 "Beschreibung"
 
-#: printer/printerdrake.pm:2171 standalone/printerdrake:212
+#: printer/printerdrake.pm:2303 standalone/printerdrake:212
 #: standalone/printerdrake:219
 #, c-format
 msgid "Location"
 msgstr "Standort"
 
-#: printer/printerdrake.pm:2188
+#: printer/printerdrake.pm:2320
 #, c-format
 msgid "Preparing printer database..."
 msgstr "Vorbereiten der Drucker-Datenbank ..."
 
-#: printer/printerdrake.pm:2306
+#: printer/printerdrake.pm:2438
 #, c-format
 msgid "Your printer model"
 msgstr "Ihr Druckermodell"
 
-#: printer/printerdrake.pm:2307
+#: printer/printerdrake.pm:2439
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -12750,26 +12811,26 @@ msgstr ""
 "Datenbank verglichen, um den besten Treiber zu finden. Die Auswahl kann "
 "jedoch falsch sein, etwa wenn Ihr Drucker nicht in der Datenbank vorhanden "
 "ist. Kontrollieren Sie, ob die Wahl korrekt ist und wählen Sie die "
-"Schaltfläche \"Das Modell ist richtig\", wenn der Treiber Ihren Wünschen "
-"entspricht, andernfalls betägen Sie \"Modell manuell auswählen\", um die "
+"Schaltfläche „Das Modell ist richtig“, wenn der Treiber Ihren Wünschen "
+"entspricht, andernfalls betägen Sie „Modell manuell auswählen“, um die "
 "Auswahl selbst vorzunehmen.\n"
 "\n"
 "Folgender Drucker wurde gefunden:\n"
 "\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 "Das Modell ist richtig"
 
-#: 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 "Modell manuell auswählen"
 
-#: printer/printerdrake.pm:2340
+#: printer/printerdrake.pm:2472
 #, c-format
 msgid ""
 "\n"
@@ -12781,41 +12842,41 @@ msgstr ""
 "\n"
 "\n"
 "Kontrollieren Sie bitte, ob PrinterDrake Ihren Drucker korrekt erkannt hat. "
-"Falls die Markierung auf einem falschen Gerät oder auf \"Rohdaten-Drucker\" "
+"Falls die Markierung auf einem falschen Gerät oder auf „Rohdaten-Drucker“ "
 "steht, suchen Sie bitte selbst Ihren Drucker in der Liste."
 
-#: printer/printerdrake.pm:2359
+#: printer/printerdrake.pm:2491
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr ""
 
-#: printer/printerdrake.pm:2390
+#: printer/printerdrake.pm:2522
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
 "printer's options and features."
 msgstr ""
 
-#: 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 "
 "delivered with the printer."
 msgstr ""
 
-#: 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 ""
 
-#: 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 "
 "your Windows partition, too."
 msgstr ""
 
-#: 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 "
@@ -12823,65 +12884,65 @@ msgid ""
 "printer's hardware"
 msgstr ""
 
-#: 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 "
 "then be used for the setup of your printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2397
+#: printer/printerdrake.pm:2529
 #, fuzzy, c-format
 msgid "Install PPD file from"
 msgstr "Installiere Firmware Datei von"
 
-#: 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
 #, fuzzy, 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 "Diskettenlaufwerk"
 
-#: 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 "Andere Orte"
 
-#: printer/printerdrake.pm:2416
+#: printer/printerdrake.pm:2548
 #, fuzzy, c-format
 msgid "Select PPD file"
 msgstr "Datei auswählen"
 
-#: printer/printerdrake.pm:2420
+#: printer/printerdrake.pm:2552
 #, fuzzy, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr "Die Firmware Date %s existiert nicht oder ist unlesbar!"
 
-#: printer/printerdrake.pm:2426
+#: printer/printerdrake.pm:2558
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr ""
 
-#: printer/printerdrake.pm:2437
+#: printer/printerdrake.pm:2569
 #, fuzzy, c-format
 msgid "Installing PPD file..."
 msgstr "Installiere %s ..."
 
-#: printer/printerdrake.pm:2539
+#: printer/printerdrake.pm:2682
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "OKI Win-Drucker-Konfiguration"
 
-#: printer/printerdrake.pm:2540
+#: printer/printerdrake.pm:2683
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -12897,12 +12958,12 @@ msgstr ""
 "Schnittstelle oder an einer Printserver-Box hängen, schließen Sie ihn bitte "
 "an den ersten Parallelport, bevor Sie versuchen eine Testseite zu drucken ..."
 
-#: printer/printerdrake.pm:2564 printer/printerdrake.pm:2593
+#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Lexmark-Tintenstrahl-Konfiguration"
 
-#: printer/printerdrake.pm:2565
+#: printer/printerdrake.pm:2708
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -12915,7 +12976,7 @@ msgstr ""
 "Bitte schließen Sie den Drucker direkt an Ihren Rechner oder richten Sie ihn "
 "auf dem Rechner ein, an den er angeschlossen ist."
 
-#: printer/printerdrake.pm:2594
+#: printer/printerdrake.pm:2737
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -12929,20 +12990,38 @@ msgid ""
 msgstr ""
 "Um mit Ihrem Lexmark-Tintenstrahldrucker drucken zu können, benötigen Sie "
 "die Treiber, die von Lexmark bereitgestellt werden (http://www.lexmark."
-"com/). Klicken Sie auf den \"Drivers\"-Link. Wählen Sie dann das "
-"Druckermodell und geben Sie \"Linux\" als Betriebssystem an. Sie erhalten "
-"die Treiber als RPM-Paket oder als Shellskript mit interaktiver grafischer "
-"Installation. Sie müssen die Einrichtung nicht mit dem Lexmark-Klicktool "
-"vornehmen. Sie können direkt nach der Lizenz auf \"Abbrechen\" drücken. "
-"Drucken Sie dann die Druckkopf-Justierungsseiten mit \"lexmarkmaintain\" und "
-"justieren Sie damit den Druckkopf."
+"com/). Klicken Sie auf den „Drivers“-Link. Wählen Sie dann das Druckermodell "
+"und geben Sie „Linux“ als Betriebssystem an. Sie erhalten die Treiber als "
+"RPM-Paket oder als Shellskript mit interaktiver grafischer Installation. Sie "
+"müssen die Einrichtung nicht mit dem Lexmark-Klicktool vornehmen. Sie können "
+"direkt nach der Lizenz auf „Abbrechen“ drücken. Drucken Sie dann die "
+"Druckkopf-Justierungsseiten mit „lexmarkmaintain“ und justieren Sie damit "
+"den Druckkopf."
+
+#: printer/printerdrake.pm:2746
+#, fuzzy, c-format
+msgid "Lexmark X125 configuration"
+msgstr "Lexmark-Tintenstrahl-Konfiguration"
+
+#: printer/printerdrake.pm:2747
+#, fuzzy, 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 ""
+"Der Lexmark-Tintenstrahl-Druckertreiber unterstützt nur lokale Drucker, "
+"keine Drucker an anderen Rechnern im Netzwerk oder an Printserver-Boxen. "
+"Bitte schließen Sie den Drucker direkt an Ihren Rechner oder richten Sie ihn "
+"auf dem Rechner ein, an den er angeschlossen ist."
 
-#: printer/printerdrake.pm:2597
+#: printer/printerdrake.pm:2765
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "Firmware-Upload an HP LaserJet 1000"
 
-#: printer/printerdrake.pm:2710
+#: printer/printerdrake.pm:2878
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -12959,41 +13038,41 @@ msgstr ""
 "richtig eingestellt sind. Es sei auch angemerkt, dass häufig mit steigender "
 "Druckqualität die Druckgeschwindigkeit sinkt."
 
-#: printer/printerdrake.pm:2835
+#: printer/printerdrake.pm:3003
 #, c-format
 msgid "Printer default settings"
 msgstr "Standard-Einstellungen des Druckers"
 
-#: printer/printerdrake.pm:2842
+#: printer/printerdrake.pm:3010
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "Der Parameter %s muss eine ganzzahlige Zahl sein!"
 
-#: printer/printerdrake.pm:2846
+#: printer/printerdrake.pm:3014
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "Der Parameter %s muss eine Zahl sein!"
 
-#: printer/printerdrake.pm:2850
+#: printer/printerdrake.pm:3018
 #, c-format
 msgid "Option %s out of range!"
 msgstr "Der Parameter %s ist groß oder zu klein!"
 
-#: printer/printerdrake.pm:2901
+#: printer/printerdrake.pm:3069
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
 "as the default printer?"
 msgstr ""
-"Möchten Sie diesen Drucker (\"%s\")\n"
+"Möchten Sie diesen Drucker („%s“)\n"
 "als Standarddrucker verwenden?"
 
-#: printer/printerdrake.pm:2916
+#: printer/printerdrake.pm:3084
 #, c-format
 msgid "Test pages"
 msgstr "Testseiten"
 
-#: printer/printerdrake.pm:2917
+#: printer/printerdrake.pm:3085
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -13008,47 +13087,57 @@ msgstr ""
 "gedruckt wird. Normalerweise sollte es ausreichen, die Standard-Testseiten "
 "auszudrucken."
 
-#: printer/printerdrake.pm:2921
+#: printer/printerdrake.pm:3089
 #, c-format
 msgid "No test pages"
 msgstr "Keine Testseiten"
 
-#: printer/printerdrake.pm:2922
+#: printer/printerdrake.pm:3090
 #, c-format
 msgid "Print"
 msgstr "Drucken"
 
-#: printer/printerdrake.pm:2947
+#: printer/printerdrake.pm:3115
 #, c-format
 msgid "Standard test page"
 msgstr "Standard-Testseite"
 
-#: printer/printerdrake.pm:2950
+#: printer/printerdrake.pm:3118
 #, c-format
 msgid "Alternative test page (Letter)"
-msgstr "Alternative Testseite (US-Format - \"Letter\")"
+msgstr "Alternative Testseite (US-Format - „Letter“)"
 
-#: printer/printerdrake.pm:2953
+#: printer/printerdrake.pm:3121
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Alternative Testseite (A4)"
 
-#: printer/printerdrake.pm:2955
+#: printer/printerdrake.pm:3123
 #, c-format
 msgid "Photo test page"
 msgstr "Foto-Testseite"
 
-#: printer/printerdrake.pm:2959
+#: printer/printerdrake.pm:3127
 #, c-format
 msgid "Do not print any test page"
 msgstr "Keine Testseite(n) drucken"
 
-#: printer/printerdrake.pm:2967 printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "Druck der Testseite(n) ..."
 
-#: printer/printerdrake.pm:2992
+#: printer/printerdrake.pm:3150
+#, fuzzy, c-format
+msgid "Could not install the %s package!"
+msgstr "Installation des Paketes %s"
+
+#: printer/printerdrake.pm:3152
+#, fuzzy, c-format
+msgid "Skipping photo test page."
+msgstr "Foto-Testseite"
+
+#: printer/printerdrake.pm:3169
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13063,7 +13152,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"
@@ -13072,17 +13161,17 @@ msgstr ""
 "Die Testseite(n) wurden an den Drucker gesandt.\n"
 "Es kann einen Augenblick dauern, bevor der Drucker seine Arbeit aufnimmt.\n"
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3180
 #, c-format
 msgid "Did it work properly?"
 msgstr "War der Ausdruck korrekt?"
 
-#: printer/printerdrake.pm:3024 printer/printerdrake.pm:4192
+#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
 #, c-format
 msgid "Raw printer"
 msgstr "Rohdaten-Drucker"
 
-#: 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 "
@@ -13090,25 +13179,25 @@ msgid ""
 "\"kprinter <file>\". The graphical tools allow you to choose the printer and "
 "to modify the option settings easily.\n"
 msgstr ""
-"Sie können sowohl den Befehl \"%s <datei>\" verwenden, wenn Sie in einer "
-"Konsole die Datei \"<datei>\"  drucken wollen, als auch ein grafisches "
-"Hilfsprogramm verwenden: \"xpp <datei>\" oder \"kprinter <datei>\". Die "
+"Sie können sowohl den Befehl „%s <datei>“ verwenden, wenn Sie in einer "
+"Konsole die Datei „<datei>“  drucken wollen, als auch ein grafisches "
+"Hilfsprogramm verwenden: „xpp <datei>“ oder „kprinter <datei>“. Die "
 "grafischen Hilfsprogramme erlauben Ihnen auf einfache Weise den richtigen "
 "Drucker zu wählen und die notwendigen Drucker-Parameter anzugeben.\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 "
 "printing dialogs of many applications, but here do not supply the file name "
 "because the file to print is provided by the application.\n"
 msgstr ""
-"Sie können diese Befehle auch in dem \"Druck-Kommando\"-Feld des "
-"Druckdialogs zahlreicher Anwendungen angeben, lassen Sie jedoch den "
-"Dateinamen weg, da die zu druckende Datei von der Anwendung geliefert wird.\n"
+"Sie können diese Befehle auch in dem „Druck-Kommando“-Feld des Druckdialogs "
+"zahlreicher Anwendungen angeben, lassen Sie jedoch den Dateinamen weg, da "
+"die zu druckende Datei von der Anwendung geliefert wird.\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"
@@ -13117,11 +13206,11 @@ msgid ""
 "line, e. g. \"%s <file>\". "
 msgstr ""
 "\n"
-"Der Befehl \"%s\" erlaubt es Ihnen auch zahlreiche Einstellungen für einen "
+"Der Befehl „%s“ erlaubt es Ihnen auch zahlreiche Einstellungen für einen "
 "bestimmten Druckauftrag zu ändern. Geben Sie die gewünschten Angaben einfach "
-"in der Kommandozeile mit an, etwa: \"%s <Datei>\". "
+"in der Kommandozeile mit an, etwa: „%s <Datei>“. "
 
-#: 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 "
@@ -13129,11 +13218,11 @@ msgid ""
 "\n"
 msgstr ""
 "Um alle existierenden Optionen des Druckers zu erfahren, lesen Sie entweder "
-"die unten angegebene Liste oder betätigen Sie die Schaltfläche \"Liste der "
-"Drucker-Optionen\". %s%s%s\n"
+"die unten angegebene Liste oder betätigen Sie die Schaltfläche „Liste der "
+"Drucker-Optionen“. %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"
@@ -13142,46 +13231,46 @@ msgstr ""
 "Hier die Liste vorhandener Drucker-Parameter des aktuellen Druckers:\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 "
 "<file>\".\n"
 msgstr ""
-"Verwenden Sie den Befehl \"%s <Datei>\", um die Datei <Datei> in der "
+"Verwenden Sie den Befehl „%s <Datei>“, um die Datei <Datei> in der "
 "Kommandozeile auszudrucken.\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 "
 "printing dialogs of many applications. But here do not supply the file name "
 "because the file to print is provided by the application.\n"
 msgstr ""
-"Sie können diesen Befehl auch im \"Druckkommando\"-Feld vieler Programme "
+"Sie können diesen Befehl auch im „Druckkommando“-Feld vieler Programme "
 "angeben. Tragen Sie bitte keinen Dateinamen ein, da dieser vom Programm "
 "ergänzt wird.\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 "
 "\"Print option list\" button."
 msgstr ""
 "Um eine Liste der Drucker-Parameter Ihres Druckers zu erhalten, betätigen "
-"Sie bitte die Schaltfläche \"Liste der Drucker-Optionen\"."
+"Sie bitte die Schaltfläche „Liste der Drucker-Optionen“."
 
-#: 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 "
 "<file>\" or \"%s <file>\".\n"
 msgstr ""
-"Verwenden Sie einen der Befehle \"%s <Datei>\" oder \"%s <Datei>\", um die "
-"Datei <Datei> in der Kommandozeile auszudrucken.\n"
+"Verwenden Sie einen der Befehle „%s <Datei>„ oder „%s <Datei>“, um die Datei "
+"<Datei> in der Kommandozeile auszudrucken.\n"
 
-#: printer/printerdrake.pm:3095
+#: printer/printerdrake.pm:3272
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -13191,14 +13280,14 @@ msgid ""
 "jobs immediately when you click it. This is for example useful for paper "
 "jams.\n"
 msgstr ""
-"Sie können auch das Grafikwerkzeug \"xpdq\" zum Setzen der Optionen und "
+"Sie können auch das Grafikwerkzeug „xpdq“ zum Setzen der Optionen und "
 "Verwalten der Druckjobs verwenden.\n"
 "Falls Sie KDE als Arbeitsoberfläche nutzen, haben Sie eine Panik-Abschaltung "
-"in Form des Arbeitsflächensymbols \"Drucker anhalten!\", dass sofort alle "
+"in Form des Arbeitsflächensymbols „Drucker anhalten!“, dass sofort alle "
 "Druckaufträge anhält, wenn Sie es betätigen. Das kann beispielsweise dann "
 "hilfreich sein, wenn Sie einen Papierstau in Ihrem Drucker haben.\n"
 
-#: printer/printerdrake.pm:3099
+#: printer/printerdrake.pm:3276
 #, c-format
 msgid ""
 "\n"
@@ -13207,46 +13296,46 @@ msgid ""
 "line, e. g. \"%s <file>\".\n"
 msgstr ""
 "\n"
-"Die Befehle \"%s\" und \"%s\" erlauben es Ihnen ebenfalls die Optionen eines "
+"Die Befehle „%s“ und „%s“ erlauben es Ihnen ebenfalls die Optionen eines "
 "speziellen Druckjobs zu konfigurieren. Fügen Sie einfach die gewünschten "
-"Einstellungen in der Kommandozeile ein, etwa \"%s <Datei>\".\n"
+"Einstellungen in der Kommandozeile ein, etwa „%s <Datei>“.\n"
 
-#: printer/printerdrake.pm:3109
+#: printer/printerdrake.pm:3286
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
-msgstr "Drucken/Scannen/Fotokarten mit \"%s\""
+msgstr "Drucken/Scannen/Fotokarten mit „%s“"
 
-#: printer/printerdrake.pm:3110
+#: printer/printerdrake.pm:3287
 #, c-format
 msgid "Printing/Scanning on \"%s\""
-msgstr "Drucken/Scannen mit \"%s\""
+msgstr "Drucken/Scannen mit „%s“"
 
-#: printer/printerdrake.pm:3112
+#: printer/printerdrake.pm:3289
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
-msgstr "Drucken/Fotokartenzugriff mit \"%s\""
+msgstr "Drucken/Fotokartenzugriff mit „%s“"
 
-#: printer/printerdrake.pm:3113
+#: printer/printerdrake.pm:3290
 #, c-format
 msgid "Printing on the printer \"%s\""
-msgstr "Drucken auf Drucker \"%s\""
+msgstr "Drucken auf Drucker „%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 "Schließen"
 
-#: printer/printerdrake.pm:3119
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Print option list"
 msgstr "Liste der Drucker-Optionen"
 
-#: printer/printerdrake.pm:3140
+#: printer/printerdrake.pm:3317
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -13260,17 +13349,17 @@ msgid ""
 "Do not use \"scannerdrake\" for this device!"
 msgstr ""
 "Ihr Multifunktionsgerät wurde automatisch auch zum Scannen eingerichtet. Sie "
-"können nun mit dem Befehl \"scanimage\" (\"scanimage -d hp:%s\" um den "
-"Scanner auszuwählen, falls Sie mehrere angeschlossen haben), eingegeben in "
-"der Kommandozeile, scannen. Wenn Sie eine grafisches Werkzeug verwenden "
-"wollen: \"xscanimage\" bzw. \"xsane\". Sie können auch den GIMP verwenden. "
-"Wählen Sie einfach im Menü \"Datei/Holen\" den entsprechenden Eintrag. Sie "
-"können sich auch mittels \"man scanimage\" bzw \"man sane-hp\" in der "
-"Kommandozeile weitere Informationen ausgeben lassen.\n"
+"können nun mit dem Befehl „scanimage“ („scanimage -d hp:%s“ um den Scanner "
+"auszuwählen, falls Sie mehrere angeschlossen haben), eingegeben in der "
+"Kommandozeile, scannen. Wenn Sie eine grafisches Werkzeug verwenden wollen: "
+"„xscanimage“ bzw. „xsane“. Sie können auch den GIMP verwenden. Wählen Sie "
+"einfach im Menü „Datei/Holen“ den entsprechenden Eintrag. Sie können sich "
+"auch mittels „man scanimage„ bzw „man sane-hp“ in der Kommandozeile weitere "
+"Informationen ausgeben lassen.\n"
 "\n"
-"Verwenden Sie für dieses Gerät nicht \"ScannerDrake\"!"
+"Verwenden Sie für dieses Gerät nicht „ScannerDrake“!"
 
-#: printer/printerdrake.pm:3163
+#: printer/printerdrake.pm:3343
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -13285,28 +13374,28 @@ msgid ""
 msgstr ""
 "Ihr Drucker wurde automatisch so konfiguriert, dass Sie von Ihrem Rechner "
 "auf die Foto-Speicherkartenlaufwerke zugreifen können. Sie können jetzt "
-"entweder mit dem grafischen Programm MToolsFM (Menü: \"Programme\" -> "
-"\"Dateiwerkzeuge\" -> \"MTools-Datei-Manager\") oder auf der Kommandozeile "
-"mit den mtools (Für mehr Informationen geben Sie \"man mtools\" auf der "
+"entweder mit dem grafischen Programm MToolsFM (Menü: „Programme“ -> "
+"„Dateiwerkzeuge“ -> „MTools-Datei-Manager“) oder auf der Kommandozeile mit "
+"den mtools (Für mehr Informationen geben Sie „man mtools“ auf der "
 "Kommandozeile ein) auf die eingelegte Karte zugreifen. Sie finden das "
-"Dateisystem der Karte unter dem Laufwerksbuchstaben \"p:\" oder, wenn Sie "
-"mehr als einen HP-Drucker mit Foto-Speicherkartenlaufwerken haben, unter den "
+"Dateisystem der Karte unter dem Laufwerksbuchstaben „p:“ oder, wenn Sie mehr "
+"als einen HP-Drucker mit Foto-Speicherkartenlaufwerken haben, unter den "
 "nachfolgenden Buchstaben. In MToolsFM können Sie zwischen den "
 "Laufwerksbuchstaben mit dem Feld über der oberen rechten Ecke der Dateiliste "
 "umschalten."
 
-#: printer/printerdrake.pm:3185 printer/printerdrake.pm:3575
+#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
 #, c-format
 msgid "Reading printer data..."
 msgstr "Lesen der Treiber-Datenbank ..."
 
-#: 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 "Drucker-Einstellung übertragen"
 
-#: printer/printerdrake.pm:3206
+#: printer/printerdrake.pm:3386
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -13315,14 +13404,14 @@ msgid ""
 "overtaken, but jobs will not be transferred.\n"
 "Not all queues can be transferred due to the following reasons:\n"
 msgstr ""
-"Sie können die Druckerkonfiguration, die Sie für den Spooler \"%s\" "
-"vorgenommen haben für \"%s\", ihren aktuellen Spooler, verwenden. Alle Daten "
+"Sie können die Druckerkonfiguration, die Sie für den Spooler „%s“ "
+"vorgenommen haben für „%s“, ihren aktuellen Spooler, verwenden. Alle Daten "
 "(Name, Beschreibung, Standort, Verbindungsart und Standard- "
 "Optionseinstellungen) werden übernommen, Druckjobs in der alten "
 "Warteschlange gehen jedoch verloren.\n"
 "Nicht alle Warteschlangen können übernommen werden:\n"
 
-#: printer/printerdrake.pm:3209
+#: printer/printerdrake.pm:3389
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
@@ -13331,7 +13420,7 @@ msgstr ""
 "CUPS unterstützt keine Drucker an Novell-Servern oder Drucker, die ihre "
 "Daten in ein frei gewähltes Kommando senden.\n"
 
-#: printer/printerdrake.pm:3211
+#: printer/printerdrake.pm:3391
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -13340,21 +13429,21 @@ msgstr ""
 "PDQ unterstützt nur lokale Drucker, entfernte LPD-Drucker und Socket/TCP-"
 "Drucker.\n"
 
-#: printer/printerdrake.pm:3213
+#: printer/printerdrake.pm:3393
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPD und LPRng unterstützen keine IPP-Drucker.\n"
 
-#: printer/printerdrake.pm:3215
+#: printer/printerdrake.pm:3395
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
 msgstr ""
-"Warteschlangen, die nicht mit diesem Programm oder \"foomatic-configure\" "
+"Warteschlangen, die nicht mit diesem Programm oder „foomatic-configure“ "
 "erstellt wurden, können nicht übertragen werden."
 
-#: printer/printerdrake.pm:3216
+#: printer/printerdrake.pm:3396
 #, c-format
 msgid ""
 "\n"
@@ -13365,7 +13454,7 @@ msgstr ""
 "Drucker, die mit den PPD-Dateien ihrer Hersteller oder CUPS-spezifischen "
 "Treibern eingerichtet wurden, können nicht übertragen werden."
 
-#: printer/printerdrake.pm:3217
+#: printer/printerdrake.pm:3397
 #, c-format
 msgid ""
 "\n"
@@ -13374,71 +13463,71 @@ msgid ""
 msgstr ""
 "\n"
 "Markieren Sie die Drucker, die sie übertragen wollen und betätigen Sie die "
-"Schaltfläche \"Übertragen\"."
+"Schaltfläche „Übertragen“."
 
-#: printer/printerdrake.pm:3220
+#: printer/printerdrake.pm:3400
 #, c-format
 msgid "Do not transfer printers"
 msgstr "Druckerdaten nicht übertragen"
 
-#: printer/printerdrake.pm:3221 printer/printerdrake.pm:3237
+#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
 #, c-format
 msgid "Transfer"
 msgstr "Übertragen"
 
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3413
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
 "Click \"Transfer\" to overwrite it.\n"
 "You can also type a new name or skip this printer."
 msgstr ""
-"Es existiert bereits ein Drucker mit Namen \"%s\" unter %s.\n"
-"Durch Betätigen der Schaltfäche \"Übertragen\" können Sie ihn\n"
+"Es existiert bereits ein Drucker mit Namen „%s“ unter %s.\n"
+"Durch Betätigen der Schaltfäche „Übertragen“ können Sie ihn\n"
 "überschreiben. Sie können dem Drucker auch einen neuen \n"
 "Namen geben oder ihn einfach überspringen."
 
-#: printer/printerdrake.pm:3254
+#: printer/printerdrake.pm:3434
 #, c-format
 msgid "New printer name"
 msgstr "Neuer Druckername"
 
-#: printer/printerdrake.pm:3257
+#: printer/printerdrake.pm:3437
 #, c-format
 msgid "Transferring %s..."
-msgstr "Übertrage \"%s\" ..."
+msgstr "Übertrage „%s“ ..."
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3448
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
 "the default printer under the new printing system %s?"
 msgstr ""
-"Sie haben Ihren alten Standarddrucker (\"%s\") übertragen, soll es auch Ihr "
-"Standarddrucker unter dem neuen Drucksystem \"%s\" werden?"
+"Sie haben Ihren alten Standarddrucker („%s“) übertragen, soll es auch Ihr "
+"Standarddrucker unter dem neuen Drucksystem „%s“ werden?"
 
-#: printer/printerdrake.pm:3278
+#: printer/printerdrake.pm:3458
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "Aktualisieren der Druckerdaten ..."
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3467
 #, c-format
 msgid "Starting network..."
 msgstr "Netzwerk starten ..."
 
-#: 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 "Netzwerk jetzt konfigurieren"
 
-#: printer/printerdrake.pm:3329
+#: printer/printerdrake.pm:3509
 #, c-format
 msgid "Network functionality not configured"
 msgstr "Ihr Netzwerk ist nicht konfiguriert"
 
-#: printer/printerdrake.pm:3330
+#: printer/printerdrake.pm:3510
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -13451,16 +13540,16 @@ msgstr ""
 "Wenn Sie dennoch fortfahren, ohne Ihr Netzwerk einzurichten, ist der Drucker "
 "hinterher nicht zu verwenden. Wie wollen Sie verfahren?"
 
-#: printer/printerdrake.pm:3333
+#: printer/printerdrake.pm:3513
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Weiter ohne Netzwerkkonfiguration"
 
-#: printer/printerdrake.pm:3367
+#: printer/printerdrake.pm:3547
 #, fuzzy, 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\""
@@ -13468,11 +13557,11 @@ msgstr ""
 "Das von Ihnen während der Installation eingerichtete Netzwerk kann jetzt "
 "nicht gestartet werden. Testen Sie bitte, ob es nach einem Neustart zur "
 "Verfügung steht. Falls nicht, berichtigen Sie die Einstellungen im Mandrake "
-"Kontrollzentrum unter \"Netzwerk & Internet/Verbindung\". Versuchen Sie "
-"anschließend erneut den Drucker mittels \"Hardware/Drucker\"im "
-"Kontrollzentrum einzurichten."
+"Kontrollzentrum unter „Netzwerk & Internet/Verbindung“. Versuchen Sie "
+"anschließend erneut den Drucker mittels „Hardware/Drucker“im Kontrollzentrum "
+"einzurichten."
 
-#: printer/printerdrake.pm:3368
+#: printer/printerdrake.pm:3548
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -13484,34 +13573,34 @@ msgstr ""
 "und Ihre Softwareeinstellungen. Versuchen Sie anschließend erneut den "
 "Netzwerkdrucker einzurichten."
 
-#: printer/printerdrake.pm:3378
+#: printer/printerdrake.pm:3558
 #, c-format
 msgid "Restarting printing system..."
 msgstr "Drucksystem neu starten ..."
 
-#: printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3597
 #, c-format
 msgid "high"
 msgstr "Hoch"
 
-#: printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3597
 #, c-format
 msgid "paranoid"
 msgstr "Paranoid"
 
-#: printer/printerdrake.pm:3418
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "Installiere ein Drucksystem in Sicherheitsebene %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"
@@ -13529,12 +13618,12 @@ msgstr ""
 "\n"
 "Wollen Sie wirklich dieses Drucksystem auf diesem Rechner installieren?"
 
-#: printer/printerdrake.pm:3453
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "Drucksystem beim Systemstart aktivieren"
 
-#: printer/printerdrake.pm:3454
+#: printer/printerdrake.pm:3634
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -13554,47 +13643,71 @@ msgstr ""
 "\n"
 "Wollen sie den automatischen Start des Drucksystems wiederherstellen?"
 
-#: printer/printerdrake.pm:3475 printer/printerdrake.pm:3690
+#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
 #, c-format
 msgid "Checking installed software..."
 msgstr "Suche nach installierter Software..."
 
-#: printer/printerdrake.pm:3481
+#: printer/printerdrake.pm:3661
 #, c-format
 msgid "Removing %s ..."
 msgstr "Entferne %s ..."
 
-#: printer/printerdrake.pm:3488
+#: printer/printerdrake.pm:3665
+#, fuzzy, c-format
+msgid "Could not remove the %s printing system!"
+msgstr "Drucksystem ändern"
+
+#: printer/printerdrake.pm:3674
 #, c-format
 msgid "Installing %s ..."
 msgstr "Installiere %s ..."
 
-#: printer/printerdrake.pm:3535
+#: printer/printerdrake.pm:3678
+#, fuzzy, c-format
+msgid "Could not install the %s printing system!"
+msgstr "Drucksystem ändern"
+
+#: printer/printerdrake.pm:3727
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "Standarddrucker wählen ..."
 
-#: printer/printerdrake.pm:3555
+#: printer/printerdrake.pm:3747
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "Wählen Sie das Drucksystem"
 
-#: printer/printerdrake.pm:3556
+#: printer/printerdrake.pm:3748
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Welches Drucksystem (Spooler) wollen Sie verwenden?"
 
-#: printer/printerdrake.pm:3607
+#: printer/printerdrake.pm:3799
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
-msgstr "Konnte Drucker \"%s\" nicht konfigurieren!"
+msgstr "Konnte Drucker „%s“ nicht konfigurieren!"
 
-#: printer/printerdrake.pm:3620
+#: printer/printerdrake.pm:3812
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Installiere das Paket Foomatic ..."
 
-#: printer/printerdrake.pm:3806
+#: printer/printerdrake.pm:3818
+#, fuzzy, c-format
+msgid "Could not install %s packages, %s cannot be started!"
+msgstr ""
+"Konnte die notwendigen Programmpakete zum Teilen des Scanners mit Anderen "
+"nicht installieren."
+
+#: printer/printerdrake.pm:3910
+#, fuzzy, c-format
+msgid "Could not install necessary packages, %s cannot be started!"
+msgstr ""
+"Konnte die notwendigen Programmpakete zum Einrichten eines Scanners mit "
+"Scannerdrake nicht installieren."
+
+#: printer/printerdrake.pm:4011
 #, fuzzy, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -13605,48 +13718,48 @@ msgstr ""
 "Doppelklick auf einen aus, um ihn zu ändern, als Standarddrucker zu "
 "verwenden oder Informationen über ihn zu erhalten."
 
-#: printer/printerdrake.pm:3834
+#: printer/printerdrake.pm:4039
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "Alle Netzwerk-CUPS-Drucker anzeigen"
 
-#: printer/printerdrake.pm:3835
+#: printer/printerdrake.pm:4040
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr "Aktualisiere Druckerliste (um alle entfernten CUPS-Drucker anzuzeigen)"
 
-#: printer/printerdrake.pm:3845
+#: printer/printerdrake.pm:4050
 #, c-format
 msgid "CUPS configuration"
 msgstr "CUPS-Konfiguration"
 
-#: printer/printerdrake.pm:3857
+#: printer/printerdrake.pm:4062
 #, c-format
 msgid "Change the printing system"
 msgstr "Drucksystem ändern"
 
-#: printer/printerdrake.pm:3866
+#: printer/printerdrake.pm:4071
 #, c-format
 msgid "Normal Mode"
 msgstr "Normaler Modus"
 
-#: printer/printerdrake.pm:3867
+#: printer/printerdrake.pm:4072
 #, c-format
 msgid "Expert Mode"
 msgstr "Expertenmodus"
 
-#: 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 "Drucker-Optionen"
 
-#: printer/printerdrake.pm:4174
+#: printer/printerdrake.pm:4379
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Drucker-Konfiguration ändern"
 
-#: printer/printerdrake.pm:4176
+#: printer/printerdrake.pm:4381
 #, c-format
 msgid ""
 "Printer %s\n"
@@ -13655,123 +13768,123 @@ msgstr ""
 "Drucker %s\n"
 "Was wollen Sie an diesem Drucker ändern?"
 
-#: printer/printerdrake.pm:4180
+#: printer/printerdrake.pm:4385
 #, c-format
 msgid "Do it!"
 msgstr "Ausführen!"
 
-#: printer/printerdrake.pm:4185 printer/printerdrake.pm:4243
+#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
 #, c-format
 msgid "Printer connection type"
 msgstr "Art der Druckeranbindung"
 
-#: printer/printerdrake.pm:4186 printer/printerdrake.pm:4247
+#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
 #, c-format
 msgid "Printer name, description, location"
 msgstr "Druckername, Beschreibung, Standort"
 
-#: printer/printerdrake.pm:4188 printer/printerdrake.pm:4266
+#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "Druckerproduzent, Modell, Treiber"
 
-#: printer/printerdrake.pm:4189 printer/printerdrake.pm:4267
+#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "Druckerproduzent, Modell"
 
-#: 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 "Als Standarddrucker verwenden"
 
-#: 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 "Diesen Drucker für StarOffice/OpenOffice.org/GIMP hinzufügen"
 
-#: 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 "Diesen Drucker von StarOffice/OpenOffice.org/GIMP entfernen"
 
-#: printer/printerdrake.pm:4199 printer/printerdrake.pm:4295
+#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
 #, c-format
 msgid "Print test pages"
 msgstr "Testseite(n) drucken"
 
-#: 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 "Wie dieser Drucker genutzt werden kann"
 
-#: printer/printerdrake.pm:4201 printer/printerdrake.pm:4299
+#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
 #, c-format
 msgid "Remove printer"
 msgstr "Drucker entfernen"
 
-#: printer/printerdrake.pm:4255
+#: printer/printerdrake.pm:4460
 #, c-format
 msgid "Removing old printer \"%s\"..."
-msgstr "Entferne alten Drucker \"%s\"..."
+msgstr "Entferne alten Drucker „%s“..."
 
-#: printer/printerdrake.pm:4286
+#: printer/printerdrake.pm:4491
 #, c-format
 msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
 msgstr "Drucker für StarOffice/OpenOffice.org/GIMP hinzufügen"
 
-#: printer/printerdrake.pm:4288
+#: printer/printerdrake.pm:4493
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
 msgstr ""
-"Der Drucker \"%s\" wurde erfogreich zu StarOffice/OpenOffice.org/GIMP "
+"Der Drucker „%s“ wurde erfogreich zu StarOffice/OpenOffice.org/GIMP "
 "hinzugefügt."
 
-#: printer/printerdrake.pm:4289
+#: printer/printerdrake.pm:4494
 #, c-format
 msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr "Fehler beim Hinzufügen von \"%s\" für StarOffice/OpenOffice.org/GIMP."
+msgstr "Fehler beim Hinzufügen von „%s“ für StarOffice/OpenOffice.org/GIMP."
 
-#: printer/printerdrake.pm:4291
+#: printer/printerdrake.pm:4496
 #, c-format
 msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
 msgstr "Entferne Drucker von StarOffice/OpenOffice.org/GIMP"
 
-#: printer/printerdrake.pm:4293
+#: printer/printerdrake.pm:4498
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
 "GIMP."
 msgstr ""
-"Der Drucker \"%s\" wurde erfogreich für StarOffice/OpenOffice.org/GIMP "
+"Der Drucker „%s“ wurde erfogreich für StarOffice/OpenOffice.org/GIMP "
 "entfernt."
 
-#: printer/printerdrake.pm:4294
+#: printer/printerdrake.pm:4499
 #, c-format
 msgid ""
 "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr "Fehler beim Entfernen von \"%s\" für StarOffice/OpenOffice.org/GIMP."
+msgstr "Fehler beim Entfernen von „%s“ für StarOffice/OpenOffice.org/GIMP."
 
-#: printer/printerdrake.pm:4338
+#: printer/printerdrake.pm:4543
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
-msgstr "Möchten Sie den Drucker \"%s\" wirklich entfernen?"
+msgstr "Möchten Sie den Drucker „%s“ wirklich entfernen?"
 
-#: printer/printerdrake.pm:4342
+#: printer/printerdrake.pm:4547
 #, c-format
 msgid "Removing printer \"%s\"..."
-msgstr "Entferne Drucker \"%s\"..."
+msgstr "Entferne Drucker „%s“..."
 
-#: printer/printerdrake.pm:4366
+#: printer/printerdrake.pm:4571
 #, c-format
 msgid "Default printer"
 msgstr "Standarddrucker"
 
-#: printer/printerdrake.pm:4367
+#: printer/printerdrake.pm:4572
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
-msgstr "Der Drucker \"%s\" ist jetzt Ihr Standarddrucker\""
+msgstr "Der Drucker „%s“ ist jetzt Ihr Standarddrucker“"
 
 #: raid.pm:37
 #, c-format
@@ -13798,34 +13911,39 @@ msgstr "Nicht genügend Partitionen für RAID-Level %d\n"
 msgid "Could not create directory /usr/share/sane/firmware!"
 msgstr "Konnte Verzeichnis /usr/share/sane/firmware nicht erstellen!"
 
-#: scanner.pm:102
+#: scanner.pm:107
+#, fuzzy, c-format
+msgid "Could not create link /usr/share/sane/%s!"
+msgstr "Konnte Verzeichnis /usr/share/sane/firmware nicht erstellen!"
+
+#: scanner.pm:114
 #, c-format
 msgid "Could not copy firmware file %s to /usr/share/sane/firmware!"
 msgstr ""
 "Ich konnte die Firmware Datei %s nicht auf /usr/share/sane/firmware kopieren!"
 
-#: scanner.pm:109
+#: scanner.pm:121
 #, c-format
 msgid "Could not set permissions of firmware file %s!"
 msgstr ""
 
-#: 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
 #, fuzzy, c-format
 msgid "Could not install the packages needed to share your scanner(s)."
 msgstr ""
 "Konnte die notwendigen Programmpakete zum Teilen des Scanners mit Anderen "
 "nicht installieren."
 
-#: scanner.pm:190
+#: scanner.pm:202
 #, c-format
 msgid "Your scanner(s) will not be available for non-root users."
 msgstr "Ihr(e) Scanner wird nur für Benutzer Root verfügbar sein"
@@ -14028,7 +14146,7 @@ msgstr "Setzen der Root Umask"
 #: security/help.pm:100
 #, c-format
 msgid "if set to yes, check open ports."
-msgstr "Auf \"Ja\" gestellt, werden offene Ports kontrolliert."
+msgstr "Auf „Ja“ gestellt, werden offene Ports kontrolliert."
 
 #: security/help.pm:101
 #, c-format
@@ -14041,13 +14159,13 @@ msgid ""
 "\n"
 "- for users with the 0 id other than root."
 msgstr ""
-"Falls \"Ja\", kontrolliere:\n"
+"Falls „Ja“, kontrolliere:\n"
 "\n"
 "- leere Passwörter,\n"
 "\n"
-"- fehlende Passwörter in \"/etc/shadow\",\n"
+"- fehlende Passwörter in „/etc/shadow“,\n"
 "\n"
-"- Kennzeichen außer \"root\" mit ID 0."
+"- Kennzeichen außer „root“ mit ID 0."
 
 #: security/help.pm:108
 #, c-format
@@ -14062,8 +14180,7 @@ msgstr "Wenn ja, überprüfe ob die Netzwerk Geräte im gemischten Modus sind"
 #: security/help.pm:110
 #, c-format
 msgid "if set to yes, run the daily security checks."
-msgstr ""
-"Wenn auf \"Ja\" gesetzt, werden täglich Sicherheitschecks durchgeführt."
+msgstr "Wenn auf „Ja“ gesetzt, werden täglich Sicherheitschecks durchgeführt."
 
 #: security/help.pm:111
 #, c-format
@@ -14083,12 +14200,12 @@ msgstr "Wenn ja, kontrolliere die Prüfsumme der suid/sgid Dateien"
 #: security/help.pm:114
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
-msgstr "Falls ja, Suche von Veränderungen bei \"suid root\" Dateien."
+msgstr "Falls ja, Suche von Veränderungen bei „suid root“ Dateien."
 
 #: security/help.pm:115
 #, c-format
 msgid "if set to yes, report unowned files."
-msgstr "Wenn auf \"Ja\" gesetzt, werden Dateien ohne Eigentümer gemeldet."
+msgstr "Wenn auf „Ja“ gesetzt, werden Dateien ohne Eigentümer gemeldet."
 
 #: security/help.pm:116
 #, fuzzy, c-format
@@ -14106,7 +14223,7 @@ msgstr "Wenn ja, starte chkrootkit Überprüfung"
 msgid ""
 "if set, send the mail report to this email address else send it to root."
 msgstr ""
-"Wenn ausgefüllt, wird E-Mail an diese Adresse geschickt, sonst an \"root\"."
+"Wenn ausgefüllt, wird E-Mail an diese Adresse geschickt, sonst an „root“."
 
 #: security/help.pm:119
 #, c-format
@@ -14137,7 +14254,7 @@ msgstr "Wenn ja, werden Prüfergebnisse nach tty gesendet."
 #, fuzzy, c-format
 msgid "Set shell commands history size. A value of -1 means unlimited."
 msgstr ""
-"Setzen der Größe des Kommandozeilenarchivs. Der Wert \"-1\" steht für "
+"Setzen der Größe des Kommandozeilenarchivs. Der Wert „-1“ steht für "
 "unbegrenzt."
 
 #: security/help.pm:127
@@ -14221,7 +14338,7 @@ msgstr "Der Befehl Chkconfig folget den msec Regeln"
 #: security/l10n.pm:24
 #, c-format
 msgid "Enable \"crontab\" and \"at\" for users"
-msgstr "Aktiviere  \"crontab\" und \"at\" für Benutzer"
+msgstr "Aktiviere  „crontab“ und „at“ für Benutzer"
 
 #: security/l10n.pm:25
 #, c-format
@@ -14347,7 +14464,7 @@ msgstr "Tägliche Sicherheitschecks durchführen"
 #: security/l10n.pm:49
 #, c-format
 msgid "Check additions/removals of sgid files"
-msgstr "Suche Änderungen von \"sgid\" Dateien"
+msgstr "Suche Änderungen von „sgid“ Dateien"
 
 #: security/l10n.pm:50
 #, c-format
@@ -14388,7 +14505,7 @@ msgstr "Keine unnötigen Emails senden"
 #, c-format
 msgid "If set, send the mail report to this email address else send it to root"
 msgstr ""
-"Wenn ausgefüllt, wird E-Mail an diese Adresse geschickt, sonst an \"root\"."
+"Wenn ausgefüllt, wird E-Mail an diese Adresse geschickt, sonst an „root“."
 
 #: security/l10n.pm:58
 #, c-format
@@ -14519,13 +14636,13 @@ msgstr "Sicherheitsebene"
 #: security/level.pm:62
 #, c-format
 msgid "Use libsafe for servers"
-msgstr "\"libsafe\" bei Servern verwenden"
+msgstr "„libsafe“ bei Servern verwenden"
 
 #: security/level.pm:63
 #, c-format
 msgid ""
 "A library which defends against buffer overflow and format string attacks."
-msgstr "Eine Bibliothek, die gegen sog. \"buffer overflow\"-Angriffe schützt."
+msgstr "Eine Bibliothek, die gegen sog. „buffer overflow“-Angriffe schützt."
 
 #: security/level.pm:64
 #, c-format
@@ -14632,7 +14749,7 @@ msgstr ""
 "Der Internet Superserver-Dienst (inetd) startet je nach Bedarf \n"
 "etliche andere Internet-Dienste, so etwa telnet, ftp, rsh oder \n"
 "rlogin. Dies jedoch nur, wenn die entsprechenden Dienste in der \n"
-"Datei \"/etc/inetd.conf\" freigeschaltet sind. \n"
+"Datei „/etc/inetd.conf“ freigeschaltet sind. \n"
 "Schalten Sie diesen Dienst ab, können Sie auf keine der von inetd \n"
 "verwalteten Dienste mehr zugreifen."
 
@@ -14653,7 +14770,7 @@ msgid ""
 "You should leave this enabled for most machines."
 msgstr ""
 "Dieser Dienst lädt die Tastaturbelegung, die in der Datei \n"
-"\"/etc/sysconfig/keyboard\" angegeben ist. Mittels \"kbdconfig\" \n"
+"„/etc/sysconfig/keyboard“ angegeben ist. Mittels „kbdconfig“ \n"
 "können Sie diese Einstellung ändern. Schalten Sie diesen Dienst ab, \n"
 "müssen Sie ab dem nächsten Systemstart mit der amerikanischen \n"
 "Tastatur vorlieb nehmen."
@@ -14712,7 +14829,7 @@ msgid ""
 msgstr ""
 "Der Dienst named (BIND) stellt ihnen einen Server zur Verfügung, \n"
 "mit dessen Hilfe Rechnernamen in IP-Adressen umgesetzt werden. \n"
-"Ein solcher Dienst wird \"Domain Name Server\" (DNS) genannt. \n"
+"Ein solcher Dienst wird „Domain Name Server“ (DNS) genannt. \n"
 "Falls Sie nur einen Rechner besitzen, mit dem Sie per Modem/ISDN ins \n"
 "Netz gehen, benötigen Sie diesen Dienst nicht."
 
@@ -14747,7 +14864,7 @@ msgstr ""
 "durch verschiedene Rechner gemeinsam nutzen zu können\n"
 " (File sharing). \n"
 "Dieser Dienst stellt Ihnen einen solchen Server zur Verfügung. \n"
-"Konfiguriert wird er in der Datei \"/etc/exports\"."
+"Konfiguriert wird er in der Datei „/etc/exports“."
 
 #: services.pm:62
 #, c-format
@@ -14767,7 +14884,7 @@ msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
 msgstr ""
-"Schaltet beim Betriebssystemstart automatisch die \"Num\"-Taste für \n"
+"Schaltet beim Betriebssystemstart automatisch die „Num“-Taste für \n"
 "die virtuellen Konsolen und XFree ein."
 
 #: services.pm:66
@@ -14957,7 +15074,7 @@ msgstr ""
 "weiteren Informationen zu\n"
 "diesem Dienst."
 
-#: services.pm:226 ugtk2.pm:1139
+#: services.pm:226 ugtk2.pm:1167
 #, c-format
 msgid "Info"
 msgstr "Info"
@@ -14985,8 +15102,8 @@ msgstr "Stopp"
 #: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13
 #: share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
 #, fuzzy, c-format
-msgid "<b>Congratulations for choosing Mandrake Linux!</b>"
-msgstr "Danke, dass Sie sich für Mandrake Linux 92 entschieden haben"
+msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
+msgstr "Danke, dass Sie sich für Mandrakelinux 92 entschieden haben"
 
 #: share/advertising/dis-01.pl:15 share/advertising/dwd-01.pl:15
 #: share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15
@@ -14997,9 +15114,9 @@ msgstr "Willkommen in der Open Source Welt."
 #: 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 ""
 
 #: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
@@ -15189,7 +15306,7 @@ msgstr ""
 #: share/advertising/pwp-09.pl:13
 #, fuzzy, c-format
 msgid "Become a <b>MandrakeClub</b> member!"
-msgstr "Werden Sie ein \"MandrakeExpert\""
+msgstr "Werden Sie ein „MandrakeExpert“"
 
 #: share/advertising/dis-10.pl:15 share/advertising/ppp-10.pl:15
 #: share/advertising/pwp-09.pl:15
@@ -15214,8 +15331,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
 #, fuzzy, c-format
-msgid "\t- Voting for software to put in Mandrake Linux"
-msgstr "Danke, dass Sie sich für Mandrake Linux 92 entschieden haben"
+msgid "\t- Voting for software to put in Mandrakelinux"
+msgstr "Danke, dass Sie sich für Mandrakelinux 92 entschieden haben"
 
 #: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
 #: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
@@ -15259,15 +15376,15 @@ 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 ""
 
 #: share/advertising/dwd-02.pl:13
 #, c-format
-msgid "<b>Join the Mandrake Linux community!</b>"
+msgid "<b>Join the Mandrakelinux community!</b>"
 msgstr ""
 
 #: share/advertising/dwd-02.pl:15
@@ -15286,28 +15403,28 @@ msgstr ""
 
 #: share/advertising/dwd-03.pl:13
 #, c-format
-msgid "<b>What is Mandrake Linux?</b>"
+msgid "<b>What is Mandrakelinux?</b>"
 msgstr ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
@@ -15318,7 +15435,7 @@ msgstr ""
 
 #: share/advertising/dwd-04.pl:16
 #, c-format
-msgid "\t- Find out Mandrake Linux on a bootable CD with <b>MandrakeMove</b>"
+msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
 msgstr ""
 
 #: share/advertising/dwd-04.pl:17
@@ -15367,7 +15484,7 @@ 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 ""
 
@@ -15389,7 +15506,7 @@ msgstr ""
 #: share/advertising/dwd-07.pl:13
 #, fuzzy, c-format
 msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "Werden Sie ein \"MandrakeExpert\""
+msgstr "Werden Sie ein „MandrakeExpert“"
 
 #: share/advertising/dwd-07.pl:15
 #, c-format
@@ -15411,7 +15528,7 @@ msgstr ""
 
 #: 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 ""
 
 #: share/advertising/dwd-09.pl:20
@@ -15425,9 +15542,9 @@ 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 ""
 
 #: share/advertising/ppp-02.pl:13
@@ -15446,7 +15563,7 @@ 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 ""
 
 #: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
@@ -15457,7 +15574,7 @@ msgstr "Wählen Sie Ihren Dateisystem-Schlüssel (Passwort)"
 #: 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 ""
@@ -15465,7 +15582,7 @@ msgstr ""
 #: 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 ""
 
@@ -15612,8 +15729,8 @@ msgstr ""
 #: 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 ""
 
@@ -15641,7 +15758,7 @@ msgstr ""
 #: 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 ""
 
@@ -15950,17 +16067,17 @@ msgstr ""
 "Sie müssen sich abmelden und wieder anmelden, damit die Änderungen  wirksam "
 "werden"
 
-#: standalone/drakTermServ:71
+#: standalone/drakTermServ:77
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "Nicht sinnvoll ohne Terminal Server"
 
-#: standalone/drakTermServ:101 standalone/drakTermServ:108
+#: standalone/drakTermServ:114 standalone/drakTermServ:121
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: %s benötigt einen Benutzernamen...\n"
 
-#: standalone/drakTermServ:121
+#: standalone/drakTermServ:134
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -15969,78 +16086,78 @@ msgstr ""
 "%s: %s benötigt Rechnername, MAC Adresse, IP, nbi-image, 0/1 für "
 "THIN_CLIENT, 0/1 für Lokale Konfiguration ...\n"
 
-#: standalone/drakTermServ:128
+#: standalone/drakTermServ:141
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: %s benötigt hostname...\n"
 
-#: standalone/drakTermServ:140
+#: standalone/drakTermServ:153
 #, c-format
 msgid "You must be root to read configuration file. \n"
-msgstr "Sie müssen \"root\" sein, um die Kunfiguration lesen zu können.\n"
+msgstr "Sie müssen „root“ sein, um die Kunfiguration lesen zu können.\n"
 
-#: standalone/drakTermServ:219 standalone/drakTermServ:488
-#: standalone/drakfont:572
+#: standalone/drakTermServ:238 standalone/drakTermServ:511
+#: standalone/drakfont:575
 #, c-format
 msgid "OK"
 msgstr " OK "
 
-#: standalone/drakTermServ:235
+#: standalone/drakTermServ:249 standalone/drakTermServ:252
 #, fuzzy, c-format
 msgid "Terminal Server Configuration"
 msgstr "Mandrake Terminal-Server-Konfiguration"
 
-#: standalone/drakTermServ:240
-#, c-format
-msgid "DrakTermServ"
-msgstr "DrakTermServ"
-
-#: standalone/drakTermServ:264
+#: standalone/drakTermServ:267
 #, c-format
 msgid "Enable Server"
 msgstr "Server aktivieren"
 
-#: standalone/drakTermServ:270
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Disable Server"
 msgstr "Server deaktivieren"
 
-#: standalone/drakTermServ:278
+#: standalone/drakTermServ:281
 #, c-format
 msgid "Start Server"
 msgstr "Server starten"
 
-#: standalone/drakTermServ:284
+#: standalone/drakTermServ:287
 #, c-format
 msgid "Stop Server"
 msgstr "Server stoppen"
 
-#: standalone/drakTermServ:292
+#: standalone/drakTermServ:295
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Etherboot Diskette/ISO"
 
-#: standalone/drakTermServ:296
+#: standalone/drakTermServ:299
 #, c-format
 msgid "Net Boot Images"
 msgstr "Net Boot Images"
 
-#: standalone/drakTermServ:302
+#: standalone/drakTermServ:305
 #, c-format
 msgid "Add/Del Users"
 msgstr "Benutzer hinzufügen/löschen"
 
-#: standalone/drakTermServ:306
+#: standalone/drakTermServ:309
 #, c-format
 msgid "Add/Del Clients"
 msgstr "Clients hinzufügen/löschen"
 
-#: standalone/drakTermServ:317 standalone/drakbug:54
+#: standalone/drakTermServ:320 standalone/drakbug:54
 #, c-format
 msgid "First Time Wizard"
 msgstr "First Time Assistent"
 
-#: standalone/drakTermServ:342
+#: standalone/drakTermServ:351 standalone/drakTermServ:352
+#, c-format
+msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
+msgstr ""
+
+#: standalone/drakTermServ:358
 #, c-format
 msgid ""
 "\n"
@@ -16063,64 +16180,69 @@ msgid ""
 "    f) If it's thin clients, ask if you want to restart KDM.\n"
 msgstr ""
 
-#: standalone/drakTermServ:387
+#: standalone/drakTermServ:403
 #, fuzzy, c-format
 msgid "Cancel Wizard"
 msgstr "Hier starten Sie den Assistenten "
 
-#: standalone/drakTermServ:399
+#: standalone/drakTermServ:415
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr ""
 
-#: standalone/drakTermServ:427
+#: standalone/drakTermServ:443
+#, fuzzy, c-format
+msgid "Use thin clients."
+msgstr "Erlaube Thin Clients"
+
+#: 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."
 msgstr ""
 
-#: standalone/drakTermServ:433
-#, fuzzy, c-format
-msgid "Allow thin clients."
-msgstr "Erlaube Thin Clients"
+#: standalone/drakTermServ:457 standalone/drakTermServ:1071
+#, c-format
+msgid "Sync client X keyboard settings with server."
+msgstr ""
 
-#: standalone/drakTermServ:441
+#: standalone/drakTermServ:464
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr ""
 
-#: 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 "Das dauert einige Minuten"
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:466
+#: standalone/drakTermServ:469 standalone/drakTermServ:489
 #, fuzzy, c-format
 msgid "Done!"
 msgstr "Fertig"
 
-#: standalone/drakTermServ:452
+#: standalone/drakTermServ:475
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 
-#: standalone/drakTermServ:472
+#: standalone/drakTermServ:495
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
 "be restarted. Restart now?"
 msgstr ""
 
-#: standalone/drakTermServ:507
-#, c-format
-msgid "drakTermServ Overview"
-msgstr ""
+#: standalone/drakTermServ:530
+#, fuzzy, c-format
+msgid "Terminal Server Overview"
+msgstr "Mandrake Terminal-Server-Konfiguration"
 
-#: standalone/drakTermServ:508
+#: standalone/drakTermServ:531
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -16136,7 +16258,7 @@ msgid ""
 "one full kernel."
 msgstr ""
 
-#: standalone/drakTermServ:514
+#: standalone/drakTermServ:537
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -16156,7 +16278,7 @@ msgid ""
 "like:"
 msgstr ""
 
-#: standalone/drakTermServ:532
+#: standalone/drakTermServ:555
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -16195,7 +16317,7 @@ msgid ""
 "clients."
 msgstr ""
 
-#: standalone/drakTermServ:552
+#: standalone/drakTermServ:575
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -16213,7 +16335,7 @@ msgid ""
 "        \tWith SUBNET/MASK being defined for your network."
 msgstr ""
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:587
 #, fuzzy, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -16228,7 +16350,7 @@ msgstr ""
 "\n"
 " system file."
 
-#: standalone/drakTermServ:568
+#: standalone/drakTermServ:591
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -16239,7 +16361,7 @@ msgid ""
 "        \tdrakTermServ will help create these files."
 msgstr ""
 
-#: standalone/drakTermServ:573
+#: standalone/drakTermServ:596
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -16259,7 +16381,7 @@ msgid ""
 "machine is configured."
 msgstr ""
 
-#: standalone/drakTermServ:582
+#: standalone/drakTermServ:605
 #, fuzzy, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -16308,7 +16430,7 @@ msgstr ""
 "\n"
 "."
 
-#: standalone/drakTermServ:603
+#: standalone/drakTermServ:626
 #, fuzzy, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
@@ -16334,57 +16456,62 @@ msgstr ""
 "\n"
 "\n"
 
-#: standalone/drakTermServ:638
+#: standalone/drakTermServ:661
 #, c-format
 msgid "Boot Floppy"
 msgstr "Bootdiskette"
 
-#: standalone/drakTermServ:640
+#: standalone/drakTermServ:663
 #, c-format
 msgid "Boot ISO"
 msgstr "Boot ISO"
 
-#: standalone/drakTermServ:642
+#: standalone/drakTermServ:665
 #, fuzzy, c-format
 msgid "PXE Image"
 msgstr "Image"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:734
+#, fuzzy, c-format
+msgid "Default kernel version"
+msgstr "Angabe der Kernelversion"
+
+#: standalone/drakTermServ:761
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "Ganzen Kernel erstellen -->"
 
-#: standalone/drakTermServ:730
+#: standalone/drakTermServ:768
 #, c-format
 msgid "No kernel selected!"
 msgstr "Kein Kernel ausgewählt!"
 
-#: standalone/drakTermServ:733
+#: standalone/drakTermServ:771
 #, c-format
 msgid "Build Single NIC -->"
 msgstr ""
 
-#: standalone/drakTermServ:737
+#: standalone/drakTermServ:775
 #, c-format
 msgid "No NIC selected!"
 msgstr "Keine Netzwerkkarte ausgewählt!"
 
-#: standalone/drakTermServ:740
+#: standalone/drakTermServ:778
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "Alle Kernel erstellen -->"
 
-#: standalone/drakTermServ:747
+#: standalone/drakTermServ:786
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Löschen"
 
-#: standalone/drakTermServ:754
+#: standalone/drakTermServ:793
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Alle NBIs löschen"
 
-#: standalone/drakTermServ:841
+#: standalone/drakTermServ:880
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -16396,27 +16523,27 @@ msgstr ""
 "Entfernen/erneutes Hinzufügen des Benutzers zum Terminal Server \n"
 "nötig, um das Anmelden zu ermöglichen."
 
-#: standalone/drakTermServ:846
+#: standalone/drakTermServ:885
 #, c-format
 msgid "Add User -->"
 msgstr "Benutzer hinzufügen -->"
 
-#: standalone/drakTermServ:852
+#: standalone/drakTermServ:891
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- Benutzer löschen"
 
-#: standalone/drakTermServ:888
+#: standalone/drakTermServ:927
 #, c-format
 msgid "type: %s"
 msgstr "Typ: %s"
 
-#: standalone/drakTermServ:892
+#: standalone/drakTermServ:931
 #, c-format
 msgid "local config: %s"
 msgstr "lokale Konfiguration: %s"
 
-#: standalone/drakTermServ:922
+#: standalone/drakTermServ:961
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -16425,67 +16552,67 @@ msgstr ""
 "Erlaube lokale Hardware-\n"
 "Konfiguration"
 
-#: standalone/drakTermServ:931
+#: standalone/drakTermServ:970
 #, c-format
 msgid "No net boot images created!"
 msgstr "Keine Net Boot Images erstellt!"
 
-#: standalone/drakTermServ:949
+#: standalone/drakTermServ:988
 #, c-format
 msgid "Thin Client"
 msgstr "Thin Client"
 
-#: standalone/drakTermServ:953
+#: standalone/drakTermServ:992
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "Erlaube Thin Clients"
 
-#: standalone/drakTermServ:954
+#: standalone/drakTermServ:993
 #, c-format
 msgid "Add Client -->"
 msgstr "Client hinzufügen -->"
 
-#: standalone/drakTermServ:968
+#: standalone/drakTermServ:1007
 #, c-format
 msgid "type: fat"
 msgstr "Typ: FAT"
 
-#: standalone/drakTermServ:969
+#: standalone/drakTermServ:1008
 #, c-format
 msgid "type: thin"
 msgstr "Typ: Thin"
 
-#: standalone/drakTermServ:976
+#: standalone/drakTermServ:1015
 #, c-format
 msgid "local config: false"
 msgstr "Lokale Einstellung: fehlerhaft"
 
-#: standalone/drakTermServ:977
+#: standalone/drakTermServ:1016
 #, fuzzy, c-format
 msgid "local config: true"
 msgstr "Nicht eingerichtet"
 
-#: standalone/drakTermServ:985
+#: standalone/drakTermServ:1024
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Client bearbeiten"
 
-#: standalone/drakTermServ:1011
+#: standalone/drakTermServ:1050
 #, c-format
 msgid "Disable Local Config"
 msgstr ""
 
-#: standalone/drakTermServ:1018
+#: standalone/drakTermServ:1057
 #, c-format
 msgid "Delete Client"
 msgstr "Client löschen"
 
-#: standalone/drakTermServ:1027
+#: standalone/drakTermServ:1066
 #, c-format
 msgid "dhcpd Config..."
 msgstr "DHCP Konfigurieren ..."
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1082
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -16494,57 +16621,67 @@ msgstr ""
 "Sie müssen den Display-Manager neu starten, damit alle Änderungen\n"
 "wirksam werden. (Geben Sie auf der Konsole ein: service dm restart)"
 
-#: standalone/drakTermServ:1084
+#: standalone/drakTermServ:1122
+#, c-format
+msgid "Thin clients won't work with autologin. Disable autologin?"
+msgstr ""
+
+#: standalone/drakTermServ:1138
+#, c-format
+msgid "All clients will use %s"
+msgstr ""
+
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Subnet:"
 msgstr "Subnetz:"
 
-#: standalone/drakTermServ:1091
+#: standalone/drakTermServ:1175
 #, c-format
 msgid "Netmask:"
 msgstr "Netzmaske:"
 
-#: standalone/drakTermServ:1098
+#: standalone/drakTermServ:1182
 #, c-format
 msgid "Routers:"
 msgstr "Router:"
 
-#: standalone/drakTermServ:1105
+#: standalone/drakTermServ:1189
 #, c-format
 msgid "Subnet Mask:"
 msgstr "Subnetzmaske:"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1196
 #, c-format
 msgid "Broadcast Address:"
 msgstr "Broadcast-Adresse:"
 
-#: standalone/drakTermServ:1119
+#: standalone/drakTermServ:1203
 #, c-format
 msgid "Domain Name:"
 msgstr "Name der Domäne:"
 
-#: standalone/drakTermServ:1127
+#: standalone/drakTermServ:1211
 #, c-format
 msgid "Name Servers:"
 msgstr "DNS-Server:"
 
-#: standalone/drakTermServ:1138
+#: standalone/drakTermServ:1222
 #, c-format
 msgid "IP Range Start:"
 msgstr "Anfang des IP-Bereichs:"
 
-#: standalone/drakTermServ:1139
+#: standalone/drakTermServ:1223
 #, c-format
 msgid "IP Range End:"
 msgstr "Ende des IP-Bereichs:"
 
-#: standalone/drakTermServ:1191
+#: standalone/drakTermServ:1275
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "dhcpd-Server-Konfiguration"
 
-#: standalone/drakTermServ:1192
+#: standalone/drakTermServ:1276
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -16555,135 +16692,135 @@ msgstr ""
 "laufenden System entnommen.\n"
 "Sie können diese nach Bedarf anpassen."
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1279
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr "Pool dynamischer IP-Adressen:"
 
-#: standalone/drakTermServ:1208
+#: standalone/drakTermServ:1292
 #, c-format
 msgid "Write Config"
 msgstr "Konfiguration speichern"
 
-#: standalone/drakTermServ:1326
+#: standalone/drakTermServ:1411
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Bitte legen Sie eine Diskette ein:"
 
-#: standalone/drakTermServ:1330
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr "Kein Diskettenzugriff möglich!"
 
-#: standalone/drakTermServ:1332
+#: standalone/drakTermServ:1417
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "Sie können die Diskette nun entfernen"
 
-#: standalone/drakTermServ:1335
+#: standalone/drakTermServ:1420
 #, c-format
 msgid "No floppy drive available!"
 msgstr "Kein Disketten-Laufwerk verfügbar!"
 
-#: standalone/drakTermServ:1340
+#: standalone/drakTermServ:1425
 #, fuzzy, c-format
 msgid "PXE image is %s/%s"
 msgstr "Etherboot ISO Image ist %s"
 
-#: standalone/drakTermServ:1342
+#: standalone/drakTermServ:1427
 #, fuzzy, c-format
 msgid "Error writing %s/%s"
 msgstr "Fehler beim Schreiben in Datei %s"
 
-#: standalone/drakTermServ:1351
+#: standalone/drakTermServ:1436
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "Etherboot ISO Image ist %s"
 
-#: standalone/drakTermServ:1353
+#: standalone/drakTermServ:1438
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
-msgstr "Es trat ein Fehler auf! Ist \"mkisofs\" installiert?"
+msgstr "Es trat ein Fehler auf! Ist „mkisofs“ installiert?"
 
-#: standalone/drakTermServ:1372
+#: standalone/drakTermServ:1458
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
-msgstr "\"/etc/dhcpd.conf\" muss erst angelegt werden!"
+msgstr "„/etc/dhcpd.conf“ muss erst angelegt werden!"
 
-#: standalone/drakTermServ:1533
+#: standalone/drakTermServ:1619
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr ""
 
-#: standalone/drakTermServ:1551
+#: standalone/drakTermServ:1637
 #, fuzzy, c-format
 msgid "%s is not a user..\n"
 msgstr "%s nicht gefunden...\n"
 
-#: standalone/drakTermServ:1552
+#: standalone/drakTermServ:1638
 #, fuzzy, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "%s bereits anderweitig genutzt\n"
 
-#: standalone/drakTermServ:1554
+#: standalone/drakTermServ:1640
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr ""
 
-#: standalone/drakTermServ:1556
+#: standalone/drakTermServ:1642
 #, fuzzy, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "Nicht sinnvoll ohne Terminal Server"
 
-#: standalone/drakTermServ:1608
+#: standalone/drakTermServ:1694
 #, fuzzy, c-format
 msgid "Deleted %s...\n"
 msgstr "%s gefunden"
 
-#: standalone/drakTermServ:1610 standalone/drakTermServ:1687
+#: standalone/drakTermServ:1696 standalone/drakTermServ:1773
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s nicht gefunden...\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 bereits anderweitig genutzt\n"
 
-#: standalone/drakTermServ:1658
+#: standalone/drakTermServ:1744
 #, fuzzy, c-format
 msgid "Can't open %s!"
 msgstr "Kann %s auf %s nicht finden"
 
-#: standalone/drakTermServ:1715
+#: standalone/drakTermServ:1801
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr ""
 "/etc/hosts.allow und /etc/hosts.deny sind bereits konfiguriert - keine "
 "Änderung"
 
-#: standalone/drakTermServ:1872
+#: standalone/drakTermServ:1958
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "Konfiguration geändert - Neustart von clusternfs/dhcpd?"
 
-#: standalone/drakautoinst:37
+#: standalone/drakautoinst:38
 #, c-format
 msgid "Error!"
 msgstr "Fehler!"
 
-#: standalone/drakautoinst:38
+#: standalone/drakautoinst:39
 #, c-format
 msgid "I can't find needed image file `%s'."
-msgstr "Ich kann die benötigte Image-Datei \"%s\" nicht finden."
+msgstr "Ich kann die benötigte Image-Datei „%s“ nicht finden."
 
-#: standalone/drakautoinst:40
+#: standalone/drakautoinst:41
 #, c-format
 msgid "Auto Install Configurator"
 msgstr "Auto-Installationskonfigurator"
 
-#: standalone/drakautoinst:41
+#: standalone/drakautoinst:42
 #, fuzzy, c-format
 msgid ""
 "You are about to configure an Auto Install floppy. This feature is somewhat "
@@ -16710,22 +16847,22 @@ msgstr ""
 "\n"
 "Wollen Sie fortfahren?"
 
-#: standalone/drakautoinst:59
+#: standalone/drakautoinst:60
 #, c-format
 msgid "replay"
 msgstr "wiederholen"
 
-#: standalone/drakautoinst:59 standalone/drakautoinst:68
+#: standalone/drakautoinst:60 standalone/drakautoinst:69
 #, c-format
 msgid "manual"
 msgstr "manuell"
 
-#: standalone/drakautoinst:63
+#: standalone/drakautoinst:64
 #, c-format
 msgid "Automatic Steps Configuration"
 msgstr "Automatische Konfiguration der Schritte"
 
-#: standalone/drakautoinst:64
+#: standalone/drakautoinst:65
 #, c-format
 msgid ""
 "Please choose for each step whether it will replay like your install, or it "
@@ -16734,12 +16871,23 @@ msgstr ""
 "Bitte wählen Sie für jeden Schritt, ob er wie bei Ihrer Installation "
 "vorgenommen werden soll, oder ob Sie ihn manuell durchführen wollen."
 
-#: standalone/drakautoinst:76 standalone/drakautoinst:77
+#: standalone/drakautoinst:77 standalone/drakautoinst:78
+#: standalone/drakautoinst:92
 #, c-format
 msgid "Creating auto install floppy"
 msgstr "Erstellen einer Auto-Installationsdiskette"
 
-#: standalone/drakautoinst:141
+#: standalone/drakautoinst:90
+#, fuzzy, c-format
+msgid "Insert another blank floppy in drive %s (for drivers disk)"
+msgstr "Legen Sie eine leere Diskette in das %s ein."
+
+#: standalone/drakautoinst:91
+#, fuzzy, c-format
+msgid "Creating auto install floppy (drivers disk)"
+msgstr "Erstellen einer Auto-Installationsdiskette"
+
+#: standalone/drakautoinst:158
 #, c-format
 msgid ""
 "\n"
@@ -16752,13 +16900,13 @@ msgstr ""
 "\n"
 "Die Parameter der Auto-Installation sind in den Abschnitten rechts verfügbar."
 
-#: 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 "Herzlichen Glückwunsch!"
 
-#: standalone/drakautoinst:236
+#: standalone/drakautoinst:253
 #, c-format
 msgid ""
 "The floppy has been successfully generated.\n"
@@ -16767,37 +16915,37 @@ msgstr ""
 "Die Diskette wurde erfolgreich erstellt.\n"
 "Sie können die Installation nun automatisch durchführen."
 
-#: standalone/drakautoinst:272
+#: standalone/drakautoinst:289
 #, c-format
 msgid "Auto Install"
 msgstr "Auto-Installation"
 
-#: standalone/drakautoinst:341
+#: standalone/drakautoinst:358
 #, c-format
 msgid "Add an item"
 msgstr "Eintrag hinzufügen"
 
-#: standalone/drakautoinst:348
+#: standalone/drakautoinst:365
 #, c-format
 msgid "Remove the last item"
 msgstr "Letzten Eintrag entfernen?"
 
-#: standalone/drakbackup:87
+#: standalone/drakbackup:88
 #, fuzzy, c-format
 msgid "hd"
 msgstr "hd"
 
-#: standalone/drakbackup:87
+#: standalone/drakbackup:88
 #, c-format
 msgid "tape"
 msgstr "Bandlaufwerk"
 
-#: standalone/drakbackup:158
+#: standalone/drakbackup:112
 #, c-format
 msgid "No devices found"
 msgstr "Keine Geräte gefunden"
 
-#: standalone/drakbackup:196
+#: standalone/drakbackup:154
 #, c-format
 msgid ""
 "Expect is an extension to the Tcl scripting language that allows interactive "
@@ -16806,26 +16954,19 @@ msgstr ""
 "Expect ist eine Erweiterung der Tcl Skriptsprache, die interaktive Sitzungen "
 "ohne Benutzereingriff erlaubt."
 
-#: standalone/drakbackup:197
+#: standalone/drakbackup:155
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr "Passwort dieses Systems in der DrakBackup Konfiguration speichern."
 
-#: standalone/drakbackup:198
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
 "the cdrw is erased before each backup."
 msgstr ""
 
-#: 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 ""
-
-#: standalone/drakbackup:200
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
@@ -16835,7 +16976,7 @@ msgstr ""
 "hängt davon ab, ob der inkrementelle oder differentielle Modus verwendet "
 "wird."
 
-#: standalone/drakbackup:201
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
@@ -16844,7 +16985,7 @@ msgstr ""
 "Inkrementelle Sicherung speichert nur Dateien, die sich geändert haben oder "
 "seit der letzten Sicherung neu hinzugekommen sind."
 
-#: standalone/drakbackup:202
+#: standalone/drakbackup:159
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
@@ -16853,23 +16994,23 @@ msgstr ""
 "Inkrementelle Archivierung speichert nur Dateien, die seit der letzten "
 "kompletten Archivierung verändert wurden."
 
-#: standalone/drakbackup:203
+#: standalone/drakbackup:160
 #, fuzzy, c-format
 msgid ""
 "This should be a local user or email addresse that you want the backup "
 "results sent to. You will need to define a functioning mail server."
 msgstr "list An system."
 
-#: standalone/drakbackup:204
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
 "tree will not be backed up."
 msgstr ""
-"Dateien sowie Platzhalter in \".backupignore\" Dateien im Startverzeichnis "
+"Dateien sowie Platzhalter in „.backupignore“ Dateien im Startverzeichnis "
 "eines Verzeichnisbaums werden nicht archiviert."
 
-#: standalone/drakbackup:205
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -16881,7 +17022,7 @@ msgstr ""
 "dieser Möglichkeit, sorgt für das Löschen der Kopie auf der Platte nach "
 "beendeter Sicherung."
 
-#: standalone/drakbackup:206
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -16889,48 +17030,58 @@ msgid ""
 "path."
 msgstr ""
 
-#: standalone/drakbackup:207
+#: standalone/drakbackup:164
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
 "run-parts in /etc/crontab."
 msgstr ""
 
-#: standalone/drakbackup:604
+#: standalone/drakbackup:396
+#, c-format
+msgid "No media selected for cron operation."
+msgstr ""
+
+#: standalone/drakbackup:400
+#, c-format
+msgid "No interval selected for cron operation."
+msgstr ""
+
+#: standalone/drakbackup:447
 #, fuzzy, c-format
 msgid "Interval cron not available as non-root"
 msgstr "Cron ist noch nicht für unprivilegierte Kennzeichen nutzbar"
 
-#: 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 ""
 
-#: 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 "
 "a complete email address!"
 msgstr ""
 
-#: standalone/drakbackup:728
+#: standalone/drakbackup:545
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr ""
 "Liste der gültigen Benutzer hat sich geändert, aktualisiere "
 "Konfigurationsdatei"
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:547
 #, c-format
 msgid "Old user list:\n"
 msgstr "Liste alter Benutzer:\n"
 
-#: standalone/drakbackup:732
+#: standalone/drakbackup:549
 #, c-format
 msgid "New user list:\n"
 msgstr "Liste der neuen Benutzer:\n"
 
-#: standalone/drakbackup:779
+#: standalone/drakbackup:594
 #, c-format
 msgid ""
 "\n"
@@ -16940,7 +17091,7 @@ msgstr ""
 "                      DrakBackup-Report \n"
 "\n"
 
-#: standalone/drakbackup:780
+#: standalone/drakbackup:595
 #, c-format
 msgid ""
 "\n"
@@ -16950,7 +17101,7 @@ msgstr ""
 "                      DrakBackup Dämon-Report\n"
 "\n"
 
-#: standalone/drakbackup:786
+#: standalone/drakbackup:601
 #, c-format
 msgid ""
 "\n"
@@ -16962,13 +17113,13 @@ msgstr ""
 "                    DrakBackup-Report-Details\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 "Fortschritt (komplett)"
 
-#: standalone/drakbackup:865
+#: standalone/drakbackup:678
 #, fuzzy, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -16981,43 +17132,43 @@ msgstr ""
 "Warnung: Wenn Sie dies schon gemacht haben, müssen Sie wahrscheinlich\n"
 "den Eintrag in der Datei authorized_keys auf dem Server löschen."
 
-#: standalone/drakbackup:874
+#: standalone/drakbackup:687
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "Das Generieren der Schlüssel kann einen Moment dauern."
 
 # spawn=laichen?????????????
-#: standalone/drakbackup:881
+#: standalone/drakbackup:694
 #, fuzzy, c-format
 msgid "Cannot spawn %s."
 msgstr "FEHLER: Kann auf %s nicht zugreifen."
 
-#: standalone/drakbackup:898
+#: standalone/drakbackup:711
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "Keine Passwortaufforderung auf %s am Port %s"
 
-#: standalone/drakbackup:899
+#: standalone/drakbackup:712
 #, c-format
 msgid "Bad password on %s"
 msgstr "Falsches Passwort auf %s"
 
-#: standalone/drakbackup:900
+#: standalone/drakbackup:713
 #, fuzzy, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "Erlaubnis verweigert beim übertragen von %s nach %s"
 
-#: standalone/drakbackup:901
+#: standalone/drakbackup:714
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "Kann %s auf %s nicht finden"
 
-#: standalone/drakbackup:904
+#: standalone/drakbackup:718
 #, c-format
 msgid "%s not responding"
 msgstr "%s anwortet nicht"
 
-#: standalone/drakbackup:908
+#: standalone/drakbackup:722
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -17034,84 +17185,84 @@ msgstr ""
 "\n"
 "ohne das Sie jetzt nach einem Passwort gefragt werden."
 
-#: standalone/drakbackup:953
+#: standalone/drakbackup:766
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "Die entfernte WebDAV Seite ist bereits synchronisiert!"
 
-#: standalone/drakbackup:957
+#: standalone/drakbackup:770
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr "WebDAV-Übertragung schlug fehl!"
 
-#: standalone/drakbackup:978
+#: standalone/drakbackup:791
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "Keine CD/DVDR im Laufwerk!"
 
-#: standalone/drakbackup:982
+#: standalone/drakbackup:795
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "Das Medium ist nicht beschreibbar!"
 
-#: standalone/drakbackup:986
+#: standalone/drakbackup:799
 #, c-format
 msgid "Not erasable media!"
 msgstr "Das Medium ist nicht löschbar!"
 
-#: standalone/drakbackup:1027
+#: standalone/drakbackup:840
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr "Das Löschen des Mediums kann einen Moment dauern."
 
-#: standalone/drakbackup:1103
+#: standalone/drakbackup:898
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "Problem beim Zugriff auf die CD."
 
-#: standalone/drakbackup:1130
+#: standalone/drakbackup:925
 #, c-format
 msgid "No tape in %s!"
 msgstr "Es liegt kein Band in %s!"
 
-#: standalone/drakbackup:1232
+#: standalone/drakbackup:1025
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
 "%d MB used vs %d MB allocated."
 msgstr ""
 
-#: standalone/drakbackup:1251 standalone/drakbackup:1305
+#: standalone/drakbackup:1044 standalone/drakbackup:1077
 #, c-format
 msgid "Backup system files..."
 msgstr "Systemdateien sichern ..."
 
-#: standalone/drakbackup:1306 standalone/drakbackup:1368
+#: standalone/drakbackup:1078 standalone/drakbackup:1119
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "Backup-Dateien auf der Festplatte ..."
 
-#: standalone/drakbackup:1367
+#: standalone/drakbackup:1118
 #, c-format
 msgid "Backup User files..."
 msgstr "Benutzerdateien sichern ..."
 
-#: standalone/drakbackup:1421
+#: standalone/drakbackup:1153
 #, c-format
 msgid "Backup Other files..."
 msgstr "Andere Dateien sichern ..."
 
-#: standalone/drakbackup:1422
+#: standalone/drakbackup:1154
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "Festplattenbackup in Bearbeitung ..."
 
-#: standalone/drakbackup:1427
+#: standalone/drakbackup:1159
 #, c-format
 msgid "No changes to backup!"
 msgstr "Keine Änderungen zu sichern!"
 
-#: standalone/drakbackup:1445 standalone/drakbackup:1469
+#: standalone/drakbackup:1177 standalone/drakbackup:1201
 #, c-format
 msgid ""
 "\n"
@@ -17122,7 +17273,7 @@ msgstr ""
 "DrakBackup Aktivitäten via %s:\n"
 "\n"
 
-#: standalone/drakbackup:1454
+#: standalone/drakbackup:1186
 #, c-format
 msgid ""
 "\n"
@@ -17133,7 +17284,7 @@ msgstr ""
 " FTP-Verbindungsproblem: Es war nicht möglich, Ihre Dateien per FTP zu "
 "übertragen.\n"
 
-#: standalone/drakbackup:1455
+#: standalone/drakbackup:1187
 #, fuzzy, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
@@ -17141,14 +17292,14 @@ msgstr ""
 "Fehler bei der Übertragung via FTP.\n"
 " Bitte korrigieren Sie Ihre FTP-Konfiguration."
 
-#: standalone/drakbackup:1457
+#: standalone/drakbackup:1189
 #, fuzzy, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr ""
 "Dateiliste gesendet per FTP: %s\n"
 " "
 
-#: standalone/drakbackup:1474
+#: standalone/drakbackup:1206
 #, c-format
 msgid ""
 "\n"
@@ -17159,7 +17310,7 @@ msgstr ""
 "Drakbackup Aktivitäten über CD:\n"
 "\n"
 
-#: standalone/drakbackup:1479
+#: standalone/drakbackup:1211
 #, c-format
 msgid ""
 "\n"
@@ -17170,7 +17321,7 @@ msgstr ""
 "Drakbackup-Aktivitäten über Bandlaufwerk:\n"
 "\n"
 
-#: standalone/drakbackup:1488
+#: standalone/drakbackup:1220
 #, fuzzy, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr ""
@@ -17178,35 +17329,24 @@ msgstr ""
 "  Ihre Bericht-Mail konnte nicht versandt werden.\n"
 "  Bitte richten Sie Sendmail ein."
 
-#: standalone/drakbackup:1489
+#: standalone/drakbackup:1221
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " Fehler beim Verschicken der E-Mail. \n"
 
-#: standalone/drakbackup:1518
+#: standalone/drakbackup:1249
 #, c-format
 msgid "Can't create catalog!"
 msgstr "Ich kann den Katalog nicht erstellen!"
 
-#: standalone/drakbackup:1639
-#, c-format
-msgid "Can't create log file!"
-msgstr "Kann die Log Datei nicht erstellen!"
-
-#: standalone/drakbackup:1656 standalone/drakbackup:1667
-#: standalone/drakfont:584
-#, c-format
-msgid "File Selection"
-msgstr "Dateiauswahl"
-
-#: standalone/drakbackup:1695
+#: standalone/drakbackup:1455
 #, fuzzy, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr ""
 "Wählen Sie die Dateien oder Verzeichnisse und betätigen Sie die Schaltfläche "
-"\"Hinzufügen\""
+"„Hinzufügen“"
 
-#: standalone/drakbackup:1723
+#: standalone/drakbackup:1484
 #, c-format
 msgid ""
 "\n"
@@ -17215,234 +17355,220 @@ msgstr ""
 "\n"
 "Bitte wählen Sie alle benötigten Parameter.\n"
 
-#: standalone/drakbackup:1724
+#: standalone/drakbackup:1485
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 msgstr ""
-"Diese Optionen kann alle Ihre Dateien im Verzeichnis \"/etc\" sichern und "
+"Diese Optionen kann alle Ihre Dateien im Verzeichnis „/etc“ sichern und "
 "wiederherstellen\n"
 
-#: standalone/drakbackup:1725
+#: standalone/drakbackup:1486
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "Sichern Sie Ihre Systemdateien. (Verzeichnis /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 "Inkrementelle Archivierung (alte Archive nicht ersetzen)"
 
-#: 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 "Inkrementelle Archivierung"
 
-#: 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 "Differentielles Backup verwenden"
 
-#: standalone/drakbackup:1730
+#: standalone/drakbackup:1491
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "Keine kritischen Dateien (passwd, group, fstab) archivieren"
 
-#: 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 ""
 "Mit dieser Option sind Sie in der Lage, jede Version Ihres \n"
-"\"/etc\" Verzeichnisses wiederherzustellen."
+"„/etc“ Verzeichnisses wiederherzustellen."
 
-#: standalone/drakbackup:1762
+#: standalone/drakbackup:1523
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr ""
 "Bitte wählen Sie alle Benutzer, deren Dateien mitgesichert werden sollen."
 
-#: standalone/drakbackup:1789
+#: standalone/drakbackup:1550
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "Die Browser-Caches nicht archivieren"
 
-#: standalone/drakbackup:1844 standalone/drakfont:650
+#: standalone/drakbackup:1605 standalone/drakfont:656
 #, c-format
 msgid "Remove Selected"
 msgstr "Markierte entfernen"
 
-#: standalone/drakbackup:1891 standalone/drakbackup:1895
-#, c-format
-msgid "Under Devel ... please wait."
-msgstr "In Entwicklung, haben Sie noch etwas Geduld ..."
-
-#: standalone/drakbackup:1909
-#, c-format
-msgid "Windows (FAT32)"
-msgstr "Windows (FAT32)"
-
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1668
 #, c-format
 msgid "Users"
 msgstr "Benutzer"
 
-#: standalone/drakbackup:1961
+#: standalone/drakbackup:1688
 #, c-format
 msgid "Use network connection to backup"
 msgstr "Netzwerkverbindung zur Datensicherung verwenden"
 
-#: standalone/drakbackup:1963
+#: standalone/drakbackup:1690
 #, c-format
 msgid "Net Method:"
 msgstr "Netz-Methode:"
 
-#: standalone/drakbackup:1967
+#: standalone/drakbackup:1694
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "Benutze Expect für SSH"
 
-#: standalone/drakbackup:1968
+#: standalone/drakbackup:1695
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1970
+#: standalone/drakbackup:1697
 #, c-format
 msgid "Transfer Now"
 msgstr "Übertrage jetzt"
 
-#: standalone/drakbackup:1972
+#: standalone/drakbackup:1699
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr ""
 
-#: standalone/drakbackup:1975
+#: standalone/drakbackup:1702
 #, c-format
 msgid "Host name or IP."
 msgstr "Rechnername oder IP"
 
-#: standalone/drakbackup:1980
+#: standalone/drakbackup:1707
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr ""
 "Bitte geben Sie das Verzeichnis (oder Modul) an,\n"
 "in dem die Archive auf diesem Rechner erstellt werden sollen."
 
-#: standalone/drakbackup:1985
+#: standalone/drakbackup:1712
 #, c-format
 msgid "Login name"
 msgstr "Benutzername"
 
-#: standalone/drakbackup:1992
+#: standalone/drakbackup:1719
 #, c-format
 msgid "Remember this password"
 msgstr "Passwort behalten"
 
-#: standalone/drakbackup:2004
+#: standalone/drakbackup:1735
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "Brauche Rechnername, Benutzername und Passwort!"
 
-#: standalone/drakbackup:2106
+#: standalone/drakbackup:1833
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "Sicherungskopie auf CD/DVD-ROM"
 
-#: standalone/drakbackup:2109
+#: standalone/drakbackup:1836
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "Bitte wählen Sie ihr CD/DVD-Gerät"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:1841
 #, fuzzy, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "Bitte wählen Sie die Größe des CD/DVD-Mediums (MB)"
 
-#: standalone/drakbackup:2121
+#: standalone/drakbackup:1848
 #, c-format
 msgid "Multisession CD"
 msgstr "Multisession CD"
 
-#: standalone/drakbackup:2123
+#: standalone/drakbackup:1850
 #, c-format
 msgid "CDRW media"
 msgstr "CD-RW Medium"
 
-#: standalone/drakbackup:2128
+#: standalone/drakbackup:1856
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "RW-Medium löschen (erste Session)"
 
-#: standalone/drakbackup:2129
+#: standalone/drakbackup:1857
 #, c-format
 msgid " Erase Now "
 msgstr " Jetzt löschen"
 
-#: standalone/drakbackup:2136
+#: standalone/drakbackup:1863
 #, fuzzy, c-format
 msgid "DVD+RW media"
 msgstr "CD-RW Medium"
 
-#: standalone/drakbackup:2138
+#: standalone/drakbackup:1865
 #, fuzzy, c-format
 msgid "DVD-R media"
 msgstr "CD-RW Medium"
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:1867
 #, c-format
 msgid "DVDRAM device"
 msgstr "DVD-RAM Laufwerk"
 
-#: standalone/drakbackup:2145
-#, c-format
-msgid ""
-"Enter your CD Writer device name\n"
-" ex: 0,1,0"
-msgstr ""
-"Bitte geben Sie den Gerätenamen \n"
-"Ihres CD-Brenners an, etwa \"0,1,0\"."
-
-#: standalone/drakbackup:2177
+#: standalone/drakbackup:1898
 #, c-format
 msgid "No CD device defined!"
 msgstr "Kein CD-Gerät angegeben!"
 
-#: standalone/drakbackup:2227
+#: standalone/drakbackup:1945
 #, c-format
 msgid "Use tape to backup"
 msgstr "Auf Bandlaufwerk sichern"
 
-#: standalone/drakbackup:2230
+#: standalone/drakbackup:1948
 #, c-format
 msgid "Device name to use for backup"
 msgstr "Bitte geben Sie den Gerätenamen für Archivierung an."
 
-#: standalone/drakbackup:2237
+#: standalone/drakbackup:1954
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr "Band nach der Sicherung nicht zurückspulen"
 
-#: standalone/drakbackup:2243
+#: standalone/drakbackup:1960
 #, c-format
 msgid "Erase tape before backup"
 msgstr "Band vor Sicherung löschen"
 
-#: standalone/drakbackup:2249
+#: standalone/drakbackup:1966
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "Band nach der Sicherung auswerfen"
 
-#: standalone/drakbackup:2317
+#: standalone/drakbackup:2033
 #, fuzzy, c-format
 msgid "Enter the directory to save to:"
 msgstr "Bitte geben Sie das Archivverzeichnis an:"
 
-#: standalone/drakbackup:2326
+#: standalone/drakbackup:2037
+#, fuzzy, c-format
+msgid "Directory to save to"
+msgstr "Bitte geben Sie das Archivverzeichnis an:"
+
+#: standalone/drakbackup:2042
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -17451,318 +17577,312 @@ msgstr ""
 "Bitte geben Sie die Maximalgröße \n"
 "für DrakBackup an."
 
-#: standalone/drakbackup:2399
+#: standalone/drakbackup:2106
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CD-ROM / DVD-ROM"
 
-#: standalone/drakbackup:2404
+#: standalone/drakbackup:2111
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "Festplatte/NFS"
 
-#: standalone/drakbackup:2420 standalone/drakbackup:2425
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2127 standalone/drakbackup:2132
+#: standalone/drakbackup:2137
 #, c-format
 msgid "hourly"
 msgstr "stündlich"
 
-#: standalone/drakbackup:2421 standalone/drakbackup:2426
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2128 standalone/drakbackup:2133
+#: standalone/drakbackup:2137
 #, c-format
 msgid "daily"
 msgstr "täglich"
 
-#: standalone/drakbackup:2422 standalone/drakbackup:2427
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2129 standalone/drakbackup:2134
+#: standalone/drakbackup:2137
 #, c-format
 msgid "weekly"
 msgstr "wöchentlich"
 
-#: standalone/drakbackup:2423 standalone/drakbackup:2428
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2130 standalone/drakbackup:2135
+#: standalone/drakbackup:2137
 #, c-format
 msgid "monthly"
 msgstr "monatlich"
 
-#: standalone/drakbackup:2424 standalone/drakbackup:2429
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2131 standalone/drakbackup:2136
+#: standalone/drakbackup:2137
 #, c-format
 msgid "custom"
 msgstr "Benutzerdefiniert"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "January"
 msgstr "Januar"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "February"
 msgstr "Februar"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "March"
 msgstr "März"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "April"
 msgstr "April"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "May"
 msgstr "Mai"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "June"
 msgstr "Juni"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "July"
 msgstr "Juli"
 
-#: 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 "Oktober"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "November"
 msgstr "November"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "December"
 msgstr "Dezember"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Monday"
 msgstr "Montag"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Friday"
 msgstr "Freitag"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Saturday"
 msgstr "Samstag"
 
-#: standalone/drakbackup:2478
+#: standalone/drakbackup:2185
 #, c-format
 msgid "Use daemon"
 msgstr "Dämon verwenden"
 
-#: standalone/drakbackup:2483
+#: standalone/drakbackup:2190
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "Bitte wählen Sie das Zeitintervall zwischen zwei Sicherungen."
 
-#: standalone/drakbackup:2489
+#: standalone/drakbackup:2196
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr ""
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2201
 #, c-format
 msgid "Minute"
 msgstr "Minute"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Hour"
 msgstr "Stunde"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2209
 #, c-format
 msgid "Day"
 msgstr "Tag"
 
-#: standalone/drakbackup:2506
+#: standalone/drakbackup:2213
 #, c-format
 msgid "Month"
 msgstr "Monat"
 
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2217
 #, c-format
 msgid "Weekday"
 msgstr "Wochentag"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2223
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "Bitte wählen Sie ein Sicherungsmedium."
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2230
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr "Stellen Sie sicher, dass der Cron-Dämon als Dienst aktiviert ist."
 
-#: standalone/drakbackup:2524
+#: standalone/drakbackup:2231
 #, fuzzy, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr ""
-"Beachten Sie, dass zur Zeit alle \"Netzmedien\" auch die Festplatte "
-"verwenden."
+"Beachten Sie, dass zur Zeit alle „Netzmedien“ auch die Festplatte verwenden."
 
-#: standalone/drakbackup:2571
-#, c-format
-msgid "Use tar and bzip2 (rather than tar and gzip)"
-msgstr "Benutze tar und bzip2 (besser als tar und gzip)"
+#: standalone/drakbackup:2281
+#, fuzzy, c-format
+msgid "Please choose the compression type"
+msgstr "Bitte wählen Sie, welches Datum wiederhergestellt werden soll."
 
-#: standalone/drakbackup:2572
+#: standalone/drakbackup:2285
 #, c-format
 msgid "Use .backupignore files"
 msgstr "Verwende .backupignore Dateien"
 
-#: standalone/drakbackup:2574
+#: standalone/drakbackup:2287
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "E-Mail-Bericht nach jedem Sicherungsvorgang an: "
 
-#: standalone/drakbackup:2580
+#: standalone/drakbackup:2293
 #, fuzzy, c-format
 msgid "SMTP server for mail:"
 msgstr "SMB-Server"
 
-#: standalone/drakbackup:2585
+#: standalone/drakbackup:2298
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr ""
 "Nach dem Backup auf ein anderes Medium die tar-Dateien von der Festplatte "
 "löschen."
 
-#: standalone/drakbackup:2624
+#: standalone/drakbackup:2338
 #, c-format
 msgid "What"
 msgstr "Was"
 
-#: standalone/drakbackup:2629
+#: standalone/drakbackup:2343
 #, c-format
 msgid "Where"
 msgstr "Wo"
 
-#: standalone/drakbackup:2634
+#: standalone/drakbackup:2348
 #, c-format
 msgid "When"
 msgstr "Wann"
 
-#: standalone/drakbackup:2639
+#: standalone/drakbackup:2353
 #, c-format
 msgid "More Options"
 msgstr "Mehr Parameter"
 
-#: standalone/drakbackup:2651
+#: standalone/drakbackup:2366
 #, fuzzy, c-format
 msgid "Backup destination not configured..."
 msgstr "Ihr Netzwerk ist nicht konfiguriert"
 
-#: standalone/drakbackup:2667 standalone/drakbackup:4731
+#: standalone/drakbackup:2385 standalone/drakbackup:4413
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "DrakBackup-Konfiguration"
 
-#: standalone/drakbackup:2684
+#: standalone/drakbackup:2402
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "Bitte wählen Sie wohin Sie die Sicherungskopien machen wollen."
 
-#: standalone/drakbackup:2686
+#: standalone/drakbackup:2404
 #, fuzzy, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr ""
 "Nach dem Backup auf ein anderes Medium die tar-Dateien von der Festplatte "
 "löschen."
 
-#: standalone/drakbackup:2694
+#: standalone/drakbackup:2412
 #, c-format
 msgid "Across Network"
 msgstr "über Netzwerk"
 
-#: standalone/drakbackup:2702
+#: standalone/drakbackup:2420
 #, c-format
 msgid "On CD-R"
 msgstr "auf CD-ROM"
 
-#: standalone/drakbackup:2710
+#: standalone/drakbackup:2428
 #, c-format
 msgid "On Tape Device"
 msgstr "auf Bandlaufwerk (Streamer)"
 
-#: standalone/drakbackup:2738
-#, c-format
-msgid "Please select media for backup..."
-msgstr "Bitte wählen Sie ein Sicherungsmedium..."
-
-#: standalone/drakbackup:2760
+#: standalone/drakbackup:2468
 #, c-format
 msgid "Backup Users"
 msgstr "Benutzer sichern"
 
-#: standalone/drakbackup:2761
+#: standalone/drakbackup:2469
 #, c-format
 msgid " (Default is all users)"
 msgstr " (Standard: alle Benutzer)"
 
-#: standalone/drakbackup:2773
+#: standalone/drakbackup:2481
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "Bitte wählen Sie, was Sie sichern wollen"
 
-#: standalone/drakbackup:2774
+#: standalone/drakbackup:2482
 #, c-format
 msgid "Backup System"
 msgstr "System sichern"
 
-#: standalone/drakbackup:2776
+#: standalone/drakbackup:2484
 #, c-format
 msgid "Select user manually"
 msgstr "Benutzer auswählen"
 
-#: standalone/drakbackup:2805
+#: standalone/drakbackup:2513
 #, c-format
 msgid "Please select data to backup..."
 msgstr "Bitte wählen Sie die zu sichernden Daten..."
 
-#: standalone/drakbackup:2879
+#: standalone/drakbackup:2585
 #, c-format
 msgid ""
 "\n"
@@ -17771,7 +17891,7 @@ msgstr ""
 "\n"
 "Sicherungsquellen: \n"
 
-#: standalone/drakbackup:2880
+#: standalone/drakbackup:2586
 #, c-format
 msgid ""
 "\n"
@@ -17780,7 +17900,7 @@ msgstr ""
 "\n"
 "- Systemdateien:\n"
 
-#: standalone/drakbackup:2882
+#: standalone/drakbackup:2588
 #, c-format
 msgid ""
 "\n"
@@ -17789,7 +17909,7 @@ msgstr ""
 "\n"
 "- Benutzerdateien:\n"
 
-#: standalone/drakbackup:2884
+#: standalone/drakbackup:2590
 #, c-format
 msgid ""
 "\n"
@@ -17798,7 +17918,7 @@ msgstr ""
 "\n"
 "- Sonstige Dateien:\n"
 
-#: standalone/drakbackup:2886
+#: standalone/drakbackup:2592
 #, c-format
 msgid ""
 "\n"
@@ -17807,12 +17927,12 @@ msgstr ""
 "\n"
 "- Auf Festplatte sichern unter: %s\n"
 
-#: standalone/drakbackup:2887
+#: standalone/drakbackup:2593
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tPlattenplatz auf %s MB begrenzen\n"
 
-#: standalone/drakbackup:2890
+#: standalone/drakbackup:2596
 #, c-format
 msgid ""
 "\n"
@@ -17821,17 +17941,17 @@ msgstr ""
 "\n"
 "- Nach dem Backup die tar-Dateien von der Festplatte löschen.\n"
 
-#: standalone/drakbackup:2894
+#: standalone/drakbackup:2600
 #, fuzzy, c-format
 msgid "NO"
 msgstr "INFO"
 
-#: standalone/drakbackup:2895
+#: standalone/drakbackup:2601
 #, c-format
 msgid "YES"
 msgstr "JA"
 
-#: standalone/drakbackup:2896
+#: standalone/drakbackup:2602
 #, c-format
 msgid ""
 "\n"
@@ -17840,22 +17960,22 @@ msgstr ""
 "\n"
 "- Auf CD brennen"
 
-#: standalone/drakbackup:2897
+#: standalone/drakbackup:2603
 #, fuzzy, c-format
 msgid "RW"
 msgstr "RW (Rewritable)"
 
-#: standalone/drakbackup:2898
+#: standalone/drakbackup:2604
 #, c-format
 msgid " on device: %s"
 msgstr " an Gerät: %s"
 
-#: standalone/drakbackup:2899
+#: standalone/drakbackup:2605
 #, c-format
 msgid " (multi-session)"
 msgstr " (Multisession)"
 
-#: standalone/drakbackup:2900
+#: standalone/drakbackup:2606
 #, c-format
 msgid ""
 "\n"
@@ -17864,12 +17984,12 @@ msgstr ""
 "\n"
 "- Auf Band an Gerät %s sichern"
 
-#: standalone/drakbackup:2901
+#: standalone/drakbackup:2607
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tLöschen=%s"
 
-#: standalone/drakbackup:2904
+#: standalone/drakbackup:2610
 #, c-format
 msgid ""
 "\n"
@@ -17878,7 +17998,7 @@ msgstr ""
 "\n"
 "- via %s auf Rechner %s sichern\n"
 
-#: standalone/drakbackup:2905
+#: standalone/drakbackup:2611
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -17887,7 +18007,7 @@ msgstr ""
 "\t\t Benutzer: %s\n"
 "\t\t Pfad: %s \n"
 
-#: standalone/drakbackup:2906
+#: standalone/drakbackup:2612
 #, c-format
 msgid ""
 "\n"
@@ -17896,37 +18016,42 @@ msgstr ""
 "\n"
 "- Optionen:\n"
 
-#: standalone/drakbackup:2907
+#: standalone/drakbackup:2613
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tKeine Systemdateien\n"
 
-#: standalone/drakbackup:2910
+#: standalone/drakbackup:2615
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
-msgstr "\tSicherungen verwenden \"tar\" und \"bzip2\"\n"
+msgstr "\tSicherungen verwenden „tar“ und „bzip2“\n"
 
-#: standalone/drakbackup:2912
+#: standalone/drakbackup:2616
 #, c-format
 msgid "\tBackups use tar and gzip\n"
-msgstr "\tSicherungen verwenden \"tar\" und \"gzip\"\n"
+msgstr "\tSicherungen verwenden „tar“ und „gzip“\n"
+
+#: standalone/drakbackup:2617
+#, fuzzy, c-format
+msgid "\tBackups use tar only\n"
+msgstr "\tSicherungen verwenden „tar“ und „gzip“\n"
 
-#: standalone/drakbackup:2915
+#: standalone/drakbackup:2619
 #, c-format
 msgid "\tUse .backupignore files\n"
-msgstr "\t\".backupignore\"-Dateien verwenden.\n"
+msgstr "\t“.backupignore“-Dateien verwenden.\n"
 
-#: standalone/drakbackup:2916
+#: standalone/drakbackup:2620
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\tSendw Email an %s\n"
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2621
 #, fuzzy, c-format
 msgid "\tUsing SMTP server %s\n"
-msgstr "Auf CUPS-Server \"%s\""
+msgstr "Auf CUPS-Server „%s“"
 
-#: standalone/drakbackup:2919
+#: standalone/drakbackup:2623
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -17935,48 +18060,48 @@ msgstr ""
 "\n"
 "- Dämon (%s) enthält:\n"
 
-#: standalone/drakbackup:2920
+#: standalone/drakbackup:2624
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t- Festplatte.\n"
 
-#: standalone/drakbackup:2921
+#: standalone/drakbackup:2625
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t- CD-ROM.\n"
 
-#: standalone/drakbackup:2922
+#: standalone/drakbackup:2626
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-Band \n"
 
-#: standalone/drakbackup:2923
+#: standalone/drakbackup:2627
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t- Netzwerk per FTP.\n"
 
-#: standalone/drakbackup:2924
+#: standalone/drakbackup:2628
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t- Netzwerk per SSH.\n"
 
-#: standalone/drakbackup:2925
+#: standalone/drakbackup:2629
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t- Netzwerk per rsync.\n"
 
-#: standalone/drakbackup:2926
+#: standalone/drakbackup:2630
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t- Netzwerk per webdav.\n"
 
-#: standalone/drakbackup:2928
+#: standalone/drakbackup:2632
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr ""
 "Keine Konfiguration. Wählen Sie den Assistenten oder Fortgeschritten.\n"
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2637
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -17985,33 +18110,33 @@ msgstr ""
 "Liste der wiederherzustellenden Daten:\n"
 "\n"
 
-#: standalone/drakbackup:2935
+#: standalone/drakbackup:2639
 #, fuzzy, c-format
 msgid "- Restore System Files.\n"
 msgstr ""
 "\n"
 "- Systemdateien:\n"
 
-#: standalone/drakbackup:2937 standalone/drakbackup:2947
+#: standalone/drakbackup:2641 standalone/drakbackup:2651
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2940
+#: standalone/drakbackup:2644
 #, fuzzy, c-format
 msgid "- Restore User Files: \n"
 msgstr ""
 "\n"
 "- Benutzerdateien:\n"
 
-#: standalone/drakbackup:2945
+#: standalone/drakbackup:2649
 #, fuzzy, c-format
 msgid "- Restore Other Files: \n"
 msgstr ""
 "\n"
 "- Sonstige Dateien:\n"
 
-#: standalone/drakbackup:3121
+#: standalone/drakbackup:2830
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -18020,128 +18145,138 @@ msgstr ""
 "Liste der beschädigten Daten:\n"
 "\n"
 
-#: standalone/drakbackup:3123
+#: standalone/drakbackup:2832
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr ""
 "Bitte entfernen Sie die Markierung oder löschen Sie sie das nächste Mal."
 
-#: standalone/drakbackup:3133
+#: standalone/drakbackup:2842
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "Die Sicherungen sind beschädigt."
 
-#: standalone/drakbackup:3154
+#: standalone/drakbackup:2863
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "            Alle Ihre gewählten Daten wurden            "
 
-#: standalone/drakbackup:3155
+#: standalone/drakbackup:2864
 #, c-format
 msgid "          Successfuly Restored on %s       "
 msgstr "    erfolgreich auf %s wiederhergestellt   "
 
-#: standalone/drakbackup:3270
+#: standalone/drakbackup:2987
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "    Konfiguration wiederherstellen   "
 
-#: standalone/drakbackup:3298
+#: standalone/drakbackup:3015
 #, c-format
 msgid "OK to restore the other files."
 msgstr "Bereit um die anderen Dateien wiederherzustellen"
 
-#: standalone/drakbackup:3316
+#: standalone/drakbackup:3031
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
 "Liste wiederherzustellender Benutzer (letztes Datum pro Benutzer ist wichtig)"
 
-#: standalone/drakbackup:3382
+#: standalone/drakbackup:3098
 #, fuzzy, c-format
 msgid "Please choose the date to restore:"
 msgstr "Bitte wählen Sie, welches Datum wiederhergestellt werden soll."
 
-#: standalone/drakbackup:3420
+#: standalone/drakbackup:3135
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "Von Festplatte wiederherstellen"
 
-#: standalone/drakbackup:3422
+#: standalone/drakbackup:3137
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "Bitte geben Sie das Verzeichnis an, in dem die Sicherungskopien liegen"
 
-#: standalone/drakbackup:3478
+#: standalone/drakbackup:3141
+#, fuzzy, c-format
+msgid "Directory with backups"
+msgstr "Alle Sicherungen wiederherstellen"
+
+#: standalone/drakbackup:3194
 #, c-format
 msgid "Select another media to restore from"
 msgstr "Wählen Sie ein anderes Medium von dem Sie wiederherstellen wollen."
 
-#: standalone/drakbackup:3480
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Other Media"
 msgstr "Anderes Medium"
 
-#: standalone/drakbackup:3485
+#: standalone/drakbackup:3201
 #, c-format
 msgid "Restore system"
 msgstr "System wiederherstellen"
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3202
 #, c-format
 msgid "Restore Users"
 msgstr "Benutzer wiederherstellen"
 
-#: standalone/drakbackup:3487
+#: standalone/drakbackup:3203
 #, c-format
 msgid "Restore Other"
 msgstr "Sonstiges wiederherstellen"
 
-#: standalone/drakbackup:3489
+#: standalone/drakbackup:3205
 #, c-format
-msgid "select path to restore (instead of /)"
+msgid "Select path to restore (instead of /)"
 msgstr "Pfad zum Wiederherstellen auswählen (anstatt /)"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3209 standalone/drakbackup:3490
+#, fuzzy, c-format
+msgid "Path To Restore To"
+msgstr "Benutzerdefinierte Wiederherstellung"
+
+#: standalone/drakbackup:3212
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr ""
 "Erstelle Sicherung vor dem Wiederherstellen (nur für inkrementelle "
 "Sicherungen)."
 
-#: standalone/drakbackup:3495
+#: standalone/drakbackup:3214
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Verzeichnisse der Benutzer vor dem Wiederherstellen entfernen."
 
-#: standalone/drakbackup:3575
+#: standalone/drakbackup:3298
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr ""
 
-#: standalone/drakbackup:3578
+#: standalone/drakbackup:3301
 #, c-format
 msgid "Search Backups"
 msgstr "Durchsuche Sicherheitskopien"
 
-#: standalone/drakbackup:3597
+#: standalone/drakbackup:3320
 #, fuzzy, c-format
 msgid "No matches found..."
 msgstr "Kein Image gefunden"
 
-#: standalone/drakbackup:3601
+#: standalone/drakbackup:3324
 #, c-format
 msgid "Restore Selected"
 msgstr "Markierte Dateien wiederherstellen"
 
-#: standalone/drakbackup:3735
+#: standalone/drakbackup:3458
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
 "Ctrl-Click files to select multiple files."
 msgstr ""
 
-#: standalone/drakbackup:3741
+#: standalone/drakbackup:3464
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18150,7 +18285,7 @@ msgstr ""
 "Ausgewählte Katalogeinträge\n"
 "wieder herstellen"
 
-#: standalone/drakbackup:3750
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18159,26 +18294,17 @@ msgstr ""
 "Markierte Dateien\n"
 "wiederherstellen"
 
-#: standalone/drakbackup:3766
-#, c-format
-msgid ""
-"Change\n"
-"Restore Path"
-msgstr ""
-"Ändern\n"
-"Pfad wiederherstellen"
-
-#: standalone/drakbackup:3833
+#: standalone/drakbackup:3550
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "Backup-Dateien nicht unter %s gefunden."
 
-#: standalone/drakbackup:3846
+#: standalone/drakbackup:3563
 #, c-format
 msgid "Restore From CD"
 msgstr "Von CD wiederherstellen"
 
-#: standalone/drakbackup:3846
+#: standalone/drakbackup:3563
 #, fuzzy, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -18187,17 +18313,17 @@ msgstr ""
 "Legen Sie die Cd mit Namen %s\n"
 "in das CD Laufwerk, welches auf /mnt/cdrom gemountet ist"
 
-#: standalone/drakbackup:3848
+#: standalone/drakbackup:3565
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "Nicht die korrekte CD. Die richtige CD heißt %s"
 
-#: standalone/drakbackup:3858
+#: standalone/drakbackup:3575
 #, c-format
 msgid "Restore From Tape"
 msgstr "Von Band wiederherstellen"
 
-#: standalone/drakbackup:3858
+#: standalone/drakbackup:3575
 #, fuzzy, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -18206,282 +18332,287 @@ msgstr ""
 "Legen Sie das Band mit dem Namen %s\n"
 "in das Bandlaufwerk %s"
 
-#: standalone/drakbackup:3860
+#: standalone/drakbackup:3577
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "Nicht das richtige Band. Das richtige Band heißt %s"
 
-#: standalone/drakbackup:3871
+#: standalone/drakbackup:3588
 #, c-format
 msgid "Restore Via Network"
 msgstr "Über Netzwerk wiederherstellen"
 
-#: standalone/drakbackup:3871
+#: standalone/drakbackup:3588
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "Wiederherstellen mit Netzwerkprotokoll: %s"
 
-#: standalone/drakbackup:3872
+#: standalone/drakbackup:3589
 #, c-format
 msgid "Host Name"
 msgstr "Rechnername"
 
-#: standalone/drakbackup:3873
+#: standalone/drakbackup:3590
 #, c-format
 msgid "Host Path or Module"
 msgstr "Rechnerpfad oder Modul"
 
-#: standalone/drakbackup:3880
+#: standalone/drakbackup:3597
 #, c-format
 msgid "Password required"
 msgstr "Passwort nötig"
 
-#: standalone/drakbackup:3886
+#: standalone/drakbackup:3603
 #, c-format
 msgid "Username required"
 msgstr "Benutzername nötig"
 
-#: standalone/drakbackup:3889
+#: standalone/drakbackup:3606
 #, c-format
 msgid "Hostname required"
 msgstr "Rechnername nötig"
 
-#: standalone/drakbackup:3894
+#: standalone/drakbackup:3611
 #, c-format
 msgid "Path or Module required"
 msgstr "Pfad oder Modul benötigt"
 
-#: standalone/drakbackup:3907
+#: standalone/drakbackup:3624
 #, c-format
 msgid "Files Restored..."
 msgstr "Dateien wiederhergestellt..."
 
-#: standalone/drakbackup:3910
+#: standalone/drakbackup:3627
 #, c-format
 msgid "Restore Failed..."
 msgstr "Wiederherstellen fehlgeschlagen..."
 
-#: standalone/drakbackup:4015 standalone/drakbackup:4031
+#: standalone/drakbackup:3737 standalone/drakbackup:3754
 #, fuzzy, c-format
 msgid "%s not retrieved..."
 msgstr "%s nicht gefunden...\n"
 
-#: standalone/drakbackup:4155 standalone/drakbackup:4228
+#: standalone/drakbackup:3880 standalone/drakbackup:3953
 #, c-format
 msgid "Search for files to restore"
 msgstr "Suche wiederherzustellende Dateien."
 
-#: standalone/drakbackup:4160
+#: standalone/drakbackup:3885
 #, c-format
 msgid "Restore all backups"
 msgstr "Alle Sicherungen wiederherstellen"
 
-#: standalone/drakbackup:4169
+#: standalone/drakbackup:3894
 #, c-format
 msgid "Custom Restore"
 msgstr "Benutzerdefinierte Wiederherstellung"
 
-#: standalone/drakbackup:4174 standalone/drakbackup:4224
+#: standalone/drakbackup:3899 standalone/drakbackup:3949
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Wiederherstellen aus Katalog"
 
-#: standalone/drakbackup:4196
+#: standalone/drakbackup:3921
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "Kann kein Archiv zum Wiederherstellen finden...\n"
 
-#: standalone/drakbackup:4197
+#: standalone/drakbackup:3922
 #, fuzzy, c-format
 msgid "Verify that %s is the correct path"
 msgstr "Stellen Sie sicher dass %s der richtige Pfad ist"
 
-#: standalone/drakbackup:4198
+#: standalone/drakbackup:3923
 #, c-format
 msgid " and the CD is in the drive"
 msgstr " und die CD im Laufwerk ist"
 
-#: standalone/drakbackup:4200
+#: standalone/drakbackup:3925
 #, fuzzy, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr "An"
 
-#: standalone/drakbackup:4216
+#: standalone/drakbackup:3941
 #, c-format
 msgid "CD in place - continue."
 msgstr "Aktuelle CD - fortfahren."
 
-#: standalone/drakbackup:4221
+#: standalone/drakbackup:3946
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "Zum neuen Wiederherstellungsverzeichnis wechseln"
 
-#: standalone/drakbackup:4258
+#: standalone/drakbackup:3947
+#, fuzzy, c-format
+msgid "Directory To Restore From"
+msgstr "Von CD wiederherstellen"
+
+#: standalone/drakbackup:3986
 #, c-format
 msgid "Restore Progress"
 msgstr "Wiederherstellungs-Fortschritt"
 
-#: standalone/drakbackup:4292 standalone/drakbackup:4404
-#: standalone/logdrake:175
+#: standalone/drakbackup:4016 standalone/drakbackup:4123
+#: standalone/logdrake:174
 #, c-format
 msgid "Save"
 msgstr "Speichern"
 
-#: standalone/drakbackup:4378
+#: standalone/drakbackup:4099
 #, c-format
 msgid "Build Backup"
 msgstr "Sicherung erstellen"
 
-#: standalone/drakbackup:4430 standalone/drakbackup:4829
+#: standalone/drakbackup:4147 standalone/drakbackup:4512
 #, c-format
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: standalone/drakbackup:4600
+#: standalone/drakbackup:4277
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "Die folgenden Pakete müssen installiert werden:\n"
 
-#: standalone/drakbackup:4622
+#: standalone/drakbackup:4304
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Bitte wählen Sie die wiederherzustellenden Daten..."
 
-#: standalone/drakbackup:4662
+#: standalone/drakbackup:4344
 #, c-format
 msgid "Backup system files"
 msgstr "Systemdateien sichern"
 
-#: standalone/drakbackup:4665
+#: standalone/drakbackup:4347
 #, c-format
 msgid "Backup user files"
 msgstr "Benutzerdateien sichern"
 
-#: standalone/drakbackup:4668
+#: standalone/drakbackup:4350
 #, c-format
 msgid "Backup other files"
 msgstr "Andere Dateien sichern"
 
-#: standalone/drakbackup:4671 standalone/drakbackup:4707
+#: standalone/drakbackup:4353 standalone/drakbackup:4389
 #, c-format
 msgid "Total Progress"
 msgstr "Fortschritt"
 
-#: standalone/drakbackup:4699
+#: standalone/drakbackup:4381
 #, c-format
 msgid "Sending files by FTP"
 msgstr "Dateien mittels FTP übertragen"
 
-#: standalone/drakbackup:4702
+#: standalone/drakbackup:4384
 #, c-format
 msgid "Sending files..."
 msgstr "Sende Dateien ..."
 
-#: standalone/drakbackup:4772
+#: standalone/drakbackup:4455
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "Jetzt Sicherung anhand der Konfigurationsdatei erstellen"
 
-#: standalone/drakbackup:4777
+#: standalone/drakbackup:4460
 #, c-format
 msgid "View Backup Configuration."
 msgstr "Sicherungskonfiguration anzeigen"
 
-#: standalone/drakbackup:4803
+#: standalone/drakbackup:4486
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Assistentengestützte Konfiguration"
 
-#: standalone/drakbackup:4808
+#: standalone/drakbackup:4491
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Expertenkonfiguration"
 
-#: standalone/drakbackup:4813
+#: standalone/drakbackup:4496
 #, c-format
 msgid "View Configuration"
 msgstr "Einstellung anschauen"
 
-#: standalone/drakbackup:4817
+#: standalone/drakbackup:4500
 #, c-format
 msgid "View Last Log"
 msgstr "Letzten Log Eintrag betrachten"
 
-#: standalone/drakbackup:4822
+#: standalone/drakbackup:4505
 #, c-format
 msgid "Backup Now"
 msgstr "Jetzt sichern"
 
-#: standalone/drakbackup:4826
+#: standalone/drakbackup:4509
 #, c-format
 msgid ""
 "No configuration file found \n"
 "please click Wizard or Advanced."
 msgstr ""
 "Keine Konfigurationsdatei gefunden.\n"
-"Bitte wählen Sie den \"Assistenten\" oder \"Erweitert\"."
+"Bitte wählen Sie den „Assistenten“ oder „Erweitert“."
 
-#: standalone/drakbackup:4858 standalone/drakbackup:4865
+#: standalone/drakbackup:4530 standalone/drakbackup:4533
 #, c-format
 msgid "Drakbackup"
 msgstr "DrakBackup"
 
-#: standalone/drakboot:56
+#: standalone/drakboot:57
 #, fuzzy, c-format
 msgid "Graphical boot theme selection"
 msgstr "Auswahl des Druckermodells"
 
-#: standalone/drakboot:56
+#: standalone/drakboot:57
 #, c-format
 msgid "System mode"
 msgstr "System-Modus"
 
-#: 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 "/_Datei"
 
-#: standalone/drakboot:67 standalone/drakfloppy:47 standalone/logdrake:76
+#: standalone/drakboot:68 standalone/drakfloppy:47 standalone/logdrake:77
 #, c-format
 msgid "/File/_Quit"
 msgstr "/Datei/B_eenden"
 
-#: 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 "Designs installieren"
 
-#: standalone/drakboot:119
+#: standalone/drakboot:120
 #, c-format
 msgid "Create new theme"
 msgstr "Ein neues Design erzeugen"
 
-#: standalone/drakboot:133
+#: standalone/drakboot:134
 #, c-format
 msgid "Use graphical boot"
 msgstr ""
 
-#: standalone/drakboot:138
+#: 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."
 msgstr ""
 
-#: standalone/drakboot:145
+#: standalone/drakboot:146
 #, fuzzy, c-format
 msgid "Theme"
 msgstr "Designs"
 
-#: standalone/drakboot:147
+#: standalone/drakboot:149
 #, c-format
 msgid ""
 "Display theme\n"
@@ -18490,32 +18621,32 @@ msgstr ""
 "Design in der\n"
 "Konsole anzeigen"
 
-#: standalone/drakboot:156
+#: standalone/drakboot:158
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "Arbeitsoberfläche nach dem Hochfahren automatisch starten "
 
-#: standalone/drakboot:164
-#, c-format
-msgid "Yes, I want autologin with this (user, desktop)"
-msgstr "Ja, ich will Autologin mit diesem Benutzer und dieser Oberfläche"
-
-#: standalone/drakboot:165
+#: standalone/drakboot:166
 #, c-format
 msgid "No, I don't want autologin"
 msgstr "Nein, ich will kein Autologin"
 
-#: standalone/drakboot:171
+#: standalone/drakboot:167
+#, c-format
+msgid "Yes, I want autologin with this (user, desktop)"
+msgstr "Ja, ich will Autologin mit diesem Benutzer und dieser Oberfläche"
+
+#: standalone/drakboot:173
 #, c-format
 msgid "Default user"
 msgstr "Standardkennzeichen"
 
-#: standalone/drakboot:172
+#: standalone/drakboot:174
 #, c-format
 msgid "Default desktop"
 msgstr "Standard Arbeitsumgebung"
 
-#: standalone/drakboot:236
+#: standalone/drakboot:238
 #, c-format
 msgid "Installation of %s failed. The following error occured:"
 msgstr "Die Installation von %s schlug fehl. Folgender Fehler trat auf:"
@@ -18759,12 +18890,12 @@ msgstr "Aktiviere das Network Time Protocol"
 msgid "Server:"
 msgstr "Server: "
 
-#: standalone/drakclock:125 standalone/drakclock:137
+#: standalone/drakclock:129 standalone/drakclock:141
 #, fuzzy, c-format
 msgid "Reset"
 msgstr "Ablehnen"
 
-#: standalone/drakclock:200
+#: standalone/drakclock:204
 #, fuzzy, c-format
 msgid ""
 "We need to install ntp package\n"
@@ -18775,213 +18906,204 @@ msgstr ""
 "Das ntp Programmpaket muss installiert werden\n"
 "um das Network Time Protocol zu aktivieren"
 
-#: standalone/drakconnect:78
+#: standalone/drakconnect:81
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Netzwerk-Konfiguration (%d Karten)"
 
-#: standalone/drakconnect:89 standalone/drakconnect:686
+#: standalone/drakconnect:92 standalone/drakconnect:728
 #, c-format
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: standalone/drakconnect:89 standalone/drakconnect:686
+#: standalone/drakconnect:92 standalone/drakconnect:728
 #, c-format
 msgid "Interface:"
 msgstr "Schnittstelle:"
 
-#: standalone/drakconnect:93 standalone/net_monitor:105
+#: standalone/drakconnect:96 standalone/net_monitor:105
 #, c-format
 msgid "Wait please"
 msgstr "Bitte warten"
 
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116
 #, c-format
 msgid "Interface"
 msgstr "Schnittstelle"
 
-#: 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 "Treiber"
 
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116
 #, c-format
 msgid "State"
 msgstr "Status"
 
-#: standalone/drakconnect:130
+#: standalone/drakconnect:133
 #, c-format
 msgid "Hostname: "
 msgstr "Rechnername: "
 
-#: standalone/drakconnect:132
+#: standalone/drakconnect:135
 #, c-format
 msgid "Configure hostname..."
 msgstr "Rechnername wählen ..."
 
-#: standalone/drakconnect:146 standalone/drakconnect:727
+#: standalone/drakconnect:149 standalone/drakconnect:769
 #, c-format
 msgid "LAN configuration"
 msgstr "LAN-Konfiguration"
 
-#: standalone/drakconnect:151
+#: standalone/drakconnect:154
 #, c-format
 msgid "Configure Local Area Network..."
 msgstr "Netzwerk konfigurieren"
 
-#: standalone/drakconnect:159 standalone/drakconnect:228
-#: standalone/drakconnect:232
+#: standalone/drakconnect:162 standalone/drakconnect:237
+#: standalone/drakconnect:241
 #, c-format
 msgid "Apply"
 msgstr "Anwenden"
 
-#: standalone/drakconnect:254 standalone/drakconnect:263
-#: standalone/drakconnect:277 standalone/drakconnect:283
-#: standalone/drakconnect:293 standalone/drakconnect:294
-#: standalone/drakconnect:540
+#: standalone/drakconnect:197
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Kabel-Verbindung"
+
+#: 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 ""
 
-#: 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
 #, fuzzy, c-format
 msgid "Account"
 msgstr "Über"
 
-#: 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 ""
 
-#: standalone/drakconnect:325
+#: standalone/drakconnect:344
 #, fuzzy, c-format
 msgid "DNS servers"
 msgstr "DNS-Server"
 
-#: standalone/drakconnect:332
+#: standalone/drakconnect:351
 #, fuzzy, c-format
 msgid "Search Domain"
 msgstr "NIS-Domain"
 
-#: standalone/drakconnect:338
+#: standalone/drakconnect:359
 #, fuzzy, c-format
 msgid "static"
 msgstr "Automatische IP-Adressen-Zuweisung"
 
-#: standalone/drakconnect:338
-#, fuzzy, c-format
-msgid "dhcp"
-msgstr "DHCP verwenden"
+#: standalone/drakconnect:359
+#, c-format
+msgid "DHCP"
+msgstr ""
 
-#: standalone/drakconnect:457
+#: standalone/drakconnect:482
 #, fuzzy, c-format
 msgid "Flow control"
 msgstr "<control>S"
 
 #
-#: standalone/drakconnect:458
+#: standalone/drakconnect:483
 #, fuzzy, c-format
 msgid "Line termination"
 msgstr "Internet-Station"
 
-#: standalone/drakconnect:463
-#, c-format
-msgid "Tone dialing"
-msgstr ""
-
-#: standalone/drakconnect:463
-#, c-format
-msgid "Pulse dialing"
-msgstr ""
-
-#: standalone/drakconnect:468
+#: standalone/drakconnect:493
 #, fuzzy, c-format
 msgid "Use lock file"
 msgstr "Datei auswählen"
 
-#: standalone/drakconnect:471
+#: standalone/drakconnect:496
 #, fuzzy, c-format
 msgid "Modem timeout"
 msgstr "BS-Startverzögerung für den Kernel"
 
-#: standalone/drakconnect:475
+#: standalone/drakconnect:500
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr ""
 
-#: standalone/drakconnect:478
+#: standalone/drakconnect:503
 #, fuzzy, c-format
 msgid "Busy wait"
 msgstr "Kuwait"
 
-#: standalone/drakconnect:482
+#: standalone/drakconnect:507
 #, fuzzy, c-format
 msgid "Modem sound"
 msgstr "Modem"
 
-#: standalone/drakconnect:483
+#: standalone/drakconnect:508
 #, fuzzy, c-format
 msgid "Enable"
 msgstr "aktivieren"
 
-#: standalone/drakconnect:483
+#: standalone/drakconnect:508
 #, fuzzy, c-format
 msgid "Disable"
 msgstr "deaktivieren"
 
-#: standalone/drakconnect:522 standalone/harddrake2:58
+#: standalone/drakconnect:558 standalone/harddrake2:58
 #, c-format
 msgid "Media class"
 msgstr "Medienklasse"
 
-#: standalone/drakconnect:523 standalone/drakfloppy:140
+#: standalone/drakconnect:559 standalone/drakfloppy:140
 #, c-format
 msgid "Module name"
 msgstr " Modulname "
 
-#: standalone/drakconnect:524
+#: standalone/drakconnect:560
 #, fuzzy, c-format
 msgid "Mac Address"
 msgstr "Broadcast-Adresse:"
 
-#: standalone/drakconnect:525 standalone/harddrake2:21
+#: standalone/drakconnect:561 standalone/harddrake2:21
 #, c-format
 msgid "Bus"
 msgstr "Bus"
 
-#: standalone/drakconnect:526 standalone/harddrake2:29
+#: standalone/drakconnect:562 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr "Standort auf dem Bus"
 
-#: standalone/drakconnect:587
+#: standalone/drakconnect:632 standalone/drakgw:248 standalone/drakpxe:138
 #, c-format
 msgid ""
-"An unexpected error has happened:\n"
-"%s"
-msgstr "Ein unerwarteter Fehler ist aufgetreten:/n %s"
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Ihr Rechner hat keine konfigurierte Netzwerkkarte. Bitte verwenden Sie erst "
+"HardDrake, bevor Sie weiter machen."
 
-#: standalone/drakconnect:597
+#: standalone/drakconnect:638
 #, c-format
 msgid "Remove a network interface"
 msgstr "Eine Netzwerkkarte entfernen"
 
-#: standalone/drakconnect:601
+#: standalone/drakconnect:642
 #, fuzzy, c-format
 msgid "Select the network interface to remove:"
 msgstr "Wählen Sie die Netzwerkkarte"
 
-#: standalone/drakconnect:617
+#: standalone/drakconnect:656
 #, fuzzy, c-format
 msgid ""
 "An error occured while deleting the \"%s\" network interface:\n"
@@ -18992,53 +19114,53 @@ msgstr ""
 "\n"
 "%s"
 
-#: standalone/drakconnect:619
+#: standalone/drakconnect:658
 #, c-format
 msgid ""
 "Congratulations, the \"%s\" network interface has been succesfully deleted"
-msgstr "Gratulation, die \"%s\" Netzwerk Karte wurde erfolgreich gelöscht"
+msgstr "Gratulation, die „%s“ Netzwerk Karte wurde erfolgreich gelöscht"
 
-#: standalone/drakconnect:636
+#: standalone/drakconnect:675
 #, fuzzy, c-format
 msgid "No Ip"
 msgstr "Keine lp"
 
-#: standalone/drakconnect:637
+#: standalone/drakconnect:676
 #, c-format
 msgid "No Mask"
 msgstr "Keine Maske"
 
-#: standalone/drakconnect:638 standalone/drakconnect:798
+#: standalone/drakconnect:677 standalone/drakconnect:840
 #, c-format
 msgid "up"
 msgstr ""
 
-#: standalone/drakconnect:638 standalone/drakconnect:798
+#: standalone/drakconnect:677 standalone/drakconnect:840
 #, fuzzy, c-format
 msgid "down"
 msgstr "Fertig"
 
-#: standalone/drakconnect:677 standalone/net_monitor:415
+#: standalone/drakconnect:718 standalone/net_monitor:415
 #, c-format
 msgid "Connected"
 msgstr "Verbunden"
 
-#: standalone/drakconnect:677 standalone/net_monitor:415
+#: standalone/drakconnect:718 standalone/net_monitor:415
 #, c-format
 msgid "Not connected"
 msgstr "Nicht Verbunden"
 
-#: standalone/drakconnect:678
+#: standalone/drakconnect:720
 #, c-format
 msgid "Disconnect..."
 msgstr "Trenne Verbindung ..."
 
-#: standalone/drakconnect:678
+#: standalone/drakconnect:720
 #, c-format
 msgid "Connect..."
 msgstr "Verbinde ..."
 
-#: standalone/drakconnect:707
+#: standalone/drakconnect:749
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
@@ -19047,17 +19169,17 @@ msgstr ""
 "WARNUNG: Es wurde bereits eine Internetverbindung gefunden. Vielleicht nutzt "
 "diese ihr Netzwerk."
 
-#: standalone/drakconnect:723
+#: standalone/drakconnect:765
 #, c-format
 msgid "Deactivate now"
 msgstr "Jetzt deaktivieren"
 
-#: standalone/drakconnect:723
+#: standalone/drakconnect:765
 #, c-format
 msgid "Activate now"
 msgstr "Jetzt aktivieren"
 
-#: standalone/drakconnect:731
+#: standalone/drakconnect:773
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -19065,29 +19187,29 @@ msgid ""
 msgstr ""
 "Sie haben noch keine Schnittstelle eingerichtet.\n"
 "Sie können dies tun, indem Sie die Schaltfläche \n"
-"\"Konfigurieren\" betätigen."
+"„Konfigurieren“ betätigen."
 
-#: standalone/drakconnect:745
+#: standalone/drakconnect:787
 #, c-format
 msgid "LAN Configuration"
 msgstr "LAN-Konfiguration"
 
-#: standalone/drakconnect:757
+#: standalone/drakconnect:799
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adapter %s: %s"
 
-#: standalone/drakconnect:766
+#: standalone/drakconnect:808
 #, c-format
 msgid "Boot Protocol"
 msgstr "Boot-Protokoll"
 
-#: standalone/drakconnect:767
+#: standalone/drakconnect:809
 #, c-format
 msgid "Started on boot"
 msgstr "Beim Hochfahren gestartet"
 
-#: standalone/drakconnect:803
+#: standalone/drakconnect:845
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
@@ -19096,7 +19218,7 @@ msgstr ""
 "Diese Schnittstelle wurde noch nicht eingerichtet.\n"
 "Starten Sie den Konfigurationsassistenten im Hauptfenster."
 
-#: standalone/drakconnect:858
+#: standalone/drakconnect:900
 #, fuzzy, c-format
 msgid ""
 "You don't have any configured Internet connection.\n"
@@ -19104,49 +19226,34 @@ msgid ""
 msgstr ""
 "Sie haben noch keine Internetverbindung eingerichtet.\n"
 "Sie können dies tun, indem Sie die Schaltfläche \n"
-"\"Konfigurieren\" betätigen."
+"„Konfigurieren“ betätigen."
 
-#: standalone/drakconnect:866
+#: standalone/drakconnect:908
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Konfiguration der Internetverbindung"
 
-#: standalone/drakconnect:907
-#, c-format
-msgid "Provider dns 1 (optional)"
-msgstr "Erster DNS des Providers (optional)"
-
-#: standalone/drakconnect:908
-#, c-format
-msgid "Provider dns 2 (optional)"
-msgstr "Zweiter DNS des Providers (optional)"
-
-#: standalone/drakconnect:921
-#, c-format
-msgid "Ethernet Card"
-msgstr "Netzwerkkarte"
-
-#: standalone/drakconnect:922
-#, c-format
-msgid "DHCP Client"
-msgstr "DHCP-Client"
+#: standalone/drakconnect:926
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Erster DNS-Server (optional)"
 
-#: standalone/drakconnect:951
+#: standalone/drakconnect:948
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Konfiguration der Internetverbindung"
 
-#: standalone/drakconnect:952
+#: standalone/drakconnect:949
 #, c-format
 msgid "Internet access"
 msgstr "Internetzugang"
 
-#: standalone/drakconnect:954 standalone/net_monitor:87
+#: standalone/drakconnect:951 standalone/net_monitor:87
 #, c-format
 msgid "Connection type: "
 msgstr "Verbindungstyp: "
 
-#: standalone/drakconnect:957
+#: standalone/drakconnect:954
 #, c-format
 msgid "Status:"
 msgstr "Status:"
@@ -19215,7 +19322,7 @@ msgstr " Größe "
 #: standalone/drakfloppy:143
 #, fuzzy, c-format
 msgid "Mkinitrd optional arguments"
-msgstr "Optionale Parameter für \"mkinitrd\""
+msgstr "Optionale Parameter für „mkinitrd“"
 
 #: standalone/drakfloppy:145
 #, c-format
@@ -19283,113 +19390,113 @@ msgid ""
 "\n"
 "<span foreground=\"Red\"><tt>%s</tt></span>"
 msgstr ""
-"Ich kann \"mkbootdisk\" nicht richtig beenden: \n"
+"Ich kann „mkbootdisk“ nicht richtig beenden: \n"
 "\n"
 "<span foreground=\"Red\"><tt>%s</tt></span>"
 
-#: standalone/drakfont:181
+#: standalone/drakfont:183
 #, c-format
 msgid "Search installed fonts"
 msgstr "Installierte Schriftarten suchen"
 
-#: standalone/drakfont:183
+#: standalone/drakfont:185
 #, c-format
 msgid "Unselect fonts installed"
 msgstr "Auswahl installierter Schriftarten zurücksetzen"
 
-#: standalone/drakfont:206
+#: standalone/drakfont:208
 #, c-format
 msgid "parse all fonts"
 msgstr "Alle Schriftarten analysieren"
 
-#: standalone/drakfont:208
+#: standalone/drakfont:210
 #, fuzzy, c-format
 msgid "No fonts found"
 msgstr "Keine Schriftarten gefunden"
 
-#: 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 "Fertig"
 
-#: standalone/drakfont:221
+#: standalone/drakfont:223
 #, fuzzy, c-format
 msgid "Could not find any font in your mounted partitions"
 msgstr "Ich konnte keine Schriften in Ihren eingehängten Partitionen finden"
 
-#: standalone/drakfont:254
+#: standalone/drakfont:256
 #, c-format
 msgid "Reselect correct fonts"
 msgstr "Neuwahl korrekter Schriftarten"
 
-#: standalone/drakfont:257
+#: standalone/drakfont:259
 #, fuzzy, c-format
 msgid "Could not find any font.\n"
 msgstr "Konnte keine Schriftarten finden.\n"
 
-#: standalone/drakfont:267
+#: standalone/drakfont:269
 #, c-format
 msgid "Search for fonts in installed list"
 msgstr "Suche installierter Schriften"
 
-#: standalone/drakfont:292
+#: standalone/drakfont:294
 #, c-format
 msgid "%s fonts conversion"
 msgstr "%sSchriftkonvertierung"
 
-#: standalone/drakfont:321
+#: standalone/drakfont:323
 #, fuzzy, c-format
 msgid "Fonts copy"
 msgstr "Kopiere Schriften"
 
-#: standalone/drakfont:324
+#: standalone/drakfont:326
 #, c-format
 msgid "True Type fonts installation"
 msgstr "Installation von TrueType-Schriftarten"
 
-#: standalone/drakfont:331
+#: standalone/drakfont:333
 #, c-format
 msgid "please wait during ttmkfdir..."
 msgstr "Bitte warten Sie - ttmkfdir arbeitet ..."
 
-#: standalone/drakfont:332
+#: standalone/drakfont:334
 #, c-format
 msgid "True Type install done"
 msgstr "TrueType-Installation beendet"
 
-#: standalone/drakfont:338 standalone/drakfont:353
+#: standalone/drakfont:340 standalone/drakfont:355
 #, c-format
 msgid "type1inst building"
-msgstr "Erzeuge \"type1inst\""
+msgstr "Erzeuge „type1inst“"
 
-#: standalone/drakfont:347
+#: standalone/drakfont:349
 #, c-format
 msgid "Ghostscript referencing"
 msgstr "Ghostscriptreferenz"
 
-#: standalone/drakfont:357
+#: standalone/drakfont:359
 #, c-format
 msgid "Suppress Temporary Files"
 msgstr "Temporäre Dateien löschen"
 
-#: standalone/drakfont:360
+#: standalone/drakfont:362
 #, c-format
 msgid "Restart XFS"
 msgstr "Neustart des X-Font-Servers"
 
-#: standalone/drakfont:406 standalone/drakfont:416
+#: standalone/drakfont:408 standalone/drakfont:418
 #, c-format
 msgid "Suppress Fonts Files"
 msgstr "Schriftartdateien unterdrücken"
 
-#: standalone/drakfont:418
+#: standalone/drakfont:420
 #, c-format
 msgid "xfs restart"
 msgstr "Neustart des X-Font-Servers"
 
-#: standalone/drakfont:426
+#: standalone/drakfont:428
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -19404,32 +19511,32 @@ msgstr ""
 "- Sie können die Schriftarten auf normalem Weg einbinden. In seltenen "
 "Fällenkönnen defekte Schriftarten den X-Server lahmlegen."
 
-#: standalone/drakfont:474 standalone/drakfont:483
+#: standalone/drakfont:477 standalone/drakfont:486
 #, c-format
 msgid "DrakFont"
 msgstr ""
 
-#: standalone/drakfont:484
+#: standalone/drakfont:487
 #, c-format
 msgid "Font List"
 msgstr "Font-Liste"
 
-#: standalone/drakfont:490
+#: standalone/drakfont:493
 #, c-format
 msgid "About"
 msgstr "Über"
 
-#: standalone/drakfont:492 standalone/drakfont:681 standalone/drakfont:719
+#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
 #, fuzzy, c-format
 msgid "Uninstall"
 msgstr "Nach dem Entfernen"
 
-#: standalone/drakfont:493
+#: standalone/drakfont:496
 #, fuzzy, c-format
 msgid "Import"
 msgstr "Schriftarten einbinden"
 
-#: standalone/drakfont:509
+#: standalone/drakfont:512
 #, c-format
 msgid ""
 "Copyright (C) 2001-2002 by MandrakeSoft \n"
@@ -19442,7 +19549,7 @@ msgid ""
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
 
-#: standalone/drakfont:518
+#: standalone/drakfont:521
 #, fuzzy, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -19475,7 +19582,7 @@ msgstr ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: standalone/drakfont:534
+#: standalone/drakfont:537
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -19493,12 +19600,12 @@ msgid ""
 "             Convert ttf font files to afm and pfb fonts\n"
 msgstr ""
 
-#: standalone/drakfont:553
+#: standalone/drakfont:556
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "Wählen Sie die Programme, die die Schriftarten verwenden sollen:"
 
-#: standalone/drakfont:554
+#: standalone/drakfont:557
 #, fuzzy, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -19513,198 +19620,198 @@ msgstr ""
 "- Sie können die Schriftarten auf normalem Weg einbinden. In seltenen "
 "Fällenkönnen defekte Schriftarten den X-Server lahmlegen."
 
-#: 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 "Generische Drucker"
 
-#: standalone/drakfont:583
+#: standalone/drakfont:586
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr ""
 "Wählen Sie eine Schriftartdatei bzw. ein Verzeichnis und betätigen Sie "
-"\"Hinzufügen\""
+"„Hinzufügen“"
+
+#: standalone/drakfont:587
+#, c-format
+msgid "File Selection"
+msgstr "Dateiauswahl"
 
-#: standalone/drakfont:597
+#: standalone/drakfont:600
 #, c-format
 msgid "You've not selected any font"
 msgstr "Sie haben keine Schriftart ausgewählt"
 
-#: standalone/drakfont:646
+#: standalone/drakfont:652
 #, fuzzy, c-format
 msgid "Import fonts"
 msgstr "Schriftarten einbinden"
 
-#: standalone/drakfont:651
+#: standalone/drakfont:657
 #, fuzzy, c-format
 msgid "Install fonts"
 msgstr "Schriftarten entfernen"
 
-#: standalone/drakfont:686
+#: standalone/drakfont:692
 #, c-format
 msgid "click here if you are sure."
 msgstr "Klicken Sie hier, wenn Sie sicher sind."
 
-#: standalone/drakfont:688
+#: standalone/drakfont:694
 #, c-format
 msgid "here if no."
 msgstr "Hier, falls nicht."
 
-#: standalone/drakfont:727
+#: standalone/drakfont:733
 #, c-format
 msgid "Unselected All"
 msgstr "Markierung löschen"
 
-#: standalone/drakfont:730
+#: standalone/drakfont:736
 #, c-format
 msgid "Selected All"
 msgstr "Alle auswählen"
 
-#: standalone/drakfont:733
+#: standalone/drakfont:739
 #, c-format
 msgid "Remove List"
 msgstr "Liste entfernen"
 
-#: standalone/drakfont:744 standalone/drakfont:763
+#: standalone/drakfont:750 standalone/drakfont:769
 #, fuzzy, c-format
 msgid "Importing fonts"
 msgstr "Schriftarten einbinden"
 
-#: standalone/drakfont:748 standalone/drakfont:768
+#: standalone/drakfont:754 standalone/drakfont:774
 #, c-format
 msgid "Initial tests"
 msgstr "Vortests"
 
-#: standalone/drakfont:749
+#: standalone/drakfont:755
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "Schriftarten auf Ihren Rechner kopieren"
 
-#: standalone/drakfont:750
+#: standalone/drakfont:756
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Schriftarten installieren und konvertieren"
 
-#: standalone/drakfont:751
+#: standalone/drakfont:757
 #, c-format
 msgid "Post Install"
 msgstr "Nach der Installation"
 
-#: standalone/drakfont:769
+#: standalone/drakfont:775
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "Entfernen von Schriftarten auf Ihrem Rechner"
 
-#: standalone/drakfont:770
+#: standalone/drakfont:776
 #, c-format
 msgid "Post Uninstall"
 msgstr "Nach dem Entfernen"
 
-#: standalone/drakgw:59 standalone/drakgw:190
+#: standalone/drakgw:58 standalone/drakgw:193
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "Teilen der Internet-Verbindung"
 
-#: standalone/drakgw:117 standalone/drakvpn:49
-#, fuzzy, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "Tja, wir unterstützen nur 2.4-Kernel."
-
-#: standalone/drakgw:128
+#: standalone/drakgw:124
 #, c-format
-msgid "Internet Connection Sharing currently enabled"
-msgstr "Gemeinsame Internetverbindung momentan eingeschaltet."
+msgid "Internet Connection Sharing currently disabled"
+msgstr "Gemeinsame Internet-Verbindung momentan abgeschaltet."
 
-#: 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 ""
-"Es wurde bereits eine gemeinsame Internet-Verbindung aufgesetzt.\n"
-"Momentan ist sie aktiviert.\n"
+"Die Einrichtung einer gemeinsamen Internet-Verbindung wurde bereits "
+"durchgeführt.\n"
+"Momentan ist sie deaktiviert.\n"
 "\n"
 "Was wollen Sie tun?"
 
-#: standalone/drakgw:133 standalone/drakvpn:99
+#: standalone/drakgw:129 standalone/drakvpn:125
 #, c-format
-msgid "disable"
-msgstr "deaktivieren"
+msgid "enable"
+msgstr "aktivieren"
 
-#: 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 "neu konfigurieren"
 
-#: 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 "Verwerfen"
 
 #: standalone/drakgw:136
 #, c-format
-msgid "Disabling servers..."
-msgstr "Deaktiviere Server ..."
+msgid "Enabling servers..."
+msgstr "Aktiviere Server..."
 
-#: standalone/drakgw:150
+#: standalone/drakgw:148
 #, c-format
-msgid "Internet Connection Sharing is now disabled."
-msgstr "Gemeinsame Internet-Verbindung ist nun abgeschaltet."
+msgid "Internet Connection Sharing is now enabled."
+msgstr "Die Internetverbindungsfreigabe ist nun eingeschaltet."
 
-#: standalone/drakgw:157
+#: standalone/drakgw:151
 #, c-format
-msgid "Internet Connection Sharing currently disabled"
-msgstr "Gemeinsame Internet-Verbindung momentan abgeschaltet."
+msgid "Internet Connection Sharing currently enabled"
+msgstr "Gemeinsame Internetverbindung momentan eingeschaltet."
 
-#: 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 ""
-"Die Einrichtung einer gemeinsamen Internet-Verbindung wurde bereits "
-"durchgeführt.\n"
-"Momentan ist sie deaktiviert.\n"
+"Es wurde bereits eine gemeinsame Internet-Verbindung aufgesetzt.\n"
+"Momentan ist sie aktiviert.\n"
 "\n"
 "Was wollen Sie tun?"
 
-#: standalone/drakgw:162 standalone/drakvpn:125
+#: standalone/drakgw:156 standalone/drakvpn:99
 #, c-format
-msgid "enable"
-msgstr "aktivieren"
+msgid "disable"
+msgstr "deaktivieren"
 
-#: standalone/drakgw:169
+#: standalone/drakgw:159
 #, c-format
-msgid "Enabling servers..."
-msgstr "Aktiviere Server..."
+msgid "Disabling servers..."
+msgstr "Deaktiviere Server ..."
 
-#: standalone/drakgw:175
+#: standalone/drakgw:174
 #, c-format
-msgid "Internet Connection Sharing is now enabled."
-msgstr "Die Internetverbindungsfreigabe ist nun eingeschaltet."
+msgid "Internet Connection Sharing is now disabled."
+msgstr "Gemeinsame Internet-Verbindung ist nun abgeschaltet."
 
-#: standalone/drakgw:191
+#: standalone/drakgw:194
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -19725,49 +19832,27 @@ msgstr ""
 "Anmerkung: Sie benötigen eine Netzwerkkarte, mit deren Hilfe Sie ein \n"
 "lokales Netz (LAN) aufsetzen können."
 
-#: 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 ""
-"Bitte geben Sie den Namen der Schnittstelle ein, über die Sie ins Internet "
-"gehen.\n"
-"\n"
-"Beispiele:\n"
-"\t\tppp+ für Modem- oder DSL-Verbindungen, \n"
-"\t\teth0, oder eth1 für eine Kabel-Verbindung, \n"
-"\t\tippp+ für eine ISDN-Verbindung.\n"
-
-#: standalone/drakgw:230
+#: standalone/drakgw:237
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Schnittstelle %s (verwendet Modul %s)"
 
-#: standalone/drakgw:231
+#: standalone/drakgw:238
 #, c-format
 msgid "Interface %s"
 msgstr "Schnittstelle: %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 ""
-"Ihr Rechner hat keine konfigurierte Netzwerkkarte. Bitte verwenden Sie erst "
-"HardDrake, bevor Sie weiter machen."
+msgid "No network adapter on your system!"
+msgstr "Sie haben keine Netzwerkkarte!"
 
-#: standalone/drakgw:247
+#: standalone/drakgw:254
 #, c-format
 msgid "Network interface"
 msgstr "Netzwerkkarte"
 
-#: standalone/drakgw:248
+#: standalone/drakgw:255
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -19782,7 +19867,7 @@ msgstr ""
 "\n"
 "Ich setze ihr lokales Netz damit auf."
 
-#: standalone/drakgw:255
+#: standalone/drakgw:262
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
@@ -19791,12 +19876,12 @@ msgstr ""
 "Bitte wählen Sie die Netzwerkkarte, die mit Ihrem lokalen Netzwerk \n"
 "verbunden ist."
 
-#: standalone/drakgw:283
+#: standalone/drakgw:291
 #, c-format
 msgid "Network interface already configured"
 msgstr "Ihr Netzwerk ist bereits konfiguriert"
 
-#: standalone/drakgw:284
+#: standalone/drakgw:292
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -19805,34 +19890,34 @@ msgid ""
 "\n"
 "You can do it manually but you need to know what you're doing."
 msgstr ""
-"Warnung, das Netzwerkgerät \"%s\" ist bereits konfiguriert.\n"
+"Warnung, das Netzwerkgerät „%s“ ist bereits konfiguriert.\n"
 "\n"
 "Wollen Sie eine automatische Neukonfiguration?\n"
 "\n"
 "Sie können auch eine manuelle Einrichtung vornehmen - dafür sollten Sie "
 "jedoch wissen, wie das funktioniert."
 
-#: standalone/drakgw:289
+#: standalone/drakgw:297
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Automatische Rekonfiguration"
 
-#: standalone/drakgw:289
+#: standalone/drakgw:297
 #, c-format
 msgid "No (experts only)"
 msgstr "Nein (nur für Experten)"
 
-#: standalone/drakgw:290
+#: standalone/drakgw:298
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Aktuelle Schnittstellenkonfiguration anzeigen"
 
-#: standalone/drakgw:291
+#: standalone/drakgw:299
 #, c-format
 msgid "Current interface configuration"
 msgstr "Aktuelle Schnittstellenkonfiguration"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:300
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -19842,14 +19927,14 @@ msgid ""
 "IP attribution: %s\n"
 "Driver: %s"
 msgstr ""
-"Aktuelle Konfiguration von \"%s\":\n"
+"Aktuelle Konfiguration von „%s“:\n"
 "\n"
 "Netzwerk: %s\n"
 "IP-Adresse: %s\n"
 "IP-Eigenschaften: %s\n"
 "Treiber: %s"
 
-#: standalone/drakgw:305
+#: standalone/drakgw:313
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -19877,12 +19962,12 @@ msgstr ""
 "Server für Sie aufsetzen.\n"
 "\n"
 
-#: standalone/drakgw:312
+#: standalone/drakgw:320
 #, c-format
 msgid "Local Network adress"
 msgstr "Lokale Netzwerkadresse"
 
-#: standalone/drakgw:316
+#: standalone/drakgw:324
 #, fuzzy, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -19898,74 +19983,74 @@ msgstr ""
 "sie ist.\n"
 "\n"
 
-#: standalone/drakgw:320
+#: standalone/drakgw:328
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "(Diese) DHCP-Server-IP"
 
-#: standalone/drakgw:321
+#: standalone/drakgw:329
 #, c-format
 msgid "The DNS Server IP"
 msgstr "Die IP des DNS-Servers"
 
-#: standalone/drakgw:322
+#: standalone/drakgw:330
 #, c-format
 msgid "The internal domain name"
 msgstr "Der interne Domänen-Name"
 
-#: standalone/drakgw:323
+#: standalone/drakgw:331
 #, c-format
 msgid "The DHCP start range"
 msgstr "Der DHCP Startbereich"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:332
 #, c-format
 msgid "The DHCP end range"
 msgstr ""
 
-#: standalone/drakgw:325
+#: standalone/drakgw:333
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "Standard-IP-Verleihdauer (in Sekunden)"
 
-#: standalone/drakgw:326
+#: standalone/drakgw:334
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "Maximale IP-Verleihdauer (in Sekunden)"
 
-#: standalone/drakgw:327
+#: standalone/drakgw:335
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Neukonfiguration des Geräts und des DHCP-Servers"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:342
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
-msgstr "Das lokale Netzwerk endet nicht auf \".0\" - bereinige."
+msgstr "Das lokale Netzwerk endet nicht auf “.0“ - bereinige."
 
-#: standalone/drakgw:344
+#: standalone/drakgw:352
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 "Es liegt ein möglicher LAN-Adressen-Konflikt in der Konfiguration\n"
 "von %s vor!\n"
 
-#: standalone/drakgw:354
+#: standalone/drakgw:362
 #, c-format
 msgid "Configuring..."
 msgstr "Konfiguriere ..."
 
-#: standalone/drakgw:355
+#: standalone/drakgw:363
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Konfiguriere Skripte, installiere Software, starte Dienste..."
 
-#: 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 "Probleme beim Installieren von Paket %s"
 
-#: standalone/drakgw:584
+#: standalone/drakgw:595
 #, fuzzy, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -20051,7 +20136,7 @@ msgstr "Benutzerdefinierte & Systemeinstellungen"
 msgid "Editable"
 msgstr "änderbar"
 
-#: standalone/drakperm:48 standalone/drakperm:315
+#: standalone/drakperm:48 standalone/drakperm:314
 #, c-format
 msgid "Path"
 msgstr "Pfad"
@@ -20066,7 +20151,7 @@ msgstr "Benutzer"
 msgid "Group"
 msgstr "Gruppe"
 
-#: standalone/drakperm:48 standalone/drakperm:327
+#: standalone/drakperm:48 standalone/drakperm:326
 #, c-format
 msgid "Permissions"
 msgstr "Berechtigungen"
@@ -20123,7 +20208,8 @@ msgstr "Neue Regel am Ende hinzufügen"
 msgid "Delete selected rule"
 msgstr "Markierte Regel entfernen"
 
-#: 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"
@@ -20147,7 +20233,7 @@ msgstr "Lesen"
 #: standalone/drakperm:253
 #, c-format
 msgid "Enable \"%s\" to read the file"
-msgstr "Aktiviere \"%s\" um die Datei zu lesen"
+msgstr "Aktiviere „%s“ um die Datei zu lesen"
 
 #: standalone/drakperm:256
 #, c-format
@@ -20157,7 +20243,7 @@ msgstr "Schreiben"
 #: standalone/drakperm:257
 #, c-format
 msgid "Enable \"%s\" to write the file"
-msgstr "\"%s\" aktivieren, um die Datei zu schreiben"
+msgstr "„%s“ aktivieren, um die Datei zu schreiben"
 
 #: standalone/drakperm:260
 #, c-format
@@ -20167,7 +20253,7 @@ msgstr "Ausführen"
 #: standalone/drakperm:261
 #, c-format
 msgid "Enable \"%s\" to execute the file"
-msgstr "Aktivierung von \"%s\", um die Datei auszuführen"
+msgstr "Aktivierung von „%s“, um die Datei auszuführen"
 
 #: standalone/drakperm:263
 #, c-format
@@ -20223,12 +20309,12 @@ msgstr "Aktueller Benutzer"
 msgid "When checked, owner and group won't be changed"
 msgstr "wenn markiert, werden Eigentümer und Gruppe nicht geändert"
 
-#: standalone/drakperm:301
+#: standalone/drakperm:300
 #, c-format
 msgid "Path selection"
 msgstr "Pfad-Auswahl"
 
-#: standalone/drakperm:321
+#: standalone/drakperm:320
 #, c-format
 msgid "Property"
 msgstr "Eigenschaft"
@@ -20334,7 +20420,7 @@ msgid ""
 "Leave it blank if you do not want to set up automatic installation mode.\n"
 "\n"
 msgstr ""
-"Bitte geben Sie an, wo sich die Datei \"auto_install.cfg\" befindet.\n"
+"Bitte geben Sie an, wo sich die Datei „auto_install.cfg“ befindet.\n"
 "\n"
 "Lassen Sie das Feld leer, wenn Sie keine automatische Installaton wollen.\n"
 "\n"
@@ -20354,7 +20440,7 @@ msgstr "Alle"
 msgid "LOCAL"
 msgstr "LOKAL"
 
-#: standalone/draksec:44
+#: standalone/draksec:44 standalone/drakvpn:1144
 #, c-format
 msgid "default"
 msgstr " Standard "
@@ -20374,7 +20460,7 @@ msgstr "Nein"
 msgid "yes"
 msgstr "Ja"
 
-#: standalone/draksec:70
+#: standalone/draksec:81
 #, c-format
 msgid ""
 "Here, you can setup the security level and administrator of your machine.\n"
@@ -20469,32 +20555,32 @@ msgstr ""
 "Sicherheitsregeln\n"
 "sind auf Maximum"
 
-#: standalone/draksec:118
+#: standalone/draksec:129
 #, c-format
 msgid "(default value: %s)"
 msgstr " (Voreinstellung: %s)"
 
-#: standalone/draksec:159
+#: standalone/draksec:170
 #, c-format
 msgid "Security Level:"
 msgstr "Sicherheitsebene:"
 
-#: standalone/draksec:162
+#: standalone/draksec:173
 #, c-format
 msgid "Security Alerts:"
 msgstr "Sicherheitswarnungen:"
 
-#: standalone/draksec:166
+#: standalone/draksec:177
 #, c-format
 msgid "Security Administrator:"
 msgstr "Sicherheitsadministrator (Benutzername oder E-Mail):"
 
-#: standalone/draksec:168
+#: standalone/draksec:179
 #, c-format
 msgid "Basic options"
 msgstr "grundlegende Optionen"
 
-#: standalone/draksec:181
+#: standalone/draksec:192
 #, c-format
 msgid ""
 "The following options can be set to customize your\n"
@@ -20504,27 +20590,27 @@ msgstr ""
 "anzupassen. Wenn Sie eine Erklärung brauchen, verwenden Sie den Hilfe "
 "Tooltip\n"
 
-#: standalone/draksec:183
+#: standalone/draksec:194
 #, c-format
 msgid "Network Options"
 msgstr "Netzwerkoptionen"
 
-#: standalone/draksec:183
+#: standalone/draksec:194
 #, c-format
 msgid "System Options"
 msgstr "Systemoptionen"
 
-#: standalone/draksec:229
+#: standalone/draksec:240
 #, c-format
 msgid "Periodic Checks"
 msgstr "Periodische Checks"
 
-#: standalone/draksec:247
+#: standalone/draksec:258
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "Bitte warten, Sicherheitsebene wird eingestellt..."
 
-#: standalone/draksec:253
+#: standalone/draksec:264
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "Bitte warten, Sicherheitsoptionen werden eingestellt..."
@@ -20569,7 +20655,7 @@ msgstr ""
 "\n"
 "\n"
 "Hinweis: Wenn Sie eine ISA PnP Sound Karte haben, müssen Sie das Programm "
-"sndconfig verwenden. Einfach in einer Konsole \"sndconfig\" eingeben."
+"sndconfig verwenden. Einfach in einer Konsole „sndconfig“ eingeben."
 
 #: standalone/draksplash:21
 #, c-format
@@ -20578,40 +20664,40 @@ msgid ""
 "Click \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"
 msgstr ""
 "Das Paket ‚ImageMagick‘ wird zur Beendigung der Konfiguration benötigt.\n"
-"Wählen Sie \"OK\", um ‚ImageMagick‘ zu installieren oder \"Abbrechen\" zum "
+"Wählen Sie „OK“, um ‚ImageMagick‘ zu installieren oder „Abbrechen“ zum "
 "Beenden."
 
-#: standalone/draksplash:67
+#: standalone/draksplash:68
 #, c-format
 msgid "first step creation"
 msgstr "Erster Schritt-Erstellung"
 
-#: standalone/draksplash:70
+#: standalone/draksplash:71
 #, c-format
 msgid "final resolution"
 msgstr "endgültige Auflösung"
 
-#: standalone/draksplash:71 standalone/draksplash:165
+#: standalone/draksplash:72
 #, c-format
 msgid "choose image file"
 msgstr "Image-Datei auswählen"
 
-#: standalone/draksplash:72
+#: standalone/draksplash:73
 #, c-format
 msgid "Theme name"
 msgstr "Design-Name"
 
-#: standalone/draksplash:77
+#: standalone/draksplash:78
 #, c-format
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: standalone/draksplash:87 standalone/draksplash:153
+#: standalone/draksplash:93 standalone/draksplash:158
 #, c-format
 msgid "Configure bootsplash picture"
 msgstr "Bootsplash-Bild konfigurieren"
 
-#: standalone/draksplash:90
+#: standalone/draksplash:96
 #, c-format
 msgid ""
 "x coordinate of text box\n"
@@ -20620,7 +20706,7 @@ msgstr ""
 "x Koordinaten des Textfeldes\n"
 "in der Zahl der Zeichen"
 
-#: standalone/draksplash:91
+#: standalone/draksplash:97
 #, c-format
 msgid ""
 "y coordinate of text box\n"
@@ -20629,17 +20715,17 @@ msgstr ""
 "Y-Koordinate des Textfeldes\n"
 "in Anzahl-Zeichen"
 
-#: standalone/draksplash:92
+#: standalone/draksplash:98
 #, c-format
 msgid "text width"
 msgstr "Text Breite"
 
-#: standalone/draksplash:93
+#: standalone/draksplash:99
 #, c-format
 msgid "text box height"
 msgstr "Höhe des Textfelds"
 
-#: standalone/draksplash:94
+#: standalone/draksplash:100
 #, c-format
 msgid ""
 "the progress bar x coordinate\n"
@@ -20648,94 +20734,257 @@ msgstr ""
 "Linke obere Ecke des\n"
 "Fortschrittsbalkens"
 
-#: standalone/draksplash:95
+#: standalone/draksplash:101
 #, c-format
 msgid ""
 "the progress bar y coordinate\n"
 "of its upper left corner"
 msgstr ""
 
-#: standalone/draksplash:96
+#: standalone/draksplash:102
 #, c-format
 msgid "the width of the progress bar"
 msgstr "Die Breite des Fortschrittbalkens"
 
-#: standalone/draksplash:97
+#: standalone/draksplash:103
 #, c-format
 msgid "the height of the progress bar"
 msgstr "Die Höhe des Fortschrittbalkens"
 
-#: standalone/draksplash:98
+#: standalone/draksplash:104
 #, c-format
 msgid "the color of the progress bar"
 msgstr "Die Farbe des Fortschrittbalkens"
 
-#: standalone/draksplash:113
+#: standalone/draksplash:119
 #, c-format
 msgid "Preview"
 msgstr "Vorschau"
 
-#: standalone/draksplash:115
+#: standalone/draksplash:121
 #, c-format
 msgid "Save theme"
 msgstr "Design speichern"
 
-#: standalone/draksplash:116
+#: standalone/draksplash:122
 #, c-format
 msgid "Choose color"
 msgstr "Farbauswahl"
 
-#: standalone/draksplash:119
+#: standalone/draksplash:125
 #, c-format
 msgid "Display logo on Console"
 msgstr "Logo auf Konsole anzeigen"
 
-#: standalone/draksplash:120
+#: standalone/draksplash:126
 #, c-format
 msgid "Make kernel message quiet by default"
 msgstr ""
 
-#: standalone/draksplash:156 standalone/draksplash:320
-#: standalone/draksplash:448
+#: standalone/draksplash:161 standalone/draksplash:319
+#: standalone/draksplash:462
 #, c-format
 msgid "Notice"
 msgstr "Anmerkung"
 
-#: 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 "Dieses Design hat noch keinen Bootsplash in %s!"
 
-#: standalone/draksplash:162
+#: standalone/draksplash:167
 #, c-format
 msgid "choose image"
 msgstr "Image-Datei auswählen"
 
-#: standalone/draksplash:204
+#: standalone/draksplash:209
 #, c-format
 msgid "saving Bootsplash theme..."
 msgstr "Sichere das Bootsplash-Design..."
 
-#: standalone/draksplash:428
+#: standalone/draksplash:443
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "Farbauswahl für den Fortschrittsbalken"
 
-#: standalone/draksplash:448
+#: standalone/draksplash:462
 #, c-format
 msgid "You must choose an image file first!"
 msgstr "Sie müssen zuerst eine Image-Datei auswählen!"
 
-#: standalone/draksplash:453
+#: standalone/draksplash:467
 #, c-format
 msgid "Generating preview ..."
 msgstr "Erzeuge Vorschau..."
 
-#: standalone/draksplash:499
+#: standalone/draksplash:512
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr "%s BootSplash (%s) Vorschau"
 
+#: standalone/drakups:63
+#, c-format
+msgid "Connected through a serial port or an usb cable"
+msgstr ""
+
+#: standalone/drakups:69
+#, c-format
+msgid "Add an UPS device"
+msgstr "Ein USV Gerät hinzufügen"
+
+#: standalone/drakups:72
+#, fuzzy, c-format
+msgid ""
+"Welcome to the UPS configuration utility.\n"
+"\n"
+"Here, you'll be add a new UPS to your system.\n"
+msgstr ""
+"Herzlich willkommen zum E-Mail-Benachrichtigungsassistenten.\n"
+"\n"
+"Hier können Sie Ihr Benachrichtigungssystem einrichten.\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 ""
+
+#: standalone/drakups:82
+#, fuzzy, c-format
+msgid "Autodetection"
+msgstr "Autoerkennung"
+
+#: standalone/drakups:90 standalone/harddrake2:134
+#, c-format
+msgid "Detection in progress"
+msgstr "Erkennung läuft"
+
+#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479
+#: standalone/logdrake:485
+#, c-format
+msgid "Congratulations"
+msgstr "Herzlichen Glückwunsch!"
+
+#: standalone/drakups:109
+#, fuzzy, c-format
+msgid "The wizard successfully added the following UPS devices:"
+msgstr "Der Assistent hat den Email Alarm erfolgreich konfiguriert."
+
+#: standalone/drakups:111
+#, c-format
+msgid "No new UPS devices was found"
+msgstr "Keine neuen USV Geräte gefunden"
+
+#: standalone/drakups:116 standalone/drakups:128
+#, fuzzy, c-format
+msgid "UPS driver configuration"
+msgstr "CUPS-Drucker-Konfiguration"
+
+#: standalone/drakups:116
+#, fuzzy, c-format
+msgid "Please select your UPS model."
+msgstr "Bitte testen Sie Ihre Maus"
+
+#: standalone/drakups:117
+#, c-format
+msgid "Manufacturer / Model:"
+msgstr "Hersteller / Modell"
+
+#: 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 ""
+
+#: standalone/drakups:133
+#, c-format
+msgid "Name:"
+msgstr "Name: "
+
+#: standalone/drakups:133
+#, fuzzy, c-format
+msgid "The name of your ups"
+msgstr "Name der CPU"
+
+#: standalone/drakups:134
+#, c-format
+msgid "The driver that manage your ups"
+msgstr ""
+
+#: standalone/drakups:135
+#, c-format
+msgid "Port:"
+msgstr "Port:"
+
+#: standalone/drakups:137
+#, fuzzy, c-format
+msgid "The port on which is connected your ups"
+msgstr "Der Typ des Busses, an dem die Maus angeschlossen ist."
+
+#: standalone/drakups:144
+#, fuzzy, c-format
+msgid "The wizard successfully configured the new \"%s\" UPS device."
+msgstr "Der Assistent hat den Email Alarm erfolgreich konfiguriert."
+
+#: standalone/drakups:232
+#, c-format
+msgid "UPS devices"
+msgstr "USV Geräte"
+
+#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266
+#: standalone/harddrake2:63
+#, c-format
+msgid "Name"
+msgstr "Name"
+
+#: standalone/drakups:250
+#, fuzzy, c-format
+msgid "UPS users"
+msgstr "Benutzer"
+
+#: standalone/drakups:265
+#, c-format
+msgid "Access Control Lists"
+msgstr "Access Control Liste"
+
+#: standalone/drakups:266
+#, c-format
+msgid "IP mask"
+msgstr ""
+
+#: standalone/drakups:277
+#, c-format
+msgid "Rules"
+msgstr "Regeln"
+
+#: standalone/drakups:278
+#, fuzzy, c-format
+msgid "Action"
+msgstr "Bearbeiten"
+
+#: standalone/drakups:278 standalone/drakvpn:1144 standalone/harddrake2:57
+#, c-format
+msgid "Level"
+msgstr "Ebene"
+
+#: standalone/drakups:278
+#, c-format
+msgid "ACL name"
+msgstr "ACL Name"
+
+#: standalone/drakups:297 standalone/drakups:301 standalone/drakups:310
+#, fuzzy, c-format
+msgid "DrakUPS"
+msgstr "DrakUSV"
+
+#: standalone/drakups:307
+#, c-format
+msgid "Welcome to the UPS configuration tools"
+msgstr "Willkommen zum USV Konfigurations Tool"
+
 #: standalone/drakvpn:71
 #, fuzzy, c-format
 msgid "DrakVPN"
@@ -20800,7 +21049,7 @@ msgstr "Aktiviere Server..."
 msgid "The VPN connection is now enabled."
 msgstr "Die Internetverbindungsfreigabe ist nun eingeschaltet."
 
-#: standalone/drakvpn:153 standalone/drakvpn:179
+#: standalone/drakvpn:153 standalone/drakvpn:181
 #, c-format
 msgid "Simple VPN setup."
 msgstr ""
@@ -20821,7 +21070,7 @@ msgid ""
 "drakconnect before going any further."
 msgstr ""
 
-#: standalone/drakvpn:180
+#: standalone/drakvpn:182
 #, c-format
 msgid ""
 "VPN connection.\n"
@@ -20837,12 +21086,12 @@ msgid ""
 "before going any further."
 msgstr ""
 
-#: standalone/drakvpn:192
+#: standalone/drakvpn:194
 #, fuzzy, c-format
 msgid "Kernel module."
 msgstr "Modul entfernen"
 
-#: standalone/drakvpn:193
+#: standalone/drakvpn:195
 #, c-format
 msgid ""
 "The kernel need to have ipsec support.\n"
@@ -20852,22 +21101,22 @@ msgid ""
 "This kernel has '%s' support."
 msgstr ""
 
-#: standalone/drakvpn:288
+#: standalone/drakvpn:290
 #, fuzzy, c-format
 msgid "Security Policies"
 msgstr "Sicherheitswarnungen:"
 
-#: standalone/drakvpn:288
+#: standalone/drakvpn:290
 #, c-format
 msgid "IKE daemon racoon"
 msgstr ""
 
-#: standalone/drakvpn:291 standalone/drakvpn:302
+#: standalone/drakvpn:293 standalone/drakvpn:304
 #, fuzzy, c-format
 msgid "Configuration file"
 msgstr "Konfiguration"
 
-#: standalone/drakvpn:292
+#: standalone/drakvpn:294
 #, c-format
 msgid ""
 "Configuration step !\n"
@@ -20879,7 +21128,7 @@ msgid ""
 "What would you like to configure ?\n"
 msgstr ""
 
-#: standalone/drakvpn:303
+#: standalone/drakvpn:305
 #, c-format
 msgid ""
 "Next, we will configure the %s file.\n"
@@ -20888,12 +21137,12 @@ msgid ""
 "Simply click on Next.\n"
 msgstr ""
 
-#: standalone/drakvpn:321 standalone/drakvpn:681
+#: standalone/drakvpn:323 standalone/drakvpn:683
 #, fuzzy, c-format
 msgid "%s entries"
 msgstr ", %s Sektoren"
 
-#: standalone/drakvpn:322
+#: standalone/drakvpn:324
 #, c-format
 msgid ""
 "The %s file contents\n"
@@ -20907,23 +21156,27 @@ msgid ""
 "What would you like to do ?\n"
 msgstr ""
 
-#: standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakvpn:331 standalone/drakvpn:692
 #, fuzzy, c-format
-msgid "Display"
+msgid ""
+"_:display here is a verb\n"
+"Display"
 msgstr "täglich"
 
-#: standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakvpn:331 standalone/drakvpn:692
 #, fuzzy, c-format
 msgid "Commit"
 msgstr "kompakt"
 
-#: standalone/drakvpn:343 standalone/drakvpn:347 standalone/drakvpn:705
-#: standalone/drakvpn:709
+#: standalone/drakvpn:345 standalone/drakvpn:349 standalone/drakvpn:707
+#: standalone/drakvpn:711
 #, fuzzy, c-format
-msgid "Display configuration"
+msgid ""
+"_:display here is a verb\n"
+"Display configuration"
 msgstr "LAN-Konfiguration"
 
-#: standalone/drakvpn:348
+#: standalone/drakvpn:350
 #, c-format
 msgid ""
 "The %s file does not exist.\n"
@@ -20933,12 +21186,12 @@ msgid ""
 "You'll have to go back and choose 'add'.\n"
 msgstr ""
 
-#: standalone/drakvpn:364
+#: standalone/drakvpn:366
 #, c-format
 msgid "ipsec.conf entries"
 msgstr ""
 
-#: standalone/drakvpn:365
+#: standalone/drakvpn:367
 #, c-format
 msgid ""
 "The %s file contains different sections.\n"
@@ -20953,27 +21206,27 @@ msgid ""
 "Choose the section you would like to add.\n"
 msgstr ""
 
-#: standalone/drakvpn:372
+#: standalone/drakvpn:374
 #, fuzzy, c-format
 msgid "config setup"
 msgstr "neu konfigurieren"
 
-#: standalone/drakvpn:372
+#: standalone/drakvpn:374
 #, fuzzy, c-format
 msgid "conn %default"
 msgstr " Standard "
 
-#: standalone/drakvpn:372
+#: standalone/drakvpn:374
 #, fuzzy, c-format
 msgid "normal conn"
 msgstr "Normaler Modus"
 
-#: standalone/drakvpn:378 standalone/drakvpn:419 standalone/drakvpn:506
+#: standalone/drakvpn:380 standalone/drakvpn:421 standalone/drakvpn:508
 #, fuzzy, c-format
 msgid "Exists !"
 msgstr "Verlassen"
 
-#: standalone/drakvpn:379 standalone/drakvpn:420
+#: standalone/drakvpn:381 standalone/drakvpn:422
 #, c-format
 msgid ""
 "A section with this name already exists.\n"
@@ -20983,7 +21236,7 @@ msgid ""
 "or change its name.\n"
 msgstr ""
 
-#: standalone/drakvpn:396
+#: standalone/drakvpn:398
 #, c-format
 msgid ""
 "This section has to be on top of your\n"
@@ -20995,37 +21248,37 @@ msgid ""
 "Choose continue or previous when you are done.\n"
 msgstr ""
 
-#: standalone/drakvpn:401
+#: standalone/drakvpn:403
 #, fuzzy, c-format
 msgid "interfaces"
 msgstr "Schnittstelle"
 
-#: standalone/drakvpn:402
+#: standalone/drakvpn:404
 #, c-format
 msgid "klipsdebug"
 msgstr ""
 
-#: standalone/drakvpn:403
+#: standalone/drakvpn:405
 #, c-format
 msgid "plutodebug"
 msgstr ""
 
-#: standalone/drakvpn:404
+#: standalone/drakvpn:406
 #, c-format
 msgid "plutoload"
 msgstr ""
 
-#: standalone/drakvpn:405
+#: standalone/drakvpn:407
 #, c-format
 msgid "plutostart"
 msgstr ""
 
-#: standalone/drakvpn:406
+#: standalone/drakvpn:408
 #, c-format
 msgid "uniqueids"
 msgstr ""
 
-#: standalone/drakvpn:440
+#: standalone/drakvpn:442
 #, c-format
 msgid ""
 "This is the first section after the config\n"
@@ -21038,52 +21291,52 @@ msgid ""
 "section.\n"
 msgstr ""
 
-#: standalone/drakvpn:447
-#, c-format
-msgid "pfs"
-msgstr ""
+#: standalone/drakvpn:449
+#, fuzzy, c-format
+msgid "PFS"
+msgstr "HFS"
 
-#: standalone/drakvpn:448
+#: standalone/drakvpn:450
 #, c-format
 msgid "keyingtries"
 msgstr ""
 
-#: standalone/drakvpn:449
+#: standalone/drakvpn:451
 #, c-format
 msgid "compress"
 msgstr ""
 
-#: standalone/drakvpn:450
+#: standalone/drakvpn:452
 #, c-format
 msgid "disablearrivalcheck"
 msgstr ""
 
-#: standalone/drakvpn:451 standalone/drakvpn:490
+#: standalone/drakvpn:453 standalone/drakvpn:492
 #, fuzzy, c-format
 msgid "left"
 msgstr "Löschen"
 
-#: standalone/drakvpn:452 standalone/drakvpn:491
+#: standalone/drakvpn:454 standalone/drakvpn:493
 #, c-format
 msgid "leftcert"
 msgstr ""
 
-#: standalone/drakvpn:453 standalone/drakvpn:492
+#: standalone/drakvpn:455 standalone/drakvpn:494
 #, c-format
 msgid "leftrsasigkey"
 msgstr ""
 
-#: standalone/drakvpn:454 standalone/drakvpn:493
+#: standalone/drakvpn:456 standalone/drakvpn:495
 #, c-format
 msgid "leftsubnet"
 msgstr ""
 
-#: standalone/drakvpn:455 standalone/drakvpn:494
+#: standalone/drakvpn:457 standalone/drakvpn:496
 #, c-format
 msgid "leftnexthop"
 msgstr ""
 
-#: standalone/drakvpn:484
+#: standalone/drakvpn:486
 #, c-format
 msgid ""
 "Your %s file has several sections, or connections.\n"
@@ -21092,47 +21345,47 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:487
+#: standalone/drakvpn:489
 #, fuzzy, c-format
 msgid "section name"
 msgstr "Name der Verbindung"
 
-#: standalone/drakvpn:488
+#: standalone/drakvpn:490
 #, fuzzy, c-format
 msgid "authby"
 msgstr "Pfad"
 
-#: standalone/drakvpn:489
+#: standalone/drakvpn:491
 #, fuzzy, c-format
 msgid "auto"
 msgstr "Automatisch"
 
-#: standalone/drakvpn:495
+#: standalone/drakvpn:497
 #, fuzzy, c-format
 msgid "right"
 msgstr "Hoch"
 
-#: standalone/drakvpn:496
+#: standalone/drakvpn:498
 #, fuzzy, c-format
 msgid "rightcert"
 msgstr "Höher"
 
-#: standalone/drakvpn:497
+#: standalone/drakvpn:499
 #, c-format
 msgid "rightrsasigkey"
 msgstr ""
 
-#: standalone/drakvpn:498
+#: standalone/drakvpn:500
 #, c-format
 msgid "rightsubnet"
 msgstr ""
 
-#: standalone/drakvpn:499
+#: standalone/drakvpn:501
 #, c-format
 msgid "rightnexthop"
 msgstr ""
 
-#: standalone/drakvpn:507
+#: standalone/drakvpn:509
 #, c-format
 msgid ""
 "A section with this name already exists.\n"
@@ -21142,7 +21395,7 @@ msgid ""
 "or change the name of the section.\n"
 msgstr ""
 
-#: standalone/drakvpn:539
+#: standalone/drakvpn:541
 #, c-format
 msgid ""
 "Add a Security Policy.\n"
@@ -21152,12 +21405,12 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:572 standalone/drakvpn:822
+#: standalone/drakvpn:574 standalone/drakvpn:824
 #, fuzzy, c-format
 msgid "Edit section"
 msgstr "Pfad-Auswahl"
 
-#: standalone/drakvpn:573
+#: standalone/drakvpn:575
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21166,18 +21419,18 @@ msgid ""
 "and then click on next.\n"
 msgstr ""
 
-#: standalone/drakvpn:576 standalone/drakvpn:656 standalone/drakvpn:827
-#: standalone/drakvpn:873
+#: standalone/drakvpn:578 standalone/drakvpn:658 standalone/drakvpn:829
+#: standalone/drakvpn:875
 #, fuzzy, c-format
 msgid "Section names"
 msgstr "Name der Verbindung"
 
-#: standalone/drakvpn:586
+#: standalone/drakvpn:588
 #, fuzzy, c-format
 msgid "Can't edit !"
 msgstr "Kann %s auf %s nicht finden"
 
-#: standalone/drakvpn:587
+#: standalone/drakvpn:589
 #, c-format
 msgid ""
 "You cannot edit this section.\n"
@@ -21188,7 +21441,7 @@ msgid ""
 "enable the oportunistic encryption.\n"
 msgstr ""
 
-#: standalone/drakvpn:596
+#: standalone/drakvpn:598
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -21197,7 +21450,7 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:607
+#: standalone/drakvpn:609
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21206,7 +21459,7 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:620
+#: standalone/drakvpn:622
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21216,7 +21469,7 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:641
+#: standalone/drakvpn:643
 #, c-format
 msgid ""
 "Edit a Security Policy.\n"
@@ -21226,12 +21479,12 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:652 standalone/drakvpn:869
+#: standalone/drakvpn:654 standalone/drakvpn:871
 #, fuzzy, c-format
 msgid "Remove section"
 msgstr "Liste entfernen"
 
-#: standalone/drakvpn:653 standalone/drakvpn:870
+#: standalone/drakvpn:655 standalone/drakvpn:872
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21240,7 +21493,7 @@ msgid ""
 "and then click on next.\n"
 msgstr ""
 
-#: standalone/drakvpn:682
+#: standalone/drakvpn:684
 #, c-format
 msgid ""
 "The racoon.conf file configuration.\n"
@@ -21254,7 +21507,7 @@ msgid ""
 "  - commit \t\t (writes the changes to the real file)"
 msgstr ""
 
-#: standalone/drakvpn:710
+#: standalone/drakvpn:712
 #, c-format
 msgid ""
 "The %s file does not exist\n"
@@ -21264,12 +21517,12 @@ msgid ""
 "You'll have to go back and choose configure.\n"
 msgstr ""
 
-#: standalone/drakvpn:724
+#: standalone/drakvpn:726
 #, c-format
 msgid "racoonf.conf entries"
 msgstr ""
 
-#: standalone/drakvpn:725
+#: standalone/drakvpn:727
 #, c-format
 msgid ""
 "The 'add' sections step.\n"
@@ -21282,22 +21535,22 @@ msgid ""
 "Choose the section you would like to add.\n"
 msgstr ""
 
-#: standalone/drakvpn:731
+#: standalone/drakvpn:733
 #, fuzzy, c-format
 msgid "path"
 msgstr "Pfad"
 
-#: standalone/drakvpn:731
+#: standalone/drakvpn:733
 #, fuzzy, c-format
 msgid "remote"
 msgstr "Entfernen"
 
-#: standalone/drakvpn:731
+#: standalone/drakvpn:733
 #, fuzzy, c-format
 msgid "sainfo"
 msgstr "Spanisch"
 
-#: standalone/drakvpn:739
+#: standalone/drakvpn:741
 #, c-format
 msgid ""
 "The 'add path' section step.\n"
@@ -21307,12 +21560,12 @@ msgid ""
 "Put your mouse over the certificate entry to obtain online help."
 msgstr ""
 
-#: standalone/drakvpn:742
+#: standalone/drakvpn:744
 #, fuzzy, c-format
 msgid "path type"
 msgstr "Typ ändern"
 
-#: standalone/drakvpn:746
+#: standalone/drakvpn:748
 #, c-format
 msgid ""
 "path include path : specifies a path to include\n"
@@ -21336,12 +21589,12 @@ msgid ""
 "Pre-shared key authentication method in phase 1."
 msgstr ""
 
-#: standalone/drakvpn:766
+#: standalone/drakvpn:768 standalone/drakvpn:861
 #, fuzzy, c-format
 msgid "real file"
 msgstr "Datei auswählen"
 
-#: standalone/drakvpn:789
+#: standalone/drakvpn:791
 #, c-format
 msgid ""
 "Make sure you already have the path sections\n"
@@ -21351,7 +21604,7 @@ msgid ""
 "Choose continue or previous when you are done.\n"
 msgstr ""
 
-#: standalone/drakvpn:806
+#: standalone/drakvpn:808
 #, c-format
 msgid ""
 "Make sure you already have the path sections\n"
@@ -21361,7 +21614,7 @@ msgid ""
 "Choose continue or previous when you are done.\n"
 msgstr ""
 
-#: standalone/drakvpn:823
+#: standalone/drakvpn:825
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21370,7 +21623,7 @@ msgid ""
 "to edit and then click on next.\n"
 msgstr ""
 
-#: standalone/drakvpn:834
+#: standalone/drakvpn:836
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -21381,7 +21634,7 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:843
+#: standalone/drakvpn:845
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -21391,7 +21644,7 @@ msgid ""
 "Choose continue when you are done to write the data."
 msgstr ""
 
-#: standalone/drakvpn:851
+#: standalone/drakvpn:853
 #, c-format
 msgid ""
 "This section has to be on top of your\n"
@@ -21405,17 +21658,12 @@ msgid ""
 "Choose continue or previous when you are done.\n"
 msgstr ""
 
-#: standalone/drakvpn:858
+#: standalone/drakvpn:860
 #, c-format
 msgid "path_type"
 msgstr ""
 
-#: standalone/drakvpn:859
-#, fuzzy, c-format
-msgid "real_file"
-msgstr "Datei auswählen"
-
-#: standalone/drakvpn:899
+#: standalone/drakvpn:901
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -21427,12 +21675,12 @@ msgid ""
 "section is configured."
 msgstr ""
 
-#: standalone/drakvpn:919
+#: standalone/drakvpn:921
 #, c-format
 msgid "Sainfo source address"
 msgstr ""
 
-#: standalone/drakvpn:920
+#: standalone/drakvpn:922
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21455,12 +21703,12 @@ msgid ""
 "\t172.16.1.0/24 is the source address"
 msgstr ""
 
-#: standalone/drakvpn:937
+#: standalone/drakvpn:939
 #, fuzzy, c-format
 msgid "Sainfo source protocol"
 msgstr "Europäisches Protokoll"
 
-#: standalone/drakvpn:938
+#: standalone/drakvpn:940
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21480,12 +21728,12 @@ msgid ""
 "\tthe first 'any' allows any protocol for the source"
 msgstr ""
 
-#: standalone/drakvpn:952
+#: standalone/drakvpn:954
 #, c-format
 msgid "Sainfo destination address"
 msgstr ""
 
-#: standalone/drakvpn:953
+#: standalone/drakvpn:955
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21508,12 +21756,12 @@ msgid ""
 "\t172.16.2.0/24 is the destination address"
 msgstr ""
 
-#: standalone/drakvpn:970
+#: standalone/drakvpn:972
 #, fuzzy, c-format
 msgid "Sainfo destination protocol"
 msgstr "Windows-Migrationswerkzeug"
 
-#: standalone/drakvpn:971
+#: standalone/drakvpn:973
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21533,12 +21781,12 @@ msgid ""
 "\tthe last 'any' allows any protocol for the destination"
 msgstr ""
 
-#: standalone/drakvpn:985
+#: standalone/drakvpn:987
 #, c-format
 msgid "PFS group"
 msgstr ""
 
-#: standalone/drakvpn:987
+#: standalone/drakvpn:989
 #, c-format
 msgid ""
 "define the group of Diffie-Hellman exponentiations.\n"
@@ -21548,12 +21796,12 @@ msgid ""
 "Or you can define 1, 2, or 5 as the DH group number."
 msgstr ""
 
-#: standalone/drakvpn:992
+#: standalone/drakvpn:994
 #, fuzzy, c-format
 msgid "Lifetime number"
 msgstr "eine Nummer"
 
-#: standalone/drakvpn:993
+#: standalone/drakvpn:995
 #, c-format
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
@@ -21574,12 +21822,12 @@ msgid ""
 "So, here, the lifetime numbers are 1, 1, 30, 30, 60 and 12.\n"
 msgstr ""
 
-#: standalone/drakvpn:1009
+#: standalone/drakvpn:1011
 #, c-format
 msgid "Lifetime unit"
 msgstr ""
 
-#: standalone/drakvpn:1011
+#: standalone/drakvpn:1013
 #, c-format
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
@@ -21601,27 +21849,32 @@ msgid ""
 "'hour'.\n"
 msgstr ""
 
-#: standalone/drakvpn:1027 standalone/drakvpn:1112
+#: standalone/drakvpn:1029 standalone/drakvpn:1114
 #, fuzzy, c-format
 msgid "Encryption algorithm"
 msgstr "Authentifizierung"
 
-#: standalone/drakvpn:1029
+#: standalone/drakvpn:1031
 #, fuzzy, c-format
 msgid "Authentication algorithm"
 msgstr "Authentifizierung"
 
-#: standalone/drakvpn:1031
+#: standalone/drakvpn:1033
 #, c-format
 msgid "Compression algorithm"
 msgstr ""
 
-#: standalone/drakvpn:1039
+#: standalone/drakvpn:1034
+#, fuzzy, c-format
+msgid "deflate"
+msgstr " Standard "
+
+#: standalone/drakvpn:1041
 #, fuzzy, c-format
 msgid "Remote"
 msgstr "Entfernen"
 
-#: standalone/drakvpn:1040
+#: standalone/drakvpn:1042
 #, c-format
 msgid ""
 "remote (address | anonymous) [[port]] { statements }\n"
@@ -21636,12 +21889,12 @@ msgid ""
 "remote ::1 [8000]"
 msgstr ""
 
-#: standalone/drakvpn:1048
+#: standalone/drakvpn:1050
 #, fuzzy, c-format
 msgid "Exchange mode"
 msgstr "Wählmodus"
 
-#: standalone/drakvpn:1050
+#: standalone/drakvpn:1052
 #, c-format
 msgid ""
 "defines the exchange mode for phase 1 when racoon is the\n"
@@ -21652,12 +21905,22 @@ msgid ""
 "racoon uses when it is the initiator.\n"
 msgstr ""
 
-#: standalone/drakvpn:1056
+#: standalone/drakvpn:1058
 #, fuzzy, c-format
 msgid "Generate policy"
 msgstr "Sicherheit"
 
-#: standalone/drakvpn:1058
+#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#, c-format
+msgid "off"
+msgstr ""
+
+#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#, fuzzy, c-format
+msgid "on"
+msgstr "Runter"
+
+#: standalone/drakvpn:1060
 #, c-format
 msgid ""
 "This directive is for the responder.  Therefore you\n"
@@ -21676,12 +21939,12 @@ msgid ""
 "the initiator case.  The default value is off."
 msgstr ""
 
-#: standalone/drakvpn:1072
+#: standalone/drakvpn:1074
 #, fuzzy, c-format
 msgid "Passive"
 msgstr "Palästina"
 
-#: standalone/drakvpn:1074
+#: standalone/drakvpn:1076
 #, c-format
 msgid ""
 "If you do not want to initiate the negotiation, set this\n"
@@ -21689,59 +21952,59 @@ msgid ""
 "server."
 msgstr ""
 
-#: standalone/drakvpn:1077
+#: standalone/drakvpn:1079
 #, c-format
 msgid "Certificate type"
 msgstr ""
 
-#: standalone/drakvpn:1079
+#: standalone/drakvpn:1081
 #, fuzzy, c-format
 msgid "My certfile"
 msgstr "Datei auswählen"
 
-#: standalone/drakvpn:1080
+#: standalone/drakvpn:1082
 #, fuzzy, c-format
 msgid "Name of the certificate"
 msgstr "Druckername"
 
-#: standalone/drakvpn:1081
+#: standalone/drakvpn:1083
 #, c-format
 msgid "My private key"
 msgstr ""
 
-#: standalone/drakvpn:1082
+#: standalone/drakvpn:1084
 #, fuzzy, c-format
 msgid "Name of the private key"
 msgstr "Druckername"
 
-#: standalone/drakvpn:1083
+#: standalone/drakvpn:1085
 #, fuzzy, c-format
 msgid "Peers certfile"
 msgstr "Datei auswählen"
 
-#: standalone/drakvpn:1084
+#: standalone/drakvpn:1086
 #, c-format
 msgid "Name of the peers certificate"
 msgstr ""
 
-#: standalone/drakvpn:1085
+#: standalone/drakvpn:1087
 #, fuzzy, c-format
 msgid "Verify cert"
 msgstr "sehr angenehm"
 
-#: 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 ""
 
-#: standalone/drakvpn:1089
+#: standalone/drakvpn:1091
 #, c-format
 msgid "My identifier"
 msgstr ""
 
-#: standalone/drakvpn:1090
+#: standalone/drakvpn:1092
 #, c-format
 msgid ""
 "specifies the identifier sent to the remote host and the\n"
@@ -21768,17 +22031,17 @@ msgid ""
 "my_identifier user_fqdn \"myemail@mydomain.com\""
 msgstr ""
 
-#: standalone/drakvpn:1110
+#: standalone/drakvpn:1112
 #, fuzzy, c-format
 msgid "Peers identifier"
 msgstr "Drucker"
 
-#: standalone/drakvpn:1111
+#: standalone/drakvpn:1113
 #, fuzzy, c-format
 msgid "Proposal"
 msgstr "Protokoll"
 
-#: standalone/drakvpn:1113
+#: standalone/drakvpn:1115
 #, c-format
 msgid ""
 "specify the encryption algorithm used for the\n"
@@ -21790,70 +22053,105 @@ msgid ""
 "For other transforms, this statement should not be used."
 msgstr ""
 
-#: standalone/drakvpn:1120
+#: standalone/drakvpn:1122
 #, c-format
 msgid "Hash algorithm"
 msgstr ""
 
-#: standalone/drakvpn:1121
+#: standalone/drakvpn:1123
 #, fuzzy, c-format
 msgid "Authentication method"
 msgstr "Authentifizierung"
 
-#: standalone/drakvpn:1122
+#: standalone/drakvpn:1124
 #, fuzzy, c-format
 msgid "DH group"
 msgstr "Gruppe"
 
-#: standalone/drakvpn:1129
+#: standalone/drakvpn:1131
 #, fuzzy, c-format
 msgid "Command"
 msgstr "Kommandozeile"
 
-#: standalone/drakvpn:1130
+#: standalone/drakvpn:1132
 #, c-format
 msgid "Source IP range"
 msgstr ""
 
-#: standalone/drakvpn:1131
+#: standalone/drakvpn:1133
 #, c-format
 msgid "Destination IP range"
 msgstr ""
 
-#: standalone/drakvpn:1132
+#: standalone/drakvpn:1134
 #, fuzzy, c-format
 msgid "Upper-layer protocol"
 msgstr "Europäisches Protokoll"
 
-#: standalone/drakvpn:1133
+#: standalone/drakvpn:1134 standalone/drakvpn:1141
+#, fuzzy, c-format
+msgid "any"
+msgstr "Tag"
+
+#: standalone/drakvpn:1136
 #, c-format
 msgid "Flag"
 msgstr ""
 
-#: standalone/drakvpn:1134
+#: standalone/drakvpn:1137
 #, fuzzy, c-format
 msgid "Direction"
 msgstr "Beschreibung"
 
-#: standalone/drakvpn:1135
+#: standalone/drakvpn:1138
 #, c-format
 msgid "IPsec policy"
 msgstr ""
 
-#: standalone/drakvpn:1137
+#: standalone/drakvpn:1138
+#, fuzzy, c-format
+msgid "ipsec"
+msgstr "Msec"
+
+#: standalone/drakvpn:1138
+#, fuzzy, c-format
+msgid "discard"
+msgstr "deaktiviert"
+
+#: standalone/drakvpn:1141
 #, fuzzy, c-format
 msgid "Mode"
 msgstr "Modell"
 
-#: standalone/drakvpn:1138
+#: standalone/drakvpn:1141
+#, fuzzy, c-format
+msgid "tunnel"
+msgstr "Kanal"
+
+#: standalone/drakvpn:1141
+#, fuzzy, c-format
+msgid "transport"
+msgstr "Gesendet"
+
+#: standalone/drakvpn:1143
 #, fuzzy, c-format
 msgid "Source/destination"
 msgstr "Arbeitsplatzrechner"
 
-#: standalone/drakvpn:1139 standalone/harddrake2:57
+#: standalone/drakvpn:1144
 #, c-format
-msgid "Level"
-msgstr "Ebene"
+msgid "require"
+msgstr ""
+
+#: standalone/drakvpn:1144
+#, fuzzy, c-format
+msgid "use"
+msgstr "Maus"
+
+#: standalone/drakvpn:1144
+#, fuzzy, c-format
+msgid "unique"
+msgstr "Martinique"
 
 #: standalone/drakxtv:46
 #, c-format
@@ -21961,7 +22259,7 @@ msgstr "Bis bald!"
 #: standalone/drakxtv:110
 #, c-format
 msgid "Now, you can run xawtv (under X Window!) !\n"
-msgstr "Sie können nun (unter X-Windows) \"xawtv\" starten.\n"
+msgstr "Sie können nun (unter X-Windows) „xawtv“ starten.\n"
 
 #: standalone/drakxtv:131
 #, c-format
@@ -22134,7 +22432,7 @@ msgstr "Alte Gerätedatei"
 #: standalone/harddrake2:42
 #, c-format
 msgid "old static device name used in dev package"
-msgstr "Alter statischer Name im \"dev\" Paket"
+msgstr "Alter statischer Name im „dev“ Paket"
 
 #: standalone/harddrake2:43
 #, c-format
@@ -22225,7 +22523,7 @@ msgid ""
 "after the \"halt\" instruction is used"
 msgstr ""
 "Einige der früheren i486DX-100 Chips wechseln nicht verlässlich in "
-"Betriebsmodus nachdem der \"halt\" Befehl benutz wurde."
+"Betriebsmodus nachdem der „halt“ Befehl benutz wurde."
 
 #: standalone/harddrake2:56
 #, c-format
@@ -22285,11 +22583,6 @@ msgstr "Anzahl der Maustasten"
 
 #: standalone/harddrake2:63
 #, c-format
-msgid "Name"
-msgstr "Name"
-
-#: standalone/harddrake2:63
-#, c-format
 msgid "the name of the CPU"
 msgstr "Name der CPU"
 
@@ -22346,13 +22639,13 @@ msgid ""
 "accesses to user memory (aka this is a bug guard)"
 msgstr "memory Zustand Prozessor memory"
 
-#: 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 "/_Optionen"
 
-#: 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
@@ -22400,17 +22693,12 @@ msgstr ""
 
 #: standalone/harddrake2:115
 #, c-format
-msgid "Select a device !"
-msgstr "Wählen Sie ein Gerät!"
-
-#: standalone/harddrake2:115
-#, c-format
 msgid ""
 "Once you've selected a device, you'll be able to see the device information "
 "in fields displayed on the right frame (\"Information\")"
 msgstr ""
 "Wenn Sie ein Gerät auswählen, werden im rechten Rahmen die Geräte-"
-"Informationen angezeigt (\"Informationen\")."
+"Informationen angezeigt („Informationen“)."
 
 #: standalone/harddrake2:120 standalone/printerdrake:173
 #, c-format
@@ -22436,48 +22724,43 @@ msgid ""
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
-"HardDrake - das Mandrake Linux Hardware-Konfigurationswerkzeug.\n"
+"HardDrake - das Mandrakelinux Hardware-Konfigurationswerkzeug.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 
-#: standalone/harddrake2:133
-#, c-format
-msgid "Detection in progress"
-msgstr "Erkennung läuft"
-
-#: standalone/harddrake2:140
+#: standalone/harddrake2:141
 #, c-format
 msgid "Harddrake2 version %s"
 msgstr "HardDrake2-Version %s"
 
-#: standalone/harddrake2:156
+#: standalone/harddrake2:157
 #, c-format
 msgid "Detected hardware"
 msgstr "Gefundene Hardware"
 
-#: standalone/harddrake2:161
+#: standalone/harddrake2:162
 #, c-format
 msgid "Configure module"
 msgstr "Modul konfigurieren"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:169
 #, c-format
 msgid "Run config tool"
 msgstr "Konfigurationswerkzeug starten"
 
-#: standalone/harddrake2:215
+#: standalone/harddrake2:216
 #, c-format
 msgid "unknown"
 msgstr "Unbekannt"
 
-#: standalone/harddrake2:216
+#: standalone/harddrake2:217
 #, c-format
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: standalone/harddrake2:234
+#: standalone/harddrake2:235
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
@@ -22485,22 +22768,22 @@ msgstr ""
 "Klicken Sie auf ein Gerät in der linken Leiste, um die entsprechende "
 "Information anzuzeigen"
 
-#: standalone/harddrake2:282
+#: standalone/harddrake2:286
 #, c-format
 msgid "secondary"
 msgstr "sekundär"
 
-#: standalone/harddrake2:282
+#: standalone/harddrake2:286
 #, c-format
 msgid "primary"
 msgstr "primär"
 
-#: standalone/harddrake2:290
+#: standalone/harddrake2:294
 #, c-format
 msgid "burner"
 msgstr "Brenner"
 
-#: standalone/harddrake2:290
+#: standalone/harddrake2:294
 #, c-format
 msgid "DVD"
 msgstr "DVD"
@@ -22522,210 +22805,210 @@ msgstr ""
 "Die Einstellungen wurden vorgenommen, werden jedoch erst nach einer "
 "Neuanmeldung wirksam"
 
-#: standalone/logdrake:50
-#, c-format
-msgid "Mandrake Tools Explanation"
+#: standalone/logdrake:51
+#, fuzzy, c-format
+msgid "Mandrake Tools Logs"
 msgstr "Erklärung der Mandrake-Programme"
 
-#: standalone/logdrake:51
+#: standalone/logdrake:52
 #, fuzzy, c-format
 msgid "Logdrake"
 msgstr "LogDrake"
 
-#: standalone/logdrake:64
+#: standalone/logdrake:65
 #, c-format
 msgid "Show only for the selected day"
 msgstr "Nur für diesen Tag zeigen"
 
-#: standalone/logdrake:71
+#: standalone/logdrake:72
 #, c-format
 msgid "/File/_New"
 msgstr "/Datei/_Neu"
 
-#: 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 "/Datei/_Öffnen"
 
-#: 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 "/Datei/_Speichern"
 
-#: 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 "/Datei/Speichern _unter ..."
 
-#: standalone/logdrake:75
+#: standalone/logdrake:76
 #, c-format
 msgid "/File/-"
 msgstr "/Datei/-"
 
-#: standalone/logdrake:78
+#: standalone/logdrake:79
 #, c-format
 msgid "/Options/Test"
 msgstr "/Optionen/Test"
 
-#: standalone/logdrake:80
+#: standalone/logdrake:81
 #, c-format
 msgid "/Help/_About..."
 msgstr "/Hilfe/_Über ..."
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr ""
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr ""
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr ""
 
-#: standalone/logdrake:114
+#: standalone/logdrake:113
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
 msgstr ""
 
-#: standalone/logdrake:118
+#: standalone/logdrake:117
 #, c-format
 msgid "search"
 msgstr "Suche"
 
-#: standalone/logdrake:130
+#: standalone/logdrake:129
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "Ein Werkzeug zum Überwachen Ihrer Logbücher"
 
-#: standalone/logdrake:131 standalone/net_monitor:85
+#: standalone/logdrake:130 standalone/net_monitor:85
 #, c-format
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, fuzzy, c-format
 msgid "Matching"
 msgstr "Übereinstimmung mit"
 
-#: standalone/logdrake:137
+#: standalone/logdrake:136
 #, c-format
 msgid "but not matching"
 msgstr "keine Übereinstimmung mit"
 
-#: standalone/logdrake:141
+#: standalone/logdrake:140
 #, c-format
 msgid "Choose file"
 msgstr "Datei wählen"
 
-#: 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 "Inhalt der Logbücher"
 
-#: standalone/logdrake:164 standalone/logdrake:377
+#: standalone/logdrake:163 standalone/logdrake:429
 #, c-format
 msgid "Mail alert"
 msgstr "E-Mail-Benachrichtigung"
 
-#: standalone/logdrake:171
+#: standalone/logdrake:170
 #, c-format
 msgid "The alert wizard had unexpectly failled:"
 msgstr ""
 
-#: standalone/logdrake:219
+#: standalone/logdrake:221
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr "Einen Moment, ich durchsuche: %s"
 
-#: standalone/logdrake:355
+#: standalone/logdrake:406
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Apache Web-Server"
 
-#: standalone/logdrake:356
+#: standalone/logdrake:407
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "DNS"
 
-#: 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 E-Mail-Server"
 
-#: 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-Dienst"
 
-#: standalone/logdrake:362
+#: standalone/logdrake:413
 #, c-format
 msgid "Xinetd Service"
 msgstr "Xinetd-Dienst"
 
-#: standalone/logdrake:372
+#: standalone/logdrake:424
 #, fuzzy, c-format
 msgid "Configure the mail alert system"
 msgstr "Das CUPS Drucker System konfigurieren"
 
-#: standalone/logdrake:373
+#: standalone/logdrake:425
 #, c-format
 msgid "Stop the mail alert system"
 msgstr ""
 
-#: standalone/logdrake:380
+#: standalone/logdrake:432
 #, c-format
 msgid "Mail alert configuration"
 msgstr "Mail-Benachrichtigungskonfiguration"
 
-#: standalone/logdrake:381
+#: standalone/logdrake:433
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -22736,17 +23019,17 @@ msgstr ""
 "\n"
 "Hier können Sie Ihr Benachrichtigungssystem einrichten.\n"
 
-#: standalone/logdrake:384
+#: standalone/logdrake:436
 #, fuzzy, c-format
 msgid "What do you want to do?"
-msgstr "Wo wollen Sie \"%s\" einhängen?"
+msgstr "Wo wollen Sie „%s“ einhängen?"
 
-#: standalone/logdrake:391
+#: standalone/logdrake:443
 #, fuzzy, c-format
 msgid "Services settings"
 msgstr "Dienste einstellen"
 
-#: standalone/logdrake:392
+#: standalone/logdrake:444
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
@@ -22754,56 +23037,51 @@ msgid ""
 msgstr ""
 "Sie werden benachrichtigt, falls einer der gewählten Dienste nicht mehr läuft"
 
-#: standalone/logdrake:399
+#: standalone/logdrake:451
 #, c-format
 msgid "Load setting"
 msgstr "Einstellungen laden"
 
-#: standalone/logdrake:400
+#: standalone/logdrake:452
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "Sie erhalten eine Nachricht, wenn die Load über diesen Wert steigt"
 
-#: standalone/logdrake:401
+#: standalone/logdrake:453
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "Systemauslastung"
 
-#: standalone/logdrake:406
+#: standalone/logdrake:458
 #, fuzzy, c-format
 msgid "Alert configuration"
 msgstr "Benachrichtigungskonfiguration"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:459
 #, c-format
 msgid "Please enter your email address below "
 msgstr "Bitte geben Sie Ihre E-Mail-Adresse ein"
 
-#: standalone/logdrake:408
+#: standalone/logdrake:460
 #, fuzzy, c-format
 msgid "and enter the name (or the IP) of the SMTP server you whish to use"
 msgstr ""
 "Geben Sie die IP-Adresse und den Port des Rechners ein, dessen Drucker Sie "
 "verwenden wollen. "
 
-#: standalone/logdrake:427 standalone/logdrake:433
-#, c-format
-msgid "Congratulations"
-msgstr "Herzlichen Glückwunsch!"
-
-#: standalone/logdrake:427
+#: standalone/logdrake:479
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr "Der Assistent hat den Email Alarm erfolgreich konfiguriert."
 
-#: standalone/logdrake:433
+#: standalone/logdrake:485
 #, fuzzy, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr "Der Assistent hat den Email Alarm erfolgreich konfiguriert."
 
-#: standalone/logdrake:492
+#: standalone/logdrake:544
 #, c-format
 msgid "Save as.."
 msgstr "Speichern unter..."
@@ -23118,7 +23396,20 @@ msgstr "Autoren: "
 msgid "Printer Management \n"
 msgstr "Drucker Verwaltung \n"
 
-#: standalone/scannerdrake:53
+#: standalone/scannerdrake:50
+#, fuzzy, c-format
+msgid ""
+"SANE packages need to be installed to use scanners.\n"
+"\n"
+"Do you want to install the SANE packages?"
+msgstr "Das Paket %s muss installiert sein. Soll ich es installieren?"
+
+#: standalone/scannerdrake:54
+#, fuzzy, c-format
+msgid "Aborting Scannerdrake."
+msgstr "ScannerDrake"
+
+#: standalone/scannerdrake:59
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
@@ -23126,99 +23417,99 @@ msgstr ""
 "Konnte die notwendigen Programmpakete zum Einrichten eines Scanners mit "
 "Scannerdrake nicht installieren."
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:60
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr "Scannerdrake wird jetzt nicht gestartet."
 
-#: standalone/scannerdrake:60 standalone/scannerdrake:452
+#: standalone/scannerdrake:66 standalone/scannerdrake:459
 #, c-format
 msgid "Searching for configured scanners ..."
 msgstr "Suche nach eingerichteten Scannern ..."
 
-#: standalone/scannerdrake:64 standalone/scannerdrake:456
+#: standalone/scannerdrake:70 standalone/scannerdrake:463
 #, c-format
 msgid "Searching for new scanners ..."
 msgstr "Suche nach neuen Scannern ..."
 
-#: standalone/scannerdrake:72 standalone/scannerdrake:478
+#: standalone/scannerdrake:78 standalone/scannerdrake:485
 #, c-format
 msgid "Re-generating list of configured scanners ..."
 msgstr "Erneuere die Liste der konfigurierten Scanner..."
 
-#: standalone/scannerdrake:94 standalone/scannerdrake:135
-#: standalone/scannerdrake:149
+#: standalone/scannerdrake:100 standalone/scannerdrake:141
+#: standalone/scannerdrake:155
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "Der %s wird von dieser Mandrake Linux-Version NICHT unterstützt."
+msgstr "Der %s wird von dieser Mandrakelinux-Version NICHT unterstützt."
 
-#: standalone/scannerdrake:97
+#: standalone/scannerdrake:103
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "%s an %s gefunden. Wollen Sie eine automatische Einrichtung?"
 
-#: standalone/scannerdrake:109
+#: standalone/scannerdrake:115
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr ""
 "%s ist nicht in der Scanner-Datenbank vorhanden. Wollen Sie ihn manuell "
 "einrichten?"
 
-#: standalone/scannerdrake:124
+#: standalone/scannerdrake:130
 #, c-format
 msgid "Select a scanner model"
 msgstr "Wählen Sie einen Scanner"
 
-#: standalone/scannerdrake:125
+#: standalone/scannerdrake:131
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:126
+#: standalone/scannerdrake:132
 #, c-format
 msgid "Detected model: %s"
 msgstr "Gefundendenes Modell: %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 "Der %s wird nicht von dieser Version von ScannerDrake unterstützt."
 
-#: standalone/scannerdrake:163 standalone/scannerdrake:177
+#: standalone/scannerdrake:169 standalone/scannerdrake:183
 #, c-format
 msgid "Do not install firmware file"
 msgstr "Keine Firmware Datei installieren"
 
-#: 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 ""
 
-#: 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 "Wenn das der Fall ist, kann das auch automatisch erledigt werden."
 
-#: 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 "
 "can be installed."
 msgstr ""
 
-#: 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 "
@@ -23228,110 +23519,110 @@ msgstr ""
 "Scanner bekommen haben, auf der Webseite des Herstellers oder auf Ihrer "
 "Windows Partition"
 
-#: standalone/scannerdrake:172 standalone/scannerdrake:231
+#: standalone/scannerdrake:178 standalone/scannerdrake:237
 #, c-format
 msgid "Install firmware file from"
 msgstr "Installiere Firmware Datei von"
 
-#: standalone/scannerdrake:192
+#: standalone/scannerdrake:198
 #, fuzzy, c-format
 msgid "Select firmware file"
 msgstr "Datei auswählen"
 
-#: 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 "Die Firmware Date %s existiert nicht oder ist unlesbar!"
 
-#: standalone/scannerdrake:218
+#: standalone/scannerdrake:224
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
 "everytime when they are turned on."
 msgstr ""
 
-#: 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 "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:225
+#: standalone/scannerdrake:231
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
 "firmware here by supplying the new firmware file."
 msgstr ""
 
-#: standalone/scannerdrake:227
+#: standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware for the"
 msgstr "Installiere Firmware für den"
 
-#: standalone/scannerdrake:250
+#: standalone/scannerdrake:256
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr "Firmware Datei auswählen für den %s"
 
-#: standalone/scannerdrake:276
+#: standalone/scannerdrake:282
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr "Die Firmware Datei für Ihren %s wurde erfolgreich installiert"
 
-#: standalone/scannerdrake:286
+#: standalone/scannerdrake:292
 #, c-format
 msgid "The %s is unsupported"
-msgstr "Der Scanner \"%s\" wird NICHT unterstützt"
+msgstr "Der Scanner „%s“ wird NICHT unterstützt"
 
-#: standalone/scannerdrake:291
+#: standalone/scannerdrake:297
 #, fuzzy, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
 "You can launch printerdrake from the %s Control Center in Hardware section."
 msgstr ""
-"Der Scanner \"%s\" muss von PrinterDrake konfiguriert werden.\n"
+"Der Scanner „%s“ muss von PrinterDrake konfiguriert werden.\n"
 "Sie können PrinterDrake im Mandrake Kontrollzentrum im Hardware-Bereich "
 "starten."
 
-#: 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 "Verfügbare Ports automatisch erkennen"
 
-#: 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 "Bitte wählen Sie den Gerätenamen, an dem Ihr \"%s\" hängt."
+msgstr "Bitte wählen Sie den Gerätenamen, an dem Ihr „%s“ hängt."
 
-#: standalone/scannerdrake:298
+#: standalone/scannerdrake:304
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(Anmerkung: Parallelports können nicht automatisch erkannt werden)"
 
-#: standalone/scannerdrake:300 standalone/scannerdrake:345
+#: standalone/scannerdrake:306 standalone/scannerdrake:351
 #, c-format
 msgid "choose device"
 msgstr "Gerät wählen"
 
-#: standalone/scannerdrake:334
+#: standalone/scannerdrake:340
 #, c-format
 msgid "Searching for scanners ..."
 msgstr "Suche nach neuen Scannern ..."
 
-#: standalone/scannerdrake:368
-#, c-format
+#: standalone/scannerdrake:375
+#, fuzzy, 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 ""
 "Ihr %s wurde konfiguriert.\n"
-"Sie können nun Dokumente mit \"XSane\" scannen (unter \"Multimedia/Graphik\" "
-"im Mandrake-Menü)."
+"Sie können nun Dokumente mit „XSane“ scannen (unter „Multimedia/Graphik“ im "
+"Mandrake-Menü)."
 
-#: standalone/scannerdrake:392
+#: standalone/scannerdrake:399
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -23344,7 +23635,7 @@ msgstr ""
 "%s\n"
 "sind direkt an Ihr System angeschlossen.\n"
 
-#: standalone/scannerdrake:393
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -23357,51 +23648,51 @@ msgstr ""
 "%s\n"
 "ist direkt an Ihr System angeschlossen.\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 "Ich konnte keine Scanner direkt an Ihrem Rechner finden.\n"
 
-#: standalone/scannerdrake:413
+#: standalone/scannerdrake:420
 #, c-format
 msgid "Search for new scanners"
 msgstr "Suche nach neuen Scannern"
 
-#: standalone/scannerdrake:419
+#: standalone/scannerdrake:426
 #, c-format
 msgid "Add a scanner manually"
 msgstr "Scanner manuell hinzufügen"
 
-#: standalone/scannerdrake:426
+#: standalone/scannerdrake:433
 #, fuzzy, c-format
 msgid "Install/Update firmware files"
 msgstr "Datei auswählen"
 
-#: standalone/scannerdrake:432
+#: standalone/scannerdrake:439
 #, c-format
 msgid "Scanner sharing"
 msgstr "Gemeinsamer Scannerzugriff"
 
-#: standalone/scannerdrake:491 standalone/scannerdrake:656
+#: standalone/scannerdrake:498 standalone/scannerdrake:663
 #, c-format
 msgid "All remote machines"
 msgstr "Alle entfernten Maschinen"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:806
+#: standalone/scannerdrake:510 standalone/scannerdrake:813
 #, c-format
 msgid "This machine"
 msgstr "Dieser Rechner"
 
-#: 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 ""
 "Hier können Sie einstellen, ob die Scanner, die an diesem Rechner hängen, "
 "für andere Rechner nutzbar sein sollen und falls ja, für welche."
 
-#: standalone/scannerdrake:544
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
@@ -23410,33 +23701,33 @@ msgstr ""
 "Sie können hier entscheiden, ob Scanner von anderen Rechnern automatisch auf "
 "diesem Rechner zur Verfügung gestellt werden sollen."
 
-#: standalone/scannerdrake:547
+#: standalone/scannerdrake:554
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr "Die Scanner dieses Rechners sind für andere Rechner nutzbar"
 
-#: standalone/scannerdrake:549
+#: standalone/scannerdrake:556
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "Scanner mit folgenden Rechnern teilen:"
 
-#: standalone/scannerdrake:563
+#: standalone/scannerdrake:570
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "Benutze Scanner auf entfernten Computern"
 
-#: standalone/scannerdrake:566
+#: standalone/scannerdrake:573
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "Verwende die Scanner am Rechner:"
 
-#: 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 "Gemeinsamer Zugriff auf lokale Scanner"
 
-#: standalone/scannerdrake:594
+#: standalone/scannerdrake:601
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
@@ -23445,58 +23736,68 @@ msgstr ""
 "Das sind die Rechner und Netzwerke, für die die lokalen Scanner zugänglich "
 "sein sollen:"
 
-#: standalone/scannerdrake:605 standalone/scannerdrake:755
+#: standalone/scannerdrake:612 standalone/scannerdrake:762
 #, c-format
 msgid "Add host"
 msgstr "Hinzufügen eines Rechners"
 
-#: standalone/scannerdrake:611 standalone/scannerdrake:761
+#: standalone/scannerdrake:618 standalone/scannerdrake:768
 #, c-format
 msgid "Edit selected host"
 msgstr "Änderung des markierten Rechners"
 
-#: standalone/scannerdrake:620 standalone/scannerdrake:770
+#: standalone/scannerdrake:627 standalone/scannerdrake:777
 #, c-format
 msgid "Remove selected host"
 msgstr "Löschen des markierten Rechners"
 
-#: 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 "Name/IP-Adresse des Rechners:"
 
-#: 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 ""
 "Wählen Sie den Rechner, dem der lokale Scanner bekannt gemacht werden soll:"
 
-#: 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 "Sie müssen einen Rechnernamen oder eine IP eingeben.\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 ""
 "Der Computer ist bereits in der Liste, er kann nicht erneut hinzugefügt "
 "werden.\n"
 
-#: standalone/scannerdrake:743
+#: standalone/scannerdrake:750
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "Scanner an anderen Rechnern nutzen"
 
-#: standalone/scannerdrake:744
+#: standalone/scannerdrake:751
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr "Das sind die Rechner, für die der Scanner zugänglich sein soll:"
 
-#: standalone/scannerdrake:904
+#: standalone/scannerdrake:908
+#, fuzzy, 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 ""
+"Das ntp Programmpaket muss installiert werden\n"
+"um das Network Time Protocol zu aktivieren"
+
+#: standalone/scannerdrake:912 standalone/scannerdrake:916
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr "Ihr(e) Scanner wird nicht im Netzwerk verfügbar sein"
@@ -23511,7 +23812,7 @@ msgstr "Einige Geräte in der Klasse %s wurden entfernt:\n"
 msgid "Some devices were added: %s\n"
 msgstr "Einige Geräte wurden hinzugefügt:%s\n"
 
-#: standalone/service_harddrake:94
+#: standalone/service_harddrake:98
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "Hardwareerkennung läuft"
@@ -23606,22 +23907,22 @@ msgstr "Aktualisieren"
 msgid "Exit install"
 msgstr "Installation beenden"
 
-#: ugtk2.pm:1047
+#: ugtk2.pm:1075
 #, c-format
 msgid "Is this correct?"
 msgstr "Ist dies richtig?"
 
-#: ugtk2.pm:1175
+#: ugtk2.pm:1203
 #, c-format
 msgid "Expand Tree"
 msgstr "Baum erweitern"
 
-#: ugtk2.pm:1176
+#: ugtk2.pm:1204
 #, c-format
 msgid "Collapse Tree"
 msgstr "Baum verkleinern"
 
-#: ugtk2.pm:1177
+#: ugtk2.pm:1205
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "Umschalten zwischen unsortiert und gruppiert"
@@ -23632,247 +23933,305 @@ msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
+"%s ist nicht installiert\n"
+"Wählen Sie „Weiter“ für die Installation, oder „Abbrechen“ zum Beenden."
 
 #: wizards.pm:99
 #, c-format
 msgid "Installation failed"
 msgstr "Die Installation schlug fehl!"
 
-#~ msgid "Configuration of a remote printer"
-#~ msgstr "Konfiguration eines Netzwerkdruckers"
+#: ../../share/compssUsers:999
+msgid "Office Workstation"
+msgstr "Büro-Arbeitsplatz"
 
-#, fuzzy
-#~ msgid "configure %s"
-#~ msgstr "neu konfigurieren"
+#: ../../share/compssUsers:999
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Office-Programme: Textverarbeitung (KWord, Abiword), Tabellenkalkulation "
+"(KSpread, Gnumeric), PDF-Betrachter, usw."
 
-#, fuzzy
-#~ msgid "protocol = "
-#~ msgstr "Protokoll"
+#: ../../share/compssUsers:999
+msgid "Game station"
+msgstr "Spiele-Station"
+
+#: ../../share/compssUsers:999
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Spiele: Arcade-, Brett-, Strategiespiele, usw."
+
+#: ../../share/compssUsers:999
+msgid "Multimedia station"
+msgstr "Multimedia-Station"
+
+#: ../../share/compssUsers:999
+msgid "Sound and video playing/editing programs"
+msgstr "Sound- und Video-Player/Editoren"
+
+#
+#: ../../share/compssUsers:999
+msgid "Internet station"
+msgstr "Internet-Station"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "level = "
-#~ msgstr "Ebene"
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr ""
+"Programme um E-Mails und News zu lesen und zu versenden (pine, mutt, tin..) "
+"und um im Internet zu surfen"
 
-#~ msgid "Office Workstation"
-#~ msgstr "Büro-Arbeitsplatz"
+#
+#: ../../share/compssUsers:999
+msgid "Network Computer (client)"
+msgstr "Netzwerk-Computer (Client)"
 
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Office-Programme: Textverarbeitung (KWord, Abiword), Tabellenkalkulation "
-#~ "(KSpread, Gnumeric), PDF-Betrachter, usw."
+#: ../../share/compssUsers:999
+msgid "Clients for different protocols including ssh"
+msgstr "Clients für verschiedene Protokolle, u.a. SSH"
 
-#~ msgid "Game station"
-#~ msgstr "Spiele-Station"
+#: ../../share/compssUsers:999
+msgid "Configuration"
+msgstr "Konfiguration"
 
-#~ msgid "Amusement programs: arcade, boards, strategy, etc"
-#~ msgstr "Spiele: Arcade-, Brett-, Strategiespiele, usw."
+#: ../../share/compssUsers:999
+msgid "Tools to ease the configuration of your computer"
+msgstr "Werkzeuge, die die Konfiguration Ihres Computers erleichtern"
 
-#~ msgid "Multimedia station"
-#~ msgstr "Multimedia-Station"
+#: ../../share/compssUsers:999
+msgid "Console Tools"
+msgstr "Konsolen-Werkzeuge"
 
-#~ msgid "Sound and video playing/editing programs"
-#~ msgstr "Sound- und Video-Player/Editoren"
+#: ../../share/compssUsers:999
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editoren, Shells, Dateiwerkzeuge, Konsolen"
 
-#
-#~ msgid "Internet station"
-#~ msgstr "Internet-Station"
+#: ../../share/compssUsers:999
+msgid "KDE Workstation"
+msgstr "KDE-Arbeitsplatz"
 
-#, fuzzy
-#~ msgid ""
-#~ "Set of tools to read and send mail and news (mutt, tin..) and to browse "
-#~ "the Web"
-#~ msgstr ""
-#~ "Programme um E-Mails und News zu lesen und zu versenden (pine, mutt, "
-#~ "tin..) und um im Internet zu surfen"
+#: ../../share/compssUsers:999
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"Die K Desktop Umgebung, die Standard-Arbeitsfläche mit einer Sammlung "
+"zugehöriger Programme"
 
-#
-#~ msgid "Network Computer (client)"
-#~ msgstr "Netzwerk-Computer (Client)"
+#: ../../share/compssUsers:999
+msgid "GNOME Workstation"
+msgstr "Gnome-Arbeitsplatz"
 
-#~ msgid "Clients for different protocols including ssh"
-#~ msgstr "Clients für verschiedene Protokolle, u.a. SSH"
+#: ../../share/compssUsers:999
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Eine grafische Umgebung mit anwenderfreundlichen Anwendungen und Werkzeugen"
 
-#~ msgid "Configuration"
-#~ msgstr "Konfiguration"
+#: ../../share/compssUsers:999
+msgid "Other Graphical Desktops"
+msgstr "Andere grafische Arbeitsflächen"
 
-#~ msgid "Tools to ease the configuration of your computer"
-#~ msgstr "Werkzeuge, die die Konfiguration Ihres Computers erleichtern"
+#: ../../share/compssUsers:999
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, usw."
 
-#~ msgid "Scientific Workstation"
-#~ msgstr "Wissenschaftliche Tools"
+#: ../../share/compssUsers:999
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C und C++ Entwicklung: Bibliotheken, Programme und Include-Dateien"
 
-#~ msgid "Scientific applications such as gnuplot"
-#~ msgstr "Wissenschaftliche Programme wie gnuplot"
+#: ../../share/compssUsers:999
+msgid "Documentation"
+msgstr "Dokumentation"
 
-#~ msgid "Console Tools"
-#~ msgstr "Konsolen-Werkzeuge"
+#: ../../share/compssUsers:999
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Bücher und HOWTOs zu GNU/Linux und Freier Software"
 
-#~ msgid "Editors, shells, file tools, terminals"
-#~ msgstr "Editoren, Shells, Dateiwerkzeuge, Konsolen"
+#: ../../share/compssUsers:999
+msgid "LSB"
+msgstr "Linux Standard Base (LSB)"
 
-#~ msgid "KDE Workstation"
-#~ msgstr "KDE-Arbeitsplatz"
+#: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Drittanbieterunterstützung"
 
-#~ msgid ""
-#~ "The K Desktop Environment, the basic graphical environment with a "
-#~ "collection of accompanying tools"
-#~ msgstr ""
-#~ "Die K Desktop Umgebung, die Standard-Arbeitsfläche mit einer Sammlung "
-#~ "zugehöriger Programme"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Server, Web/FTP"
 
-#~ msgid "Gnome Workstation"
-#~ msgstr "Gnome-Arbeitsplatz"
+#: ../../share/compssUsers:999
+msgid "Apache, Pro-ftpd"
+msgstr "Apache und Pro-ftpd"
 
-#~ msgid ""
-#~ "A graphical environment with user-friendly set of applications and "
-#~ "desktop tools"
-#~ msgstr ""
-#~ "Eine grafische Umgebung mit anwenderfreundlichen Anwendungen und "
-#~ "Werkzeugen"
+#: ../../share/compssUsers:999
+msgid "Mail"
+msgstr "E-Mail"
 
-#~ msgid "Other Graphical Desktops"
-#~ msgstr "Andere grafische Arbeitsflächen"
+#: ../../share/compssUsers:999
+msgid "Postfix mail server"
+msgstr "Postfix E-Mail-Server"
 
-#~ msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-#~ msgstr "Icewm, Window Maker, Enlightenment, Fvwm, usw."
+#: ../../share/compssUsers:999
+msgid "Database"
+msgstr "Server, Datenbank"
 
-#~ msgid "C and C++ development libraries, programs and include files"
-#~ msgstr "C und C++ Entwicklung: Bibliotheken, Programme und Include-Dateien"
+#: ../../share/compssUsers:999
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgeSQL oder MySQL-Datenbankserver"
 
-#~ msgid "Documentation"
-#~ msgstr "Dokumentation"
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Server, Firewall/Router"
 
-#~ msgid "Books and Howto's on Linux and Free Software"
-#~ msgstr "Bücher und HOWTOs zu GNU/Linux und Freier Software"
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Internet-Gateway"
 
-#~ msgid "LSB"
-#~ msgstr "Linux Standard Base (LSB)"
+#: ../../share/compssUsers:999
+msgid "Network Computer server"
+msgstr "Netzwerkrechner-Server"
 
-#~ msgid "Linux Standard Base. Third party applications support"
-#~ msgstr "Linux Standard Base. Drittanbieterunterstützung"
+#: ../../share/compssUsers:999
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-Server, SMB-Server, Proxy-Server, SSH-Server"
 
-#~ msgid "Web/FTP"
-#~ msgstr "Server, Web/FTP"
+#: ../../share/compssUsers:999
+msgid "Set of tools to read and send mail and news and to browse the Web"
+msgstr ""
+"Programme um E-Mails und News zu lesen und zu versenden und um im Internet "
+"zu surfen"
 
-#~ msgid "Apache, Pro-ftpd"
-#~ msgstr "Apache und Pro-ftpd"
+#~ msgid "Provider dns 1 (optional)"
+#~ msgstr "Erster DNS des Providers (optional)"
 
-#~ msgid "Mail"
-#~ msgstr "E-Mail"
+#~ msgid "Provider dns 2 (optional)"
+#~ msgstr "Zweiter DNS des Providers (optional)"
 
-#~ msgid "Postfix mail server"
-#~ msgstr "Postfix E-Mail-Server"
+#~ msgid "Ethernet Card"
+#~ msgstr "Netzwerkkarte"
 
-#~ msgid "Database"
-#~ msgstr "Server, Datenbank"
+#~ msgid "DHCP Client"
+#~ msgstr "DHCP-Client"
 
-#~ msgid "PostgreSQL or MySQL database server"
-#~ msgstr "PostgeSQL oder MySQL-Datenbankserver"
+#, fuzzy
+#~ msgid "Display"
+#~ msgstr "täglich"
 
-#~ msgid "Firewall/Router"
-#~ msgstr "Server, Firewall/Router"
+#, fuzzy
+#~ msgid "Display configuration"
+#~ msgstr "LAN-Konfiguration"
 
-#~ msgid "Internet gateway"
-#~ msgstr "Internet-Gateway"
+#~ msgid "Use tar and bzip2 (rather than tar and gzip)"
+#~ msgstr "Benutze tar und bzip2 (besser als tar und gzip)"
 
-#~ msgid "DNS/NIS "
-#~ msgstr "DNS/NIS"
+#~ msgid ""
+#~ "Change\n"
+#~ "Restore Path"
+#~ msgstr ""
+#~ "Ändern\n"
+#~ "Pfad wiederherstellen"
 
-#~ msgid "Domain Name and Network Information Server"
-#~ msgstr "Domänen- (DNS) und Netzwerk-Informations-Server (NIS)"
+#~ msgid "European protocol"
+#~ msgstr "Europäisches Protokoll"
+
+#~ msgid "Found \"%s\" interface do you want to use it ?"
+#~ msgstr "Schnittstelle \"%s\" gefunden. Wollen Sie sie verwenden?"
 
-#~ msgid "Network Computer server"
-#~ msgstr "Netzwerkrechner-Server"
+#~ msgid "What kind is your ISDN connection?"
+#~ msgstr "Um welchen Typ ISDN-Verbindung handelt es sich?"
 
-#~ msgid "NFS server, SMB server, Proxy server, ssh server"
-#~ msgstr "NFS-Server, SMB-Server, Proxy-Server, SSH-Server"
+#~ msgid "Do you want to start a new configuration ?"
+#~ msgstr "Möchten Sie eine neue Einstellung vornehmen?"
 
-#~ msgid "Set of tools to read and send mail and news and to browse the Web"
+#~ msgid ""
+#~ "I have detected an ISDN PCI card, but I don't know its type. Please "
+#~ "select a PCI card on the next screen."
 #~ msgstr ""
-#~ "Programme um E-Mails und News zu lesen und zu versenden und um im "
-#~ "Internet zu surfen"
+#~ "Ich habe eine PCI-ISDN-Karte gefunden, kenne sie jedoch nicht. Bitte "
+#~ "helfen Sie mir, indem Sie im nächsten Menü eine auswählen."
 
-#, fuzzy
-#~ msgid "add"
-#~ msgstr "Hinzufügen"
+#~ msgid "No ISDN PCI card found. Please select one on the next screen."
+#~ msgstr ""
+#~ "Ich konnte keine PCI-ISDN-Karte finden.\n"
+#~ "Bitte wählen Sie im nächsten Menü eine aus."
 
-#, fuzzy
-#~ msgid "edit"
-#~ msgstr "Bearbeiten"
+#~ msgid "DrakTermServ"
+#~ msgstr "DrakTermServ"
 
-#, fuzzy
-#~ msgid "remove"
-#~ msgstr "Entfernen"
+#~ msgid "Under Devel ... please wait."
+#~ msgstr "In Entwicklung, haben Sie noch etwas Geduld ..."
 
-#~ msgid "Add an UPS device"
-#~ msgstr "Ein USV Gerät hinzufügen"
+#~ msgid "Windows (FAT32)"
+#~ msgstr "Windows (FAT32)"
 
 #, fuzzy
 #~ msgid ""
-#~ "Welcome to the UPS configuration utility.\n"
-#~ "\n"
-#~ "Here, you'll be add a new UPS to your system.\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"
 #~ msgstr ""
-#~ "Herzlich willkommen zum E-Mail-Benachrichtigungsassistenten.\n"
+#~ "Bitte geben Sie den Namen der Schnittstelle ein, über die Sie ins "
+#~ "Internet gehen.\n"
 #~ "\n"
-#~ "Hier können Sie Ihr Benachrichtigungssystem einrichten.\n"
-
-#, fuzzy
-#~ msgid "Autodetection"
-#~ msgstr "Autoerkennung"
+#~ "Beispiele:\n"
+#~ "\t\tppp+ für Modem- oder DSL-Verbindungen, \n"
+#~ "\t\teth0, oder eth1 für eine Kabel-Verbindung, \n"
+#~ "\t\tippp+ für eine ISDN-Verbindung.\n"
 
-#~ msgid "No new UPS devices was found"
-#~ msgstr "Keine neuen USV Geräte gefunden"
+#~ msgid ""
+#~ "Enter your CD Writer device name\n"
+#~ " ex: 0,1,0"
+#~ msgstr ""
+#~ "Bitte geben Sie den Gerätenamen \n"
+#~ "Ihres CD-Brenners an, etwa \"0,1,0\"."
 
-#, fuzzy
-#~ msgid "UPS driver configuration"
-#~ msgstr "CUPS-Drucker-Konfiguration"
+#~ msgid "Scientific Workstation"
+#~ msgstr "Wissenschaftliche Tools"
 
-#, fuzzy
-#~ msgid "Please select your UPS model."
-#~ msgstr "Bitte testen Sie Ihre Maus"
+#~ msgid "Scientific applications such as gnuplot"
+#~ msgstr "Wissenschaftliche Programme wie gnuplot"
 
-#~ msgid "Manufacturer / Model:"
-#~ msgstr "Hersteller / Modell"
+#~ msgid "DNS/NIS "
+#~ msgstr "DNS/NIS"
 
-#~ msgid "Name:"
-#~ msgstr "Name: "
+#~ msgid "Domain Name and Network Information Server"
+#~ msgstr "Domänen- (DNS) und Netzwerk-Informations-Server (NIS)"
 
 #, fuzzy
-#~ msgid "The name of your ups"
-#~ msgstr "Der Name ihrer USV"
+#~ msgid "No wireless network adapter on your system!"
+#~ msgstr "Sie haben keine Netzwerkkarte!"
 
-#~ msgid "Port:"
-#~ msgstr "Port:"
+#~ msgid "Can't create log file!"
+#~ msgstr "Kann die Log Datei nicht erstellen!"
 
 #, fuzzy
-#~ msgid "The port on which is connected your ups"
-#~ msgstr "Der Typ des Busses, an dem die Maus angeschlossen ist."
+#~ msgid "dhcp"
+#~ msgstr "DHCP verwenden"
 
-#~ msgid "UPS devices"
-#~ msgstr "USV Geräte"
+#~ msgid "Please select media for backup..."
+#~ msgstr "Bitte wählen Sie ein Sicherungsmedium..."
 
 #, fuzzy
-#~ msgid "UPS users"
-#~ msgstr "Benutzer"
-
-#~ msgid "Access Control Lists"
-#~ msgstr "Access Control Liste"
+#~ msgid "real_file"
+#~ msgstr "Datei auswählen"
 
-#~ msgid "Rules"
-#~ msgstr "Regeln"
+#~ msgid "Configuration of a remote printer"
+#~ msgstr "Konfiguration eines Netzwerkdruckers"
 
 #, fuzzy
-#~ msgid "Action"
-#~ msgstr "Bearbeiten"
-
-#~ msgid "ACL name"
-#~ msgstr "ACL Name"
+#~ msgid "configure %s"
+#~ msgstr "neu konfigurieren"
 
-#~ msgid "Welcome to the UPS configuration tools"
-#~ msgstr "Willkommen zum USV Konfigurations Tool"
+#~ msgid "Gnome Workstation"
+#~ msgstr "Gnome-Arbeitsplatz"
 
 #, fuzzy
 #~ msgid "Running \"%s\" ..."
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:1287
+#: 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: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
@@ -9530,321 +9575,272 @@ msgstr "Kõik (tulemüür puudub)"
 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
+#: network/isdn.pm:113 network/netconnect.pm:424
 #, c-format
-msgid "ISDN Configuration"
-msgstr "ISDN seadistused"
+msgid "Unlisted - edit manually"
+msgstr "Puudub nimekirjast - käsitsimääramine"
 
-#: 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"
-
-#: network/isdn.pm:146
-#, c-format
-msgid "Which protocol do you want to use?"
-msgstr "Millist protokolli soovite kasutada?"
-
-#: network/isdn.pm:157
-#, c-format
-msgid "Found \"%s\" interface do you want to use it ?"
-msgstr "Leiti \"%s\" liides, kas soovite seda kasutada?"
-
-#: network/isdn.pm:164
-#, c-format
-msgid "What kind of card do you have?"
-msgstr "Millist tüüpi kaart Teil on?"
-
-#: 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
+#: 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 "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
-#, 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
+#: network/netconnect.pm:148
 #, c-format
-msgid "Bewan USB modem"
-msgstr "Bewan USB modem"
+msgid "Bewan modem"
+msgstr "Bewan modem"
 
-#: network/netconnect.pm:159
-#, c-format
-msgid "Bewan PCI modem"
-msgstr "Bewan PCI 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: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:301
+#: 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 "Do you want to start a new configuration ?"
-msgstr "Kas soovite alustada uue seadistusega?"
+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:335
+#: network/netconnect.pm:385
 #, 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."
+"\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 ""
-"Leiti küll PCI ISDN kaart, kuid selle tüüp on tundmatu. Palun valige PCI "
-"kaart järgmisel sammul."
+"\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:344
+#: network/netconnect.pm:389
 #, 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 "Continue"
+msgstr "Jätka"
 
-#: network/netconnect.pm:353
+#: 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 "Protocol"
+msgstr "Protokoll"
+
+#: network/netconnect.pm:421
+#, 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/netconnect.pm:423 network/netconnect.pm:529
+#: network/netconnect.pm:675
+#, c-format
+msgid "Provider:"
+msgstr "Teenusepakkuja:"
+
+#: 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:141
+#: standalone/drakautoinst:91
+#, c-format
+msgid "Creating auto install floppy (drivers disk)"
+msgstr "Automaatpaigaldusdisketi (draiverid) loomine"
+
+#: 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"
+msgstr "Vookontroll"
 
-#: standalone/drakconnect:458
-#, fuzzy, c-format
-msgid "Line termination"
-msgstr "Interneti tööjaam"
-
-#: 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"
+msgid "Third DNS server (optional)"
+msgstr "Kolmas nimeserver (pole kohustuslik)"
 
-#: standalone/drakconnect:922
-#, c-format
-msgid "DHCP Client"
-msgstr "DHCP klient"
-
-#: 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
+#: standalone/drakgw:124
 #, 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
-#, 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"
@@ -21832,13 +22173,30 @@ msgid ""
 "\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"
+"        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 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
@@ -22543,11 +23029,6 @@ msgstr "hiire nuppude arv"
 
 #: standalone/harddrake2:63
 #, c-format
-msgid "Name"
-msgstr "Nimi"
-
-#: standalone/harddrake2:63
-#, c-format
 msgid "the name of the CPU"
 msgstr "protsessori (CPU) nimi"
 
@@ -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
@@ -22661,11 +23142,6 @@ msgstr ""
 
 #: standalone/harddrake2:115
 #, c-format
-msgid "Select a device !"
-msgstr "Valige seade!"
-
-#: standalone/harddrake2:115
-#, c-format
 msgid ""
 "Once you've selected a device, you'll be able to see the device information "
 "in fields displayed on the right frame (\"Information\")"
@@ -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"
+#: ../../share/compssUsers:999
+msgid "Office Workstation"
+msgstr "Kontori tööjaam"
 
-#~ 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"
-
-#~ 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"
diff --git a/perl-install/share/po/fa.po b/perl-install/share/po/fa.po
index 561921f0f..d69d7cafb 100644
--- a/perl-install/share/po/fa.po
+++ b/perl-install/share/po/fa.po
@@ -1,20 +1,18 @@
 # translation of DrakX-fa.po to Persian
-# translation of DrakX_1.po to Persian
-# translation of DrakX.po to Persian
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# Abbas Izad <abbasizad@hotmail.com>, 2003
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Abbas Izad <abbasizad@hotmail.com>, 2003, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-fa\n"
-"POT-Creation-Date: 2004-02-19 18:02+0100\n"
-"PO-Revision-Date: 2003-09-21 21:51+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-19 14:32+0100\n"
+"PO-Revision-Date: 2004-03-20 15:13+0330\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
-"Language-Team: Persian\n"
+"Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.1\n"
 
 #: ../move/move.pm:359
 #, c-format
@@ -56,15 +54,15 @@ msgid ""
 "able to use Mandrake Move as a normal live Mandrake\n"
 "Operating System."
 msgstr ""
-"ما هیچ کلید USB را بر سیستم شما شناسائی نکردیم. اگر شما\n"
-"یک کلید USB را اکنون وصل کنید، انتقال ماندرایک توانایی ذخیره‌ی\n"
+"ما هیچ کلید USB را بر سیستم‌تان شناسائی نکردیم. اگر شما\n"
+"یک کلید USB را اکنون وصل کنید، ماندرایک Move توانایی ذخیره‌ی\n"
 "بطور شفاف داده‌ها را در آغازه‌ی شما و پیکربندی تمام سیستم برای\n"
 "آغازگری بعدی بر این رایانه یا یکی دیگر را دارد. توجه: اگر کلیدی را\n"
 "اکنون وصل کردید، چند ثانیه قبل از شناسائی دوباره صبر کنید.\n"
 "\n"
 "\n"
 "شما البته می‌توانید بدون یک کلید USB ادامه دهید - شما هنوز\n"
-"قادر خواهید بود از انتقال ماندرایک مانند سیستم عامل زنده‌ی\n"
+"قادر خواهید بود از ماندرایک Move مانند سیستم عامل زنده‌ی\n"
 "ماندرایک استفاده کنید.‌"
 
 #: ../move/move.pm:380
@@ -105,7 +103,7 @@ msgstr ""
 "بردارید،\n"
 "کلید را دوباره وصل کرده، و 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 "آغازگری مجدد"
@@ -157,44 +155,51 @@ msgstr "لطفاً صبر کنید، در حال شناسائی و پیکربن
 #: 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"
@@ -359,9 +364,9 @@ msgstr ""
 "چکار می خواهید انجام دهید؟"
 
 #: Xconfig/card.pm:312
-#, fuzzy, c-format
+#, c-format
 msgid "Can't install XFree package: %s"
-msgstr "نصب بسته %s"
+msgstr "نمی‌توان بسته‌ی XFree را نصب کرد: %s"
 
 #: Xconfig/card.pm:322
 #, c-format
@@ -453,15 +458,16 @@ msgstr ""
 msgid "Xpmac (installation display driver)"
 msgstr "Xpmac (نصب راه‌انداز نمایش)"
 
-#: 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 "سفارشی"
 
 #: 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 "ترک"
@@ -488,11 +494,11 @@ msgstr "آزمایش"
 
 #: 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 "گزینه‌ها"
@@ -525,7 +531,7 @@ msgstr "Plug'n Play"
 msgid "Generic"
 msgstr "عمومی"
 
-#: 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"
@@ -610,52 +616,51 @@ msgid "Graphics card: %s"
 msgstr "کارت گرافیک: %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 "تأیید"
 
-#: 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 "لغو"
 
 #: 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 "راهنما"
@@ -798,19 +803,20 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "تلویزیون شما از چه مأخذی استفاده می‌کند؟"
 
-#: 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 "لطفاً صبر کنید"
 
-#: any.pm:98
+#: any.pm:103
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "نصب بارگذارآغازگر در پیشروی است"
 
-#: any.pm:137
+#: any.pm:142
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -825,269 +831,269 @@ msgstr ""
 "\n"
 "شما از روی کدام دستگاه آغازگری می‌کنید؟"
 
-#: 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 "اولین بند گرداننده (MBR)"
 
-#: any.pm:161
+#: any.pm:166
 #, c-format
 msgid "First sector of the root partition"
 msgstr "اولین بند قسمت‌بندی ریشه"
 
-#: any.pm:163
+#: any.pm:168
 #, c-format
 msgid "On Floppy"
 msgstr "بر دیسکچه"
 
-#: 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 "پرش"
 
-#: any.pm:170
+#: any.pm:175
 #, c-format
 msgid "SILO Installation"
 msgstr "نصب SILO "
 
-#: any.pm:170
+#: any.pm:175
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "نصب LILO/grub"
 
-#: any.pm:171
+#: any.pm:176
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "کجا می‌خواهید بارگذارآغازگر را نصب کنید؟"
 
-#: any.pm:192
+#: any.pm:197
 #, c-format
 msgid "First sector of boot partition"
 msgstr "اولین بند قسمت‌بندی آغازگری"
 
-#: any.pm:204 any.pm:239
-#, c-format
-msgid "Bootloader main options"
-msgstr "گزینه‌های اصلی بارگذارآغازگری"
-
-#: any.pm:205
+#: any.pm:208
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "پیکربندی سبک آغازگری"
 
-#: any.pm:209
+#: any.pm:210 any.pm:244
+#, c-format
+msgid "Bootloader main options"
+msgstr "گزینه‌های اصلی بارگذارآغازگری"
+
+#: any.pm:214
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "اندازه‌ی حافظه موقت را در مگابایت بدهید"
 
-#: any.pm:211
+#: any.pm:216
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "گزینه‌ی ``محدودیت گزینه‌های خط فرمان'' بدون یک گذرواژه بی‌فایده است"
 
-#: 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 "گذرواژه‌ها مطابقت نمی‌کنند"
 
-#: 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 "لطفاً دوباره امتحان کنید"
 
-#: 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 "بارگذارآغازگری برای استفاده"
 
-#: any.pm:219
+#: any.pm:224
 #, c-format
 msgid "Bootloader installation"
 msgstr "نصب بارگذارآغازگری"
 
-#: any.pm:221 any.pm:244 help.pm:768
+#: any.pm:226 any.pm:249 help.pm:768
 #, c-format
 msgid "Boot device"
 msgstr "دستگاه آغازگری"
 
-#: any.pm:223
+#: any.pm:228
 #, c-format
 msgid "Delay before booting default image"
 msgstr "تأخیر قبل از آغازگری تصویر پیش‌فرض"
 
-#: any.pm:224 help.pm:768
+#: any.pm:229 help.pm:768
 #, c-format
 msgid "Enable ACPI"
 msgstr "بکار انداختن ACPI"
 
-#: any.pm:225
+#: any.pm:230
 #, c-format
 msgid "Force No APIC"
 msgstr "اجبار بدون APIC"
 
-#: 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 "گذرواژه"
 
-#: 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 "گذرواژه (دوباره)"
 
-#: any.pm:229
+#: any.pm:234
 #, c-format
 msgid "Restrict command line options"
 msgstr "محدودیت گزینه‌های خط فرمان"
 
-#: any.pm:229
+#: any.pm:234
 #, c-format
 msgid "restrict"
 msgstr "محدودیت"
 
-#: any.pm:231
+#: any.pm:236
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "پاک کردن شاخه‌ی /tmp در هر آغازگری"
 
-#: any.pm:232
+#: any.pm:237
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "اندازه‌ی دقیق حافظه اگر لازم باشد (%d مگابایت یافت شد)"
 
-#: any.pm:234
+#: any.pm:239
 #, c-format
 msgid "Enable multiple profiles"
 msgstr "بکار انداختن نمایه‌های چندگانه"
 
-#: any.pm:243
+#: any.pm:248
 #, c-format
 msgid "Init Message"
 msgstr "پیغام init"
 
-#: any.pm:245
+#: any.pm:250
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "تأخیر Firmware متن باز"
 
-#: any.pm:246
+#: any.pm:251
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "مدت انتظار آغازگری هسته"
 
-#: any.pm:247
+#: any.pm:252
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "بکار انداختن آغازگری سی‌دی؟"
 
-#: any.pm:248
+#: any.pm:253
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "بکار انداختن آغازگری OF؟"
 
-#: any.pm:249
+#: any.pm:254
 #, c-format
 msgid "Default OS?"
 msgstr "سیستم‌عامل پیش‌فرض؟"
 
-#: any.pm:290
+#: any.pm:295
 #, c-format
 msgid "Image"
 msgstr "تصویر"
 
-#: any.pm:291 any.pm:300
+#: any.pm:296 any.pm:305
 #, c-format
 msgid "Root"
 msgstr "ریشه"
 
-#: any.pm:292 any.pm:313
+#: any.pm:297 any.pm:318
 #, c-format
 msgid "Append"
 msgstr "پیوست به انتها"
 
-#: any.pm:294
+#: any.pm:299
 #, c-format
 msgid "Video mode"
 msgstr "حالت ویدیوئی"
 
-#: 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 "برچسب"
 
-#: 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 "پیش‌فرض"
 
-#: any.pm:314
+#: any.pm:319
 #, c-format
 msgid "Initrd-size"
 msgstr "اندازه‌ی-Initrd"
 
-#: any.pm:316
+#: any.pm:321
 #, c-format
 msgid "NoVideo"
 msgstr "بدون‌ ویدیو"
 
-#: any.pm:327
+#: any.pm:332
 #, c-format
 msgid "Empty label not allowed"
 msgstr "برچسب خالی اجازه داده نمی‌شود"
 
-#: any.pm:328
+#: any.pm:333
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "تصویر هسته‌ایی را باید مشخص کنید"
 
-#: any.pm:328
+#: any.pm:333
 #, c-format
 msgid "You must specify a root partition"
 msgstr "قسمت‌بندی ریشه‌ایی را باید مشخص کنید"
 
-#: any.pm:329
+#: any.pm:334
 #, c-format
 msgid "This label is already used"
 msgstr "این جدول از قبل مورد استفاده است"
 
-#: any.pm:342
+#: any.pm:347
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "چه نوع از ورودیی را می‌خواهید اضافه کنید؟"
 
-#: any.pm:343 standalone/drakbackup:1904
+#: any.pm:348
 #, c-format
 msgid "Linux"
 msgstr "لینوکس"
 
-#: any.pm:343
+#: any.pm:348
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "سیستم عامل دیگر (SunOS...)"
 
-#: any.pm:344
+#: any.pm:349
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "سیستم عامل دیگر (MacOS...)"
 
-#: any.pm:344
+#: any.pm:349
 #, c-format
 msgid "Other OS (windows...)"
 msgstr "سیستم عامل دیگر (ویندوز...)"
 
-#: any.pm:372
+#: any.pm:377
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1096,73 +1102,73 @@ msgstr ""
 "اینها فعلاً ورودی‌های منوی آغازگری شما هستند.\n"
 "می‌توانید ورودی‌های بیشتری را ایجاد کرده یا ورودی‌های موجود را تغییر دهید."
 
-#: any.pm:504
+#: any.pm:509
 #, c-format
 msgid "access to X programs"
 msgstr "دستیابی به برنامه‌های X"
 
-#: any.pm:505
+#: any.pm:510
 #, c-format
 msgid "access to rpm tools"
 msgstr "دستیابی به ابزارهای rpm"
 
-#: any.pm:506
+#: any.pm:511
 #, c-format
 msgid "allow \"su\""
 msgstr "اجازه دادن به \"su\""
 
-#: any.pm:507
+#: any.pm:512
 #, c-format
 msgid "access to administrative files"
 msgstr "دستیابی به پرونده‌های مدیریت"
 
-#: any.pm:508
+#: any.pm:513
 #, c-format
 msgid "access to network tools"
 msgstr "دستیابی به ابزارهای شبکه"
 
-#: any.pm:509
+#: any.pm:514
 #, c-format
 msgid "access to compilation tools"
 msgstr "دستیابی به ابزارهای کمپایل کردن"
 
-#: any.pm:515
+#: any.pm:520
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s از قبل اضافه شده است)"
 
-#: any.pm:520
+#: any.pm:525
 #, c-format
 msgid "This password is too simple"
 msgstr "این گذرواژه خیلی ساده است"
 
-#: any.pm:521
+#: any.pm:526
 #, c-format
 msgid "Please give a user name"
 msgstr "لطفاً نام کاربریی را بدهید"
 
-#: any.pm:522
+#: any.pm:527
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "نام کاربر باید فقط دارای حروف کوچک، `-' و `_' باشد"
 
-#: any.pm:523
+#: any.pm:528
 #, c-format
 msgid "The user name is too long"
 msgstr "نام کاربر بسیار طولانی است"
 
-#: any.pm:524
+#: any.pm:529
 #, c-format
 msgid "This user name has already been added"
 msgstr "این نام کاربر از قبل اضافه شده است"
 
-#: any.pm:528
+#: any.pm:533
 #, c-format
 msgid "Add user"
 msgstr "افزودن کاربر"
 
-#: any.pm:529
+#: any.pm:534
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1171,76 +1177,76 @@ msgstr ""
 "کاربری را وارد کنید\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 "انجام شد"
 
-#: any.pm:533 help.pm:52
+#: any.pm:538 help.pm:52
 #, c-format
 msgid "Accept user"
 msgstr "پذیرش کاربر"
 
-#: any.pm:544
+#: any.pm:549
 #, c-format
 msgid "Real name"
 msgstr "نام واقعی"
 
-#: 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 "نام کاربر"
 
-#: any.pm:548
+#: any.pm:553
 #, c-format
 msgid "Shell"
 msgstr "پوسته"
 
-#: any.pm:550
+#: any.pm:555
 #, c-format
 msgid "Icon"
 msgstr "شمایل"
 
-#: any.pm:591 security/l10n.pm:14
+#: any.pm:596 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "ثبت‌ورود خودکار"
 
-#: any.pm:592
+#: any.pm:597
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "می‌توانم رایانه‌اتان را برای ثبت‌ورود خودکار یک کاربر برپاسازی کنم."
 
-#: any.pm:593 help.pm:52
+#: any.pm:598 help.pm:52
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "آیا می‌خواهید از این قابلیت استفاده کنید؟"
 
-#: any.pm:594
+#: any.pm:599
 #, c-format
 msgid "Choose the default user:"
 msgstr "انتخاب کردن کاربر پیش‌فرض:"
 
-#: any.pm:595
+#: any.pm:600
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "انتخاب کردن مدیر پنجره‌ی برای اجرا:"
 
-#: any.pm:607
+#: any.pm:612
 #, c-format
 msgid "Please choose a language to use."
 msgstr "لطفاً زبان برای استفاده را انتخاب کنید."
 
-#: 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 ""
@@ -1248,48 +1254,48 @@ msgstr ""
 "را که می‌خواهید نصب کنید انتخاب نمایید. آنها وقتی نصب شما تکمیل \n"
 "شود و شما سیستم خود را راه‌اندازی مجدد کنید قابل دسترسی می‌باشند."
 
-#: any.pm:646 help.pm:660
+#: any.pm:651 help.pm:660
 #, c-format
 msgid "Use Unicode by default"
 msgstr "استفاده کردن از یونی‌کد در پیش‌فرض"
 
-#: any.pm:647 help.pm:660
+#: any.pm:652 help.pm:660
 #, c-format
 msgid "All languages"
 msgstr "همه‌ی زبان‌ها"
 
-#: 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 "کشور / منطقه"
 
-#: any.pm:684
+#: any.pm:689
 #, c-format
 msgid "Please choose your country."
 msgstr "لطفاً کشور خود را انتخاب کنید."
 
-#: any.pm:686
+#: any.pm:691
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "این لیست کامل کشورهای در دسترس می‌باشد"
 
-#: 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 "بیشتر"
 
-#: any.pm:818
+#: any.pm:823
 #, c-format
 msgid "No sharing"
 msgstr "بدون اشتراک"
 
-#: any.pm:818
+#: any.pm:823
 #, c-format
 msgid "Allow all users"
 msgstr "اجازه دادن به تمام کاربرها"
 
-#: any.pm:822
+#: any.pm:827
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1304,7 +1310,7 @@ msgstr ""
 "\n"
 "\"سفارشی\" اجازه‌ی هر-کاربر تکی را می‌دهد.\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."
@@ -1312,17 +1318,17 @@ msgstr ""
 "می‌توانید با استفاده از NFS یا Samba صادر کنید. لطفاً آن را که می‌خواهید "
 "استفاده کنید را انتخاب کنید."
 
-#: any.pm:846
-#, fuzzy, c-format
+#: any.pm:851
+#, c-format
 msgid "The package %s is going to be removed."
-msgstr "بسته‌های ذیل برداشته خواهند شد"
+msgstr "بسته‌ی %s برداشته خواهد شد."
 
-#: any.pm:858
+#: any.pm:863
 #, c-format
 msgid "Launch userdrake"
 msgstr "راه‌اندازی userdrake"
 
-#: any.pm:860
+#: any.pm:865
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1430,7 +1436,7 @@ msgid "Can't use broadcast with no NIS domain"
 msgstr "نمی‌توان از پخش همگانی بدون دامنه‌ی NIS استفاده کرد"
 
 #. -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"
@@ -1441,63 +1447,67 @@ msgid ""
 msgstr ""
 "به انتخاب‌گر سیستم عامل خوش آمدید!\n"
 "\n"
-"سیستم عاملی را از لیست بالا انتخاب کرده\n"
-"یا برای آغازگری پیش‌فرض صبر کنید.\n"
+"سیستم عاملی را از لیست بالا انتخاب کرده یا\n"
+"برای آغازگری پیش‌فرض صبر کنید.\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 با منوی گرافیکی"
 
-#: bootloader.pm:677 help.pm:768
+#: bootloader.pm:670 help.pm:768
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO با منوی متنی"
 
-#: 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 وجود ندارد"
 
-#: bootloader.pm:1178
+#: bootloader.pm:1175
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "نمی‌توانید بارگذارآغازگر را بر یک قسمت‌بندی %s نصب کنید\n"
 
-#: bootloader.pm:1218
+#: bootloader.pm:1219
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr ""
+"پیکربندی بارگذار آغازگر باید بروزسازی شود برای اینکه قسمت‌بندی شماره‌گذاری "
+"مجدد گردیده است"
 
-#: 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 ""
+"بارگذار آغازگر نمی‌تواند بدرستی نصب گردد. شما باید با گزینه‌ی نجات آغازگری "
+"کرده و \"%s\" را انتخاب کنید"
 
-#: bootloader.pm:1226
-#, fuzzy, c-format
+#: bootloader.pm:1227
+#, c-format
 msgid "Re-install Boot Loader"
-msgstr "نصب بارگزار آغازگر"
+msgstr "نصب-مجدد بارگذار آغازگر"
 
 #: common.pm:125
 #, c-format
@@ -1534,90 +1544,91 @@ msgstr "۱ دقیقه"
 msgid "%d seconds"
 msgstr "%d ثانیه"
 
-#: common.pm:196
+#: common.pm:197
 #, c-format
 msgid "Can't make screenshots before partitioning"
 msgstr "نمی‌توان قبل از قسمت‌بندی عکس‌صفحه گرفت"
 
-#: common.pm:203
+#: common.pm:204
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "عکس‌صفحه‌ها بعد از نصب در %s در دسترس خواهند بود"
 
-#: common.pm:268
+#: common.pm:269
 #, c-format
 msgid "kdesu missing"
 msgstr "kdesu حضور ندارد"
 
-#: common.pm:271
+#: common.pm:272
 #, c-format
 msgid "consolehelper missing"
 msgstr "consolehelper حضور ندارد"
 
-#: 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 "فرانسه"
 
-#: crypto.pm:15 lang.pm:207
+#: crypto.pm:15 lang.pm:212
 #, c-format
 msgid "Costa Rica"
 msgstr "کوستا ریکا"
 
-#: 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 "بلژیک"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:212
+#: crypto.pm:17 crypto.pm:30 lang.pm:217
 #, c-format
 msgid "Czech Republic"
 msgstr "جمهوری چک"
 
-#: 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 "آلمان"
 
-#: crypto.pm:19 crypto.pm:32 lang.pm:244
+#: crypto.pm:19 crypto.pm:32 lang.pm:249
 #, c-format
 msgid "Greece"
 msgstr "یونان"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:317
+#: crypto.pm:20 crypto.pm:33 lang.pm:322
 #, c-format
 msgid "Norway"
 msgstr "نروژ"
 
-#: 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 "سوئد"
 
-#: 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 "هلند"
 
-#: 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 "ایتالیا"
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:172
+#: crypto.pm:24 crypto.pm:38 lang.pm:177
 #, c-format
 msgid "Austria"
 msgstr "اطریش"
 
-#: 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 "ایالات متحده"
@@ -1704,7 +1715,7 @@ msgstr "لطفاً نخست ذخیره‌ی پشتیبانی از داده‌ه
 #: 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 ""
@@ -1738,6 +1749,7 @@ msgid "Please click on a partition"
 msgstr "لطفاً بر یک قسمت‌بندی کلیک کنید"
 
 #: 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 "جزئیات"
@@ -1778,7 +1790,7 @@ msgid "Windows"
 msgstr "ویندوز"
 
 #: 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 "دیگری"
@@ -1899,7 +1911,7 @@ msgstr "تمام قسمت‌بندی‌های اولیه استفاده شده
 
 #: diskdrake/interactive.pm:330
 #, c-format
-msgid "I can't add any more partition"
+msgid "I can't add any more partitions"
 msgstr "نمی‌توانم قسمت‌بندی بیشتری را اضافه کنم"
 
 #: diskdrake/interactive.pm:331
@@ -1950,13 +1962,19 @@ msgstr ""
 "ذخیره‌ی پشتیبان جدول قسمت‌بندی با اصل جدول هم‌اندازه نیست\n"
 "با این حال ادامه می‌دهید؟"
 
-#: 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 "هشدار"
@@ -2380,7 +2398,7 @@ msgstr "سیلندر %d به %d\n"
 #: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Number of logical extents: %d"
-msgstr ""
+msgstr "تعداد وسعت‌های منطقی: %d"
 
 #: diskdrake/interactive.pm:1174
 #, c-format
@@ -2521,8 +2539,8 @@ msgstr "این کلید رمز خیلی ساده است ( باید حداقل %d
 msgid "The encryption keys do not match"
 msgstr "کلیدهای رمزی مطابقت نمی‌کنند"
 
-#: 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 "کلید رمزی"
@@ -2565,7 +2583,7 @@ msgstr ""
 "لطفاً نام‌کاربری، گذرواژه و نام دامنه‌ی خود را برای دستیابی به این میزبان وارد "
 "کنید."
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3874
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3591
 #, c-format
 msgid "Username"
 msgstr "نام‌کاربر"
@@ -2595,17 +2613,17 @@ msgstr "بسته‌ی %s لازم است نصب شود. آیا می‌خواهی
 msgid "Mandatory package %s is missing"
 msgstr "بسته‌ی ضروری %s حضور ندارد"
 
-#: do_pkgs.pm:136
+#: do_pkgs.pm:143
 #, c-format
 msgid "Installing packages..."
 msgstr "نصب بسته‌ها..."
 
-#: do_pkgs.pm:210
+#: do_pkgs.pm:217
 #, c-format
 msgid "Removing packages..."
 msgstr "حذف بسته‌ها..."
 
-#: fs.pm:399
+#: fs.pm:409
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
@@ -2614,7 +2632,7 @@ msgstr ""
 "زمان دستیابی inode در این سیستم پرونده بروزسازی نگردد\n"
 "(برای دستیابی سریع‌تر بر spool اخبار و سرعت دادن به کارگزاران اخبار)."
 
-#: fs.pm:402
+#: fs.pm:412
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
@@ -2623,12 +2641,12 @@ msgstr ""
 "فقط می‌تواند بطور صریح سوار گردد (\n"
 "گزینه -a باعث سوار شدن سیستم پرونده‌ای نخواهد شد)."
 
-#: fs.pm:405
+#: fs.pm:415
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr "نویسه‌ یا دستگاه‌های مخصوص بلوک روی سیستم پرونده‌ای تعبیر نشوند."
 
-#: fs.pm:407
+#: fs.pm:417
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2640,7 +2658,7 @@ msgstr ""
 "برای\n"
 "ساختاری غیر از ساختار خود است مفید باشد."
 
-#: fs.pm:411
+#: fs.pm:421
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2651,17 +2669,17 @@ msgstr ""
 " (این بنظر امن می‌رسد، ولی در حقیقت اگر شما suidperl(1) را نصب \n"
 "کرده‌اید ناامن است )"
 
-#: fs.pm:415
+#: fs.pm:425
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "سوار کردن سیستم پرونده بطور فقط-خواندن."
 
-#: fs.pm:417
+#: fs.pm:427
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr "همه‌ی I/O به سیستم پرونده بایستی بطور هم‌گاه انجام گیرد."
 
-#: fs.pm:421
+#: fs.pm:431
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2677,52 +2695,57 @@ msgstr ""
 "پیاده کند. این گزینه، گزینه‌های noexec, nosuid, و nodev را در بر دارد (مگر\n"
 " آنکه بوسیله گزینه‌های دیگر در خط گزینه user,exec,dev,suid پایمال گردد)."
 
-#: fs.pm:429
+#: fs.pm:439
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "دادن حق نگارش به کاربران عادی"
 
-#: 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 "دادن حق خواندن به کاربران عادی"
+
+#: 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 قالب‌بندی %s ناموفق بود"
 
-#: fs.pm:628
+#: fs.pm:647
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "نمی‌دانم چگونه %s را با نوع %s قالب‌بندی کنم"
 
-#: fs.pm:635 fs.pm:642
+#: fs.pm:654 fs.pm:661
 #, c-format
 msgid "Formatting partition %s"
 msgstr "قالب‌بندی قسمت‌بندی %s"
 
-#: fs.pm:639
+#: fs.pm:658
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "ایجاد و قالب‌بندی پرونده %s"
 
-#: fs.pm:705 fs.pm:758
+#: fs.pm:718 fs.pm:771
 #, c-format
 msgid "Mounting partition %s"
 msgstr "سوار کردن قسمت‌بندی %s"
 
-#: fs.pm:706 fs.pm:759
+#: fs.pm:719 fs.pm:772
 #, c-format
 msgid "mounting partition %s in directory %s failed"
 msgstr "سوار کردن قسمت‌بندی %s در شاخه‌ی %s شکست خورد"
 
-#: fs.pm:726 fs.pm:734
+#: fs.pm:739 fs.pm:747
 #, c-format
 msgid "Checking %s"
 msgstr "بررسی %s"
 
-#: fs.pm:775 partition_table.pm:636
+#: fs.pm:788 partition_table.pm:638
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "خطا در پیاده کردن %s: %s"
 
-#: fs.pm:807
+#: fs.pm:820
 #, c-format
 msgid "Enabling swap partition %s"
 msgstr "بکار انداختن قسمت‌بندی حافظه‌ی مبادله %s"
@@ -2760,33 +2783,33 @@ msgstr ""
 "\n"
 "آیا موافق به از دست دادن تمام قسمت‌بندی‌ها می‌باشید؟\n"
 
-#: fsedit.pm:514
+#: fsedit.pm:513
 #, c-format
 msgid "You can't use JFS for partitions smaller than 16MB"
 msgstr "نمی‌توانید از JFS برای قسمت‌بندی‌های کوچکتر از ۱۶ مگابایت استفاده کنید"
 
-#: fsedit.pm:515
+#: fsedit.pm:514
 #, c-format
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr ""
 "نمی‌توانید از ReiserFS برای قسمت‌بندی‌های کوچکتر از ۳۲ مگابایت استفاده کنید"
 
-#: fsedit.pm:534
+#: fsedit.pm:533
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "نقاط سوارسازی باید با یک / شروع شوند"
 
-#: fsedit.pm:535
+#: fsedit.pm:534
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "نقاط سوارسازی فقط باید حاوی نویسه‌های الفبا باشند"
 
-#: fsedit.pm:536
+#: fsedit.pm:535
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "قسمت‌بندیی با نقطه‌ی سوارسازی %s از قبل وجود دارد\n"
 
-#: fsedit.pm:538
+#: fsedit.pm:537
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2797,12 +2820,23 @@ msgstr ""
 "هیچ بارگزار آغازگری قادر به اداره‌ی این بدون یک قسمت‌بندی /boot نمی‌باشد. \n"
 "لطفا یک قسمت‌بندی /boot را اضافه کنید"
 
-#: fsedit.pm:541
+#: fsedit.pm:540
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "نمی‌توانید از یک حجم منطقی LVM برای نقطه سوارسازی %s استفاده کنید"
 
-#: 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 ""
+"شما حجم منطقی LVM را مانند ریشه (/) انتخاب کرده‌اید. \n"
+"هیچ بارگزار آغازگری قادر به اداره‌ی این بدون یک قسمت‌بندی /boot نمی‌باشد. \n"
+"لطفا مطمئن شوید که یک قسمت‌بندی /boot را اضافه کرده‌اید"
+
+#: fsedit.pm:545
 #, c-format
 msgid ""
 "You may not be able to install lilo (since lilo doesn't handle a LV on "
@@ -2811,12 +2845,12 @@ msgstr ""
 "ممکن است نتوانید lilo را نصب کنید (برای اینکه lilo نمی‌تواند یک LV را بر "
 "چندین PV اداره کند)"
 
-#: fsedit.pm:546 fsedit.pm:548
+#: fsedit.pm:548 fsedit.pm:550
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "این شاخه باید درون سیستم پرونده‌ی ریشه باقی بماند"
 
-#: fsedit.pm:550
+#: fsedit.pm:552
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
@@ -2825,23 +2859,23 @@ msgstr ""
 "شما به یک سیستم پرونده‌ی واقعی (ext2/ext3, reiserfs, xfs, یا jfs) برای این "
 "نقطه سوارسازی احتیاج دارید\n"
 
-#: fsedit.pm:552
+#: fsedit.pm:554
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr ""
 "نمی‌توانید از سیستم پرونده‌ی رمزگذاری شده برای نقطه سوارسازی %s استفاده کنید"
 
-#: fsedit.pm:613
+#: fsedit.pm:615
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "فضای آزاد کافی برای جاسازی-خودکار وجود ندارد"
 
-#: fsedit.pm:615
+#: fsedit.pm:617
 #, c-format
 msgid "Nothing to do"
 msgstr "کاری برای انجام نیست"
 
-#: fsedit.pm:711
+#: fsedit.pm:713
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "خطا در گشودن %s برای نگارش: %s"
@@ -2876,7 +2910,7 @@ msgstr "نگارشگرهای سی‌دی/دی‌وی‌دی"
 msgid "DVD-ROM"
 msgstr "دی‌وی‌دی-رم"
 
-#: harddrake/data.pm:59 standalone/drakbackup:2409
+#: harddrake/data.pm:59 standalone/drakbackup:2116
 #, c-format
 msgid "Tape"
 msgstr "نوار"
@@ -2916,36 +2950,41 @@ msgstr "پردازنده‌ها"
 msgid "ISDN adapters"
 msgstr "سازوارگرهای ISDN "
 
-#: harddrake/data.pm:71
+#: harddrake/data.pm:70
 #, c-format
 msgid "Ethernetcard"
 msgstr "کارت ایثرنت"
 
-#: 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 "مودم"
 
-#: harddrake/data.pm:80
+#: harddrake/data.pm:79
 #, c-format
 msgid "ADSL adapters"
 msgstr "سازوارگرهای ADSL"
 
+#: harddrake/data.pm:81
+#, c-format
+msgid "AGP controllers"
+msgstr "کنترل‌گر‌های AGP"
+
 #: harddrake/data.pm:82
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "پل‌ها وکنترل‌گر‌های سیستم"
 
 #: 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 "چاپگر"
 
-#: 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 "موشی"
@@ -2960,52 +2999,52 @@ msgstr "Joystick"
 msgid "(E)IDE/ATA controllers"
 msgstr "کنترل‌گر‌های (E)IDE/ATA "
 
-#: harddrake/data.pm:93
+#: harddrake/data.pm:94
 #, c-format
 msgid "Firewire controllers"
 msgstr "کنترل‌گر‌های Firewire "
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:95
 #, c-format
 msgid "SCSI controllers"
 msgstr "کنترل‌گر‌های SCSI "
 
-#: harddrake/data.pm:95
+#: harddrake/data.pm:96
 #, c-format
 msgid "USB controllers"
 msgstr "کنترل‌گر‌های USB"
 
-#: harddrake/data.pm:96
+#: harddrake/data.pm:97
 #, c-format
 msgid "SMBus controllers"
 msgstr "کنترل‌گر‌های SMBus "
 
-#: harddrake/data.pm:97
+#: harddrake/data.pm:98
 #, c-format
 msgid "Scanner"
 msgstr "پویشگر"
 
-#: harddrake/data.pm:99 standalone/harddrake2:315
+#: harddrake/data.pm:100 standalone/harddrake2:319
 #, c-format
 msgid "Unknown/Others"
 msgstr "ناشناس/دیگران"
 
-#: 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 "لطفاً صبر کنید... در حال بکار بستن پیکربندی"
 
-#: harddrake/sound.pm:182
+#: harddrake/sound.pm:186
 #, c-format
 msgid "No alternative driver"
 msgstr "هیچ راه‌انداز دیگر"
 
-#: 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 "
@@ -3014,12 +3053,12 @@ msgstr ""
 "هیچ راه‌انداز شناخته شده‌‌ی OSS/ALSA دیگری برای کارت صوتی شما (%s) که در حال "
 "حاضر از \"%s\" استفاده می‌کند وجود ندارد"
 
-#: harddrake/sound.pm:189
+#: harddrake/sound.pm:193
 #, c-format
 msgid "Sound configuration"
 msgstr "پیکربندی صوت"
 
-#: harddrake/sound.pm:191
+#: harddrake/sound.pm:195
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -3028,7 +3067,7 @@ msgstr ""
 "در اینجا می‌توانید راه‌انداز دیگری را (OSS یا ALSA) برای کارت صوتی خود (%s) "
 "انتخاب کنید."
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:197
 #, c-format
 msgid ""
 "\n"
@@ -3041,7 +3080,7 @@ msgstr ""
 "کارت شما در حال حاضر از راه‌انداز %s\"%s\" استفاده می‌کند (راه‌انداز پیش‌فرض "
 "برای کارت شما \"%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 "
@@ -3076,17 +3115,17 @@ msgstr ""
 "- ALSA api جدید که قابلیت‌های بهینه شده‌ی بسیاری را عرضه می‌دارد ولی با لزوم "
 "استفاده از کتابخانه ALSA .\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 "راه‌انداز:"
 
-#: harddrake/sound.pm:214
+#: harddrake/sound.pm:218
 #, c-format
 msgid "Trouble shooting"
 msgstr "مشکل گشایی"
 
-#: harddrake/sound.pm:222
+#: harddrake/sound.pm:226
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
@@ -3101,12 +3140,12 @@ msgstr ""
 "\n"
 "راه‌انداز جدید  \"%s\" فقط در bootstrap بعدی استفاده خواهد شد."
 
-#: harddrake/sound.pm:230
+#: harddrake/sound.pm:234
 #, c-format
 msgid "No open source driver"
 msgstr "هیچ راه‌انداز منبع آزاد"
 
-#: 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 "
@@ -3115,32 +3154,32 @@ msgstr ""
 "هیچ راه‌انداز آزاد برای کارت صوتی شما (%s) وجود ندارد، اما یک راه‌انداز تجاری "
 "در \"%s\" وجود دارد."
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:238
 #, c-format
 msgid "No known driver"
 msgstr "هیچ راه‌انداز آشنایی"
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:239
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "راه‌انداز شناخته شده‌ای برای کارت صوت (%s) شما وجود ندارد"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:243
 #, c-format
 msgid "Unknown driver"
 msgstr "راه‌انداز ناشناس"
 
-#: harddrake/sound.pm:240
+#: harddrake/sound.pm:244
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "خطا: راه‌انداز \"%s\" برای کارت صوتی شما در لیست وجود ندارد"
 
-#: harddrake/sound.pm:253
+#: harddrake/sound.pm:257
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "اشکال‌زدایی صوت"
 
-#: harddrake/sound.pm:254
+#: harddrake/sound.pm:258
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3184,17 +3223,17 @@ msgstr ""
 "- \"/sbin/fuser -v /dev/dsp\" به شما می‌گوید کدام برنامه از کارت صوت استفاده "
 "می‌کند.\n"
 
-#: harddrake/sound.pm:280
+#: harddrake/sound.pm:284
 #, c-format
 msgid "Let me pick any driver"
 msgstr "اجازه بده تا هر راه‌اندازی را انتخاب کنم"
 
-#: harddrake/sound.pm:283
+#: harddrake/sound.pm:287
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "انتخاب یک راه‌انداز دلخواه"
 
-#: 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 "
@@ -3277,26 +3316,26 @@ msgid "enable radio support"
 msgstr "بکار انداختن پشتیبانی رادیو"
 
 #: help.pm:11
-#, fuzzy, c-format
+#, 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 ""
-"قبل از ادامه، شما باید شرایط اجازه نامه را با دقت بخوانید. آن تمام انتشار \n"
-"لینوکس مان‌درایک را پوشش می‌دهد. اگر شما با همه‌ی شرایط در آن موافقت \n"
-"می‌کنید، جعبه‌ی \"%s\" را علامت بزنید. اگر نه بسادگی رایانه خود را خاموش "
-"نمایید. "
+"قبل از ادامه، شما باید شروط مجوز را با دقت بخوانید. آن تمام انتشار\n"
+"لینوکس ماندرایک را پوشش می‌دهد. اگر با همه‌ی شروط آن موافقت\n"
+"می‌کنید، جعبه‌ی \"%s\" را علامت بزنید. اگر نه، کلیک بر دکمه‌ی \"%s\"\n"
+"رایانه‌اتان آغازگری مجدد خواهد شد."
 
 #: 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 "پذیرش"
 
 #: help.pm:17
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "GNU/Linux is a multi-user system, meaning each user may have their own\n"
 "preferences, their own files and so on. You can read the ``Starter Guide''\n"
@@ -3335,65 +3374,56 @@ msgid ""
 "choose the desired user and window manager, then click \"%s\". If you are\n"
 "not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
-"لینوکس/گنو یک سیستم چند کاربرانه می‌باشد، بدین معنی که هر کاربر مشخصات و "
-"پرونده‌های خود را دارا \n"
-"می‌باشد. شما می‌توانید ``راهنمای مبتدی'' را برای آموختن بیشتر درباره سیستم‌های "
-"جند کاربرانه مطالعه\n"
-" نمایید. ولی برخلاف \"root\"، که مدیر سیستم می‌باشد، کاربرانی را که شما در "
-"این مرحله اضافه \n"
-"می‌کنید اجازه تغییر چیزی جز پرونده‌ها و تنظیمات خود را ندارند. این برای حفاظت "
-"سیستم از \n"
-"تغییرات غیر مترقبه یا خطرناکی است که تمام سیستم را تحت تاثیر قرار می‌دهد. شما "
-"حداقل باید \n"
-"یک کاربر معمولی برای خود ایجاد نمایید -- این حسابی است که شما برای استفاده "
-"روزانه خود \n"
-"باید از آن استفاده نمایید.هرچند این خیلی آسان است که مانند \"root\" وارد "
-"سیستم شده و هر \n"
-"کاری را بدون محدودیت انجام داد، ولی ممکن است این خیلی خطرناک باشد! یک "
-"اشتباه \n"
-"کوچک می‌تواند باعث شود که سیستم شما دیگر کار نکند. اگر شما مثل یک کاربر "
-"ساده \n"
-"اشتباه جدی را مرتکب شوید، بدترین چیزی که می‌تواند اتفاق بیافتد از دست دادن "
-"مقداری \n"
-"اطلاعات خواهد شد ولی تاثیری بر تمام سیستم نخواهد گذاشت.\n"
-"\n"
-"اولین منطقه نام حقیقی شما را می‌پرسد. البته این اجباری نیست -- شما می‌توانید "
-"در واقع \n"
-"هر چه می‌خواهید وارد نمایید. برنامه نصب DrakX اولین واژه را که در این منطقه \n"
-"وارد کرده‌اید به منطقه \"%s\" کپی می‌کند که این نام این کاربرای ورود به سیستم "
-"خواهد \n"
-"شد. اگر بخواهید می‌توانید پیش‌فرض را نادیده گرفته و نام کاربر را تغییر دهید. "
-"گام بعدی \n"
-"وارد کردن یک واژه رمز است. از نظر امنیتی یک واژه رمز (عادی) بدون امتیاز "
-"مانند \n"
-"واژه رمز \"root\" دارای حساسیت نمی‌باشد، اما آن دلیلی برای عدم استفاده از آن "
-"و خالی \n"
-"گذاشتن آن یا تایین واژه رمز بسیار ساده نمی‌باشد. بلاخره این پرونده‌های شما "
-"هستند که در\n"
-" معرض خطر می‌باشند. \n"
-"\n"
-"وقتی که شما بر روی  \"%s\" کلیک نمایید، می‌توانید کاربرهای دیگری نیز اضافه "
-"کنید. \n"
-"افزودن یک کاربر برای هر یک از دوستان، پدرتان یا خواهرتان برای مثال. \n"
-"وقتی افزودن کاربران را تمام کردید بر روی \"%s\" کلیک نمایید.\n"
+"لینوکس/گنو یک سیستم چند کاربرانه است، بدین معنی که هر کاربر ترجیحات و\n"
+"پرونده‌های خود را دارا می‌باشد. شما می‌توانید ``راهنمای مبتدی'' را برای آموختن\n"
+"بیشتر درباره‌ی سیستم‌های چند کاربرانه مطالعه کنید. ولی برخلاف \"مدیر\"، که "
+"مدیر\n"
+"سیستم می‌باشد، کاربرانی را که شما در این مرحله اضافه می‌کنید اجازه تغییر چیزی\n"
+"جز پرونده‌ها و پیکربندی‌های خود را ندارند. این برای حفاظت سیستم از تغییرات غیر "
+"مترقبه\n"
+" یا خطرناکی است که تمام سیستم را تحت تاثیر قرار می‌دهد. شما باید حداقل یک "
+"کاربر\n"
+"معمولی برای خود ایجاد کنید -- این حسابی است که شما برای استفاده روزانه‌ی خود\n"
+"باید از آن استفاده کنید.هرچند این خیلی آسان است که مانند \"root\" وارد "
+"سیستم\n"
+"شده و هر کاری را بدون محدودیت انجام داد، ولی ممکن است این خیلی خطرناک باشد!\n"
+"یک اشتباه کوچک می‌تواند باعث شود که سیستم‌تان دیگر کار نکند. اگر شما مثل یک\n"
+"کاربر ساده اشتباه جدی را مرتکب شوید، بدترین چیزی که می‌تواند اتفاق بیافتد از\n"
+"دست دادن مقداری اطلاعات خواهد شد ولی تاثیری بر تمام سیستم نخواهد گذاشت.\n"
+"\n"
+"اولین منطقه نام حقیقی شما را می‌پرسد. البته این اجباری نیست -- شما می‌توانید\n"
+"در واقع هر چه می‌خواهید وارد کنید. برنامه‌ی نصب DrakX اولین واژه را که در این\n"
+"منطقه وارد کرده‌اید به منطقه \"%s\" کپی می‌کند که این نام کاربری ورود به\n"
+"سیستم خواهد شد. اگر بخواهید می‌توانید پیش‌فرض را نادیده گرفته و نام کاربر را "
+"تغییر\n"
+"دهید. گام بعدی وارد کردن گذرواژه‌ای است. از نظر امنیتی یک گذرواژه‌ی (عادی) "
+"بدون\n"
+"امتیاز مانند گذرواژه‌ی \"مدیر\" دارای حساسیت نمی‌باشد، اما آن دلیلی برای عدم "
+"استفاده\n"
+"از آن و خالی گذاشتن آن یا تعیین گذرواژه‌ی بسیار ساده‌ای نیست. بلاخره این "
+"پرونده‌های\n"
+"شما هستند که در معرض خطر هستند.\n"
+"\n"
+"وقتی که شما بر روی  \"%s\" کلیک کنید، می‌توانید کاربرهای دیگری نیز اضافه "
+"کنید.\n"
+"افزودن یک کاربر برای هر یک از دوستان، پدرتان یا برادرتان برای مثال.\n"
+"وقتی افزودن کاربران را تمام کردید بر روی \"%s\" کلیک کنید.\n"
 "\n"
-"با کلیک کردن بر تکمه \"%s\" به شما اجازه تغییر پوسته \"shell\"پیش‌فرض برای \n"
-"آن کاربر (پیش‌قرض bash) داده خواهد شد.\n"
+"با کلیک کردن بر دکمه‌ی \"%s\" به شما اجازه‌ی تغییر \"پوسته\"پیش‌فرض برای\n"
+"آن کاربر (پیش‌فرض bash) داده خواهد شد.\n"
 "\n"
-"وقتی شما افزودن کاربران را نمام کردید از شما برای انتخاب یک کاربر که "
-"بتواند \n"
-"هنگام آغازگری رایانه بطور خودکار وارد سیستم شود سوال خواهد شد. اگر این مورد\n"
+"وقتی شما افزودن کاربران را تمام کردید از شما برای انتخاب کاربری که بتواند\n"
+"هنگام آغازگری رایانه بطور خودکار وارد سیستم شود سؤال خواهد شد. اگر این مورد\n"
 "برای شما جالب بوده (و امنیت محلی اهمیت چندانی برای شما ندارد) ، کاربر دلخواه "
 "و\n"
-"محیط کرافیک را انتخاب نموده سپس بر روی \"%s\" کلیک نمایید. اگر شما علاقه‌ای \n"
+"محیط گرافیک را انتخاب نموده سپس بر روی \"%s\" کلیک کنید. اگر شما علاقه‌ای\n"
 " به این مورد ندارید جعبه \"%s\" را غیر فعال کنید."
 
 #: 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 "بعدی"
@@ -3437,19 +3467,14 @@ msgid ""
 "With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
-"قسمت‌بندی‌های لینوکس شناسائی شده‌ی موجود بر دیسک شما در اینجا فهرست شده‌اند. \n"
-"شما می‌توانید انتخاب‌های انجام شده توسط جادوگر را نگهداشته چرا که آنها برای "
-"بیشتر نصب‌های \n"
-"عادی مناسب می‌باشند. اگر شما هر تغییری انجام دهید باید حداقل یک قسمت‌بندی ریشه "
-"(\"/\") را \n"
-"تعیین کنید. قسمت‌بندی خیلی کوچک انتخاب نکنید وگرنه نخواهید توانست نرم‌افزار "
-"کافی نصب کنید.\n"
-"اگر می‌خواهید داده‌های خود را بر یک قسمت‌بندی جداگانه ذخیره کنید، مجبور خواهید "
-"بود که \n"
-"یک قسمت‌بندی \"/home\" را ایجاد کنید (فقط در صورتی که شما بیش از یک قسمت‌بندی "
-"لینوکس \n"
-"داشته باشید). \n"
-"هر قسمت‌بندی بطریق بدنبال آمده فهرست شده است: \"نام\", \"ظرفیت\". \n"
+"قسمت‌بندی‌های لینوکس شناسائی شده‌ی موجود بر دیسک شما در اینجا فهرست شده‌اند.\n"
+"شما می‌توانید انتخاب‌های انجام شده توسط جادوگر را نگهداشته چرا که آنها برای\n"
+"بیشتر نصب‌های عادی مناسب می‌باشند. اگر شما هر تغییری انجام دهید باید حداقل\n"
+"یک قسمت‌بندی ریشه (\"/\") را تعیین کنید. قسمت‌بندی خیلی کوچک انتخاب نکنید\n"
+"وگرنه نخواهید توانست نرم‌افزار کافی نصب کنید. اگر می‌خواهید داده‌های خود را بر\n"
+"یک قسمت‌بندی جداگانه ذخیره کنید، مجبور خواهید بود که یک قسمت‌بندی \"/home\"\n"
+"را ایجاد کنید (فقط در صورتی که شما بیش از یک قسمت‌بندی لینوکس داشته باشید).\n"
+"هر قسمت‌بندی بطریق بدنبال آمده فهرست شده است: \"نام\", \"ظرفیت\".\n"
 "ساختار \"نام\" : \"نوع دستگاه دیسک\", \"شماره‌ی دستگاه دیسک\",\n"
 "\"شماره‌ی قسمت‌بندی\" (برای مثال، \"hda1\").\n"
 "\n"
@@ -3471,27 +3496,26 @@ msgstr ""
 "\"دومین کمترین شناسه SCSI\"، و غیره."
 
 #: help.pm:86
-#, fuzzy, c-format
+#, 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 در چند سی دی پخش شده است. برنامه نصب DrakX از وجود یک \n"
-"پاکت انتخاب شده بر سی دی دیگر آگاه می‌باشد بنابرین سی دی کنونی را بیرون زده "
-"و \n"
-"از شما می‌خواهد که سی دی مورد نیاز را وارد نمایید."
+"نصب لینوکس ماندرایک در چند سی‌دی پخش شده است. برنامه نصب DrakX از\n"
+"وجود یک پاکت انتخاب شده بر سی‌دی دیگر آگاه می‌باشد بنابرین سی‌دی کنونی\n"
+"را بیرون زده و از شما می‌خواهد که سی‌دی مورد نیاز را وارد کنید."
 
 #: help.pm:91
-#, fuzzy, c-format
+#, 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"
@@ -3533,58 +3557,51 @@ msgid ""
 "to avoid installing any new package. This is useful for repairing or\n"
 "updating an existing system."
 msgstr ""
-"وقت آن رسیده است که برنامه‌هایی را که می‌خواهید بر سیستم خود نصب کنید را مشخص "
-"نمایید. \n"
-"هزاران بسته‌ی در دسترس برای لینوکس مان‌درایک وجود دارد، و برای آسان کردن "
-"اداره‌ی آنها \n"
-"برنامه‌های مشابه گروه بندی شده‌اند. \n"
-"\n"
-"بسته‌ها به گروه های مربوط به استفاده ای که بر ماشین شما دارند مرتب شده‌اند. "
-"لینوکس \n"
-"مان‌درایک چهار نصب از پیش تایین شده در دسترس دارد. شما می‌توانید این رده‌های "
-"نصب را \n"
-"مانند انبارهای بسته های گوناگون تصور نمایید. شما می‌توانید برنامه ها را ترکیب "
-"و تطبیق کرده، \n"
-"بطوری که یک نصب پایگاه کار بتواند برنامه‌هایی را از گروه برنامه سازی نصب شده "
-"را داشته باشد. \n"
-" * \"%s\": اگر شما می‌خواهیداز ماشین خود مانند یک پایگاه کار استفاده نمایید، "
-"یک یا \n"
-"چند برنامه که در گروه پایگاه کار وجود دارند را انتخاب کنید.\n"
+"وقت آن رسیده است که برنامه‌هایی را که می‌خواهید بر سیستم‌تان نصب کنید را\n"
+"مشخص کنید. هزاران بسته‌ی در دسترس برای لینوکس مان‌درایک وجود دارد، و\n"
+"برای آسان کردن اداره‌ی آنها برنامه‌های مشابه گروه بندی شده‌اند.\n"
+"\n"
+"بسته‌ها به گروه‌هایی در ارتباط به استفاده‌ای که بر ماشین شما دارند مرتب "
+"شده‌اند.\n"
+" لینوکس ماندرایک چهار نصب از پیش تعیین شده در دسترس دارد. شما می‌توانید\n"
+"این رده‌های نصب را مانند انبارهای بسته‌های گوناگون تصور کنید. شما می‌توانید\n"
+"برنامه‌ها را ترکیب و تطبیق کرده، بطوری که یک نصب ایستگاه کاری بتواند "
+"برنامه‌هایی\n"
+"را از گروه برنامه‌سازی نصب شده را داشته باشد.\n"
+" * \"%s\": اگر شما می‌خواهیداز ماشین خود مانند ایستگاه کاری استفاده کنید،\n"
+"یک یا چند برنامه را که در گروه ایستگاه کار وجود دارند انتخاب کنید.\n"
 "\n"
 " * \"%s\": اگر شما از ماشین خود برای برنامه نویسی استفاده می‌کنید، بسته‌های \n"
-"متناسب را از آن گروه انتخاب نمایید.\n"
+"متناسب را از آن گروه انتخاب کنید.\n"
 "\n"
 " * \"%s\": اگر ماشین شما قرار است یک کارگزار باشد، سرویس‌های معمول را که \n"
-"می‌خواهید بر ماشین خود نصب کنید را انتخاب نمایید.\n"
+"می‌خواهید بر ماشین خود نصب کنید انتخاب کنید.\n"
 "\n"
-" * \"%s\": این جایی است که شما می‌توانید محیط تصویری ترجیح داده‌ی خود را "
-"انتخاب\n"
-"نمایید. اگر می‌خواهید یک واسط تصویری در دسترس داشته باشید حداقل\n"
+" * \"%s\": این جایی است که می‌توانید محیط گرافیکی ترجیحی خود را انتخاب\n"
+"کنید. اگر می‌خواهید واسط گرافیکی در دسترس داشته باشید حداقل\n"
 "یکی باید انتخاب شود.\n"
 "\n"
-"حرکت جانمای موش روی نام یک گروه متن توضیح کوتاهی را درباره آن گروه نشان .\n"
-"خواهد داد. اگر شما هنگام اجرای یک نصب معمولی (برخلاف یک ارتقا) هیچ گروهی \n"
-"را انتخاب نکنید، یگ گفتگو ظاهر خواهد شد که گزینه‌های گوناگونی را برای یک "
-"نصب \n"
-"حداقل پیشنهاد می‌کند:\n"
+"حرکت مکان‌نمای موش روی نام یک گروه متن توضیح کوتاهی را درباره آن گروه\n"
+"نشان خواهد داد. اگر هنگام اجرای یک نصب معمولی (برخلاف یک ارتقاء) هیچ\n"
+"گروهی را انتخاب نکنید، یگ گفتگو ظاهر خواهد شد که گزینه‌های گوناگونی را\n"
+"برای یک نصب حداقل پیشنهاد می‌کند:\n"
 "\n"
 " * \"%s\": نصب حداقل تعداد بسته‌های ممکن برای داشتن یک رومیزی تصویری فعال\n"
 "\n"
 " * \"%s\": نصب سیستم پایه بعلاوه ابزارهای اصلی و مستندات آنها.\n"
-"این نصب برای برپایی یک کارگزار مناسب می‌باشد.\n"
+"این نصب برای برپایی یک کارگزار مناسب است.\n"
 "\n"
 " * \"%s\": حداقل تعداد مطلق بسته‌های ضروری را برای یک سیستم لینوکس فعال\n"
 "را نصب خواهد نمود. با این نصب شما تنها یک واسط خط فرمان خواهید داشت.\n"
-"اندازه‌ی کل این نصب حدود ۶۵ مگابایت می‌باشد.\n"
+"اندازه‌ی کل این نصب حدود ۶۵ مگابایت است.\n"
 "\n"
-"شما می‌توانید جعبه‌ی \"%s\" را علامت بزنید، که در صورتی که شما با بسته‌های \n"
+"شما می‌توانید جعبه‌ی \"%s\" را علامت بزنید، که در صورتی که با بسته‌های\n"
 "عرضه شده آشنایی داشته باشید یا اگر بخواهید بر آنچه نصب خواهد شد اختیار کامل\n"
 "داشته باشید مفید است.\n"
 "\n"
-"اگر شما نصب را در حالت \"%s\" شروع کرده‌اید، می‌توانید تمام گروه‌ها را برای "
-"جلوگیری\n"
-"از نصب هر بسته جدید انتخاب نکنید. این برای تعمیر یا بروزسازی یک سیستم\n"
-"موجود مفید می‌باشد."
+"اگر شما نصب را در حالت \"%s\" شروع کرده‌اید، می‌توانید تمام گروه‌ها را برای\n"
+"جلوگیری از نصب هر بسته جدید انتخاب نکنید. این برای تعمیر یا بروزسازی یک\n"
+"سیستم موجود مفید است."
 
 #: help.pm:137
 #, c-format
@@ -3627,7 +3644,7 @@ msgid "Upgrade"
 msgstr "ارتقاء"
 
 #: help.pm:140
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "If you told the installer that you wanted to individually select packages,\n"
 "it will present a tree containing all packages classified by groups and\n"
@@ -3640,10 +3657,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"
@@ -3663,50 +3680,50 @@ msgid ""
 "end of another installation. See the second tip of last step on how to\n"
 "create such a floppy."
 msgstr ""
-"اگر شما به نصب کننده گفته‌اید که می‌خواهید بسته‌ها را دانه‌ای انتخاب کنید، \n"
-"آن یک درخت شامل تمام بسته‌ها دسته بندی شده بوسیله‌ی گروه‌ها و زیرگروه‌ها \n"
-"را عرضه می‌کند. هنگام مرور بر درخت، شما می‌توانید همه‌ی گروه‌ها، زیرگروه‌ها، \n"
-"یا بسته‌های دانه‌ای را انتخاب نمایید. \n"
+"اگر شما به نصب‌گر گفته‌اید که می‌خواهید بسته‌ها را دانه‌ای انتخاب کنید،\n"
+"آن درختی را شامل تمام بسته‌های دسته‌بندی شده بوسیله‌ی گروه‌ها و زیرگروه‌ها\n"
+"عرضه می‌کند. هنگام مرور بر درخت، می‌توانید همه‌ی گروه‌ها، زیرگروه‌ها،\n"
+"یا بسته‌های دانه‌ای را انتخاب کنید.\n"
 "\n"
-"هروقت شما یک بسته را در این درخت انتخاب می‌کنید، یک توضیح در قسمت \n"
-"راست ظاهر شده که به شما هدف بسته را معرفی می‌کند. \n"
+"هروقت شما بسته‌ای را در این درخت انتخاب می‌کنید، یک توضیح در قسمت\n"
+"راست ظاهر شده که به شما هدف بسته را معرفی می‌کند.\n"
 "\n"
-"!! اگر یک بسته کارگزار انتخاب شده باشد، یا اینکه شما مخصوصا بسته‌ی دانه‌ای \n"
+"!! اگر یک بسته کارگزار انتخاب شده باشد، یا اینکه شما مخصوصا بسته‌ی دانه‌ای\n"
 "را انتخاب کردید یا برای اینکه آن قسمتی از یک گروه از بسته‌ها باشد، از شما \n"
-"برای تایید آنکه شما واقعا می‌خواهید آنها را نصب کنید سوال خواهد شد. \n"
-"پیش‌فرض لینوکس مان‌درایک هر سرویس نصب شده را در زمان آغازگری \n"
+"برای تایید آنکه واقعا می‌خواهید آنها را نصب کنید سؤال خواهد شد.\n"
+"پیش‌فرض لینوکس ماندرایک هر سرویس نصب شده را در زمان آغازگری \n"
 "بطور خودکار اجرا می‌کند. هرچند آنها امن بوده و هیچ اشکالی در زمان انتشار \n"
 "ندارند، احتمال دارد که سوراخ‌های امنیتی بعد از تکمیل این نسخه لینوکس \n"
 "مان‌درایک کشف شوند. اگر شما نمی‌دانید که یک سرویس بخصوص قرار \n"
-"است چکار کند یا چرا نصب شده است، پس \"%s\" را کلیک نمایید. با کلیک \n"
+"است چکار کند یا چرا نصب شده است، پس \"%s\" را کلیک کنید. با کلیک \n"
 "بر \"%s\"سرویس‌های فهرست شده نصب خواهند شد و آنها بوسیله پیش‌فرض \n"
 "بطور خودکار هنگام آغازگری شروع می‌شوند. !! \n"
 "\n"
 "گزینه‌ی \"%s\" برای غیرفعال کردن گفتگوی هشدارهایی که هر وقت برنامه‌ی\n"
-" نصب یک بسته را برای حل یک مشکل وابستگی بطور خودکار انتخاب می‌کند \n"
+" نصب بسته‌ای را برای حل یک مشکل وابستگی بطور خودکار انتخاب می‌کند \n"
 "استفاده می‌شود. بعضی از بسته‌ها با هم روابطی دارند بطوری که نصب یک \n"
-"بسته مستلزم نصب آن بسته‌ی دیگر می‌باشد. برنامه نصب می‌تواند تایین کند \n"
-"که کدام بسته برای ارضای یک وابستگی لازم است تا نصب را با موفقیت تکمیل "
-"نماید. \n"
+"بسته مستلزم نصب آن بسته‌ی دیگر می‌باشد. برنامه نصب می‌تواند تعیین کند \n"
+"که کدام بسته برای ارضای یک وابستگی لازم است تا نصب را با موفقیت تکمیل\n"
+"نماید.\n"
 "\n"
-"آن شمایل ریز دیسک‌نرم در پایین فهرست به شما اجازه می دهد که یک \n"
-"فهرست ایجاد شده هنگام نصب قبلی را بارگزاری نمایید. این روش اگر شما \n"
-"تعدادی رایانه را بخواهید یکسان تنظیم کنید مفید است. کلیک بر این شمایل \n"
-"از شما می‌خواهد که آن دیسک‌نرمی را که در پایان نصب قبلی ایجاد کرده‌اید \n"
-"را وارد کنید. سرنخ دوم آخرین مرحله را برای چگونگی ایجاد چنین دیسک‌نرمی \n"
-"را مگاهی بیاندازید.  "
+"شمایل ریز دیسکچه در پایین فهرست به شما اجازه می‌دهد که یک\n"
+"فهرست ایجاد شده هنگام نصب قبلی را بارگذاری کنید. این روش اگر\n"
+"بخواهید تعدادی رایانه را یکسان پیکربندی کنید مفید است. کلیک بر این شمایل\n"
+"از شما می‌خواهد که آن دیسکچه را که در پایان نصب قبلی ایجاد کرده‌اید\n"
+"وارد کنید. به راهنمایی دوم آخرین مرحله برای چگونگی ایجاد چنین دیسکچه‌ای\n"
+"نگاهی بیاندازید."
 
-#: 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 "نه"
 
-#: 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 "بله"
@@ -3717,11 +3734,11 @@ msgid "Automatic dependencies"
 msgstr "وابستگی‌های خودکار"
 
 #: help.pm:175
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You will now set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"%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"
@@ -3736,34 +3753,32 @@ 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"
 "for details about the configuration, or simply wait until your system is\n"
 "installed and use the program described there to configure your connection."
 msgstr ""
-"شما اکنون ارتباط اینترنت/شبکه خود را برپاسازی خواهید نمود. اگر می‌خواهید "
-"رایانه \n"
-"خود را به اینترنت یا یک شبکه محلی ارتباط دهید، بر \"%s\" کلیک نمایید. \n"
-"لینوکس مان‌درایک سعی خواهد کرد تا دستگاه‌های شبکه و مودم را بطور خودکار \n"
-"شناسایی کند.ا گر این شناسایی موفق نبود، جعبه \"%s\" را غیر فعال نمایید. شما "
-"همچنین \n"
-"تنظیم شبکه را انتخاب نکرده یا آن را بعدا انجام دهید، در هر صورت با کلیک بر "
-"تکمه \"%s\" \n"
-"به مرحله بعدی خواهید رفت. \n"
-"\n"
-"گزینه‌های ارتباطی برای تنظیم شبکه شما عبارتند از: مودم معمولی، مودم ISDN \n"
-"ارتباط ADSL ، مودم کابلی، و در آخر یک ارتباط شبکه‌ی محلی LAN (Ethernet) "
-"می‌باشد. \n"
-"\n"
-"ما هر گزینه تنظیم را تشریح نخواهیم داد - فقط مطمئن شوید که همه اجزای مورد \n"
-"نیاز از جمله نشانی IP، دروازه پیش‌فرض، کارگزارهای DNS، و غیره را از شرکت \n"
-" عرضه کننده اینترنت یا مدیر سیستم خود دریافت نموده‌اید. \n"
-"\n"
-"شما می‌توانید برای تشریحات درباره تنظیم ارتباط اینترنت به فصل راهنمای شروع \n"
+"شما اکنون اتصال اینترنت/شبکه خود را برپاسازی خواهید کرد. اگر می‌خواهید\n"
+"رایانه خود را به اینترنت یا یک شبکه محلی وصل کنید، بر \"%s\" کلیک کنید.\n"
+"لینوکس ماندرایک سعی خواهد کرد تا دستگاه‌های شبکه و مودم را بطور خودکار\n"
+"شناسایی کند.اگر این شناسایی موفق نبود، جعبه \"%s\" را غیر فعال کنید. شما\n"
+"همچنین پیکربندی شبکه را انتخاب نکرده یا آن را بعدا انجام دهید، در هر صورت\n"
+"با کلیک بر دکمه‌ی \"%s\" به مرحله بعدی خواهید رفت.\n"
+"\n"
+"هنگام پیکربندی شبکه‌تان، گزینه‌های اتصال در دسترس عبارتند از:\n"
+"مودم معمولی، مودم ISDN ارتباط ADSL ، مودم کابلی، و در آخر یک اتصال\n"
+" شبکه‌ی محلی LAN (Ethernet) می‌باشد. \n"
+"\n"
+"ما هر گزینه‌ی پیکربندی را تشریح نخواهیم کرد - فقط مطمئن شوید که همه‌ی "
+"پارامترهای\n"
+" مورد نیاز از جمله نشانی آی‌پی، دروازه‌ی پیش‌فرض، کارگزارهای DNS، و غیره را\n"
+"از شرکت عرضه کننده‌ی اینترنت یا مدیر سیستم خود دریافت کرده‌اید.\n"
+"\n"
+"شما می‌توانید برای تشریحات درباره‌ی اتصال اینترنت به فصل راهنمای مبتدی\n"
 "مراجعه یا صبر کرده تا سیستم نصب شده وسپس از برنامه توضیح داده شده در \n"
-"آنجا برای تنظیم ارتباط خود استفاده نمایید. "
+"آنجا برای پیکربندی اتصال خود استفاده کنید."
 
 #: help.pm:197
 #, c-format
@@ -3784,8 +3799,8 @@ msgstr ""
 "نصب استفاده می‌گردد."
 
 #: 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 "پیکربندی"
@@ -3830,7 +3845,7 @@ msgstr ""
 "!!"
 
 #: help.pm:224
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
 "local time according to the time zone you selected. If the clock on your\n"
@@ -3845,27 +3860,24 @@ msgid ""
 "near you. This option actually installs a time server that can be used by\n"
 "other machines on your local network as well."
 msgstr ""
-"گنو/لینوکس زمان را بر اساس GMT (Greenwich Mean Time) اداره کرده و آن را به "
-"زمان محلی \n"
-"طبق منطقه‌ی زمانی که شما انتخاب نموده‌اید برمی‌گرداند. اگر ساعت روی "
-"کارت‌الکترونیکی مادر بر \n"
-"اساس زمان محلی گذاشته شده باشد، می‌توانید این را از طریق انتخاب نکردن \"%s\" "
-"غیرفعال \n"
-"نمایید، که به گنو/لینوکس اجازه می‌دهد که بداند که ساعت سیستم شما و ساعت "
-"سخت‌افزار در یک\n"
-" منطقه‌زمانی قرار دارند. دانستن این وقتی که ماشین شما سیستم عامل دیکری نظیر "
-"ویندوز را میزبان\n"
-" باشد مفید می‌باشد. \n"
-"\n"
-"گزینه‌ی \"%s\" ساعت را از طریق ارتباط به کارگزار از راه دور زمان بر اینترنت "
-"میزان می‌کند. \n"
-"برای کار کردن این قابلیت شما باید یک ارتباط اینترنت فعال داشته باشید. بهتر "
-"است یک کارگزار \n"
-"زمان نزدیک به خود را انتخاب نمایید. این گزینه اتفاقاً یک کارگزار زمان را "
-"می‌تواند بوسیله‌ی \n"
-"ماشین های دیگر روی شبکه شما نیز استفاده شود را نصب می‌کند."
-
-#: help.pm:235 install_steps_interactive.pm:834
+"گنو/لینوکس زمان را بر اساس GMT (Greenwich Mean Time) اداره کرده\n"
+"و آن را به زمان محلی طبق منطقه‌ی زمانی که شما انتخاب کرده‌اید برمی‌گرداند.\n"
+"اگر ساعت روی کارت ‌الکترونیکی مادر بر اساس زمان محلی گذاشته شده باشد،\n"
+"می‌توانید این را از طریق انتخاب نکردن \"%s\" غیرفعال کنید، که به گنو/لینوکس\n"
+"اجازه می‌دهد که بداند که ساعت سیستم شما و ساعت سخت‌افزار در یک منطقه‌زمانی\n"
+"قرار دارند. دانستن این وقتی که ماشین شما سیستم عامل دیگری نظیر ویندوز را "
+"میزبان\n"
+"باشد مفید می‌باشد. \n"
+"\n"
+"گزینه‌ی \"%s\" ساعت را از طریق اتصال به کارگزار از راه دور زمان بر اینترنت\n"
+"میزان می‌کند. برای کار کردن این قابلیت باید یک اتصال اینترنت فعال داشته\n"
+"باشید. بهتر است یک کارگزار زمان نزدیک به خود را انتخاب کنید. این گزینه "
+"اتفاقاً\n"
+"کارگزار زمانی را نصب می‌کند که می‌تواند بوسیله‌ی ماشین های دیگر بر روی "
+"شبکه‌اتان\n"
+"گردد."
+
+#: help.pm:235 install_steps_interactive.pm:835
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr "گذاردن ساعت سخت‌افزار به GMT"
@@ -3876,7 +3888,7 @@ msgid "Automatic time synchronization"
 msgstr "هم‌گاه‌سازی خودکار زمان"
 
 #: help.pm:238
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Graphic Card\n"
 "\n"
@@ -3890,21 +3902,21 @@ msgid ""
 msgstr ""
 "کارت گرافیک\n"
 "\n"
-"   برنامه نصب کننده معمولا کارت گرافیک نصب شده بر ماشین شما را بطور خودکار\n"
-"شناسایی و تنظیم می‌کند. اگر چنین نشده، شما می‌توانید کارتی را که خود نصب "
-"کرده‌اید \n"
-"از این لیست انتخاب نمایید.\n"
+"   برنامه نصب‌گر معمولا کارت گرافیک نصب شده بر ماشین شما را بطور خودکار\n"
+"شناسایی و پیکربندی می‌کند. اگر چنین نشده، می‌توانید کارتی را که خود نصب "
+"کرده‌اید\n"
+"از این لیست انتخاب کنید.\n"
 "\n"
 "   در صورتی که کارگزارهای مختلف برای کارت شما در دسترس می‌باشند، با یا بدون\n"
 "شتاب دهنده‌ی ۳بعدی، از شما برای انتخاب کارگزاری که برای شما مناسب‌تر می‌باشد \n"
-"سوال خواهد شد."
+"سؤال خواهد شد."
 
 #: help.pm:249
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
+"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"
@@ -3965,7 +3977,7 @@ msgstr ""
 "\n"
 "   نصب کننده معمولاً بطور خودکار کارت گرافیک بر روی ماشین شما را شناسایی\n"
 "و تنظیم خواهد کرد. اگر چنین نشد، می‌توانید کارت خود را از این لیست انتخاب "
-"نمایید.\n"
+"کنید.\n"
 "\n"
 "   در صورتی که کارگزارهای گوناگونی برای کارت شما وجود دارند، با یا بدون\n"
 "شتاب‌دهنده‌ی ۳ بعدی، از شما برای انتخاب کارگزاری که بهتر جوابگوی احتیاجات \n"
@@ -4028,7 +4040,7 @@ msgstr ""
 "که به رایانه‌ی خود وصل کرده‌اید از این لیست انتخاب کنید."
 
 #: help.pm:311
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Resolution\n"
 "\n"
@@ -4037,23 +4049,22 @@ msgid ""
 "change that after installation though). A sample of the chosen\n"
 "configuration is shown in the monitor picture."
 msgstr ""
-"وضوح \n"
+"تفکیک‌پذیری\n"
 "\n"
-"   در اینجا شما می‌توانید وضوح و عمق رنگ موجود برای سخت‌افزار خود را انتخاب \n"
-"نمایید. آن را که برای شما بهتر است انتخاب کنید (شما بعد از نصب می‌توانید آن "
-"را\n"
-" تغییر دهید). یک نمونه از تنظیم انتخاب شده در مانیتور نشان داده می‌شود."
+"   در اینجا می‌توانید تفکیک‌پذیری و عمق رنگ در دسترس را برای سخت‌افزارتان\n"
+"را انتخاب کنید. آن را که برای شما بهتر است انتخاب کنید (بعد از نصب می‌توانید\n"
+"آن را تغییر دهید). نمونه‌ای از پیکربندی انتخاب شده در نمایشگر نشان داده می‌شود."
 
 #: help.pm:319
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "In the situation where different servers are available for your card, with\n"
 "or without 3D acceleration, you are asked to choose the server that best\n"
 "suits your needs."
 msgstr ""
-"در صورتی که کارگزارهای گوناگونی برای کارت شما وجود دارند، با یا بدون \n"
-"شتاب دهنده‌ی ۳ بعدی ، از شما برای انتخاب مناسب‌ترین کارگزار سوال \n"
-"خواهد شد. "
+"در صورتی که کارگزارهای گوناگونی برای کارت‌تان در دسترس هستند، با\n"
+"یا بدون شتاب دهنده‌ی ۳ بعدی ، از شما برای انتخاب مناسب‌ترین کارگزار\n"
+" سؤال خواهد شد."
 
 #: help.pm:324
 #, c-format
@@ -4073,14 +4084,14 @@ msgstr ""
 "پیکربندی نمایشگر خود موفق نبوده‌اید."
 
 #: help.pm:332
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "At this point, you need to decide where you want to install the Mandrake\n"
 "Linux operating system on your hard drive. If your hard drive is empty or\n"
 "if an existing operating system is using all the available space you will\n"
 "have to partition the drive. Basically, partitioning a hard drive consists\n"
 "of logically dividing it to create the space needed to install your new\n"
-"Mandrake Linux system.\n"
+"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"
@@ -4107,7 +4118,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"
@@ -4116,7 +4127,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"
@@ -4134,56 +4145,52 @@ 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 ""
-"در این مرحله، شما باید تصمیم بگیرید در کجای دیسک خود می‌خواهید سیستم عامل \n"
-"لینوکس مان‌درایک را نصب نمایید. اگر دیسک شما خالی یا اگر یک سیستم عامل  \n"
-"همه‌ی فصای موجود دیسک را در اختیار دارد شما می‌بایست دیسک خود را قسمت‌بندی\n"
-" نمایید. اساسا، قسمت‌بندی یک دیسک شامل قسمت کردن منطقی آن برای ایجاد \n"
-"فضای لازم برای نصب سیستم لینوکس مان‌درایک جدید شما می‌باشد. \n"
-"\n"
-"بخاطر غیر قابل برگشت بودن پروسه قسمت‌بندی و اینکه می‌تواند به از دست دادن \n"
-"داده‌ها منتهی شود، مخصوصا اگر یک سیستم عامل قبلا وجود داشته و بر روی دیسک \n"
-"نصب شده باشد، اگر شما یک کاربر بی تجربه هستید قسمت‌بندی می‌تواند عصبی \n"
-"کننده و هیجان آور باشد. خوشبختانه، DrakX یک جادوگر راهنما را برای آسان "
-"ساختن \n"
+"در این مرحله، باید تصمیم بگیرید که در کجای دیسک خود می‌خواهید سیستم عامل\n"
+"لینوکس ماندرایک را نصب کنید. اگر دیسک شما خالی یا اگر سیستم عامل موجودی\n"
+"همه‌ی فضای در دسترس دیسک را در اختیار دارد مجبور خواهید بود دیسک خود را\n"
+"قسمت‌بندی کنید. اساسا، قسمت‌بندی دیسکی شامل قسمت کردن منطقی آن برای\n"
+"ایجاد فضای لازم برای نصب سیستم لینوکس ماندرایک جدیدتان می‌باشد.\n"
+"\n"
+"بخاطر غیر قابل برگشت بودن پروسه‌ی قسمت‌بندی و اینکه می‌تواند به از دست رفتن\n"
+"داده‌ها منتهی شود، مخصوصا اگر سیستم عاملی از قبل وجود داشته و بر روی دیسک\n"
+"نصب شده باشد، اگر شما کاربری بی‌تجربه هستید قسمت‌بندی می‌تواند عصبی\n"
+"کننده و هیجان آور باشد. خوشبختانه، DrakX جادوگر راهنمایی را برای آسان کردن\n"
 "این پروسه ضمیمه دارد. قبل از ادامه به این مرحله بقیه این بخش را بخوانید و \n"
 "بیش از هر چه وقت کافی را بخود بدهید.\n"
 "\n"
-"بستگی به تنظیم دیسک شما، چندین گزینه موجود می‌باشد:\n"
+"بستگی به پیکربندی دیسک‌تان، چندین گزینه در دسترس است:\n"
 "\n"
-" * \"%s\": این گزینه یک قسمت‌بندی خودکار دستگاه دیسک خالی شما را انجام "
-"می‌دهد.\n"
-"اگر شما از این گزینه استفاده نمایید دیگر از شما سوال دیگری نخواهد شد. \n"
+" * \"%s\": این گزینه قسمت‌بندی خودکار دستگاه دیسک خالی شما را انجام می‌دهد.\n"
+"اگر از این گزینه استفاده کنید دیگر از شما سؤال دیگری نخواهد شد.\n"
 " \n"
-" * \"%s\": جادوگر یک یا چند قسمت‌بندی موجود لینوکس را بر روی دیسک شما "
-"شناسایی\n"
-"کرده است. اگر شما می‌خواهید از آنها استفاده کنید این گزینه را انتخاب نمایید. "
-"سپس \n"
-"از شما پرسیده خواهد شد که نقاط سوارسازی مربوط به هر قسمت‌بندی را انتخاب \n"
-"نمایید. نقاط سوارسازی صحیح بوسیله‌ی پیش‌فرض انتخاب خواهند شد، در بیشتر \n"
+" * \"%s\": جادوگر یک یا چند قسمت‌بندی موجود لینوکس را بر روی دیسک شما\n"
+"شناسایی کرده است. اگر می‌خواهید از آنها استفاده کنید این گزینه را انتخاب "
+"کنید.\n"
+"از شما سپس پرسیده خواهد شد که نقاط سوارسازی مربوط به هر قسمت‌بندی را\n"
+"انتخاب کنید. نقاط سوارسازی صحیح بوسیله‌ی پیش‌فرض انتخاب خواهند شد، در بیشتر \n"
 "موارد نظر خوبی است که آنها را نگه دارید.\n"
 "\n"
 " * \"%s\": اگر ویندوز مایکروسافت بر دیسک شما نصب شده است و همه فضای موجود\n"
-"بر آن را در اختیار دارد، شما می‌بایست فضای آزاد برای لینوکس را ایجاد نمایید\n"
+"بر آن را در اختیار دارد، شما می‌بایست فضای آزاد برای لینوکس را ایجاد کنید\n"
 "برای انجام این کار، شما می‌توانید قسمت‌بندی و داده‌های ویندوز مایکروسافت\n"
 " را حذف کرده (راه حل ''پاک کردن تمام دیسک'' را ببینید) یا قسمت‌بندی FAT \n"
-"ویندوز مایکروسافت را تغییر اندازه دهید. تغییر اندازه می‌تواند بدون از دست "
-"دادن\n"
-"هیچ داده‌ای به این شرط که شما قبلا قسمت‌بندی ویندوز را نظم داده \n"
-"یا defragmented بشود و اینکه آن از قالب FAT استفاده کند. ذخیره داده‌های \n"
-"شما بشدت پیشنهاد می‌شود. استفاده از این گزینه اگر شما می‌خواهید هم لینوکس \n"
-"و هم ویندوز مایکروسابت را بر روی یک رایانه داشته باشید پیشنهاد می‌شود.\n"
-"\n"
-"   قبل از انتخاب این گزینه، لطفا توجه نمایید که بعد از این پروسه اندازه \n"
-" قسمت‌بندی ویندوز مایکروسافت شما کوچکتر از وقتی که شروع کرده‌اید خواهد شد\n"
-"شما فضای آزاد کمتری زیر ویندوز مایکروسافت برای ذخیره داده‌ها خود یا\n"
+"ویندوز مایکروسافت را تغییر اندازه دهید. تغییر اندازه می‌تواند بدون از دست\n"
+"دادن هیچ داده‌ای به این شرط که شما از قبل قسمت‌بندی ویندوز را نظم داده\n"
+"یا defragmented بشود و اینکه آن از قالب FAT استفاده کند. ذخیره‌ی داده‌های\n"
+"شما بشدت سفارش می‌شود. استفاده از این گزینه اگر می‌خواهید هم لینوکس\n"
+"و هم ویندوز مایکروسافت را بر روی یک رایانه داشته باشید سفارش می‌شود.\n"
+"\n"
+"   قبل از انتخاب این گزینه، لطفا توجه کنید که بعد از این پروسه اندازه‌ی\n"
+"قسمت‌بندی ویندوز مایکروسافت شما کوچکتر از وقتی که شروع کرده‌اید خواهد\n"
+"شد شما فضای آزاد کمتری زیر ویندوز مایکروسافت برای ذخیره‌ی داده‌ها‌ی خود یا\n"
 "نصب نرم‌افزار جدید خواهید داشت.\n"
 "\n"
 " * \"%s\": اگر می‌خواهید تمام داده‌ها و قسمت‌بندی‌های موجود بر روی دیسک\n"
-"را حذف و آنها را با سیستم لینوکس مان‌درایک جدید خود جایگزین کنید، این \n"
-"گزینه را انتخاب نمایید. دقت کنید، شما قادر نخواهید بود انتخاب خود را \n"
-"بعد از تایید پس بگیرید. \n"
+"را حذف و آنها را با سیستم لینوکس ماندرایک جدید خود جایگزین کنید، این \n"
+"گزینه را انتخاب کنید. دقت کنید، شما قادر نخواهید بود انتخاب خود را \n"
+"بعد از تأیید پس بگیرید.\n"
 "\n"
-"   !! اگر شما این گزینه را انتخاب کنید، همه داده‌ها بر روی دیسک شما حذف خواهد "
+"   !! اگر این گزینه را انتخاب کنید، همه‌ی داده‌های بر روی دیسک شما حذف خواهند "
 "شد. !! \n"
 "\n"
 " * \"%s\": این همه چیز را از دیسک پاک کرده و از نو شروع به قسمت‌بندی هر \n"
@@ -4195,9 +4202,9 @@ msgstr ""
 " * \"%s\": این گزینه را اگر خودتان می‌خواهید دیسک را قسمت‌بندی کنید انتخاب\n"
 " نمایید. دقت کنید -- این گزینه‌ی باقدرت ولی خطرناکی است و شما می‌توانید \n"
 "بسادگی تمام داده‌های خود را از دست بدهید. برای همین این گزینه واقعا فقط \n"
-"اگر شما چنین کاری را قبلا انجام داده‌اید و تجربه دارید پیشنهاد می‌شود. برای \n"
-"راهنمایی چگونگی استفاده از وسیله‌ی  به قسمت``مدیریت قسمت‌بندی‌های خود'' در \n"
-"``راهنمای شروع'' مراجعه نمایید. "
+"اگر شما چنین کاری را قبلا انجام داده‌اید و تجربه دارید سفارش می‌شود. برای \n"
+"راهنمایی چگونگی استفاده از وسیله‌ی DiskDrake به قسمت``مدیریت\n"
+"قسمت‌بندی‌های خود'' در ``راهنمای مبتدی'' مراجعه کنید."
 
 #: help.pm:389 install_interactive.pm:95
 #, c-format
@@ -4230,7 +4237,7 @@ msgid "Custom disk partitioning"
 msgstr "قسمت‌بندی اختصاصی دیسک"
 
 #: help.pm:392
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
 "ready to use. Just click \"%s\" to reboot the system. Don't forget to\n"
@@ -4260,58 +4267,54 @@ msgid ""
 "the installation. At the prompt, press the [F1] key and type >>linux\n"
 "defcfg=\"floppy\" <<."
 msgstr ""
-"بفرمایید. نصب اکنون تکمیل شده است و سیستم گنو/لینوکس آماده‌ی استفاده "
-"می‌باشد. \n"
-"فقط بر \"%s\" کلیک کرده تا سیستم آغازگری مجدد شود. اولین جیزی که شما بعد "
-"از \n"
-"اینکه رایانه‌ی شما سخت‌افزار خود را آزمایش می‌کند فهرست بارگزار آغازگری است، \n"
-"که به شما اجازه‌ی انتخاب راه‌اندازی یکی از سیستم‌های عامل را می‌دهد. \n"
+"بفرمائید. نصب اکنون تکمیل شده است و سیستم گنو/لینوکس آماده‌ی استفاده است.\n"
+"فقط بر \"%s\" کلیک کرده تا سیستم آغازگری مجدد شود. فراموش نکنید که رسانه‌ی\n"
+"نصب (سی‌دی-رم یا دیسکچه) را بردارید.اولین چیزی که شما بعد از اینکه\n"
+"رایانه‌اتان سخت‌افزار خود را آزمایش می‌کند فهرست بارگذار آغازگری است،\n"
+"که به شما اجازه‌ی انتخاب راه‌اندازی یکی از سیستم‌های عامل را می‌دهد.\n"
 "\n"
-"تکمه \"%s\" دو تکمه‌ی دیگر را نشان داده برای: \n"
+"دکمه‌ی \"%s\" دو دکمه‌ی دیگر را نشان داده برای: \n"
 "  * \"%s\": ایجاد یک دیسکچه نصب که تمام نصب را بطور خودکار بدون کمک \n"
-"کسی، شبیه به نصبی که شما اکنون تنظیم کردید را انجام می‌دهد. \n"
+"کسی، شبیه به نصبی که شما اکنون پیکربندی کردید را انجام می‌دهد. \n"
 "\n"
-"   توجه کنید که بعد از کلیک بر این تکمه دو گزینه موجود می‌باشند:\n"
+"   توجه کنید که بعد از کلیک بر این دکمه دو گزینه در دسترس هستند:\n"
 "\n"
-"    * \"%s\". این نصب نسبتاً خودکارمی‌باشد. گام قسمت‌بندی تنها \n"
-"مرحله‌ی گفتگویی می‌باشد.\n"
+"    * \"%s\". این نصب نسبتاً خودکاراست. گام قسمت‌بندی تنها \n"
+"مرحله‌ی گفتگویی است.\n"
 "\n"
 "    * \"%s\". نصب کاملاً خودکار: دیسک سخت کاملاً بازنویسی شده،\n"
 "تمام داده‌ها از دست خواهند رفت.\n"
 "\n"
-"   این قابلیت وقتی چندین ماشین قرار است شبیه به هم نصب شوند مفید می‌باشد.\n"
-"قسمت نصب خودکار را در پایگاه اینترنت ما برای اطلاعات بیشتر ملاحظه نمایید.\n"
+"   این قابلیت وقتی چندین ماشین قرار است شبیه به هم نصب شوند مفید است.\n"
+"قسمت نصب خودکار را در پایگاه اینترنت ما برای اطلاعات بیشتر ملاحظه کنید.\n"
 "\n"
 " * \"%s\"(*): یک لیست از بسته‌های انتخاب شده در این نصب را ذخیره می‌کند.\n"
-"برای استفاده از این انتخاب با نصب دیگر، دیسک‌نرم را داخل کرده و نصب\n"
-"را شروع نمایید. در اعلان, کلید [F1] را فشار داده و بنویسید >>linux\n"
-"defcfg=\"floppy\" <<.\n"
-"\n"
-"(*) شما به یک دیسک‌نرم با قالب FAT احتیاج دارید (برای ایجاد آن در لینوکس\n"
-"بنویسید \"mformat a:\")"
+"برای استفاده از این انتخاب با نصب دیگر، دیسکچه را داخل کرده و نصب\n"
+"را شروع کنید. در اعلان, کلید [F1] را فشار داده و بنویسید >>\n"
+"linux defcfg=\"floppy\" <<."
 
 #: help.pm:418
-#, fuzzy, c-format
+#, c-format
 msgid "Generate auto-install floppy"
-msgstr "تولید دیسکچه نصب-خودکار"
+msgstr "تولید دیسکچه‌ی نصب-خودکار"
 
-#: help.pm:418 install_steps_interactive.pm:1320
+#: help.pm:418 install_steps_interactive.pm:1329
 #, c-format
 msgid "Replay"
 msgstr "بازپخش"
 
-#: help.pm:418 install_steps_interactive.pm:1320
+#: help.pm:418 install_steps_interactive.pm:1329
 #, c-format
 msgid "Automated"
 msgstr "خودکار"
 
-#: help.pm:418 install_steps_interactive.pm:1323
+#: help.pm:418 install_steps_interactive.pm:1332
 #, c-format
 msgid "Save packages selection"
 msgstr "ذخیره‌ی مجموعه بسته‌ها"
 
 #: help.pm:421
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Any partitions that have been newly defined must be formatted for use\n"
 "(formatting means creating a file system).\n"
@@ -4333,53 +4336,51 @@ 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."
 msgstr ""
-"هر قسمت‌بندی که بتازگی تایین شده باشد باید برای استفاده قالب‌بندی شود\n"
-"(قالب‌بندی بمعنی ایجاد یک سیستم پرونده می‌باشد).\n"
+"هر قسمت‌بندی که بتازگی تعیین شده باشد باید برای استفاده قالب‌بندی شود\n"
+"(قالب‌بندی بمعنی ایجاد یک سیستم پرونده است).\n"
 "\n"
-"در حال حاضر، شما ممکن است بخواهید بعضی از قسمت‌بندی‌های موجود را برای\n"
-"برای پاک کردن دادهای بر آنها قالب‌بندی نمایید. اگر خیال چنین کاری را دارید، "
-"لطفاً\n"
-"آن قسمت‌بندی‌ها را نیز انتخاب نمایید.\n"
+"در حال حاضر، ممکن است بخواهید بعضی از قسمت‌بندی‌های موجود را برای\n"
+"برای پاک کردن دادهای بر آنها قالب‌بندی کنید. اگر خیال چنین کاری را دارید،\n"
+"لطفا آن قسمت‌بندی‌ها را نیز انتخاب کنید.\n"
 "\n"
 "\n"
-"لطفاً توجه نمایید که ضروری نیست که تمام قسمت‌بندی‌های موجود قالب‌بندی مجدد\n"
+"لطفاً توجه کنید که ضروری نیست که تمام قسمت‌بندی‌های موجود قالب‌بندی مجدد\n"
 "شوند. شما باید قسمت‌بندی‌های حاوی سیستم عامل (مانند \"/\", \"/usr\" یا \"/var"
-"\") \n"
+"\")\n"
 "را قالب‌بندی مجدد کرده اما شما مجبور به قالب‌بندی مجدد قسمت‌بندی‌های حاوی\n"
 "داده‌هایی که می‌خواهید نگهدارید نیستید (معمولاً \"/home\").\n"
 "\n"
-"لطفاً هنگام انتخاب قسمت‌بندی‌ها دقت نمایید. بعد از قالب‌بندی تمام داده‌های\n"
-"بر قسمت‌بندی‌های انتخاب شده حذف خواهند شد و شما قادر به تعمیر آنها نخواهید "
-"بود\n"
+"لطفاً هنگام انتخاب قسمت‌بندی‌ها دقت کنید. بعد از قالب‌بندی تمام داده‌های\n"
+"بر قسمت‌بندی‌های انتخاب شده حذف خواهند شد و قادر به تعمیر آنها نخواهید بود\n"
 "\n"
-"وقتی برای قالب‌بندی قسمت‌بندی‌ها آماده شدید بر \"%s\" کلیک نمایید.\n"
+"وقتی برای قالب‌بندی قسمت‌بندی‌ها آماده شدید بر \"%s\" کلیک کنید.\n"
 "\n"
-"اگر می‌خواهید قسمت‌بندی دیگری برای نصب سیستم عامل لینوکس مان‌درایک\n"
+"اگر می‌خواهید قسمت‌بندی دیگری برای نصب سیستم عامل لینوکس ماندرایک\n"
 "جدید خود انتخاب کنید بر %s کلیک نمایید.\n"
 "\n"
 "اگر می‌خواهید قسمت‌بندی‌هایی که باید برای بلوک‌های بد بر دیسک کنترل شوند\n"
-"را انتخاب کنید بر %s کلیک نمایید."
+"را انتخاب کنید بر %s کلیک کنید."
 
 #: 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 "پیشین"
 
 #: help.pm:447
-#, fuzzy, c-format
+#, 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"
@@ -4391,29 +4392,27 @@ msgid ""
 "appear: review the selection, and press \"%s\" to retrieve and install the\n"
 "selected package(s), or \"%s\" to abort."
 msgstr ""
-"در زمانی که شما در حال نصب لینوکس مان‌درایک هستید، به احتمال زیاد بعضی \n"
-"از بسته‌ها از زمان شروع نشر خود بروزسازی شده‌اند. اشکالات ممکن است تعمیر \n"
-"شده و مسایل امنیتی رفع شده باشند. برای استفاده از فواید این بروزسازی‌ها، شما "
-"اکنون \n"
-"می‌توانید آنها را از اینترنت بارگیری نمایید. \"%s\" را اگر شما یک ارتباط "
-"کارآرای اینترنت \n"
-"دارید علامت زده، یا \"%s\" را اگر ترجیح می‌دهید بسته‌ها را بعداً بروزسازی "
-"نمایید. \n"
-"\n"
-"انتخاب \"%s\" یک فهرست از مکان‌هایی که آن بروزسازی‌ها می‌توانند دریافت شوند \n"
-"را نشان خواهد داد. شما باید مکانی که به شما نزدیکتر است را انتخاب نمایید. "
-"یک \n"
-"درخت مجموعه-بسته ظاهر خواهد شد: مجموعه را مرور کرده، و \"%s\" را برای \n"
+"در زمانی که در حال نصب لینوکس ماندرایک هستید، به احتمال زیاد بعضی \n"
+"از بسته‌ها از زمان شروع پخش بروزسازی شده‌اند. اشکالات ممکن است تعمیر \n"
+"شده و مسایل امنیتی رفع شده باشند. برای استفاده از فواید این بروزسازی‌ها،\n"
+"اکنون می‌توانید آنها را از اینترنت بارگیری نمایید. \"%s\" را اگر شما یک "
+"ارتباط\n"
+"کارآرای اینترنت دارید علامت زده، یا \"%s\" را اگر ترجیح می‌دهید بسته‌ها را\n"
+"بعداً بروزسازی کنید.\n"
+"\n"
+"انتخاب \"%s\" لیستی از مکان‌هایی که آن بروزسازی‌ها می‌توانند دریافت شوند\n"
+"را نشان خواهد داد. شما باید مکانی که به شما نزدیکتر است را انتخاب کنید.\n"
+"درخت مجموعه-بسته ظاهر خواهد شد: مجموعه را مرور کرده، و \"%s\" را برای\n"
 "دریافت و نصب بسته‌های انتخاب شده، یا \"%s\" را برای ترک فشار دهید."
 
 #: 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 "نصب"
 
 #: help.pm:460
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "At this point, DrakX will allow you to choose the security level desired\n"
 "for the machine. As a rule of thumb, the security level should be set\n"
@@ -4429,26 +4428,30 @@ msgid ""
 "will be responsible for security. Security messages will be sent to that\n"
 "address."
 msgstr ""
-"در این نقطه، DrakX به شما اجازه‌ی انتخاب سطح امنیتی مورد نظر برای ماشین را \n"
-"می‌دهد. روش معمول این است که اگر ماشین حاوی داده های مهم خواهد شد، یا اگر \n"
-"آن ماشینی خواهد بود که مستقیماً در معرض اینترنت قرار می‌گیرد سطح امنیتی باید "
-"بالاتر\n"
-" گذاشته شود. ضرر این معامله در داشتن سطح بالاتر امنیتی عموماً در پرداخت "
-"آسانی \n"
-"استفاده بدست آورده می‌شود. \n"
+"در این نقطه، DrakX به شما اجازه‌ی انتخاب سطح امنیتی مورد نظر را برای ماشین\n"
+"می‌دهد. روش معمول این است که اگر ماشین حاوی داده‌های مهم خواهد شد، یا اگر\n"
+"آن ماشینی خواهد بود که مستقیماً در معرض اینترنت قرار می‌گیرد سطح امنیتی باید\n"
+"بالاتر گذاشته شود. ضرر این معامله در داشتن سطح بالاتر امنیتی عموماً در "
+"پرداخت\n"
+"آسانی استفاده بدست آورده می‌شود.\n"
+"\n"
+"اگر نمی‌دانید کدام را باید انتخاب کنید، گزینه‌ی پیش‌فرض را نگه دارید. بعداً "
+"می‌توانید\n"
+"با ابزار draksec از مرکز کنترل ماندرایک سطح امنیتی را تغییر دهید.\n"
 "\n"
-"اگر نمی‌دانید کدام را انتخاب کنید، گزینه‌ی پیش‌فرض را نگه دارید."
+"منطقه‌ی \"%s\" می‌تواند سیستم را از وجود کاربری که مسئول امنیت بر این رایانه\n"
+"خواهد گردید مطلع سازد. پیغام‌های امنیتی به آن نشانی فرستاده خواهد شد."
 
 #: help.pm:472
-#, fuzzy, c-format
+#, c-format
 msgid "Security Administrator"
-msgstr "مدیر امنیت:"
+msgstr "مدیر امنیت"
 
 #: help.pm:475
-#, fuzzy, c-format
+#, 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"
@@ -4518,91 +4521,82 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"در این موقع، شما مجبور به انتخاب قسمت‌بندی(های) که برای نصب سیستم لینوکس \n"
-"مان‌درایک استفاده خواهند شد هستید.اگر قسمت‌بندی‌هایی که یا از یک نصب قبلی \n"
-"گنو/لینوکس یا بوسیله ابزار قسمت‌بندی دیگر وجود دارند، شما می‌توانید ار آنها \n"
+"در این نقطه، شما مجبور به انتخاب قسمت‌بندی(های) که برای نصب سیستم لینوکس \n"
+"ماندرایک استفاده خواهد شد هستید.اگر قسمت‌بندی‌هایی که یا از یک نصب قبلی \n"
+"گنو/لینوکس یا بوسیله ابزار قسمت‌بندی دیگر وجود دارند، می‌توانید از آنها \n"
 "استفاده کنید. در غیر این صورت، قسمت‌بندی‌ها باید ایجاد شوند. \n"
 "\n"
-"برای ایجاد قسمت‌بندی‌ها، شما باید اول یک دستگاه دیسک را انتخاب نمایید. \n"
+"برای ایجاد قسمت‌بندی‌ها، شما باید اول یک دستگاه دیسک را انتخاب کنید. \n"
 "شما می‌توانید آن دیسک را بوسیله‌ی کلیک بر ``hda'' برای اولین دستگاه IDE \n"
-" و ``hdb'' برای دومین، ``sda'' برای اولین دستگاه SCSI و غیره برای قسمت‌بندی \n"
-"انتخاب نمایید. \n"
+" و ``hdb'' برای دومین، ``sda'' برای اولین دستگاه SCSI و غیره برای\n"
+"قسمت‌بندی انتخاب کنید.\n"
 "\n"
-"برای قسمت‌بندی دستگاه دیسک انتخاب شده، شما می‌توانید از این گزینه‌ها استفاده "
-"نمایید: \n"
+"برای قسمت‌بندی دستگاه دیسک انتخاب شده، می‌توانید از این گزینه‌ها استفاده کنید:\n"
 "\n"
 " * \"%s\": این گزینه تمام قسمت‌بندی‌های روی دیسک انتخاب شده را حذف می‌کند\n"
 "\n"
-" * \"%s\": این گزینه بر روی فضای آزاد دیسک شما بطور خودکار قسمت‌بندی‌های "
-"ext3 \n"
-"و حافظه مبادله swap را ایجاد می‌کند\n"
+" * \"%s\": این گزینه بر روی فضای آزاد دیسک شما بطور خودکار قسمت‌بندی‌های\n"
+"ext3 و حافظه مبادله را ایجاد می‌کند\n"
 "\n"
 "\"%s\": دسترسی به قابلیت‌های دیگر را فراهم می‌سازد\n"
 "\n"
 " * \"%s\": جدول قسمت‌بندی را بر دیسکچه ذخیره می‌کند.در صورت لزوم \n"
-" بعدا می‌توان آن را بازآوری نمود. انجام این گام بشدت پیشنهاد می‌شود.\n"
+"بعدا می‌توان آن را بازنشانی کرد. انجام این گام بشدت سفارش می‌شود.\n"
 "\n"
-" * \"%s\": به شما اجازه‌ی باز‌آوری جدول قسمت‌بندی ذخیره شده را از دیسکچه "
+" * \"%s\": به شما اجازه‌ی باز‌نشانی جدول قسمت‌بندی ذخیره شده را از دیسکچه "
 "می‌دهد.\n"
 "\n"
-" * \"%s\": اگر جدول قسمت‌بندی شما خراب شده باشد شما با این گزینه می‌توانید\n"
-"آن را بازآوری نمایید. لطفا دقت کنید و بخاطر داشته باشید که این همیشه درست "
-"کار\n"
-"نمی‌کند.\n"
+" * \"%s\": اگر جدول قسمت‌بندی شما خراب شده باشد با این گزینه می‌توانید\n"
+"آن را بازنشانی کنید. لطفا دقت کنید و بخاطر داشته باشید که این همیشه درست\n"
+"کار نمی‌کند.\n"
 "\n"
 " * \"%s\": تمام تغییرات باطل شده و جدول قسمت‌بندی اصلی بر دستگاه دیسک\n"
-"بارگزاری مجدد می‌شود.\n"
+"بارگذاری مجدد می‌شود.\n"
 "\n"
-" * \"%s\": غیرفعال کردن این گزینه کاربران را مجبور می‌کند که رسانه‌های قابل "
-"حمل\n"
-"از قبیل دیسکچه و سی‌دی را دستی سوار یا پیاده کنند.\n"
+" * \"%s\": غیرفعال کردن این گزینه کاربران را مجبور می‌کند که رسانه‌های قابل\n"
+"حمل از قبیل دیسکچه و سی‌دی را دستی سوار یا پیاده کنند.\n"
 "\n"
-" * \"%s\": اگر می‌خواهید از یک جادوگر برای قسمت‌بندی دیسک خود استفاده کنید از "
-"این\n"
-"گزینه استفاده نمایید. این گزینه اگر شما تجربه‌ی قبلی از قسمت‌بندی کردن دیسک "
-"ندارید\n"
-"پیشنهاد می‌شود.\n"
+" * \"%s\": اگر می‌خواهید از یک جادوگر برای قسمت‌بندی دیسک خود استفاده کنید از\n"
+"این گزینه استفاده نمایید. این گزینه اگر شما تجربه‌ی قبلی از قسمت‌بندی\n"
+"کردن دیسک ندارید پیشنهاد می‌شود.\n"
 "\n"
-" * \"%s\": برای لغو تغییرات خود از این گزینه استفاده نمایید.\n"
+" * \"%s\": برای لغو تغییرات خود از این گزینه استفاده کنید.\n"
 "\n"
-" * \"%s\": عملیات بیشتری را بر قسمت‌بندی‌ها اجازه داده(نوع، گزینه‌ها، قالب‌بندی) "
-"و \n"
-"اطلاعات بیشتری را درباره دستگاه دیسک می‌دهد.\n"
+" * \"%s\": عملیات بیشتری را بر قسمت‌بندی‌ها اجازه داده (نوع، گزینه‌ها، "
+"قالب‌بندی)\n"
+"و اطلاعات بیشتری را درباره دستگاه دیسک می‌دهد.\n"
 "\n"
 " * \"%s\": وقتی شما قسمت‌بندی دستگاه دیسک خود را به اتمام رساندید،\n"
 "این تغییرات شما را بر دیسک ذخیره می‌سازد.\n"
 "\n"
-"وقتی اندازه‌ی یک قسمت‌بندی را تایین می‌کنید، می‌توانید بخوبی از کلیدهای تیر \n"
-"صفحه‌کلید خود استفاده نمایید.\n"
+"وقتی اندازه‌ی یک قسمت‌بندی را تعیین می‌کنید، می‌توانید بخوبی از کلیدهای جهت‌دار\n"
+"صفحه‌کلید خود استفاده کنید.\n"
 "\n"
-"توجه: شما می‌توانید به هر گزینه توسط صفحه‌کلید دسترسی پیدا نمایید. در طول "
-"قسمت‌بندی\n"
-" با استفاده از تیرهای [Tab] و [Up/Down] مرور نمایید.\n"
+"توجه: می‌توانید به هر گزینه توسط صفحه‌کلید دسترسی پیدا کنید. در طول\n"
+"قسمت‌بندی با استفاده از جهت‌های [پرش] و [بالا/پایین] مرور کنید.\n"
 "\n"
 "وقتی یک قسمت‌بندی انتخاب شده باشد، می‌توانید از:\n"
 "\n"
-" * Ctrl-c برای ایجاد یک قسمت‌بندی جدید (وقتی یک قسمت‌بندی خالی انتخاب شده "
-"باشد)\n"
+" * Ctrl-c برای ایجاد یک قسمت‌بندی جدید (وقتی یک قسمت‌بندی خالی انتخاب\n"
+"شده باشد)\n"
 "\n"
 " * Ctrl-d برای حذف یک قسمت‌بندی \n"
 "\n"
-" * Ctrl-m برای تایین نقطه‌ی سوارساری\n"
+" * Ctrl-m برای تعیین نقطه‌ی سوارسازی\n"
 "\n"
 "برای دریافت اطلاعات درباره انواع سیستم پرونده موجود، لطفاً فصل ext2FS \n"
 "را از ` دستورالعمل مرجع'' بخوانید.\n"
 "\n"
 "اگر شما بر یک ماشین PPC نصب می‌کنید، شما باید یک قسمت‌بندی کوچک HFS \n"
-"``bootstrap'' حداقل ۱ مگابایت که برای بارگزار آغازگر yaboot استفاده می‌شود را "
-"ایجاد نمایید\n"
-"اگر شما بطور دلخواه آن قسمت‌بندی را بزرگتر بسازید، مثلاً ۵۰ مگابایت، شما آن "
-"را\n"
-"برای انبار یک هسته یدک و تصاویر ramdisk در شرایط آغازگری اضطراری\n"
-"مفید خواهید یافت."
+"``bootstrap'' حداقل ۱ مگابایت که برای بارگذار آغازگر yaboot\n"
+"استفاده می‌شود را ایجاد کنید اگر شما بطور اختیاری آن قسمت‌بندی را بزرگتر\n"
+"بسازید، مثلاً ۵۰ مگابایت، شما آن را برای انبار یک هسته یدک و تصاویر ramdisk\n"
+"در شرایط آغازگری اضطراری مفید خواهید یافت."
 
 #: help.pm:544
-#, fuzzy, c-format
+#, c-format
 msgid "Removable media auto-mounting"
-msgstr "سوارسازی خودکار رسانه قابل انتقال"
+msgstr "سوارسازی-خودکار رسانه‌ی قابل انتقال"
 
 #: help.pm:544
 #, c-format
@@ -4610,11 +4604,11 @@ msgid "Toggle between normal/expert mode"
 msgstr "تعویض بین حالت عادی/کارشناسی"
 
 #: help.pm:547
-#, fuzzy, c-format
+#, c-format
 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"
@@ -4644,7 +4638,7 @@ msgid ""
 msgstr ""
 "بیش از یک قسمت‌بندی مایکروسافت بر دیسک شما شناسایی شده است. \n"
 "لطفا آن قسمت‌بندی را که برای نصب سیستم عامل لینوکس ماندرایک می‌خواهید \n"
-"تغییر اندازه دهید را انتخاب نمایید. \n"
+"تغییر اندازه دهید انتخاب کنید.\n"
 "\n"
 "هر قسمت‌بندی فهرست شده بدنبال می‌آید: \"نام لینوکس\", \"نام ویندوز\" \n"
 "\"ظرفیت\".\n"
@@ -4659,17 +4653,16 @@ msgstr ""
 "\"شماره دستگاه دیسک\" همیشه یک حرف الفبا بعد از \"hd\" یا \"sd\"می‌باشد.\n"
 "با دستگاه‌های دیسک IDE:\n"
 "\n"
-" * \"a\" بمعنی \"دیسک ارباب بر کنترل کننده مقدم IDE \";\n"
+" * \"a\" بمعنی \"دیسک ارشد بر کنترل کننده‌ی اول IDE \";\n"
 "\n"
-" * \"b\" بمعنی \"دیسک برده بر کنترل کننده مقدم IDE \";\n"
+" * \"b\" بمعنی \"دیسک زیردست بر کنترل کننده‌ی اول IDE \";\n"
 "\n"
-" * \"c\" بمعنی \"دیسک ارباب بر کنترل کننده ثانوی IDE \";\n"
+" * \"c\" بمعنی \"دیسک ارشد بر کنترل کننده‌ی دوم IDE \";\n"
 "\n"
-" * \"d\" بمعنی \"دیسک برده بر کنترل کننده ثانوی IDE \".\n"
+" * \"d\" بمعنی \"دیسک زیردست بر کنترل کننده‌ی دوم IDE \".\n"
 "\n"
-"با دستگاه‌های دیسک SCSI, یک \"a\" بمعنی \"پایین‌ترین SCSI ID\", یک \"b\" "
-"بمعنی\n"
-"\"پایین‌ترین SCSI ID دومی\", و غیره.\n"
+"با دستگاه‌های دیسک SCSI, یک \"a\" بمعنی \"پایین‌ترین SCSI ID\", یک \"b\"\n"
+"بمعنی \"پایین‌ترین SCSI ID دومی\", و غیره.\n"
 "\n"
 "\"نام ویندوز\" حرف الفبای دستگاه دیسک شما در ویندوز می‌باشد (اولین\n"
 "دیسک یا قسمت‌بندی \"C:\" نامیده می‌شود)."
@@ -4688,13 +4681,13 @@ msgstr ""
 "کامل کشورها کلیک کنید."
 
 #: help.pm:584
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "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"
@@ -4702,39 +4695,37 @@ 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 ""
-"این گام فقط در صورتی که یک قسمت‌بندی قدیمی لینوکس/گنو بر ماشین شما پیدا شود "
+"این گام فقط در صورتی که یک قسمت‌بندی قدیمی لینوکس/گنو بر ماشین شما پیدا شود\n"
 "فعال می‌گردد. \n"
 "\n"
-"DrakX اکنون احتیاج دارد بداند که آیا شما می‌خواهید یک نصب جدید یا یک ارتقا "
-"یک \n"
-"سیستم لینوکس مان‌درایک موجود را انجام دهید: \n"
+"DrakX اکنون احتیاج دارد بداند که آیا شما می‌خواهید یک نصب جدید یا یک ارتقا\n"
+"سیستم لینوکس ماندرایک موجود را انجام دهید:\n"
 "\n"
 " * \"%s\": در مجموع این سیستم قدیمی را کاملاً پاک می‌کند اگر می‌خواهید روش\n"
-"قسمت‌بندی دستگاه‌های دیسک خود را تغییر دهید، یا سیستم پرونده را تعییر دهید، \n"
-"شما بایستی از این گزینه استفاده نمایید. هرچند، بستگی به طرح قسمت‌بندی شما، "
-"شما \n"
-"می‌توانید از بر-نگارش بعضی از داده‌های موجود خود جلوگیری کنید.\n"
+"قسمت‌بندی دستگاه‌های دیسک خود را تغییر دهید، یا سیستم پرونده را تغییر دهید، \n"
+"بایستی از این گزینه استفاده کنید. هرچند، بستگی به طرح قسمت‌بندی‌تان،\n"
+"می‌توانید از بر-نگارش بعضی از داده‌های موجودتان جلوگیری کنید.\n"
 "\n"
-" * \"%s\": این رده نصب به شما اجازه می‌دهد تا بسته‌های نصب شده کنونی لینوکس\n"
-"مان‌درایک را بروزسازی نمایید. طرح قسمت‌بندی کنونی شما و داده‌های کاربر دست\n"
-"نخواهند خورد و بیشتر گام‌های تنظیمات در دسترس باقی خواهند بود، \n"
-"شبیه به یک نصب استاندارد..\n"
+" * \"%s\": این رده‌ی نصب به شما اجازه می‌دهد تا بسته‌های نصب شده‌ی کنونی\n"
+"لینوکس ماندرایک را بروزسازی کنید. طرح قسمت‌بندی کنونی‌تان و داده‌های کاربر دست\n"
+"نخواهند خورد و بیشتر گام‌های پیکربندی در دسترس باقی خواهند بود،\n"
+"شبیه به یک نصب استاندارد.\n"
 "\n"
-"استفاده از گزینه ``ارتقا'' بایستی برای سیستم‌های لینوکس مان‌درایک نسخه \"8.1"
-"\"\n"
-"یا بعدی کارآرایی خوبی داشته باشد. اجرای یک ارتقا بر نسخ پیشتر از لینوکس\n"
-"مان‌درایک ۸.۱پیشنهاد نمی‌شود."
+"استفاده از گزینه‌ی ``ارتقاء'' بایستی برای سیستم‌های لینوکس ماندرایک نسخه‌ی\n"
+"\"8.1\"یا بعدی کارآرایی خوبی داشته باشد. اجرای ارتقاء بر نسخ پیشتر از "
+"لینوکس\n"
+"ماندرایک ۸٬۱ سفارش نمی‌شود."
 
 #: help.pm:605
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Depending on the language you chose in section , DrakX will automatically\n"
 "select a particular type of keyboard configuration. Check that the\n"
@@ -4754,23 +4745,23 @@ msgid ""
 "dialog will allow you to choose the key binding that will switch the\n"
 "keyboard between the Latin and non-Latin layouts."
 msgstr ""
-"بنابر زبان پیش‌فرض که در این قسمت انتخاب کرده‌اید، DrakX یک نوع بخصوص\n"
-"تنظیمات صفحه‌کلید را بطور خودکار انتخاب می‌کند. اگر چه ممکن است شما\n"
-"صفحه‌کلیدی که دقیقاً مطابق زبان شما باشد را نداشته باشید: برای مثال، اگر شما\n"
-"یک شخص انگلیسی زبان سوئیسی باشید، شما ممکن است یک صفحه‌کلید سوئیسی\n"
+"بنابر زبان پیش‌فرضی که در این قسمت انتخاب کرده‌اید، DrakX نوع بخصوصی\n"
+"از پیکربندی صفحه‌کلید را بطور خودکار انتخاب می‌کند. اگر چه ممکن است شما\n"
+"صفحه‌کلیدی را که دقیقاً مطابق زبان شما باشد نداشته باشید: برای مثال، اگر شما\n"
+"یک شخص انگلیسی زبان سوئیسی باشید، ممکن است یک صفحه‌کلید سوئیسی\n"
 "داشته باشید. یا اگر شما انگلیسی صحبت کرده ولی در کوبک کانادا زندگی می‌کنید،\n"
-"شما ممکن است خود را در شرایطی بیابید که زبان بومی شما و صفحه‌کلید مطابقت\n"
-"نداشته باشند. در هر دو صورت، این مرحله نصب به شما اجازه انتخاب یک صفحه‌کلید\n"
-"مناسب را از یک لیست می‌دهد.\n"
+"ممکن است خود را در شرایطی بیابید که زبان بومی شما و صفحه‌کلید مطابقت\n"
+"نداشته باشند. در هر دو صورت، این مرحله‌ی نصب به شما اجازه‌ی انتخاب\n"
+"صفحه‌کلید مناسب را از یک لیست می‌دهد.\n"
 "\n"
-"برای عرضه لیست کامل صفحه‌کلید‌های حمایت شده بر تکمه \"%s\" کلیک کنید.\n"
+"برای عرضه‌ی لیست کامل صفحه‌کلید‌های حمایت شده بر دکمه‌ی \"%s\" کلیک کنید.\n"
 "\n"
-"اگر شما یک صفحه‌کلید بر اساس یک الفبای غیر لاتین را انتخاب کنید، گفتگوی \n"
-"بعدی به شما اجازه‌ی ترکیب کلیدی که بتوانید بین طرح‌های صفحه‌کلید لاتین\n"
-"و غیر لاتین تعویض کنید را خواهد داد."
+"اگر شما صفحه‌کلیدی را بر اساس یک الفبای غیر لاتین انتخاب کنید، گفتگوی \n"
+"بعدی به شما اجازه‌ی ترکیب کلیدی را که بتوانید بین طرح‌های صفحه‌کلید لاتین\n"
+"و غیر لاتین تعویض کنید خواهد داد."
 
 #: help.pm:624
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Your choice of preferred language will affect the language of the\n"
 "documentation, the installer and the system in general. Select first the\n"
@@ -4784,7 +4775,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"
@@ -4810,30 +4801,42 @@ msgid ""
 "language used by the entire system. Running the command as a regular user\n"
 "will only change the language settings for that particular user."
 msgstr ""
-"انتخاب زبان ترجیحی شما زبان مستندات، نصب کننده و سیستم شما را در کل مورد\n"
-"تاثیر قرار خواهد داد. در ابتدا منطقه‌ای را که در آن قرار دارید و سپس زبانی را "
+"انتخاب زبان ترجیحی شما زبان نوشتجات، نصب‌گر و سیستم‌تان را در مجموع مورد\n"
+"تأثیر قرار خواهد داد. در ابتدا منطقه‌ای را که در آن قرار دارید و سپس زبانی را "
 "که\n"
-"صحبت می‌کنید را انتخاب نمایید.\n"
+"صحبت می‌کنید انتخاب نمایید.\n"
+"\n"
+"کلیک بر دکمه‌ی \"%s\" به شما اجازه می‌دهد تا زبان‌های دیگری را بر ایستگاه\n"
+"کارتان انتخاب کرده، و بدین طریق پرونده‌های مخصوص-زبان را برای سیستم\n"
+"نوشتجات و برنامه‌ها نصب کنید. برای نمونه، اگر شما کاربرانی از اسپانیا را بر\n"
+"رایانه‌اتان میزبان هستید، انگلیسی را مانند زمان پیش‌فرض در درخت‌نما انتخاب\n"
+"کرده و \"%s\" را در قسمت پیشرفته انتخاب کنید.\n"
 "\n"
-"کلیک بر تکمه‌ی \"%s\" به شما اجازه می‌دهد تا زبان‌های دیگری بر پایگاه کار\n"
-"خود را انتخاب کرده، و بدین طریق پرونده‌های مخصوص-زبان زا برای سیستم\n"
-"سندها و برنامه‌ها نصب نمایید. برای نمونه، اگر شما کاربرانی از اسپانیا را بر "
-"ماشین\n"
-"خود میزبان هستید، انگلیسی را مانند زمان پیش‌فرض در درخت‌نما انتخاب نموده\n"
-"و \"%s\" را در قسمت پیشرفته انتخاب نمایید.\n"
+"درباره‌ی پشتیبانی از UTF-8 (یونی‌کد): یونی‌کد کدگذاری نویسه‌ی جدیدی\n"
+"برای پوشش دادن همه‌ی زبان‌های موجود است. هرچند پشتیبانی کامل برای\n"
+"آن در لینوکس/گنو هنوز تحت تولید است. بدین دلیل، لینوکس ماندرایک از آن\n"
+"استفاده خواهد کرد یا بدلیل عدم وابستگی به گزینش‌های کاربر:\n"
 "\n"
-"توجه کنید که شما به انتخاب یک زبان اضافه‌ی تکی محدود نمی‌باشید. شما می‌توانید\n"
+" * اگر زبانی را با کدگذاری سنتی قوی (زبان‌های لاتین۱، روسی، ژاپنی،\n"
+"چینی، کره‌ای، تایلندی، یونانی، ترکی، بیشتر زبان‌های iso-8859-2) انتخاب\n"
+"کنید، کدگذاری سنتی بوسیله‌ی پیش‌فرض استفاده خواهد گردید:\n"
+"\n"
+" * بقیه‌ی زبان‌ها در پیش‌فرض از یونی‌کد استفاده خواهند کرد:\n"
+"\n"
+" * اگر دو یا زبان‌های بیشتری مورد نیاز است، و آن زبان‌ها از کدگذاری\n"
+"یکسان استفاده نمی‌کنند، پس یونی‌کد برای تمام سیستم استفاده خواهد شد.\n"
+"\n"
+" * در پایان، یونی‌کد می‌تواند برای سیستم با درخواست کاربر بوسیله‌ی\n"
+"انتخاب گزینه‌ی \"%s\" بدون وابستگی به زبان‌(های) گزیده شده اجبار گردد.\n"
+"\n"
+"توجه کنید که شما به انتخاب زبان اضافه‌ی تکی محدود نیستید. شما می‌توانید\n"
 "چندین زبان، حتی تمام آنها را بوسیله‌ی انتخاب جعبه‌ی \"%s\" انتخاب کنید.\n"
-"انتخاب کردن حمایت برای یک زبان بمعنی ترجمه‌ها، قلم های نگارش، غلط‌یاب‌ها\n"
-"وغیره برای آن زبان که نصب خواهد شد می‌باشد. بعلاوه، جعبه علامت \"%s\"\n"
-"به شما اجازه می‌دهد تا سیستم را مجبور به استفاده از یونی‌کد (UTF-8) نمایید.\n"
-"توجه داشته باشید که این یک قابلیت تجربی می‌باشد. اگر شما زبان های مختلف\n"
-"که لازم به رمزگذاری متفاوت دارند را انتخاب کرده‌اید، حمایت یونی‌کد بهر حال\n"
-"نصب خواهد شد.\n"
-"\n"
-"برای تعویض بین زبان‌های گوناگون نصب شده بر سیستم، شما می‌توانید\n"
+"انتخاب کردن پشتیبانی برای زبانی بمعنی ترجمه‌ها، قلم‌ها، غلط‌یاب‌ها\n"
+"وغیره برای آن زبان که نصب خواهد شد می‌باشد.\n"
+"\n"
+"برای تعویض بین زبان‌های گوناگون نصب شده بر سیستم، می‌توانید\n"
 "فرمان \"/usr/sbin/localedrake\" را مانند \"root\" برای تغییر زبان استفاده\n"
-"شده بوسیله‌ی تمام سیستم اجرا نمایید. اجرای این فرمان مانند یک کاربر عادی\n"
+"شده بوسیله‌ی تمام سیستم اجرا کنید. اجرای این فرمان مانند یک کاربر عادی\n"
 "تنظیم زبان را تنها برای آن کاربر عوض خواهد نمود."
 
 #: help.pm:660
@@ -4842,7 +4845,7 @@ msgid "Espanol"
 msgstr "اسپانول"
 
 #: help.pm:663
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usually, DrakX has no problems detecting the number of buttons on your\n"
 "mouse. If it does, it assumes you have a two-button mouse and will\n"
@@ -4874,34 +4877,39 @@ msgid ""
 "buttons and check that the mouse pointer moves on-screen as you move your\n"
 "mouse."
 msgstr ""
-"معمولا DrakX مشکلی برای شناسایی تعداد تکمه‌های موش شما ندارد. \n"
-"اگر اشکالی پیش آمد فرض بر آن می‌شود که شما موشی با دو تکمه دارید و \n"
-"می‌خواهید آن را برای شبیه‌سازی تکمه سوم تنظیم نمایید.تکمه‌ی سوم موش یک \n"
-"موش دو تکمه‌ای با فشردن همزمان تکمه‌های چپ و راست می‌تواند استفاده \n"
-"شود. DrakX بطور خودکار می‌داند که آیا موش شما از واسط PS/2 ، \n"
-"سریال یا USB استفاده می‌کند. \n"
-"\n"
-"اگر به هر دلیلی شما می‌خواهید یک نوع موش دیگر را تایین کنید، آن را از \n"
-"سیاهه عرضه شده انتخاب نمایید. \n"
-"\n"
-"اگر شما موشی غیر از پیش‌فرض انتخاب کنید، یک صفحه‌ی آزمایش نمایش داده \n"
-"خواهد شد. از تکمه‌ها و چرخ برای امتحان صحت تنظیمات و اینکه موش بدرستی \n"
-"کار می‌کند استفاده نمایید.ا گر آن موش بدرستی کار نمی‌کند، با فشار تکمه فضای \n"
-"خالی یا کلید [Return] برای لغو آزمایش و بازگشت به سیاهه‌ی انتخاب‌ها می‌توانید \n"
-"این کار را انجام دهید. \n"
-"\n"
-"چرخ‌موش‌ها بعضی وقتها خودکار شناسایی نمی‌شوند، بنابرین شما باید موش خود \n"
-"را از یک سیاهه انتخاب نمایید. مطمئن شوید که آن را که به درگاه موش شما وصل \n"
-"است را انتخاب می‌کنید. بعد از انتخاب یک موش و فشردن تکمه \"%s\" تصویر یک \n"
-"موش بر صفحه نمایان می‌شود. چرخ موش را بچرخانید تا آن را امتحان کرده باشید. \n"
-"با مشاهده‌ی چرخش موش همزمان با انجام آن توسط شما، می‌توانید تکمه‌ها را \n"
-"آزمایش کرده و امتحان کنید آیا وقتی شما موش خود را حرکت می‌دهید نشانه‌ی \n"
-"موش به همان طریق حرکت می‌کند."
+"معمولا DrakX مشکلی برای شناسایی تعداد دکمه‌های موشی‌اتان ندارد.\n"
+"اگر اشکالی پیش آمد فرض بر آن می‌شود که شما موشی دو دکمه‌ای دارید و\n"
+"می‌خواهید آن را برای شبیه‌سازی دکمه‌ی سوم پیکربندی کنید. دکمه‌ی سوم\n"
+"موشی یک موشی دو دکمه‌ای با فشردن همزمان دکمه‌های چپ و راست می‌تواند\n"
+"استفاده شود. DrakX بطور خودکار می‌داند که آیا موشی‌اتان از واسط PS/2،\n"
+"سریال یا USB استفاده می‌کند.\n"
+"\n"
+"در صورتی که موشی ۳ دکمه‌ای بدون چرخ دارید، می‌توانید موشی \"%s\"\n"
+"را انتخاب کنید. DrakeX موشی‌اتان را بعد پیکربندی کرده تا بتوانید چرخ\n"
+"آن را شبیه‌سازی کنید: برای این کار، دکمه‌ی وسطی را فشار داده و موشی‌اتان\n"
+"را به بالا و پایین حرکت دهید.\n"
+"\n"
+"اگر به هر دلیلی می‌خواهید نوع موشی دیگری را مشخص کنید، آن را از \n"
+"لیست عرضه شده انتخاب کنید.\n"
+"\n"
+"اگر شما موشی غیر از پیش‌فرض انتخاب کنید، صفحه‌ای آزمایشی نمایش داده\n"
+"خواهد شد. از دکمه‌ها و چرخ برای امتحان درستی تنظیمات و اینکه موشی بدرستی\n"
+"کار می‌کند استفاده کنید. اگر موشی بدرستی کار نمی‌کند، با فشار کلید فاصله\n"
+"یا کلید [ورود] برای لغو آزمایش و بازگشت به لیست گزینشها می‌توانید\n"
+"این کار را انجام دهید.\n"
+"\n"
+"موشی‌های چرخی بعضی وقتها خودکار شناسایی نمی‌شوند، بنابرین شما باید موشی‌اتان\n"
+"را از لیستی انتخاب کنید. مطمئن شوید که آن را که به درگاه موشی‌اتان وصل\n"
+"است انتخاب می‌کنید. بعد از انتخاب موشی و فشردن دکمه‌ی \"%s\" تصویر\n"
+"موشی بر صفحه نمایان می‌شود. چرخ موشی را بچرخانید تا آن را امتحان کرده باشید.\n"
+"با مشاهده‌ی چرخش موش همزمان با انجام آن توسط شما، می‌توانید تکمه‌ها را\n"
+"آزمایش کرده و امتحان کنید که آیا وقتی شما موشی‌اتان را حرکت می‌دهید\n"
+"مکان‌نمای موشی به همان طریق حرکت می‌کند."
 
 #: help.pm:691
-#, fuzzy, c-format
+#, c-format
 msgid "with Wheel emulation"
-msgstr "۳ دکمه با شبیه‌سازی چرخ"
+msgstr "با شبیه‌سازی چرخ"
 
 #: help.pm:694
 #, c-format
@@ -4913,7 +4921,7 @@ msgstr ""
 "بنام \"ttyS0\" در لینوکس خوانده می‌شود."
 
 #: help.pm:698
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
 "system: you have to enter the \"root\" password. \"Root\" is the system\n"
@@ -4952,49 +4960,43 @@ msgid ""
 "will never be connected to the Internet and you absolutely trust everybody\n"
 "who uses your computer, you can choose to have \"%s\"."
 msgstr ""
-"این مهمترین نقطه‌ی تصمیم گیری برای امنیت سیستم لینوکس/گنوی شما می‌باشد. شما "
-"باید\n"
-"گذرواژه‌ی \"root\" را وارد نمایید. \"Root\" مدیر سیستم می‌باشد و تنها کاربری "
-"است که\n"
-"می‌تواند بروزسازی کرده، کاربران را اضافه نماید، تنظیمات همگانی سیستم را تغییر "
-"دهد، و\n"
-"همچنین بقیه کارها ار این قبیل را. بطور خلاصه، \"root\" هر کاری می‌تواند انجام "
-"دهد! برای\n"
-"همین شما باید یک گذرواژه‌ای را انتخاب کنید که حدس زدنش سخت باشد - DrakX اگر\n"
-"گذرواژه خیلی ساده باشد به شما تذکر خواهد داد. همانطور که مشاهده می‌کنید، شما "
-"مجبور\n"
-"به وارد کردن یک گذرواژه نیستید، اما ما بشدت برعکس این را به شما نصیحت "
-"می‌کنیم.\n"
-"لینوکس/گنو مانند هر سیستم عامل دیگری مستعد برای خطاهای کارکنان می‌باشد.\n"
-"چون \"root\" هیچ محدودیت اجرایی ندارد و بطور غیر عمدی تمام داده‌ها بر\n"
-"قسمت‌بندی‌ها را بوسیله‌ی دستیابی بی‌توجه به قسمت‌بندی‌های خود پاک کند، این امر\n"
-"مهمی است که بسختی بتوان \"root\" شد.\n"
-"\n"
-"گذرواژه بایستی ترکیبی از نویسه‌های الفبا و حداقل دارای ۸ نویسه باشد. هرگز "
-"گذرواژه \n"
-"\"root\" یادداشت نشود-- آن به آسانی سیستم را تسلیم می‌کند.\n"
-"\n"
-"یک نصیحت -- گذرواژه را طولانی یا پیچیده نسازید برای اینکه شما باید بتوانید\n"
+"این مهمترین نقطه‌ی تصمیم گیری برای امنیت سیستم لینوکس/گنوی شما است.\n"
+"شما باید گذرواژه‌ی \"root\" را وارد کنید. \"Root\" مدیر سیستم است و تنها\n"
+"کاربری است که می‌تواند بروزسازی کرده، کاربران را اضافه کند، پیکربندی همگانی\n"
+"سیستم را تغییر دهد، و همچنین بقیه کارهای از این قبیل را. بطور خلاصه، \"root"
+"\"\n"
+"هر کاری را می‌تواند انجام دهد! برای همین شما باید گذرواژه‌ای را انتخاب کنید "
+"که\n"
+" حدس زدنش سخت باشد - DrakX اگر گذرواژه خیلی ساده باشد به شما تذکر داده\n"
+"خواهد شد. همانطور که مشاهده می‌کنید، شما مجبور به وارد کردن یک گذرواژه "
+"نیستید،\n"
+"ولی ما بشدت برعکس این را به شما نصیحت می‌کنیم. لینوکس/گنو مانند هر سیستم\n"
+"عامل دیگری برای خطاهای کارکنان  مستعد است. چون \"root\" هیچ محدودیت اجرایی\n"
+"ندارد و بطور غیر عمدی تمام داده‌ها بر قسمت‌بندی‌ها را بوسیله‌ی دستیابی بی‌توجه "
+"به\n"
+"قسمت‌بندی‌های خود پاک کند، این امر مهمی است که بسختی بتوان \"root\" شد.\n"
+"\n"
+"گذرواژه بایستی ترکیبی از نویسه‌های الفبا و حداقل دارای ۸ نویسه باشد. هرگز\n"
+"گذرواژه‌ی \"root\" یادداشت نشود-- آن به آسانی سیستم را تسلیم می‌کند.\n"
+"\n"
+"یک نصیحت -- گذرواژه را طولانی یا پیچیده نسازید برای اینکه باید بتوانید\n"
 "آنرا بخاطر بسپارید!\n"
 "\n"
 "گذرواژه هنگام نگارش آن برصفحه نشان داده نخواهد شد. برای کم کردن احتمال\n"
-"خطای نگارش کورکورانه لازم است که گذرواژه را دوبار بنوسید. اگر شما اتفاقی\n"
-"هر دوبار همان خطای نگارشی را انجام دهید، این گذرواژه‌ی تادرست همان می‌شود\n"
-"که شما باید بار اول استفاده کنید.\n"
+"خطای نگارش کورکورانه لازم است که گذرواژه را دوبار وارد کنید. اگر اتفاقی\n"
+"هر دوبار همان خطای نگارشی را انجام دهید، این گذرواژه‌ی نادرست همانی\n"
+"می‌شود که باید بار اول از آن استفاده کنید.\n"
 "\n"
-"اگر می‌خواهید دسترسی با این رایانه از طریق یک کارگزار اعتبارسنجی کنترل شود،\n"
-"تکمه‌ی \"%s\" را کلیک نمایید.\n"
+"اگر می‌خواهید دستیابی به این رایانه از طریق یک کارگزار تأیید هویت کنترل شود،\n"
+"دکمه‌ی \"%s\" را کلیک کنید.\n"
 "\n"
-"اگر شبکه‌ی شما نه از LDAP ،NIS، یا سرویس‌های اعتبارسنجی دامنه‌ی ویندوز\n"
-"استفاده می‌کند، یک سرویس مناسب را برای \"%s\" انتخاب نمایید. اگر نمی‌دانید از "
-"کدام\n"
-"باید استفاده کنید، باید از این را از سیستم مدیریت شبکه سوال نمایید.\n"
+"اگر شبکه‌اتان نه از LDAP ،NIS، یا سرویس‌های تأیید هویت دامنه‌ی ویندوز PDC\n"
+"استفاده می‌کند، سرویس مناسبی را برای \"%s\" انتخاب کنید. اگر نمی‌دانید از\n"
+"کدام باید استفاده کنید، باید این را از مدیر سیستم شبکه‌اتان سؤال کنید.\n"
 "\n"
-"اگر شما در بخاطر سپردن گذرواژه مشکل دارید، اگر رایانه شما هرگز به اینترنت "
-"وصل\n"
-"نخواهد شد یا شما مطلقاً به همه‌ی کسانی که از رایانه‌ی شما استفاده می‌کنند "
-"اطمینان\n"
-"دارید، می‌توانید داشتن \"%s\" را انتخاب نمایید."
+"اگر شما در بخاطر سپردن گذرواژه مشکل دارید، اگر رایانه شما هرگز به اینترنت\n"
+"وصل نخواهد شد یا شما مطلقاً به همه‌ی کسانی که از رایانه‌تان استفاده\n"
+"می‌کنند اطمینان دارید، می‌توانید داشتن \"%s\" را انتخاب کنید."
 
 #: help.pm:733
 #, c-format
@@ -5002,13 +5004,13 @@ msgid "authentication"
 msgstr "تأیید هویت"
 
 #. -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 "بدون گذرواژه"
 
 #: help.pm:736
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "This dialog allows you to fine tune your bootloader:\n"
 "\n"
@@ -5037,39 +5039,44 @@ 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"
 "Clicking the \"%s\" button in this dialog will offer advanced options which\n"
 "are normally reserved for the expert user."
 msgstr ""
-"این گفتگو به شما اجازه‌ی میزان کردن بارگزار آغازگر را می‌دهد:\n"
+"این گفتگو به شما اجازه‌ی میزان کردن بارگذار آغازگر را می‌دهد:\n"
 "\n"
-" * \"%s\": سه انتخاب برای بارگزار آغازگر شما وجود دارد:\n"
+" * \"%s\": سه گزینش برای بارگذار آغازگر شما وجود دارد:\n"
 "\n"
-"    * \"%s\": اگر شما grub (فهرست متنی) را ترجیح می‌دهید.\n"
+"    * \"%s\": اگر شما GRUB (فهرست متنی) را ترجیح می‌دهید.\n"
 "\n"
-"    * \"%s\": اگر شما LILO با واسط فهرست متنی را ترجیح می‌دهید.\n"
+"    * \"%s\": اگر شما LILO  را با واسط فهرست متنی ترجیح می‌دهید.\n"
 "\n"
-"    * \"%s\": اگر شما LILO با واسط فهرست تصویری را ترجیح می‌دهید.\n"
+"    * \"%s\": اگر شما LILO را با واسط فهرست تصویری ترجیح می‌دهید.\n"
 "\n"
-" * \"%s\": در بیشتر مواقع شما پیش‌فرض  (\"%s\") را تغییر نخواهید داد, اما "
-"اگر\n"
-"شما ترجیح می‌دهید، بارگزار آغازگر می‌تواند بر دستگاه دوم دیسک \n"
-"(\"%s\"), یا حتی بر دیسک‌نرم (\"%s\") نصب شود;\n"
+" * \"%s\": در بیشتر مواقع، شما پیش‌فرض (\"%s\") را تغییر نخواهید داد, اما\n"
+"اگر شما ترجیح می‌دهید، بارگذار آغازگر می‌تواند بر دستگاه دوم دیسک\n"
+"(\"%s\"), یا حتی بر دیسکچه (\"%s\") نصب شود;\n"
 "\n"
-" * \"%s\": بعد از آغاز و بازآغازگری رایانه، این تاملی است که به کاربر برای\n"
-"برای انتخاب یک ورودی آغازگری غیر از پیش‌فرض داده می‌شود. \n"
+" * \"%s\": بعد از آغازگری و آغازگری مجدد رایانه، این تأملی است که به\n"
+"کاربر برای انتخاب یک ورودی آغازگری غیر از پیش‌فرض داده می‌شود.\n"
 "\n"
-"!! توجه داشته باشید که اگر شما هیچ بارگزار آغازگری را برای نصب انتخاب نکنید "
-"(با انتخاب\n"
-"\"%s\"), شما باید حتما روشی برای آغاز سیستم لینوکس مان‌درایک خود داشته "
-"باشید!\n"
-"مطمئن شوید قبل از تغییر هر گزینه‌ای می‌دانید چکار دارید می‌کنید!! \n"
+" *  \"%s\": ACPI استاندارد جدیدی (که در سال ۲۰۰۲ پدید آمد) برای مدیریت\n"
+"نیرو بیشتر برای رایانه‌های کتابی است. اگر سخت‌افزارتان آن را پشتیبانی\n"
+"می‌کند و آن را احتیاج دارید، این جعبه را علامت بزنید.\n"
 "\n"
-"با کلیک بر تکمه \"%s\" در این گفتگو ، گزینه‌های پیشرفته عرضه شده که\n"
-"معمولا برای کاربران کارشناس در نظر گرفته شده‌اند."
+" *  \"%s\": اگر بر رایانه‌اتان مشکلات سخت‌افزاری مشاهده کردید (تصادم‌های\n"
+"IRQ٬ نااستواری، ایست رایانه، ...) باید سعی کنید APIC را با علامت زدن\n"
+"این جعبه از کار بیاندازید.\n"
+"\n"
+"!! توجه داشته باشید که اگر شما هیچ بارگذار آغازگری را برای نصب انتخاب نکنید\n"
+"(با انتخاب \"%s\"), باید حتما روشی برای آغاز سیستم لینوکس ماندرایک خود\n"
+"داشته باشید! مطمئن شوید قبل از تغییر هر گزینه‌ای می‌دانید چکار می‌کنید!! \n"
+"\n"
+"با کلیک بر دکمه‌ی \"%s\" در این گفتگو ، گزینه‌های پیشرفته که معمولا برای\n"
+"کاربران کارشناس در نظر گرفته شده‌اند عرضه می‌گردد."
 
 #: help.pm:768
 #, c-format
@@ -5097,9 +5104,9 @@ msgid "Delay before booting the default image"
 msgstr "درنگ پیش از آغازگری تصویر پیش‌فرض"
 
 #: help.pm:768
-#, fuzzy, c-format
+#, c-format
 msgid "Force no APIC"
-msgstr "اجبار هیچ APIC"
+msgstr "اجبار کردن بدون APIC"
 
 #: help.pm:771
 #, c-format
@@ -5134,8 +5141,9 @@ msgstr ""
 "یک دیسکچه‌ی آغازگر برای آغازگری آن سیستم‌های عامل احتیاج پیدا خواهید کرد!"
 
 #: 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 "افزودن"
@@ -5146,13 +5154,14 @@ msgid "Modify"
 msgstr "تغییر"
 
 #: 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 "برداشتن"
 
 #: help.pm:787
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "LILO and GRUB are GNU/Linux bootloaders. Normally, this stage is totally\n"
 "automated. DrakX will analyze the disk boot sector and act according to\n"
@@ -5169,27 +5178,27 @@ msgid ""
 "bootloader. Generally, the \"%s\" is the safest place. Choosing \"%s\"\n"
 "won't install any bootloader. Use it only if you know what you are doing."
 msgstr ""
-"LILO و grub بارگزاران GNU/Linux می‌باشند. معمولا این مرحله کاملا  \n"
-"خودکار می‌باشد. DrakX بندهای آغازگری دیسک را بررسی کرده و بر اساس\n"
+"LILO و GRUB بارگذارهای لینوکس/گنو هستند. معمولا این مرحله کاملا  \n"
+"خودکار است. DrakX بندهای آغازگری دیسک را بررسی کرده و بر اساس\n"
 "آنچه در آنجا پیدا می‌کند عمل خواهد کرد:\n"
 "\n"
-" * اگر یک بند آغازگر ویندوز یافت شود، آن را بوسیله یک بند آغازگر grub/LILO "
-"جایگزین\n"
-"می‌کند. بدین ترتیب شما قادر خواهید بود یا لینوکس/گنو یا یک سیستم عامل دیگر را "
-"آغازگری\n"
-"نمایید.\n"
+" * اگر بند آغازگری ویندوز یافت شود، آن را بوسیله یک بند آغازگر\n"
+"GRUB/LILO جایگزین می‌کند. بدین ترتیب شما قادر خواهید بود یا\n"
+"لینوکس/گنو یا سیستم عامل دیگری را آغازگری کنید.\n"
 "\n"
-" * اگر یک بند آغازگری grub یا LILO یافت شود, آن را با یکی دیگر جایگزین\n"
-"می‌نماید.\n"
+" * اگر یک بند آغازگری GRUB یا LILO یافت شود، آن را با یکی دیگر جایگزین\n"
+"می‌کند.\n"
 "\n"
-"اگر نتواند چیزی پیدا کند، DrakX مکانی را برای گذاشتن بارگزار آغازگر سوال \n"
-"خواهد کرد."
+"اگر نتواند چیزی پیدا کند، DrakX مکانی را برای گذاشتن بارگذار آغازگر سؤال\n"
+"خواهد کرد. معمولاً، \"%s\" مطمئن‌ترین مکان است. گزینش \"%s\" هیچ\n"
+"بارگذار آغازگر را نصب نخواهد کرد. فقط اگر می‌دانید چکار می‌کنید از آن\n"
+"استفاده کنید."
 
 #: help.pm:803
-#, fuzzy, c-format
+#, 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"
@@ -5213,41 +5222,38 @@ msgid ""
 "system you may change it by running PrinterDrake from the Mandrake Control\n"
 "Center and clicking the expert button."
 msgstr ""
-"اکنون زمان آن رسیده که یک سیستم چاپ برای رایانه شما انتخاب شود. سیستم های "
-"عامل دیگر ممکن \n"
-"است یکی را به شما عرضه کنند، ولی لینوکس مان‌درایک دو تا عرضه می‌دارد. هر یک از "
-"سیستم‌های \n"
-"چاپ برای تنظیم نوع خاصی مناسب‌تر می‌باشد. \n"
+"اکنون زمان آن رسیده که سیستم چاپی برای رایانه‌اتان انتخاب شود. سیستم‌های\n"
+"عامل دیگر ممکن است یکی را به شما عرضه کنند، ولی لینوکس ماندرایک دو تا را\n"
+" عرضه می‌کند. هر یک از سیستم‌های چاپ برای پیکربندی نوع خاصی مناسب‌تر است.\n"
 "\n"
 "  * \"%s\" -- که مخفف شده‌ی ``چاپ, بدون صف'', انتخابی است برای آن دسته که\n"
 "اتصال مستقیم به چاپگر خود دارند، شما که می‌خواهید از ترافیک چاپگر رهایی\n"
 "یابید، و چاپگرهای شبکه‌ای ندارید. (\"%s\"موارد خیلی ساده‌ی شبکه را اداره\n"
 "کرده و وقتی با شبکه استفاده شود قدری آهسته کار می‌کند.) پیشنهاد ما به شما\n"
-"استفاده از  \"pdq\" اگر این اولین تجربه‌ی شما با گنو/لینوکس است می‌باشد.\n"
+"استفاده از \"pdq\" اگر این اولین تجربه‌ی شما با لینوکس/گنوست می‌باشد.\n"
 "\n"
 " * \"%s\" - `` Common Unix Printing System'', یک انتخاب برتر برای چاپ به\n"
-"چاپگر محلی شما یا به یک چاپگر در آن طرف کره‌ی زمین می‌باشد. تنظیم آن\n"
+"چاپگر محلی‌تان یا به چاپگری در آن طرف کره‌ی زمین است. پیکربندی آن\n"
 "آسان بوده و می‌تواند مانند یک کارگزار یا یک کارگیر برای سیستم چاپ عهد عتیق\n"
-"\"lpd \" عمل کند، بنابرین آن با سیستم‌های عامل قدیمی که ممکن است هنوز به "
-"سرویس چاپ\n"
-"احتیاج داشته باشند همخوانی دارد. در حالی که بسیار قدرتمند است، برپاسازی "
-"پایه‌ای\n"
-"آن تقریباً به سادگی  \"pdq\"می‌باشد. اگر شما احتیاج به شبیه سازی یک کارگزار "
-"\"lpd\" \n"
-"دارید، مطمئن شوید که شبح \"cups-lpd \" را روشن کرده باشید. \"%s\" شامل یک \n"
-"ظاهر تصویری برای چاپ یا انتخاب گزینه‌های چاپگر و برای مدیریت چاپگر می‌باشد.\n"
+"\"lpd \" عمل کند، بنابرین آن با سیستم‌های عامل قدیمی که ممکن است هنوز به\n"
+"سرویس چاپ احتیاج داشته باشند همخوانی دارد. در حالی که بسیار قدرتمند است،\n"
+"برپاسازی پایه‌ای آن تقریباً به سادگی  \"pdq\"می‌باشد. اگر شما احتیاج به "
+"شبیه‌سازی\n"
+"یک کارگزار \"lpd\" دارید، مطمئن شوید که شبح \"cups-lpd \" را روشن کرده "
+"باشید.\n"
+"\"%s\" شامل یک ظاهر تصویری برای چاپ یا انتخاب گزینه‌های چاپگر و برای\n"
+"مدیریت چاپگر می‌باشد.\n"
 "\n"
 "اگر شما انتخاب خود را اکنون انجام دهید، و بعداً دریابید که سیستم چاپ خود را\n"
-"دوست ندارید می‌توانید آن را بوسیله‌ی برنامه PrinterDrake در مرکز کنترل "
-"مان‌درایک\n"
-"و کلیک بر تکمه کارشناس تغییر دهید."
+"دوست ندارید می‌توانید آن را بوسیله‌ی برنامه‌ی PrinterDrake در مرکز کنترل\n"
+"ماندرایک و کلیک بر دکمه‌ی کارشناس تغییر دهید. "
 
 #: help.pm:826
 #, c-format
 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"
@@ -5292,7 +5298,7 @@ msgstr ""
 "لازمند به سخت‌افزار داده شوند وارسی کند، باید راه‌انداز را دستی پیکربندی کنید."
 
 #: help.pm:847
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You can add additional entries in yaboot for other operating systems,\n"
 "alternate kernels, or for an emergency boot image.\n"
@@ -5340,56 +5346,56 @@ msgid ""
 "selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
 "highlighted with a ``*'' if you press [Tab] to see the boot selections."
 msgstr ""
-"شما می‌توانید ورودی‌های دیگری برای سیستم‌های عامل دیگری، هسته‌های \n"
-"جایگزین، یا یک تصویر آغازگری نجات را به yaboot اضافه نمایید، \n"
+"شما می‌توانید ورودی‌های دیگری را به yaboot برای سیستم‌های عامل \n"
+"دیگری، هسته‌های جایگزین، یا تصویر آغازگری نجاتی اضافه کنید.\n"
 "\n"
-"برای سیستم‌های عامل دیگر، آن ورودی فقط شامل یک برچسب و قسمت‌بندی \n"
-" \"root\"\n"
-" می‌باشد. \n"
-"برای لینوکس چند گزینه‌ی ممکنه وجود دارد: \n"
+"برای سیستم‌های عامل دیگر، ورودی فقط شامل برچسبی و\n"
+"قسمت‌بندی \"root\" است.\n"
 "\n"
-"* برچسب یا Label: این نامی است که شما باید برای انتخاب این گزینه‌ی آغازگر \n"
-"در پرومپ yaboot وارد نمایید.\n"
+"برای لینوکس چند گزینه‌ی ممکنه وجود دارند:\n"
 "\n"
-"* تصویر یا Image: این نام هسته‌ای است که آغازگر می‌باشد. معمولا، vmlinux یا \n"
-"یک نوع از vmlinux با یک دنباله.\n"
+" * برچسب: این نامی است که باید برای انتخاب این گزینه‌ی آغازگر \n"
+"در پرومپ yaboot وارد کنید.\n"
 "\n"
-"* ریشه یا Root: شاخه \"root\" یا ``/'' برای نصب لینوکس شما. \n"
+" * تصویر: این نام هسته‌ای است که آغازگر می‌باشد.\n"
+"معمولا،vmlinux یا یک نوع از vmlinux با یک دنباله.\n"
 "\n"
-"* پیوست یا Append: بر سخت‌افزار رایانه‌های Apple، گزینه‌ی \n"
-"پیوست هسته برای یاری در آشناسازی سخت‌افزار ویدیو، یا فعال سازی \n"
-"صفحه‌کلید، شبیه‌ساز تکمه موش برای دومین و سومین تکمه‌هایی که در بعضی\n"
-"از موش‌ها وجود ندارند استفاده می‌شود. \n"
-"به چند مثال در زیر توجه نمایید: \n"
+" * ریشه: شاخه‌ی \"root\" یا ``/'' برای نصب لینوکس‌تان.\n"
+"\n"
+" * پیوست: بر سخت‌افزار رایانه‌های Apple، گزینه‌ی پیوست هسته\n"
+"برای یاری در مقداردهی سخت‌افزار ویدیو، یا برای بکار اندازی صفحه‌کلید،\n"
+"شبیه‌ساز دکمه‌ی موشی برای دومین و سومین دکمه‌هایی که در بعضی\n"
+"از موشی‌ها وجود ندارند استفاده می‌شود. \n"
+"به چند مثال در زیر توجه کنید: \n"
 "\n"
 "         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
 "hda=autotune\n"
 "\n"
 "         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-"* شروعگر یا Initrd: از این گزینه برای بارگذاری بخش‌های شروعی قبل از \n"
+"* Initrd: از این گزینه برای بارگذاری بخش‌های شروعی قبل از \n"
 "دسترسی به دستگاه آغازگر، یا بارگذاری یک تصویر دیسک حافظه موقت یا ramdisk \n"
 "برای یک موقعیت اضطراری در آغازگری استفاده می‌شود. \n"
 "\n"
-"* اندازه۰شروعگر یا Initrd-size: اندازه پیش‌فرض دیسک حافظه موقت \n"
+"* Initrd-size: اندازه پیش‌فرض دیسک حافظه موقت \n"
 "معمولا ۴۰۹۶ کیلوبایت است. اگر شما احتیاج به یک دیسک حافظه موقت بزرگتر \n"
 "دارید، این گزینه برای تایین اندازه‌ی بیشتر از پیش‌فرض می‌تواند استفاده شود. \n"
 "\n"
-"* خواندن۰نوشتن یا Read-write: معمولا قسمت‌بندی \"root\" در شروع مانند \n"
+"* خواندن-نگارش: معمولا قسمت‌بندی \"root\" در شروع مانند \n"
 "فقط-خواندن سوار می‌شود، این برای توانستن کنترل قبل از زنده ``live'' شدن \n"
 "سیستم می‌باشد. شما با این گزینه می‌توانید پیش‌فرض را نادیده بگیرید. \n"
 "\n"
-"* بدون-ویدیو یا NoVideo: اگر سخت‌افزار ویدیوی اپل برای شما ایجاد \n"
-"اشکالات فراوان کرد می‌توانید این گزینه را در آغازگری انتخاب کرده \n"
-"تا بوسیله حالت ``novideo'' با حمایت ذخیره در صف بومی native frame buffer \n"
-"رایانه را آغازگری نمایید. \n"
+"* بدون-ویدیو: اگر سخت‌افزار ویدیوی اپل برای شما ایجاد اشکالات\n"
+"فراوان کرد می‌توانید این گزینه را در آغازگری انتخاب کرده تا بوسیله\n"
+"حالت ``novideo'' با حمایت ذخیره در صف بومی native frame buffer \n"
+"رایانه را آغازگری کنید.\n"
 "\n"
 "* پیش‌فرض یا Default: این ورودی انتخاب پیش‌فرض لینوکس بوده که با \n"
 "فشردن تکمه ENTER انتخاب می‌شود.اگر شما تکمه [Tab]  را برای دیدن \n"
 "انتخاب آغازگری فشار دهید این ورودی با یک ستاره نمایان می‌شود."
 
 #: help.pm:894
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Yaboot is a bootloader for NewWorld Macintosh hardware and can be used to\n"
 "boot GNU/Linux, MacOS or MacOSX. Normally, MacOS and MacOSX are correctly\n"
@@ -5422,42 +5428,38 @@ msgid ""
 " * Default OS: you can select which OS will boot by default when the Open\n"
 "Firmware Delay expires."
 msgstr ""
-"برنامه Yaboot یک بارگزار آغازگر برای سخت‌افزار مک‌اینتاش بوده و می‌تواند GNU/"
-"Linux, MacOS \n"
-"یا MacOSX را اغازگری کند. معمولاً، MacOS و MacOSX بدرستی شناسایی و در فهرست \n"
-"بارگزار آغازگر نصب می‌شوند. اگر این طور نشد، شما می‌توانید یک ورودی رادر این "
-"صحنه \n"
-"بوسیله دست اضافه نمایید. دقت کنید که اجرای درست را انتخاب می‌کنید.\n"
+"برنامه Yaboot یک بارگزار آغازگر برای سخت‌افزار مک‌اینتاش بوده و می‌تواند گنو/"
+"لینوکس,\n"
+"MacOS یا MacOSX را آغازگری کند. معمولاً، MacOS و MacOSX بدرستی شناسایی\n"
+"و در فهرست بارگزار آغازگر نصب می‌شوند. اگر این طور نشد، می‌توانید ورودیی را "
+"در\n"
+"این صحنه بوسیله دست اضافه کنید. دقت کنید که پارامترهای درست را انتخاب "
+"می‌کنید.\n"
 "\n"
 " گزینه‌های اصلی Yaboot: \n"
 "\n"
-"  * پیغام شروع: یک متن ساده پیش از اعلان آغازگر نشان داده می‌شود.\n"
+"  * پیغام init: متن ساده‌ای که پیش از اعلان آغازگر نشان داده می‌شود.\n"
 "\n"
-" * دستگاه آغازگر: نشان دهنده‌ی جایی است که می‌خواهید اطلاعات لازم برای "
-"آغازگری\n"
-"به لینوکس/گنو را قرار دهید. معمولاً، شما یک قسمت‌بندی تسمه‌آغازگری را پیشتر "
-"برای \n"
-"نگهداری این اطلاعات برپاسازی نموده‌اید.\n"
+" * دستگاه آغازگر: نشان دهنده‌ی جایی است که می‌خواهید اطلاعات لازم برای\n"
+"آغازگری به لینوکس/گنو را قرار دهید. معمولاً، شما یک قسمت‌بندی تسمه‌آغازگری\n"
+"را از قبل برای نگهداری این اطلاعات برپاسازی کرده‌اید.\n"
 "\n"
 " * تأخیر ثابت‌افزار آزاد: برخلاف LILO، دو تأخیر با yaboot موجود می‌باشد.\n"
-"اولین تأخیر با ثانیه اندازه گیری شده و در این نقطه، شما می‌توانید بین CD, OF "
-"boot, \n"
-"MacOS یا Linux انتخاب نمایید;\n"
+"اولین تأخیر با ثانیه اندازه گیری شده و در این نقطه، شما می‌توانید بین CD, OF\n"
+"boot, MacOS یا Linux انتخاب کنید;\n"
 "\n"
-" * وقفه آغازگری هسته: این وقفه شبیه تأخیر آغازگری LILO می‌باشد.\n"
+" * وقفه‌ی آغازگری هسته: این وقفه شبیه تأخیر آغازگری LILO می‌باشد.\n"
 "بعد از انتخاب لینوکس، شما این تأخیر را در یکدهم ثانیه پیش از توضیح\n"
 "هسته پیش‌فرض خود دارید;\n"
 "\n"
-" * فعال‌سازی آغازگری از CD؟: علامت زدن این گزینه به شما اجازه‌ی انتخاب ``C''را "
-"برای CD\n"
-"را در اولین اعلان آغازگری میدهد.\n"
+" * بکار اندازی آغازگری از CD؟: علامت زدن این گزینه به شما اجازه‌ی\n"
+"انتخاب ``C''را برای CD را در اولین اعلان آغازگری میدهد.\n"
 "\n"
-" * فعال‌سازی OF Boot؟: علامت زدن این گزینه به شما اجازه‌ی انتخاب ``N'' را "
-"برای\n"
-"ثابت‌افزار آزاد را در اولین اعلان آغازگری می‌دهد.\n"
+" * بکار اندازی OF Boot؟: علامت زدن این گزینه به شما اجازه‌ی انتخاب\n"
+"``N'' را برای ثابت‌افزار آزاد را در اولین اعلان آغازگری می‌دهد.\n"
 "\n"
-" * سیستم عامل پیش‌فرض: شما می‌توانید سیستم عامل آغازگر پیش‌فرض را وقتی \n"
-"وقفه‌ی ثابت‌افزار آزاد پایان می‌یابد را انتخاب نمایید."
+" * سیستم عامل پیش‌فرض: می‌توانید سیستم عامل آغازگر پیش‌فرض را\n"
+"وقتی وقفه‌ی ثابت‌افزار آزاد پایان می‌یابد انتخاب کنید."
 
 #: help.pm:926
 #, c-format
@@ -5471,14 +5473,14 @@ msgstr ""
 "می‌شود. اگر کارت نشان داده شده آن نیست که در سیستم شما وجود دارد، \n"
 "می‌توانید بر دکمه کلیک کرده و راه‌انداز دیگری را انتخاب کنید."
 
-#: 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 "کارت صوتی"
 
 #: help.pm:932
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "As a review, DrakX will present a summary of information it has about your\n"
 "system. Depending on your installed hardware, you may have some or all of\n"
@@ -5541,87 +5543,75 @@ msgid ""
 "on your machine. If you plan to use this machine as a server it's a good\n"
 "idea to review this setup."
 msgstr ""
-"مانند پیش‌نمایش، برنامه‌ی  خلاصه‌ای از اطلاعات خود را درباره‌ی سیستم شما را \n"
-"عرضه می‌دارد. بستگی به نرم‌افزارهای نصب شده، شما می‌توانید بعضی یا همه "
-"ورودی‌های \n"
-"بدنبال آمده را دارا باشید. هر ورودی از عنصری که باید تنظیمات شود و یک "
-"خلاصه‌ی \n"
-"کوتاه تنظیمات کنونی بدنبال آمده آن ساخته شده است. بر تکمه‌ی مربوط \"%s\" \n"
-"برای تغییر آن کلیک نمایید. \n"
-"\n"
-" * \"%s\": تنظیمات نقشه صفحه‌کلید کنونی را کنترل کرده و آن را اگر لازم است "
-"تغییر\n"
-"دهید.\n"
+"مانند پیش‌نمایش، DrakX خلاصه‌ای از اطلاعات خود را درباره‌ی سیستم‌تان\n"
+"عرضه می‌دارد. بستگی به نرم‌افزارهای نصب شده، می‌توانید بعضی یا همه‌ی\n"
+"ورودی‌های بدنبال آمده را دارا باشید. هر ورودی از عنصری که باید تنظیمات\n"
+"شود و یک خلاصه‌ی کوتاه تنظیمات کنونی بدنبال آمده آن ساخته شده است.\n"
+" بر دکمه‌ی مربوطه‌ی \"%s\" برای تغییر آن کلیک کنید.\n"
+"\n"
+" * \"%s\": تنظیمات نقشه صفحه‌کلید کنونی را کنترل کرده و آن را اگر لازم است\n"
+"تغییر دهید.\n"
+"\n"
+" * \"%s\": انتخاب کشور کنونی را کنترل نمایید. اگر شما در این کشور نیستید، "
+"بر\n"
+"دکمه‌ی \"%s\" کلیک کرده و یکی دیگر را انتخاب نمایید. اگر کشور شما در اولین "
+"لیست\n"
+"نشان داده شده نیست، بر دکمه‌ی \"%s\" برای دریافت لیست کامل کشورها کلیک کنید.\n"
+"\n"
+" * \"%s\": بوسیله پیش‌فرض، DrakX منطقه زمانی‌تان را بر اساس کشوری که\n"
+"انتخاب کرده‌اید استنتاج می‌کند. می‌توانید بر دکمه‌ی \"%s\" اگر این درست\n"
+"نیست کلیک کنید.\n"
+"\n"
+" * \"%s\": پیکربندی موشی کنونی را بررسی کرده و اگر لازم است آن را با کلیک "
+"بر\n"
+"دکمه‌ی تغییر دهید.\n"
+"\n"
+" * \"%s\": کلیک کردن بر دکمه‌ی \"%s\" جادوگر پیکربندی چاپگر را باز خواهد کرد\n"
+"به فصل مربوط ``راهنمای شروع'' برای اطلاعات بیشتر در چگونه یک چاپگر جدید را\n"
+"برپاسازی کنیم مراجعه کنید. ظاهر عرضه شده در آنجا شبیه به آن است که در طول\n"
+"نصب استفاده شده است.\n"
+"\n"
+" * \"%s\": اگر کارت صوتی بر سیستم‌تان شناسایی شده است، در اینجا نمایش\n"
+"داده می‌شود. اگر متوجه شدید که کارت صوتی نشان داده شده آن نیست که واقعاً \n"
+"بر سیستم‌تان وجود دارد می‌توانید بر آن دکمه برای انتخاب راه‌انداز دیگری کلیک "
+"کنید.\n"
 "\n"
-" * \"%s\": انتخاب کشور کنونی را کنترل نمایید. اگر شما در این کشور نیستید، بر "
-"تکمه‌ی\n"
-"\"%s\" کلیک کرده و یکی دیگر را انتخاب نمایید. اگر کشور شما در اولین لیست "
-"نشان داده\n"
-"شده نمی‌باشد، بر تکمه‌ی \"%s\" برای دریافت لیست کامل کشورها کلیک نمایید.\n"
+" * \"%s\": بوسیله پیش‌فرض, DrakX تفکیک‌پذیری واسط تصویری شما را\n"
+"\"800x600\" یا \"1024x768\" پیکربندی می‌کند. اگر آن برای شما مناسب نیست، \n"
+"برای پیکربندی مجدد واسط تصویری خود بر \"%s\" کلیک کنید.\n"
 "\n"
-" * \"%s\": بوسیله پیش‌فرض، DrakX منطقه زمانی شما را بر اساس کشوری را که\n"
-"انتخاب کرده‌اید استنتاج می‌کند. شما می‌توانید بر تکمه \"%s\" اگر این صحیح "
-"نمی‌باشد\n"
-"کلیک نمایید.\n"
+" * \"%s\": اگر کارت TV بر سیستم شما شناسایی شده باشد، آن در اینجا نشان\n"
+"داده می‌شود. اگر شما یک کارت TV داشته ولی شناسایی نشده، بر \"%s\"\n"
+" برای تلاش به پیکربندی دستی آن کلیک کنید.\n"
 "\n"
-" * \"%s\": تنظیمات موش کنونی را کنترل کنید و اگر لازم است آن را با کلیک بر "
-"تکمه تغییر\n"
+" * \"%s\": اگر کارت ISDN بر سیستم شما شناسایی شده باشد, آن در اینجا نشان\n"
+"داده خواهد شد. می‌توانید با کلیک بر \"%s\" پارامترهای مرتبط با کارت را تغییر "
 "دهید.\n"
 "\n"
-" * \"%s\": کلیک کردن بر تکمه \"%s\" جادوگر تنظیمات چاپگر را باز خواهد کرد\n"
-"به فصل مربوط ``راهنمای شروع'' برای اطلاعات بیشتر در چگونه یک چاپگر جدید را "
-"بر پاسازی\n"
-"کنیم مراجعه نمایید. ظاهر عرضه شده در آنجا شبیه به آن است که در طول نصب\n"
-"استفاده شده است.\n"
-"\n"
-" * \"%s\": اگر یک کارت صدا بر سیستم شما شناسایی شده است، آن در اینجا نمایش\n"
-"داده می‌شود. اگر متوجه شدید که کارت صدای نشان داده شده آن نیست که واقعاً \n"
-"بر سیستم شما وجود دارد می‌توانید بر آن تکمه برای انتخاب راه‌انداز دیگری کلیک "
-"نمایید.\n"
-"\n"
-" * \"%s\": بوسیله پیش‌فرض, DrakX وضوح واسط تصویری شما را \n"
-"\"800x600\" یا \"1024x768\" تنظیم میکند. اگر آن برای شما مناسب نمی‌باشد، \n"
-"برای تنظیم واسط تصویری خود بر \"%s\" کلیک نمایید.\n"
-"\n"
-" * \"%s\": اگر یک کارت TV بر سیستم شما شناسایی شده باشد، آن در اینجا نشان "
-"داده می‌شود.\n"
-"اگر شما یک کارت TV داشته ولی شناسایی نشده، بر \"%s\" برای تلاش به تنظیم \n"
-"دستی آن کلیک نمایید.\n"
-"\n"
-" * \"%s\": اگر یک کارت ISDN بر سیستم شما شناسایی شده باشد, آن در اینجا نشان "
-"داده\n"
-"خواهد شد. شما می‌توانید با کلیک بر \"%s\" اجزای مرتبط با کارت را تغییر دهید.\n"
-"\n"
-" * \"%s\": اگر می‌خواهید دسترسی به اینترنت یا به شبکه محلی خود را اکنون تنظیم "
-"نمایید\n"
+" * \"%s\": اگر می‌خواهید دستیابی به اینترنت یا به شبکه محلی‌تان را اکنون "
+"پیکربندی کنید\n"
 "\n"
-" * \"%s\": این ورودی به شما اجازه‌ی تعریف مجدد سطح امنیت را که در مرحله‌ی "
-"پیشین  \n"
-"تایین شده را می‌دهد.\n"
+" * \"%s\": این ورودی به شما اجازه‌ی تعریف مجدد سطح امنیت را که در مرحله‌ی\n"
+"پیشین تعیین شده می‌دهد.\n"
 "\n"
-" * \"%s\": اگر شما طرحی برای ارتباط ماشین خود به اینترنت دارید, فکر خوبی "
-"است\n"
-"که رایانه خود را از رسوخ دیگران بوسیله برپاسازی یک دیوارآتش حفاظت نمایید. به "
-"فصل\n"
-"مربوط ``راهنمای شروع'' برای تشریحات درباره تنطیم‌های دیوارآتش مراجعه نمایید.\n"
+" * \"%s\": اگر طرحی برای اتصال ماشین خود به اینترنت دارید, فکر خوبی است\n"
+"که رایانه خود را از رسوخ دیگران بوسیله برپاسازی دیوارآتش حفاظت کنید. به فصل\n"
+"مربوط ``راهنمای مبتدی'' برای تشریحات درباره تنطیمات دیوارآتش مراجعه کنید.\n"
 "\n"
-" * \"%s\": اگر می‌خواهید تنظیمات بارگزار آغازگر را تغییر دهید, آن تکمه را "
-"کلیک کنید\n"
-"این بایستی برای کاربران پیشرفته رزرو شود.\n"
+" * \"%s\": اگر می‌خواهید پیکربندی بارگذار آغازگر را تغییر دهید, آن دکمه را\n"
+"کلیک کنید این بایستی برای کاربران پیشرفته رزرو شود.\n"
 "\n"
-" * \"%s\": در اینجا شما قادر خواهید بود سرویس‌هایی را که بر ماشین شما اجرا "
-"خواهند شد\n"
-"را میزان کنید. اگر می‌خواهید از این ماشین مانند یک کارگزار استفاده کنید فکر "
-"خوبی است که\n"
-"این برپاسازی را مرور نمایید."
+" * \"%s\": در اینجا قادر خواهید بود سرویس‌هایی را که بر ماشین شما اجرا\n"
+"خواهند شد را میزان کنید. اگر می‌خواهید از این ماشین مانند یک\n"
+"کارگزار استفاده کنید فکر خوبی است که این برپاسازی را مرور کنید."
 
 #: 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 "صفحه‌کلید"
 
-#: help.pm:991 install_steps_interactive.pm:921
+#: help.pm:991 install_steps_interactive.pm:926
 #, c-format
 msgid "Timezone"
 msgstr "زمان منطقه‌ای"
@@ -5631,7 +5621,7 @@ msgstr "زمان منطقه‌ای"
 msgid "Graphical Interface"
 msgstr "واسط گرافیکی"
 
-#: help.pm:991 install_steps_interactive.pm:995
+#: help.pm:991 install_steps_interactive.pm:1000
 #, c-format
 msgid "TV card"
 msgstr "کارت تلویزیون"
@@ -5641,44 +5631,44 @@ msgstr "کارت تلویزیون"
 msgid "ISDN card"
 msgstr "کارت ISDN"
 
-#: 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 "شبکه"
 
-#: help.pm:991 install_steps_interactive.pm:1039
+#: help.pm:991 install_steps_interactive.pm:1044
 #, c-format
 msgid "Security Level"
 msgstr "سطح امنیتی"
 
-#: help.pm:991 install_steps_interactive.pm:1053
+#: help.pm:991 install_steps_interactive.pm:1058
 #, c-format
 msgid "Firewall"
 msgstr "دیوارآتش"
 
-#: help.pm:991 install_steps_interactive.pm:1067
+#: help.pm:991 install_steps_interactive.pm:1072
 #, c-format
 msgid "Bootloader"
 msgstr "بارگذار آغازگر"
 
-#: 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 "سرویس‌ها"
 
 #: help.pm:994
-#, fuzzy, c-format
+#, 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 ""
 "دستگاه دیسکی را که می‌خواهید برای نصب قسمت‌بندی جدید لینوکس ماندرایک\n"
-"پاک کنید انتخاب نمایید. دقت کنید چون تمام داده‌های موجود بر آن از بین خواهند\n"
+"پاک کنید انتخاب نمایید. دقت کنید چون تمام داده‌های موجود بر آن از دست خواهند\n"
 "رفت و دیگر نمی‌توان آنها را بازیابی نمود!"
 
 #: help.pm:999
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
 "this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
@@ -5689,13 +5679,12 @@ msgid ""
 "present on this hard drive."
 msgstr ""
 "اگر می‌خواهید تمام داده‌ها و قسمت‌بندی‌های موجود بر این دیسک را حذف کنید \n"
-"بر \"%s\" کلیک نمایید. دقت کنید که بعد از کلیک بر \"%s\"، شما نمی‌توانید "
-"هیچ \n"
-"داده و قسمت‌بندی موجود بر این دیسک، به اضافه‌ی هر داده ویندوز را بازیابی \n"
-"نمایید.\n"
+"بر \"%s\" کلیک نمایید. دقت کنید که بعد از کلیک بر \"%s\"، دیگر نمی‌توانید\n"
+"هیچ داده و قسمت‌بندی موجود بر این دیسک، به اضافه‌ی هر داده‌ی ویندوز را\n"
+"بازیابی کنید.\n"
 "\n"
-"برای توقف این عملیات بدون از دست دادن هیچ داده‌ای و قسمت‌بندی موجود بر \n"
-"این دیسک بر \"%s\" کلیک نمایید."
+"برای توقف این عملیات بدون از دست دادن هیچ داده‌ای و قسمت‌بندی موجود بر\n"
+"این دیسک بر \"%s\" کلیک کنید."
 
 #: install2.pm:119
 #, c-format
@@ -5713,7 +5702,7 @@ msgstr ""
 msgid "You must also format %s"
 msgstr "باید %s را قالب‌بندی کنید"
 
-#: install_any.pm:413
+#: install_any.pm:411
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -5736,7 +5725,7 @@ msgstr ""
 "\n"
 "آیا واقعا می‌خواهید این کارگزارها را نصب کنید؟\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"
@@ -5749,17 +5738,17 @@ msgstr ""
 "\n"
 "آیا واقعاً می‌خواهید این بسته‌ها را بردارید؟\n"
 
-#: install_any.pm:812
+#: install_any.pm:827
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "یک دیسکچه‌ی قالب‌بندی شده‌ی FAT را در دستگاه %s بگذارید"
 
-#: install_any.pm:816
+#: install_any.pm:831
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "این دیسکچه قالب‌بندی FAT ندارد"
 
-#: install_any.pm:828
+#: install_any.pm:843
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
@@ -5768,12 +5757,12 @@ msgstr ""
 "برای استفاده از این مجموعه بسته‌های ذخیره شده، نصب را با ``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 "خطا در خواندن پرونده‌ی %s"
 
-#: install_any.pm:973
+#: install_any.pm:995
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5898,11 +5887,11 @@ msgstr "حساب کردن اندازه‌ی قسمت‌بندی ویندوز"
 #, 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 ""
-"قسمت‌بندی ویندوز شما خیلی درهم ریخته است. لطفاً رایانه‌ی خود را با ویندوز "
-"آغازگری مجدد کرده، برنامه‌ی نظم بخشی ``defrag'' را اجرا کرده و سپس نصب لینوکس "
+"قسمت‌بندی ویندوز شما خیلی درهم ریخته است. لطفا رایانه‌ی خود را با ویندوز "
+"آغازگری مجدد کرده، برنامه‌ی نظم بخشی ``defrag'' را اجرا کرده و سپس نصبلینوکس "
 "ماندرایک را دوباره راه‌اندازی کنید."
 
 #: install_interactive.pm:164
@@ -6017,13 +6006,13 @@ msgstr "پایین آوردن شبکه"
 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"
@@ -6077,7 +6066,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"
@@ -6114,7 +6103,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"
@@ -6308,8 +6297,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"
@@ -6317,7 +6306,7 @@ 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 ""
 "تبریک میگوییم، نصب تکمیل شده است.\n"
 "رسانه‌ی آغازگر را برداشته و برگشت را برای آغازگری مجدد فشار دهید.\n"
@@ -6343,7 +6332,7 @@ msgstr "http://www.mandrakelinux.com/en/100errata.php3"
 msgid "Duplicate mount point %s"
 msgstr "تکثیر نقطه‌ی سوارسازی %s"
 
-#: install_steps.pm:410
+#: install_steps.pm:406
 #, c-format
 msgid ""
 "Some important packages didn't get installed properly.\n"
@@ -6356,7 +6345,7 @@ msgstr ""
 "این سی‌دی را بر یک رایانه‌ی نصب شده با استفاده از \"rpm -qpl Mandrake/RPMS/*."
 "rpm\" بررسی کنید\n"
 
-#: install_steps.pm:541
+#: install_steps.pm:535
 #, c-format
 msgid "No floppy drive available"
 msgstr "هیچ گرداننده‌ی دیسکچه‌ای در دسترس نیست"
@@ -6370,12 +6359,12 @@ msgstr "ورود به مرحله‌ی `%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 ""
-"سیستم شما منابع کمی دارد. شما ممکن است در نصب لینوکس ماندرایک با اشکال "
-"برخورد کنید. \n"
+"سیستم شما منابع کمی دارد. ممکن است در نصب لینوکس ماندرایک با اشکال برخورد "
+"کنید. \n"
 "اگر این اتفاق رخ داد، می‌توانید نصب متنی را بجایش امتحان کنید. برای این کار، "
 "`F1' را \n"
 "هنگام آغازگری با سی‌دی فشار داده، سپس `text' وارد کنید."
@@ -6579,8 +6568,8 @@ msgstr "ادامه به هر حال؟"
 msgid "There was an error installing packages:"
 msgstr "خطائی هنگام نصب بسته‌ها وجود داشت:"
 
-#: 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 "پیکربندی نشده است"
@@ -6675,7 +6664,7 @@ msgstr "IDE"
 msgid "Configuring IDE"
 msgstr "پیکربندی IDE"
 
-#: 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 "هیچ قسمت‌بندی وجود ندارد"
@@ -6792,6 +6781,9 @@ msgid ""
 "tests, the 2.4 series kernel will be installed as the default to insure\n"
 "compliance under the \"LSB\" group selection."
 msgstr ""
+"بدلیل عدم همخوانی‌های هسته‌های سری ۲٬۶ با آزمایش‌های\n"
+"زمان‌اجرای LSB٬ هسته‌ی سری ۲٬۴ برای اطمینان به همخوانی\n"
+"در گزینش گروه \"LSB\" مانند پیش‌فرض نصب خواهد گردید."
 
 #: install_steps_interactive.pm:540
 #, c-format
@@ -6896,177 +6888,176 @@ 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 ""
 "در حال تماس گرفتن با وب‌گاه لینوکس ماندرایک برای دریافت لیست پایگاه‌های "
 "آینه‌های موجود..."
 
-#: install_steps_interactive.pm:786
+#: install_steps_interactive.pm:787
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "انتخاب آینه‌ای برای گرفتن بسته‌ها"
 
-#: install_steps_interactive.pm:800
+#: install_steps_interactive.pm:801
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "تماس گرفتن با آینه برای گرفتن لیست بسته‌های موجود..."
 
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:805
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "نمی‌توان با آینه %s تماس برقرار کرد"
 
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:805
 #, c-format
 msgid "Would you like to try again?"
 msgstr "می‌خواهید دوباره امتحان کنید؟"
 
-#: install_steps_interactive.pm:830 standalone/drakclock:42
+#: install_steps_interactive.pm:831 standalone/drakclock:42
 #, c-format
 msgid "Which is your timezone?"
 msgstr "منطقه‌ی زمانی شما کدام است؟"
 
-#: install_steps_interactive.pm:835
+#: install_steps_interactive.pm:836
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "هم‌گاه‌سازی خودکار زمان (با استفاده از NTP)"
 
-#: install_steps_interactive.pm:843
+#: install_steps_interactive.pm:844
 #, c-format
 msgid "NTP Server"
 msgstr "کارگزار NTP"
 
-#: install_steps_interactive.pm:885 steps.pm:30
+#: install_steps_interactive.pm:886 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "خلاصه"
 
-#: 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 "سیستم"
 
-#: 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 "سخت‌افزار"
 
-#: 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"
 
-#: install_steps_interactive.pm:940
+#: install_steps_interactive.pm:945
 #, c-format
 msgid "No printer"
 msgstr "بدون چاپگر"
 
-#: install_steps_interactive.pm:982
+#: install_steps_interactive.pm:987
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "آیا کارت صوتی ISA دارید؟"
 
-#: install_steps_interactive.pm:984
+#: install_steps_interactive.pm:989
 #, c-format
 msgid "Run \"sndconfig\" after installation to configure your sound card"
 msgstr ""
 "برای پیکربندی کارت صوتی خود بعد از نصب برنامه‌ی \"sndconfig\" را اجرا کنید"
 
-#: install_steps_interactive.pm:986
+#: install_steps_interactive.pm:991
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "هیچ کارت صوتی شناسایی نشد. \"harddrake\" را بعد از نصب امتحان کنید"
 
-#: install_steps_interactive.pm:1006
+#: install_steps_interactive.pm:1011
 #, c-format
 msgid "Graphical interface"
 msgstr "واسط گرافیکی"
 
-#: 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 "شبکه و اینترنت"
 
-#: install_steps_interactive.pm:1028
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1033
+#, c-format
 msgid "Proxies"
-msgstr "نمایه"
+msgstr "پراکسی‌ها"
 
-#: install_steps_interactive.pm:1029
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1034
+#, c-format
 msgid "configured"
-msgstr "تنظیم مجدد"
+msgstr "پیکربندی شده"
 
-#: 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 "امنیت"
 
-#: install_steps_interactive.pm:1057
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "activated"
 msgstr "فعال شده"
 
-#: install_steps_interactive.pm:1057
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "disabled"
 msgstr "از کار افتاده"
 
-#: install_steps_interactive.pm:1066
+#: install_steps_interactive.pm:1071
 #, c-format
 msgid "Boot"
 msgstr "آغازگری"
 
 #. -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 بر %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 "سرویس‌ها: %d فعال شده برای %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 "شما ایکس را پیکربندی نکرده‌اید. آیا واقعاً مطمئنید که این را می‌خواهید؟"
 
-#: install_steps_interactive.pm:1149
+#: install_steps_interactive.pm:1154
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr "گذاردن گذرواژه‌ی مدیر و روش‌های تأیید هویت شبکه"
 
-#: install_steps_interactive.pm:1150
+#: install_steps_interactive.pm:1155
 #, c-format
 msgid "Set root password"
 msgstr "گذاردن گذرواژه‌ی مدیر"
 
-#: 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 "این گذرواژه خیلی کوتاه است (باید حداقل %d نویسه‌ای باشد)"
 
-#: 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 "تأیید هویت"
 
-#: install_steps_interactive.pm:1196
+#: install_steps_interactive.pm:1201
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "آماده کردن بارگذار آغازگر..."
 
-#: install_steps_interactive.pm:1206
+#: install_steps_interactive.pm:1211
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -7079,12 +7070,12 @@ msgstr ""
 "این نصب ادامه پیدا خواهد کرد، ولی شما باید \n"
 "از BootX یا طریق دیگری برای آغازگری استفاده کنید"
 
-#: install_steps_interactive.pm:1212
+#: install_steps_interactive.pm:1217
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "آیا می‌خواهید از aboot استفاده کنید؟"
 
-#: install_steps_interactive.pm:1215
+#: install_steps_interactive.pm:1220
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7093,17 +7084,17 @@ msgstr ""
 "خطا در نصب aboot, \n"
 "تلاش به اجبار نصب می‌کنید حتی اگر آن اولین قسمت‌بندی را خراب کند؟"
 
-#: install_steps_interactive.pm:1226
+#: install_steps_interactive.pm:1231
 #, c-format
 msgid "Installing bootloader"
 msgstr "نصب کردن بارگذار آغازگر"
 
-#: install_steps_interactive.pm:1233
+#: install_steps_interactive.pm:1238
 #, c-format
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "نصب بارگذار آغازگر شکست خورد. خطای بدنبال آمده رخ داد:"
 
-#: 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"
@@ -7122,24 +7113,30 @@ msgstr ""
 " سپس تایپ کنید: shut-down\n"
 "در آغازگری بعدی بایستی اعلان بارگذار آغازگر را مشاهده کنید."
 
-#: 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 ""
+"در این سطح امنیتی، دستیابی به پرونده‌های قسمت‌بندی ویندوز محدود به مدیر است."
 
-#: 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 "یک دیسکچه‌ی خالی را در گرداننده‌ی %s داخل کنید"
 
-#: install_steps_interactive.pm:1287
+#: install_steps_interactive.pm:1293
+#, c-format
+msgid "Please insert another floppy for drivers disk"
+msgstr "لطفاً دیسکچه‌ی دیگری را برای دیسک راه‌اندازها داخل کنید"
+
+#: install_steps_interactive.pm:1295
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "ایجاد کردن دیسکچه‌ی نصب خودکار..."
 
-#: install_steps_interactive.pm:1298
+#: install_steps_interactive.pm:1307
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7150,12 +7147,12 @@ msgstr ""
 "\n"
 "واقعاً می‌خواهید اکنون ترک کنید؟"
 
-#: install_steps_interactive.pm:1313
+#: install_steps_interactive.pm:1322
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "تولید دیسکچه‌ی نصب خودکار"
 
-#: install_steps_interactive.pm:1315
+#: install_steps_interactive.pm:1324
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7172,7 +7169,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrake Linux Installation %s"
+msgid "Mandrakelinux Installation %s"
 msgstr "نصب لینوکس ماندرایک %s"
 
 #: install_steps_newt.pm:33
@@ -7191,7 +7188,7 @@ msgstr "انتخاب پرونده‌ای"
 msgid "Basic"
 msgstr "پایه"
 
-#: 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 "پایان"
@@ -7305,7 +7302,7 @@ msgstr "فنلاندی"
 msgid "French"
 msgstr "فرانسوی"
 
-#: keyboard.pm:143 keyboard.pm:217
+#: keyboard.pm:143 keyboard.pm:220
 #, c-format
 msgid "Norwegian"
 msgstr "نروژی"
@@ -7315,22 +7312,22 @@ msgstr "نروژی"
 msgid "Polish"
 msgstr "لهستانی"
 
-#: keyboard.pm:145 keyboard.pm:226
+#: keyboard.pm:145 keyboard.pm:229
 #, c-format
 msgid "Russian"
 msgstr "روسی"
 
-#: keyboard.pm:147 keyboard.pm:230
+#: keyboard.pm:147 keyboard.pm:233
 #, c-format
 msgid "Swedish"
 msgstr "سوئدی"
 
-#: keyboard.pm:148 keyboard.pm:249
+#: keyboard.pm:148 keyboard.pm:252
 #, c-format
 msgid "UK keyboard"
 msgstr "صفحه‌کلید انگلیسی"
 
-#: keyboard.pm:149 keyboard.pm:250
+#: keyboard.pm:149 keyboard.pm:253
 #, c-format
 msgid "US keyboard"
 msgstr "صفحه‌کلید آمریکایی"
@@ -7525,312 +7522,312 @@ msgstr "ایتالیایی"
 msgid "Inuktitut"
 msgstr "اینوک‌تیتوت"
 
-#: keyboard.pm:197
+#: keyboard.pm:200
 #, c-format
 msgid "Japanese 106 keys"
 msgstr "ژاپنی ۱۰۶ کلیدی"
 
-#: keyboard.pm:198
+#: keyboard.pm:201
 #, c-format
 msgid "Kannada"
 msgstr "کن‌نادا"
 
-#: keyboard.pm:201
+#: keyboard.pm:204
 #, c-format
 msgid "Korean keyboard"
 msgstr "صفحه‌کلید کره‌ای"
 
-#: keyboard.pm:202
+#: keyboard.pm:205
 #, c-format
 msgid "Latin American"
 msgstr "آمریکای لاتین"
 
-#: keyboard.pm:203
+#: keyboard.pm:206
 #, c-format
 msgid "Laotian"
 msgstr "لائوسی"
 
-#: keyboard.pm:204
+#: keyboard.pm:207
 #, c-format
 msgid "Lithuanian AZERTY (old)"
 msgstr "لیتوانی AZERTY (قدیمی)"
 
-#: keyboard.pm:206
+#: keyboard.pm:209
 #, c-format
 msgid "Lithuanian AZERTY (new)"
 msgstr "لیتوانی AZERTY (جدید)"
 
-#: keyboard.pm:207
+#: keyboard.pm:210
 #, c-format
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "لیتوانی \"ردیف شماره\" QWERTY"
 
-#: keyboard.pm:208
+#: keyboard.pm:211
 #, c-format
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "لیتوانیایی \"تلفظی\" QWERTY"
 
-#: keyboard.pm:209
+#: keyboard.pm:212
 #, c-format
 msgid "Latvian"
 msgstr "لاتویایی"
 
-#: keyboard.pm:210
+#: keyboard.pm:213
 #, c-format
 msgid "Malayalam"
 msgstr "مالای‌الام"
 
-#: keyboard.pm:211
+#: keyboard.pm:214
 #, c-format
 msgid "Macedonian"
 msgstr "مقدونیه‌ای"
 
-#: keyboard.pm:212
+#: keyboard.pm:215
 #, c-format
 msgid "Myanmar (Burmese)"
 msgstr "مؤنمار (برمه‌ای)"
 
-#: keyboard.pm:213
+#: keyboard.pm:216
 #, c-format
 msgid "Mongolian (cyrillic)"
 msgstr "مغول (سیرلیک)"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
 msgid "Maltese (UK)"
 msgstr "مالتی (انگلیس)"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
 msgid "Maltese (US)"
 msgstr "مالتی (آمریکا)"
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
 msgid "Dutch"
 msgstr "هلندی"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
 msgid "Oriya"
 msgstr "اوری‌یا"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
 msgid "Polish (qwerty layout)"
 msgstr "لهستانی (طرح qwerty)"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
 msgid "Polish (qwertz layout)"
 msgstr "لهستانی (طرح qwerty)"
 
-#: keyboard.pm:221
+#: keyboard.pm:224
 #, c-format
 msgid "Portuguese"
 msgstr "پرتغالی"
 
-#: keyboard.pm:222
+#: keyboard.pm:225
 #, c-format
 msgid "Canadian (Quebec)"
 msgstr "کانادایی (کوبک)"
 
-#: keyboard.pm:224
+#: keyboard.pm:227
 #, c-format
 msgid "Romanian (qwertz)"
 msgstr "رومانیایی (qwertz)"
 
-#: keyboard.pm:225
+#: keyboard.pm:228
 #, c-format
 msgid "Romanian (qwerty)"
 msgstr "رومانیایی (qwertz)"
 
-#: keyboard.pm:227
+#: keyboard.pm:230
 #, c-format
 msgid "Russian (Phonetic)"
 msgstr "روسی (تلفظی)"
 
-#: keyboard.pm:228
+#: keyboard.pm:231
 #, c-format
 msgid "Saami (norwegian)"
 msgstr "سامی (نروژی)"
 
-#: keyboard.pm:229
+#: keyboard.pm:232
 #, c-format
 msgid "Saami (swedish/finnish)"
 msgstr "سام (سوئدی/فنلاندی)"
 
-#: keyboard.pm:231
+#: keyboard.pm:234
 #, c-format
 msgid "Slovenian"
 msgstr "اسلوونیایی"
 
-#: keyboard.pm:232
+#: keyboard.pm:235
 #, c-format
 msgid "Slovakian (QWERTZ)"
 msgstr "اسلوواکی (QWERTZ)"
 
-#: keyboard.pm:233
+#: keyboard.pm:236
 #, c-format
 msgid "Slovakian (QWERTY)"
 msgstr "اسلوواکی (QWERTY)"
 
-#: keyboard.pm:235
+#: keyboard.pm:238
 #, c-format
 msgid "Serbian (cyrillic)"
 msgstr "صربی (سیریلیک)"
 
-#: keyboard.pm:236
+#: keyboard.pm:239
 #, c-format
 msgid "Syriac"
 msgstr "سیریاک"
 
-#: keyboard.pm:237
+#: keyboard.pm:240
 #, c-format
 msgid "Syriac (phonetic)"
 msgstr "سیریاک (تلفظی)"
 
-#: keyboard.pm:238
+#: keyboard.pm:241
 #, c-format
 msgid "Telugu"
 msgstr "تلوگو"
 
-#: keyboard.pm:240
+#: keyboard.pm:243
 #, c-format
 msgid "Tamil (ISCII-layout)"
 msgstr "تامیل (ISCII-layout)"
 
-#: keyboard.pm:241
+#: keyboard.pm:244
 #, c-format
 msgid "Tamil (Typewriter-layout)"
 msgstr "تامیل (طرح-ماشین‌نویسی)"
 
-#: keyboard.pm:242
+#: keyboard.pm:245
 #, c-format
 msgid "Thai keyboard"
 msgstr "صفحه‌کلید تایلندی"
 
-#: keyboard.pm:244
+#: keyboard.pm:247
 #, c-format
 msgid "Tajik keyboard"
 msgstr "صفحه‌کلید تاجیکی"
 
-#: keyboard.pm:245
+#: keyboard.pm:248
 #, c-format
 msgid "Turkish (traditional \"F\" model)"
 msgstr "ترکی (مدل \"F\" سنتی)"
 
-#: keyboard.pm:246
+#: keyboard.pm:249
 #, c-format
 msgid "Turkish (modern \"Q\" model)"
 msgstr "ترکی (مدل \"Q\" جدید)"
 
-#: keyboard.pm:248
+#: keyboard.pm:251
 #, c-format
 msgid "Ukrainian"
 msgstr "اوکراینی"
 
-#: keyboard.pm:251
+#: keyboard.pm:254
 #, c-format
 msgid "US keyboard (international)"
 msgstr "صفحه‌کلید آمریکا (بین‌المللی)"
 
-#: keyboard.pm:252
+#: keyboard.pm:255
 #, c-format
 msgid "Uzbek (cyrillic)"
 msgstr "ازبک (سیریلیک)"
 
-#: keyboard.pm:253
+#: keyboard.pm:256
 #, c-format
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "ویتنامی \"ردیف عددی\" QWERTY"
 
-#: keyboard.pm:254
+#: keyboard.pm:257
 #, c-format
 msgid "Yugoslavian (latin)"
 msgstr "یوگوسلاو (لاتین)"
 
-#: keyboard.pm:261
+#: keyboard.pm:264
 #, c-format
 msgid "Right Alt key"
 msgstr "کلید راست تبدیل"
 
-#: keyboard.pm:262
+#: keyboard.pm:265
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "هر دو کلیدهای تبدیل بطور همزمان"
 
-#: keyboard.pm:263
+#: keyboard.pm:266
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "کلیدهای مهار و تبدیل بطور همزمان"
 
-#: keyboard.pm:264
+#: keyboard.pm:267
 #, c-format
 msgid "CapsLock key"
 msgstr "کلید قفل‌تبدیل"
 
-#: keyboard.pm:265
+#: keyboard.pm:268
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "کلیدهای مهار و دگرساز بطور همزمان"
 
-#: keyboard.pm:266
+#: keyboard.pm:269
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "کلیدهای دگرساز و تبدیل بطور هم‌زمان"
 
-#: keyboard.pm:267
+#: keyboard.pm:270
 #, c-format
 msgid "\"Menu\" key"
 msgstr "کلید \"منو\""
 
-#: keyboard.pm:268
+#: keyboard.pm:271
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "کلید \"ویندوز\" چپ"
 
-#: keyboard.pm:269
+#: keyboard.pm:272
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "کلید \"ویندوز\" راست"
 
-#: keyboard.pm:270
+#: keyboard.pm:273
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "هر دو کلیدهای مهار بطور همزمان"
 
-#: keyboard.pm:271
+#: keyboard.pm:274
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "هر دو کلیدهای دگرساز بطور همزمان"
 
-#: keyboard.pm:272
+#: keyboard.pm:275
 #, c-format
 msgid "Left Shift key"
 msgstr "کلید تبدیل چپ"
 
-#: keyboard.pm:273
+#: keyboard.pm:276
 #, c-format
 msgid "Right Shift key"
 msgstr "کلید تبدیل راست"
 
-#: keyboard.pm:274
+#: keyboard.pm:277
 #, c-format
 msgid "Left Alt key"
 msgstr "کلید دگرساز چپ"
 
-#: keyboard.pm:275
+#: keyboard.pm:278
 #, c-format
 msgid "Left Control key"
 msgstr "کلید مهار چپ"
 
-#: keyboard.pm:276
+#: keyboard.pm:279
 #, c-format
 msgid "Right Control key"
 msgstr "کلید مهار راست"
 
-#: keyboard.pm:307
+#: keyboard.pm:310
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -7841,7 +7838,7 @@ msgstr ""
 "بین طرح‌های گوناگون صفحه‌کلید تعویض کنید انتخاب کنید\n"
 "(یعنی بین لاتین و غیر لاتین)"
 
-#: keyboard.pm:312
+#: keyboard.pm:315
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -7852,1144 +7849,1144 @@ msgstr ""
 "در طول نصب، شما باید از کلید راست مهار برای\n"
 "تعویض بین طرحهای مختلف صفحه‌کلید استفاده کنید."
 
-#: lang.pm:144
+#: lang.pm:149
 #, c-format
 msgid "default:LTR"
-msgstr "پیش‌فرض: از چپ به راست"
+msgstr "default:RTL"
 
-#: lang.pm:160
+#: lang.pm:165
 #, c-format
 msgid "Afghanistan"
 msgstr "افغانستان"
 
-#: lang.pm:161
+#: lang.pm:166
 #, c-format
 msgid "Andorra"
 msgstr "آندورا"
 
-#: lang.pm:162
+#: lang.pm:167
 #, c-format
 msgid "United Arab Emirates"
 msgstr "امارات متحده‌ی عربی"
 
-#: lang.pm:163
+#: lang.pm:168
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "انتیگوا و باربودا"
 
-#: lang.pm:164
+#: lang.pm:169
 #, c-format
 msgid "Anguilla"
 msgstr "آنگیلا"
 
-#: lang.pm:165
+#: lang.pm:170
 #, c-format
 msgid "Albania"
 msgstr "آلبانی"
 
-#: lang.pm:166
+#: lang.pm:171
 #, c-format
 msgid "Armenia"
 msgstr "ارمنستان"
 
-#: lang.pm:167
+#: lang.pm:172
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "هلند انتیلز"
 
-#: lang.pm:168
+#: lang.pm:173
 #, c-format
 msgid "Angola"
 msgstr "آنگولا"
 
-#: lang.pm:169
+#: lang.pm:174
 #, c-format
 msgid "Antarctica"
 msgstr "ان‌تارک‌تیکا"
 
-#: lang.pm:170 standalone/drakxtv:51
+#: lang.pm:175 standalone/drakxtv:51
 #, c-format
 msgid "Argentina"
 msgstr "آرژانتین"
 
-#: lang.pm:171
+#: lang.pm:176
 #, c-format
 msgid "American Samoa"
 msgstr "ساموای آمریکا"
 
-#: lang.pm:173 standalone/drakxtv:49
+#: lang.pm:178 network/adsl_consts.pm:20 standalone/drakxtv:49
 #, c-format
 msgid "Australia"
 msgstr "استرالیا"
 
-#: lang.pm:174
+#: lang.pm:179
 #, c-format
 msgid "Aruba"
 msgstr "آروبا"
 
-#: lang.pm:175
+#: lang.pm:180
 #, c-format
 msgid "Azerbaijan"
 msgstr "آذربایجان"
 
-#: lang.pm:176
+#: lang.pm:181
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "بوسنی هرسه‌گوینا"
 
-#: lang.pm:177
+#: lang.pm:182
 #, c-format
 msgid "Barbados"
 msgstr "باربادوس"
 
-#: lang.pm:178
+#: lang.pm:183
 #, c-format
 msgid "Bangladesh"
 msgstr "بنگلادش"
 
-#: lang.pm:180
+#: lang.pm:185
 #, c-format
 msgid "Burkina Faso"
 msgstr "بورکینا فاسو"
 
-#: lang.pm:181
+#: lang.pm:186
 #, c-format
 msgid "Bulgaria"
 msgstr "بلغارستان"
 
-#: lang.pm:182
+#: lang.pm:187
 #, c-format
 msgid "Bahrain"
 msgstr "بحرین"
 
-#: lang.pm:183
+#: lang.pm:188
 #, c-format
 msgid "Burundi"
 msgstr "بوروندی"
 
-#: lang.pm:184
+#: lang.pm:189
 #, c-format
 msgid "Benin"
 msgstr "بنین"
 
-#: lang.pm:185
+#: lang.pm:190
 #, c-format
 msgid "Bermuda"
 msgstr "برمودا"
 
-#: lang.pm:186
+#: lang.pm:191
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "برونای داروسلام"
 
-#: lang.pm:187
+#: lang.pm:192
 #, c-format
 msgid "Bolivia"
 msgstr "بولیوی"
 
-#: lang.pm:188
+#: lang.pm:193
 #, c-format
 msgid "Brazil"
 msgstr "برزیل"
 
-#: lang.pm:189
+#: lang.pm:194
 #, c-format
 msgid "Bahamas"
 msgstr "باهاما"
 
-#: lang.pm:190
+#: lang.pm:195
 #, c-format
 msgid "Bhutan"
 msgstr "بوتان"
 
-#: lang.pm:191
+#: lang.pm:196
 #, c-format
 msgid "Bouvet Island"
 msgstr "جزیره بووت"
 
-#: lang.pm:192
+#: lang.pm:197
 #, c-format
 msgid "Botswana"
 msgstr "بوتسوانا"
 
-#: lang.pm:193
+#: lang.pm:198
 #, c-format
 msgid "Belarus"
 msgstr "بلاروس"
 
-#: lang.pm:194
+#: lang.pm:199
 #, c-format
 msgid "Belize"
 msgstr "بلایز"
 
-#: lang.pm:195
+#: lang.pm:200
 #, c-format
 msgid "Canada"
 msgstr "کانادا"
 
-#: lang.pm:196
+#: lang.pm:201
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "جزایر کوکوس (کیلینگ)"
 
-#: lang.pm:197
+#: lang.pm:202
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "کونگو (کین‌شاسا)"
 
-#: lang.pm:198
+#: lang.pm:203
 #, c-format
 msgid "Central African Republic"
 msgstr "جمهوری مرکزی آفریقا"
 
-#: lang.pm:199
+#: lang.pm:204
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "کونگو (برازاویله)"
 
-#: lang.pm:200
+#: lang.pm:205
 #, c-format
 msgid "Switzerland"
 msgstr "سوئیس"
 
-#: lang.pm:201
+#: lang.pm:206
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "کوته د'آی‌وری"
 
-#: lang.pm:202
+#: lang.pm:207
 #, c-format
 msgid "Cook Islands"
 msgstr "جزایر کوک"
 
-#: lang.pm:203
+#: lang.pm:208
 #, c-format
 msgid "Chile"
 msgstr "شیلی"
 
-#: lang.pm:204
+#: lang.pm:209
 #, c-format
 msgid "Cameroon"
 msgstr "کامرون"
 
-#: lang.pm:205
+#: lang.pm:210
 #, c-format
 msgid "China"
 msgstr "چین"
 
-#: lang.pm:206
+#: lang.pm:211
 #, c-format
 msgid "Colombia"
 msgstr "کلمبیا"
 
-#: lang.pm:208
+#: lang.pm:213
 #, c-format
 msgid "Cuba"
 msgstr "کوبا"
 
-#: lang.pm:209
+#: lang.pm:214
 #, c-format
 msgid "Cape Verde"
 msgstr "کیپ ورده"
 
-#: lang.pm:210
+#: lang.pm:215
 #, c-format
 msgid "Christmas Island"
 msgstr "جزایر کریسمس"
 
-#: lang.pm:211
+#: lang.pm:216
 #, c-format
 msgid "Cyprus"
 msgstr "قبرس"
 
-#: lang.pm:214
+#: lang.pm:219
 #, c-format
 msgid "Djibouti"
 msgstr "جیبوتی"
 
-#: lang.pm:215
+#: lang.pm:220
 #, c-format
 msgid "Denmark"
 msgstr "دانمارک"
 
-#: lang.pm:216
+#: lang.pm:221
 #, c-format
 msgid "Dominica"
 msgstr "دومینیک"
 
-#: lang.pm:217
+#: lang.pm:222
 #, c-format
 msgid "Dominican Republic"
 msgstr "جمهوری دومینیک"
 
-#: lang.pm:218
+#: lang.pm:223
 #, c-format
 msgid "Algeria"
 msgstr "الجزایر"
 
-#: lang.pm:219
+#: lang.pm:224
 #, c-format
 msgid "Ecuador"
 msgstr "اکوآدور"
 
-#: lang.pm:220
+#: lang.pm:225
 #, c-format
 msgid "Estonia"
 msgstr "استونی"
 
-#: lang.pm:221
+#: lang.pm:226
 #, c-format
 msgid "Egypt"
 msgstr "مصر"
 
-#: lang.pm:222
+#: lang.pm:227
 #, c-format
 msgid "Western Sahara"
 msgstr "صحرای غربی"
 
-#: lang.pm:223
+#: lang.pm:228
 #, c-format
 msgid "Eritrea"
 msgstr "اریتره"
 
-#: 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 "اسپانیا"
 
-#: lang.pm:225
+#: lang.pm:230
 #, c-format
 msgid "Ethiopia"
 msgstr "اتیوپی"
 
-#: lang.pm:226 network/adsl_consts.pm:119
+#: lang.pm:231 network/adsl_consts.pm:127
 #, c-format
 msgid "Finland"
 msgstr "فنلاند"
 
-#: lang.pm:227
+#: lang.pm:232
 #, c-format
 msgid "Fiji"
 msgstr "فیجی"
 
-#: lang.pm:228
+#: lang.pm:233
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "جزایر فالک‌لند (مالویناس)"
 
-#: lang.pm:229
+#: lang.pm:234
 #, c-format
 msgid "Micronesia"
 msgstr "میکرونه‌سیا"
 
-#: lang.pm:230
+#: lang.pm:235
 #, c-format
 msgid "Faroe Islands"
 msgstr "جزایر فارئو"
 
-#: lang.pm:232
+#: lang.pm:237
 #, c-format
 msgid "Gabon"
 msgstr "گابن"
 
-#: 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 "بریتانیا"
 
-#: lang.pm:234
+#: lang.pm:239
 #, c-format
 msgid "Grenada"
 msgstr "گرانادا"
 
-#: lang.pm:235
+#: lang.pm:240
 #, c-format
 msgid "Georgia"
 msgstr "گرجستان"
 
-#: lang.pm:236
+#: lang.pm:241
 #, c-format
 msgid "French Guiana"
 msgstr "گینه‌ی فرانسوی"
 
-#: lang.pm:237
+#: lang.pm:242
 #, c-format
 msgid "Ghana"
 msgstr "غنا"
 
-#: lang.pm:238
+#: lang.pm:243
 #, c-format
 msgid "Gibraltar"
 msgstr "جیبرالتا"
 
-#: lang.pm:239
+#: lang.pm:244
 #, c-format
 msgid "Greenland"
 msgstr "گرین‌لند"
 
-#: lang.pm:240
+#: lang.pm:245
 #, c-format
 msgid "Gambia"
 msgstr "گامبیا"
 
-#: lang.pm:241
+#: lang.pm:246
 #, c-format
 msgid "Guinea"
 msgstr "گینه"
 
-#: lang.pm:242
+#: lang.pm:247
 #, c-format
 msgid "Guadeloupe"
 msgstr "گوادلوپ"
 
-#: lang.pm:243
+#: lang.pm:248
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "گینه‌ی استوایی"
 
-#: lang.pm:245
+#: lang.pm:250
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "جزایر جورجیو و ساندیویچ جنوبی"
 
-#: lang.pm:246
+#: lang.pm:251
 #, c-format
 msgid "Guatemala"
 msgstr "گواتمالا"
 
-#: lang.pm:247
+#: lang.pm:252
 #, c-format
 msgid "Guam"
 msgstr "گوام"
 
-#: lang.pm:248
+#: lang.pm:253
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "گینه-بیساو"
 
-#: lang.pm:249
+#: lang.pm:254
 #, c-format
 msgid "Guyana"
 msgstr "گویانا"
 
-#: lang.pm:250
+#: lang.pm:255
 #, c-format
 msgid "China (Hong Kong)"
 msgstr "چین (هنگ‌ کنگ)"
 
-#: lang.pm:251
+#: lang.pm:256
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "جزایر هرد و مک‌دونالد "
 
-#: lang.pm:252
+#: lang.pm:257
 #, c-format
 msgid "Honduras"
 msgstr "هوندوراس"
 
-#: lang.pm:253
+#: lang.pm:258
 #, c-format
 msgid "Croatia"
 msgstr "کروآسی"
 
-#: lang.pm:254
+#: lang.pm:259
 #, c-format
 msgid "Haiti"
 msgstr "هایی‌تی"
 
-#: lang.pm:255 network/adsl_consts.pm:144
+#: lang.pm:260 network/adsl_consts.pm:152
 #, c-format
 msgid "Hungary"
 msgstr "مجارستان"
 
-#: lang.pm:256
+#: lang.pm:261
 #, c-format
 msgid "Indonesia"
 msgstr "اندونزی"
 
-#: lang.pm:257 standalone/drakxtv:48
+#: lang.pm:262 standalone/drakxtv:48
 #, c-format
 msgid "Ireland"
 msgstr "ایرلند"
 
-#: lang.pm:258
+#: lang.pm:263
 #, c-format
 msgid "Israel"
 msgstr "اسرائیل"
 
-#: lang.pm:259
+#: lang.pm:264
 #, c-format
 msgid "India"
 msgstr "هند"
 
-#: lang.pm:260
+#: lang.pm:265
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "منطقه‌ی بریتانیایی اقیانوس هند"
 
-#: lang.pm:261
+#: lang.pm:266
 #, c-format
 msgid "Iraq"
 msgstr "عراق"
 
-#: lang.pm:262
+#: lang.pm:267
 #, c-format
 msgid "Iran"
 msgstr "ایران"
 
-#: lang.pm:263
+#: lang.pm:268
 #, c-format
 msgid "Iceland"
 msgstr "آیس‌لند"
 
-#: lang.pm:265
+#: lang.pm:270
 #, c-format
 msgid "Jamaica"
 msgstr "جامائیکا"
 
-#: lang.pm:266
+#: lang.pm:271
 #, c-format
 msgid "Jordan"
 msgstr "اردن"
 
-#: lang.pm:267
+#: lang.pm:272
 #, c-format
 msgid "Japan"
 msgstr "ژاپن"
 
-#: lang.pm:268
+#: lang.pm:273
 #, c-format
 msgid "Kenya"
 msgstr "کنیا"
 
-#: lang.pm:269
+#: lang.pm:274
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "قرقیزستان"
 
-#: lang.pm:270
+#: lang.pm:275
 #, c-format
 msgid "Cambodia"
 msgstr "کامبوج"
 
-#: lang.pm:271
+#: lang.pm:276
 #, c-format
 msgid "Kiribati"
 msgstr "کیریباتی"
 
-#: lang.pm:272
+#: lang.pm:277
 #, c-format
 msgid "Comoros"
 msgstr "کوموروس"
 
-#: lang.pm:273
+#: lang.pm:278
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "سنت کیتز و نویز"
 
-#: lang.pm:274
+#: lang.pm:279
 #, c-format
 msgid "Korea (North)"
 msgstr "کره (شمال)"
 
-#: lang.pm:275
+#: lang.pm:280
 #, c-format
 msgid "Korea"
 msgstr "کره"
 
-#: lang.pm:276
+#: lang.pm:281
 #, c-format
 msgid "Kuwait"
 msgstr "کویت"
 
-#: lang.pm:277
+#: lang.pm:282
 #, c-format
 msgid "Cayman Islands"
 msgstr "جزایر کی‌من"
 
-#: lang.pm:278
+#: lang.pm:283
 #, c-format
 msgid "Kazakhstan"
 msgstr "قزاقستان"
 
-#: lang.pm:279
+#: lang.pm:284
 #, c-format
 msgid "Laos"
 msgstr "لائوس"
 
-#: lang.pm:280
+#: lang.pm:285
 #, c-format
 msgid "Lebanon"
 msgstr "لبنان"
 
-#: lang.pm:281
+#: lang.pm:286
 #, c-format
 msgid "Saint Lucia"
 msgstr "سنت لوشیا"
 
-#: lang.pm:282
+#: lang.pm:287
 #, c-format
 msgid "Liechtenstein"
 msgstr "لیختن‌اشتاین"
 
-#: lang.pm:283
+#: lang.pm:288
 #, c-format
 msgid "Sri Lanka"
 msgstr "سریلانکا"
 
-#: lang.pm:284
+#: lang.pm:289
 #, c-format
 msgid "Liberia"
 msgstr "لیبریا"
 
-#: lang.pm:285
+#: lang.pm:290
 #, c-format
 msgid "Lesotho"
 msgstr "لوسوتو"
 
-#: lang.pm:286
+#: lang.pm:291
 #, c-format
 msgid "Lithuania"
 msgstr "لیت‌وانی"
 
-#: lang.pm:287
+#: lang.pm:292
 #, c-format
 msgid "Luxembourg"
 msgstr "لوکزامبورگ"
 
-#: lang.pm:288
+#: lang.pm:293
 #, c-format
 msgid "Latvia"
 msgstr "لاتویا"
 
-#: lang.pm:289
+#: lang.pm:294
 #, c-format
 msgid "Libya"
 msgstr "لیبی"
 
-#: lang.pm:290
+#: lang.pm:295
 #, c-format
 msgid "Morocco"
 msgstr "مراکش"
 
-#: lang.pm:291
+#: lang.pm:296
 #, c-format
 msgid "Monaco"
 msgstr "موناکو"
 
-#: lang.pm:292
+#: lang.pm:297
 #, c-format
 msgid "Moldova"
 msgstr "مولدووا"
 
-#: lang.pm:293
+#: lang.pm:298
 #, c-format
 msgid "Madagascar"
 msgstr "ماداگاسکار"
 
-#: lang.pm:294
+#: lang.pm:299
 #, c-format
 msgid "Marshall Islands"
 msgstr "جزایر مارشال"
 
-#: lang.pm:295
+#: lang.pm:300
 #, c-format
 msgid "Macedonia"
 msgstr "مقدونیه"
 
-#: lang.pm:296
+#: lang.pm:301
 #, c-format
 msgid "Mali"
 msgstr "مالی"
 
-#: lang.pm:297
+#: lang.pm:302
 #, c-format
 msgid "Myanmar"
 msgstr "موانمار"
 
-#: lang.pm:298
+#: lang.pm:303
 #, c-format
 msgid "Mongolia"
 msgstr "مغولستان"
 
-#: lang.pm:299
+#: lang.pm:304
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "جزایر ماریان شمالی"
 
-#: lang.pm:300
+#: lang.pm:305
 #, c-format
 msgid "Martinique"
 msgstr "مارتینیک"
 
-#: lang.pm:301
+#: lang.pm:306
 #, c-format
 msgid "Mauritania"
 msgstr "موریتانیا"
 
-#: lang.pm:302
+#: lang.pm:307
 #, c-format
 msgid "Montserrat"
 msgstr "مونت‌سرات"
 
-#: lang.pm:303
+#: lang.pm:308
 #, c-format
 msgid "Malta"
 msgstr "مالتا"
 
-#: lang.pm:304
+#: lang.pm:309
 #, c-format
 msgid "Mauritius"
 msgstr "ماریسی"
 
-#: lang.pm:305
+#: lang.pm:310
 #, c-format
 msgid "Maldives"
 msgstr "مالدیوز"
 
-#: lang.pm:306
+#: lang.pm:311
 #, c-format
 msgid "Malawi"
 msgstr "مالاوی"
 
-#: lang.pm:307
+#: lang.pm:312
 #, c-format
 msgid "Mexico"
 msgstr "مکزیک"
 
-#: lang.pm:308
+#: lang.pm:313
 #, c-format
 msgid "Malaysia"
 msgstr "مالزی"
 
-#: lang.pm:309
+#: lang.pm:314
 #, c-format
 msgid "Mozambique"
 msgstr "موزامبیک"
 
-#: lang.pm:310
+#: lang.pm:315
 #, c-format
 msgid "Namibia"
 msgstr "نامیبیا"
 
-#: lang.pm:311
+#: lang.pm:316
 #, c-format
 msgid "New Caledonia"
 msgstr "کله‌دونیای جدید"
 
-#: lang.pm:312
+#: lang.pm:317
 #, c-format
 msgid "Niger"
 msgstr "نیجر"
 
-#: lang.pm:313
+#: lang.pm:318
 #, c-format
 msgid "Norfolk Island"
 msgstr "جزایر نورفولک"
 
-#: lang.pm:314
+#: lang.pm:319
 #, c-format
 msgid "Nigeria"
 msgstr "نیجریه"
 
-#: lang.pm:315
+#: lang.pm:320
 #, c-format
 msgid "Nicaragua"
 msgstr "نیکاراگوئه"
 
-#: lang.pm:318
+#: lang.pm:323
 #, c-format
 msgid "Nepal"
 msgstr "نپال"
 
-#: lang.pm:319
+#: lang.pm:324
 #, c-format
 msgid "Nauru"
 msgstr "ناورو"
 
-#: lang.pm:320
+#: lang.pm:325
 #, c-format
 msgid "Niue"
 msgstr "نی‌وه"
 
-#: lang.pm:321
+#: lang.pm:326
 #, c-format
 msgid "New Zealand"
 msgstr "زلاندنو"
 
-#: lang.pm:322
+#: lang.pm:327
 #, c-format
 msgid "Oman"
 msgstr "عمان"
 
-#: lang.pm:323
+#: lang.pm:328
 #, c-format
 msgid "Panama"
 msgstr "پاناما"
 
-#: lang.pm:324
+#: lang.pm:329
 #, c-format
 msgid "Peru"
 msgstr "پرو"
 
-#: lang.pm:325
+#: lang.pm:330
 #, c-format
 msgid "French Polynesia"
 msgstr "پولی‌نسیای فرانسوی"
 
-#: lang.pm:326
+#: lang.pm:331
 #, c-format
 msgid "Papua New Guinea"
 msgstr "گینه‌ی جدید پاپائو "
 
-#: lang.pm:327
+#: lang.pm:332
 #, c-format
 msgid "Philippines"
 msgstr "فیلیپین"
 
-#: lang.pm:328
+#: lang.pm:333
 #, c-format
 msgid "Pakistan"
 msgstr "پاکستان"
 
-#: lang.pm:329 network/adsl_consts.pm:177
+#: lang.pm:334 network/adsl_consts.pm:186
 #, c-format
 msgid "Poland"
 msgstr "لهستان"
 
-#: lang.pm:330
+#: lang.pm:335
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "سنت پی‌یر و میگوئل"
 
-#: lang.pm:331
+#: lang.pm:336
 #, c-format
 msgid "Pitcairn"
 msgstr "پیت‌کایرن"
 
-#: lang.pm:332
+#: lang.pm:337
 #, c-format
 msgid "Puerto Rico"
 msgstr "پورتو ریکو"
 
-#: lang.pm:333
+#: lang.pm:338
 #, c-format
 msgid "Palestine"
 msgstr "فلسطین"
 
-#: lang.pm:334 network/adsl_consts.pm:187
+#: lang.pm:339 network/adsl_consts.pm:196
 #, c-format
 msgid "Portugal"
 msgstr "پرتغال"
 
-#: lang.pm:335
+#: lang.pm:340
 #, c-format
 msgid "Paraguay"
 msgstr "پاراگوئه"
 
-#: lang.pm:336
+#: lang.pm:341
 #, c-format
 msgid "Palau"
 msgstr "پالاو"
 
-#: lang.pm:337
+#: lang.pm:342
 #, c-format
 msgid "Qatar"
 msgstr "قطر"
 
-#: lang.pm:338
+#: lang.pm:343
 #, c-format
 msgid "Reunion"
 msgstr "اتحاد مجدد"
 
-#: lang.pm:339
+#: lang.pm:344
 #, c-format
 msgid "Romania"
 msgstr "رومانی"
 
-#: lang.pm:340
+#: lang.pm:345
 #, c-format
 msgid "Russia"
 msgstr "روسیه"
 
-#: lang.pm:341
+#: lang.pm:346
 #, c-format
 msgid "Rwanda"
 msgstr "روآندا"
 
-#: lang.pm:342
+#: lang.pm:347
 #, c-format
 msgid "Saudi Arabia"
 msgstr "عربستان سعودی"
 
-#: lang.pm:343
+#: lang.pm:348
 #, c-format
 msgid "Solomon Islands"
 msgstr "جزایر سولومون"
 
-#: lang.pm:344
+#: lang.pm:349
 #, c-format
 msgid "Seychelles"
 msgstr "سیشلز"
 
-#: lang.pm:345
+#: lang.pm:350
 #, c-format
 msgid "Sudan"
 msgstr "سودان"
 
-#: lang.pm:347
+#: lang.pm:352
 #, c-format
 msgid "Singapore"
 msgstr "سنگاپور"
 
-#: lang.pm:348
+#: lang.pm:353
 #, c-format
 msgid "Saint Helena"
 msgstr "سنت هلن"
 
-#: lang.pm:349
+#: lang.pm:354
 #, c-format
 msgid "Slovenia"
 msgstr "اسلوونی"
 
-#: lang.pm:350
+#: lang.pm:355
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "سوآل‌بارد و جان ماین"
 
-#: lang.pm:351
+#: lang.pm:356
 #, c-format
 msgid "Slovakia"
 msgstr "اسلواکی"
 
-#: lang.pm:352
+#: lang.pm:357
 #, c-format
 msgid "Sierra Leone"
 msgstr "سیه‌رآ ليونه"
 
-#: lang.pm:353
+#: lang.pm:358
 #, c-format
 msgid "San Marino"
 msgstr "سن مارینو"
 
-#: lang.pm:354
+#: lang.pm:359
 #, c-format
 msgid "Senegal"
 msgstr "سنگال"
 
-#: lang.pm:355
+#: lang.pm:360
 #, c-format
 msgid "Somalia"
 msgstr "سومالی"
 
-#: lang.pm:356
+#: lang.pm:361
 #, c-format
 msgid "Suriname"
 msgstr "سورینام"
 
-#: lang.pm:357
+#: lang.pm:362
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "سايو توم و پرینسیپ"
 
-#: lang.pm:358
+#: lang.pm:363
 #, c-format
 msgid "El Salvador"
 msgstr "ال‌سالوادور"
 
-#: lang.pm:359
+#: lang.pm:364
 #, c-format
 msgid "Syria"
 msgstr "سوریه"
 
-#: lang.pm:360
+#: lang.pm:365
 #, c-format
 msgid "Swaziland"
 msgstr "سوازیلند"
 
-#: lang.pm:361
+#: lang.pm:366
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "جزایر ترک‌ها و کایکو‌ها"
 
-#: lang.pm:362
+#: lang.pm:367
 #, c-format
 msgid "Chad"
 msgstr "چاد"
 
-#: lang.pm:363
+#: lang.pm:368
 #, c-format
 msgid "French Southern Territories"
 msgstr "مناطق جنوبی فرانسوی"
 
-#: lang.pm:364
+#: lang.pm:369
 #, c-format
 msgid "Togo"
 msgstr "توگو"
 
-#: lang.pm:365
+#: lang.pm:370
 #, c-format
 msgid "Thailand"
 msgstr "تایلند"
 
-#: lang.pm:366
+#: lang.pm:371
 #, c-format
 msgid "Tajikistan"
 msgstr "تاجیکستان"
 
-#: lang.pm:367
+#: lang.pm:372
 #, c-format
 msgid "Tokelau"
 msgstr "توکل‌آو"
 
-#: lang.pm:368
+#: lang.pm:373
 #, c-format
 msgid "East Timor"
 msgstr "تیمور شرقی"
 
-#: lang.pm:369
+#: lang.pm:374
 #, c-format
 msgid "Turkmenistan"
 msgstr "ترکمنستان"
 
-#: lang.pm:370
+#: lang.pm:375
 #, c-format
 msgid "Tunisia"
 msgstr "تونس"
 
-#: lang.pm:371
+#: lang.pm:376
 #, c-format
 msgid "Tonga"
 msgstr "تونگا"
 
-#: lang.pm:372
+#: lang.pm:377
 #, c-format
 msgid "Turkey"
 msgstr "ترکیه"
 
-#: lang.pm:373
+#: lang.pm:378
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "ترینیداد و توباگو"
 
-#: lang.pm:374
+#: lang.pm:379
 #, c-format
 msgid "Tuvalu"
 msgstr "تووالو"
 
-#: lang.pm:375
+#: lang.pm:380
 #, c-format
 msgid "Taiwan"
 msgstr "چینی (تایوان)"
 
-#: lang.pm:376
+#: lang.pm:381
 #, c-format
 msgid "Tanzania"
 msgstr "تانزانیا"
 
-#: lang.pm:377
+#: lang.pm:382
 #, c-format
 msgid "Ukraine"
 msgstr "اوکراین"
 
-#: lang.pm:378
+#: lang.pm:383
 #, c-format
 msgid "Uganda"
 msgstr "اوگاندا"
 
-#: lang.pm:379
+#: lang.pm:384
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr "جزایر متفرقه کوچک ایالات متحده"
 
-#: lang.pm:381
+#: lang.pm:386
 #, c-format
 msgid "Uruguay"
 msgstr "اروگوئه"
 
-#: lang.pm:382
+#: lang.pm:387
 #, c-format
 msgid "Uzbekistan"
 msgstr "ازبکستان"
 
-#: lang.pm:383
+#: lang.pm:388
 #, c-format
 msgid "Vatican"
 msgstr "واتیکان"
 
-#: lang.pm:384
+#: lang.pm:389
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "سنت وینسنت و گرنادینز"
 
-#: lang.pm:385
+#: lang.pm:390
 #, c-format
 msgid "Venezuela"
 msgstr "ونزوئلا"
 
-#: lang.pm:386
+#: lang.pm:391
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "جزایر ویرجین (بریتانیایی)"
 
-#: lang.pm:387
+#: lang.pm:392
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "جزایر ویرجین (آمریکا)"
 
-#: lang.pm:388
+#: lang.pm:393
 #, c-format
 msgid "Vietnam"
 msgstr "ویتنام"
 
-#: lang.pm:389
+#: lang.pm:394
 #, c-format
 msgid "Vanuatu"
 msgstr "وانوآتو"
 
-#: lang.pm:390
+#: lang.pm:395
 #, c-format
 msgid "Wallis and Futuna"
 msgstr "والیس و فوتونا"
 
-#: lang.pm:391
+#: lang.pm:396
 #, c-format
 msgid "Samoa"
 msgstr "ساموآ"
 
-#: lang.pm:392
+#: lang.pm:397
 #, c-format
 msgid "Yemen"
 msgstr "یمن"
 
-#: lang.pm:393
+#: lang.pm:398
 #, c-format
 msgid "Mayotte"
 msgstr "مایوت‌ته"
 
-#: lang.pm:394
+#: lang.pm:399
 #, c-format
 msgid "Serbia & Montenegro"
-msgstr ""
+msgstr "صربستان و مونته‌نگرو"
 
-#: lang.pm:395 standalone/drakxtv:50
+#: lang.pm:400 standalone/drakxtv:50
 #, c-format
 msgid "South Africa"
 msgstr "آفریقای جنوبی"
 
-#: lang.pm:396
+#: lang.pm:401
 #, c-format
 msgid "Zambia"
 msgstr "زامبیا"
 
-#: lang.pm:397
+#: lang.pm:402
 #, c-format
 msgid "Zimbabwe"
 msgstr "زیمبابوه"
 
-#: lang.pm:966
+#: lang.pm:983
 #, c-format
 msgid "Welcome to %s"
 msgstr "به %s خوش آمدید"
@@ -9004,7 +9001,7 @@ msgstr "سوارسازی دایره‌ای %s\n"
 msgid "Remove the logical volumes first\n"
 msgstr "نخست حجم‌های منطقی برداشته شوند\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:962
+#: modules/interactive.pm:21 standalone/drakconnect:959
 #, c-format
 msgid "Parameters"
 msgstr "پارامترها"
@@ -9174,12 +9171,11 @@ msgstr "موشی چرخی PS2 عمومی"
 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 "خودکار"
@@ -9315,16 +9311,16 @@ msgid "3 buttons with Wheel emulation"
 msgstr "۳ دکمه‌ای با شبیه‌سازی چرخ"
 
 #: mouse.pm:86
-#, fuzzy, c-format
+#, c-format
 msgid "Universal"
-msgstr "بعد از نصب‌برداری"
+msgstr "جهانی"
 
 #: mouse.pm:88
 #, c-format
 msgid "Any PS/2 & USB mice"
-msgstr ""
+msgstr "هر موشی PS/2 & USB"
 
-#: mouse.pm:92
+#: mouse.pm:92 standalone/drakvpn:1138
 #, c-format
 msgid "none"
 msgstr "هیچکدام"
@@ -9384,12 +9380,12 @@ msgstr "Sagem (using pppoa) usb"
 msgid "Sagem (using dhcp) usb"
 msgstr "Sagem (using dhcp) 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 "اتصال به اینترنت"
 
-#: 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 +9396,7 @@ msgstr ""
 "بعضی اتصالات از pptp و برخی از dhcp استفاده می‌کنند.\n"
 "اگر نمی‌دانید 'استفاده از pppoe' را انتخاب کنید"
 
-#: network/adsl.pm:41 network/netconnect.pm:684
+#: network/adsl.pm:41 network/netconnect.pm:759
 #, c-format
 msgid "ADSL connection type :"
 msgstr "نوع اتصال ADSL :"
@@ -9453,7 +9449,7 @@ msgstr "کارگزار CUPS"
 #: network/drakfirewall.pm:60
 #, c-format
 msgid "Echo request (ping)"
-msgstr ""
+msgstr "درخواست پژواک (ping)"
 
 #: network/drakfirewall.pm:125
 #, c-format
@@ -9465,14 +9461,14 @@ msgstr "هیچ کارت شبکه"
 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 ""
-"پیکربند دیوارآتش شبکه \n"
+"پیکربند دیوارآتش‌درایک \n"
 "\n"
 "این دیوار‌آتش شخصی را برای این ماشین لینوکس ماندرایک پیکربندی می‌کند.\n"
-"برای دیوارآتش باقدرت و متعلق، لطفاً به پخش دیوارآتش امنیتی تخصصی \n"
+"برای دیوارآتش باقدرت و متعلق، لطفا به پخش دیوارآتش امنیتی تخصصی \n"
 "شده‌ی ماندرایک نگاهی بیاندازید."
 
 #: network/drakfirewall.pm:152
@@ -9497,11 +9493,11 @@ msgstr "چه سرویس‌هایی را مایلید به اینترنت اجا
 #, 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 ""
 "می‌توانید درگاه‌های متفرقه را وارد کنید. \n"
-"مثال‌های معتبر: 139/tcp 139/udp.\n"
+"مثال‌های معتبر: 139/tcp·139/udp·600:610/tcp·600:610/udp.\n"
 "برای اطلاعات نگاهی به پرونده‌ی /etc/services بیاندازید. "
 
 #: network/drakfirewall.pm:176
@@ -9529,321 +9525,272 @@ msgstr "همه چیز (بدون دیوار‌آتش)"
 msgid "Other ports"
 msgstr "درگاه‌های دیگر"
 
-#: 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"
-
-#: network/isdn.pm:127
-#, c-format
-msgid ""
-"Select your provider.\n"
-"If it isn't listed, choose Unlisted."
-msgstr ""
-"عرضه کننده‌ی اینترنت خود را انتخاب کنید.\n"
-"اگر در لیست نیست، Unlisted را انتخاب کنید."
-
-#: network/isdn.pm:140 standalone/drakconnect:503
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "پایان‌نامه‌ی اروپایی (EDSS1)"
-
-#: network/isdn.pm:140
-#, c-format
-msgid "European protocol"
-msgstr "پایان‌نامه‌ی اروپایی"
-
-#: network/isdn.pm:142 standalone/drakconnect:504
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"پایان‌نامه برای بقیه‌ی جهان\n"
-"بدون D-Channel (خطوط اجاره‌‌ای)"
-
-#: network/isdn.pm:142
-#, c-format
-msgid "Protocol for the rest of the world"
-msgstr "پایان‌نامه برای بقیه جهان"
-
-#: network/isdn.pm:146
+#: network/isdn.pm:113 network/netconnect.pm:424
 #, c-format
-msgid "Which protocol do you want to use?"
-msgstr "از کدام پایان‌نامه می‌خواهید استفاده کنید؟"
-
-#: network/isdn.pm:157
-#, c-format
-msgid "Found \"%s\" interface do you want to use it ?"
-msgstr "واسط \"%s\" یافت شد، می‌خواهید از آن استفاده کنید؟"
-
-#: network/isdn.pm:164
-#, c-format
-msgid "What kind of card do you have?"
-msgstr "چه نوع کارتی دارید؟"
+msgid "Unlisted - edit manually"
+msgstr "فهرست نشده - بطور دستی ویرایش کنید"
 
-#: 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 "نمی‌دانم"
+
+#: 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 "نمی‌دانم"
-
-#: 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"
-"اگر شما یک کارت ISA دارید، مقدار‌های در صفحه بعدی بایستی درست باشند.\n"
-"\n"
-"اگر شما یک کارت PCMCIA دارید، شما باید \"irq\" و \"io\" کارت خود را بدانید\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 "ادامه"
+msgid "Manual"
+msgstr "دستورالعمل"
 
-#: 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 "سقط"
+msgid "Manual choice"
+msgstr "گزینش دستی"
 
-#: network/isdn.pm:184
+#: network/netconnect.pm:88
 #, c-format
-msgid "Which of the following is your ISDN card?"
-msgstr "کدامیک از اینها کارت ISDN شما است؟"
+msgid "Internal ISDN card"
+msgstr "کارت درونی  ISDN"
 
-#: 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 "سازمان داده شده"
 
-#: network/netconnect.pm:97
+#: network/netconnect.pm:99
 #, c-format
 msgid "Master"
 msgstr "ارشد"
 
-#: network/netconnect.pm:98
+#: network/netconnect.pm:100
 #, c-format
 msgid "Repeater"
 msgstr "تکرار کننده"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:101
 #, c-format
 msgid "Secondary"
 msgstr "دومی"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:102
 #, c-format
 msgid "Auto"
 msgstr "خودکار"
 
-#: 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 "پیکربندی دستی"
 
-#: network/netconnect.pm:104
-#, fuzzy, c-format
+#: network/netconnect.pm:106
+#, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
-msgstr "آی پی خودکار"
+msgstr "آی‌پی خودکار (BOOTP/DHCP)"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:108
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
-msgstr ""
+msgstr "آی‌پی خودکار (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:156
-#, fuzzy, c-format
-msgid "Alcatel speedtouch USB modem"
-msgstr "Alcatel speedtouch usb"
+#: network/netconnect.pm:111
+#, c-format
+msgid "Protocol for the rest of the world"
+msgstr "پایان‌نامه برای بقیه جهان"
 
-#: network/netconnect.pm:157
-#, fuzzy, c-format
-msgid "Sagem USB modem"
-msgstr "حالت سیستم"
+#: network/netconnect.pm:113 standalone/drakconnect:528
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "پایان‌نامه‌ی اروپایی (EDSS1)"
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:114 standalone/drakconnect:529
 #, c-format
-msgid "Bewan USB modem"
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
 msgstr ""
+"پایان‌نامه برای بقیه‌ی جهان\n"
+"بدون D-Channel (خطوط اجاره‌‌ای)"
 
-#: network/netconnect.pm:159
+#: network/netconnect.pm:146
 #, c-format
-msgid "Bewan PCI modem"
-msgstr ""
+msgid "Alcatel speedtouch USB modem"
+msgstr "Alcatel speedtouch USB modem"
 
-#: network/netconnect.pm:160
+#: network/netconnect.pm:147
+#, c-format
+msgid "Sagem USB modem"
+msgstr "مودم Sagem USB"
+
+#: network/netconnect.pm:148
+#, c-format
+msgid "Bewan modem"
+msgstr "مودم Bewan"
+
+#: network/netconnect.pm:149
 #, c-format
 msgid "ECI Hi-Focus modem"
-msgstr ""
+msgstr "مودم ECI Hi-Focus"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:153
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
-msgstr ""
+msgstr "پایان‌نامه‌ی پیکربندی میزبان پویا (DHCP)"
 
-#: network/netconnect.pm:165
-#, fuzzy, c-format
+#: network/netconnect.pm:154
+#, c-format
 msgid "Manual TCP/IP configuration"
-msgstr "تنظیم دستی"
+msgstr "پیکربندی دستی TCP/IP"
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:155
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
-msgstr ""
+msgstr "پایان‌نامه‌ی تونل نقطه به نقطه (PPTP)"
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:156
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
-msgstr ""
+msgstr "PPP بر روی ایثرنت (PPPoE)"
 
-#: network/netconnect.pm:168
+#: network/netconnect.pm:157
 #, c-format
 msgid "PPP over ATM (PPPoA)"
-msgstr ""
+msgstr "PPP بر روی ATM (PPPoA)"
 
-#: network/netconnect.pm:172
-#, fuzzy, c-format
+#: network/netconnect.pm:161
+#, c-format
 msgid "Bridged Ethernet LLC"
-msgstr "کارت شبکه "
+msgstr "Bridged Ethernet LLC"
 
-#: network/netconnect.pm:173
-#, fuzzy, c-format
+#: network/netconnect.pm:162
+#, c-format
 msgid "Bridged Ethernet VC"
-msgstr "کارت شبکه "
+msgstr "Bridged Ethernet VC"
 
-#: network/netconnect.pm:174
+#: network/netconnect.pm:163
 #, c-format
 msgid "Routed IP LLC"
-msgstr ""
+msgstr "Routed IP LLC"
 
-#: network/netconnect.pm:175
+#: network/netconnect.pm:164
 #, c-format
 msgid "Routed IP VC"
-msgstr ""
+msgstr "Routed IP VC"
 
-#: network/netconnect.pm:176
+#: network/netconnect.pm:165
 #, c-format
 msgid "PPPOA LLC"
-msgstr ""
+msgstr "PPPOA LLC"
 
-#: network/netconnect.pm:177
+#: network/netconnect.pm:166
 #, c-format
 msgid "PPPOA VC"
-msgstr ""
+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 "بر اساس دست‌نویس"
 
-#: 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 "بر اساس-پایانه"
 
-#: 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
-#, fuzzy, c-format
+#: network/netconnect.pm:174 standalone/drakconnect:466
+#, c-format
 msgid "PAP/CHAP"
-msgstr "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 "پیکربندی شبکه & اینترنت"
 
-#: network/netconnect.pm:205
+#: network/netconnect.pm:225
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(شناسایی شده بر درگاه %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 "(شناسایی شده %s)"
 
-#: network/netconnect.pm:207
+#: network/netconnect.pm:227
 #, c-format
 msgid "(detected)"
 msgstr "(شناسایی شده)"
 
-#: network/netconnect.pm:209
-#, fuzzy, c-format
+#: network/netconnect.pm:229
+#, c-format
 msgid "Modem connection"
-msgstr "ارتباط مودم ویندوزی"
+msgstr "اتصال مودمی"
 
-#: network/netconnect.pm:210
+#: network/netconnect.pm:230
 #, c-format
 msgid "ISDN connection"
 msgstr "اتصال ISDN"
 
-#: network/netconnect.pm:211
+#: network/netconnect.pm:231
 #, c-format
 msgid "ADSL connection"
 msgstr "اتصال ADSL"
 
-#: network/netconnect.pm:212
+#: network/netconnect.pm:232
 #, c-format
 msgid "Cable connection"
 msgstr "اتصال کابلی"
 
-#: network/netconnect.pm:213
+#: network/netconnect.pm:233
 #, c-format
 msgid "LAN connection"
 msgstr "اتصال LAN"
 
-#: network/netconnect.pm:214 network/netconnect.pm:228
+#: network/netconnect.pm:234 network/netconnect.pm:248
 #, c-format
 msgid "Wireless connection"
 msgstr "اتصال بی‌سیم"
 
-#: network/netconnect.pm:224
+#: network/netconnect.pm:244
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "اتصالی را که می‌خواهید پیکربندی کنید انتخاب کنید"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:261
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -9856,139 +9803,191 @@ msgstr ""
 "\n"
 "دکمه‌ی \"%s\" را برای ادامه فشار دهید."
 
-#: network/netconnect.pm:249 network/netconnect.pm:710
+#: network/netconnect.pm:269 network/netconnect.pm:781
 #, c-format
 msgid "Connection Configuration"
 msgstr "پیکربندی اتصال"
 
-#: 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 "لطفاً منطقه‌ی زیر را پر یا علامت بزنید"
 
-#: network/netconnect.pm:256 standalone/drakconnect:494
-#: standalone/drakconnect:899
+#: network/netconnect.pm:277 standalone/drakconnect:519
 #, c-format
 msgid "Card IRQ"
 msgstr "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 "Card mem (DMA)"
 
-#: network/netconnect.pm:258 standalone/drakconnect:496
-#: standalone/drakconnect:901
+#: network/netconnect.pm:279 standalone/drakconnect:521
 #, c-format
 msgid "Card IO"
 msgstr "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 "Card IO_0"
 
-#: network/netconnect.pm:260 standalone/drakconnect:903
+#: network/netconnect.pm:281
 #, c-format
 msgid "Card IO_1"
 msgstr "Card IO_1"
 
-#: network/netconnect.pm:261 standalone/drakconnect:904
+#: network/netconnect.pm:282
 #, c-format
 msgid "Your personal phone number"
 msgstr "شماره تلفن شخصی شما"
 
-#: 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 "نام عرضه کننده (مثل provider.net)"
 
-#: network/netconnect.pm:263 standalone/drakconnect:440
-#: standalone/drakconnect:906
+#: network/netconnect.pm:284 standalone/drakconnect:463
 #, c-format
 msgid "Provider phone number"
 msgstr "شماره تلفن شرکت عرضه کننده‌ی اینترنت"
 
-#: network/netconnect.pm:264
-#, fuzzy, c-format
+#: network/netconnect.pm:285
+#, c-format
 msgid "Provider DNS 1 (optional)"
-msgstr "عرضه کننده dns  ۱ (دلخواه)"
+msgstr "عرضه کننده‌ی dns ۱ (اختیاری)"
 
-#: network/netconnect.pm:265
-#, fuzzy, c-format
+#: network/netconnect.pm:286
+#, c-format
 msgid "Provider DNS 2 (optional)"
-msgstr "عرضه کننده dns ۲ (دلخواه)"
+msgstr "عرضه کننده dns ۲ (اختیاری)"
 
-#: 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 "حالت شماره‌گیری"
 
-#: 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 "سرعت اتصال"
 
-#: 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 "زمان‌انتظار اتصال (ثانیه)"
 
-#: 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 "ثبت‌ورود حساب (نام کاربر)"
 
-#: 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 "گذرواژه‌ی حساب"
 
-#: 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 "اتصال ISDN  شما از چه نوعی است؟"
+msgid "Select the network interface to configure:"
+msgstr "انتخاب واسط شبکه برای پیکربندی کردن:"
 
-#: 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 "کارت درونی  ISDN"
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "متاسفیم، ما فقط هسته‌ی ۲٬۴ و بالاتر را پشتیبانی می‌کنیم."
 
-#: 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 "دستگاه شبکه"
+
+#: network/netconnect.pm:326 network/netconnect.pm:334
 #, c-format
 msgid "External ISDN modem"
 msgstr "مودم ISDN بیرونی"
 
-#: network/netconnect.pm:332
+#: network/netconnect.pm:365 standalone/harddrake2:115
+#, c-format
+msgid "Select a device !"
+msgstr "انتخاب یک دستگاه !"
+
+#: 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"
+
+#: network/netconnect.pm:375
 #, c-format
-msgid "Do you want to start a new configuration ?"
-msgstr "آیا می‌خواهید یک پیکربندی جدید را شروع کنید؟"
+msgid "What kind of card do you have?"
+msgstr "چه نوع کارتی دارید؟"
 
-#: network/netconnect.pm:335
+#: network/netconnect.pm:385
 #, 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."
+"\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 ""
-"من یک کارت PCI ISDN را شناسایی کرده‌ام، ولی نوع آن را نمی‌دانم. لطفاً کارت PCI "
-"را در صفحه‌ی بعد انتخاب کنید."
+"\n"
+"اگر شما یک کارت ISA دارید، مقدار‌های در صفحه بعدی بایستی درست باشند.\n"
+"\n"
+"اگر شما یک کارت PCMCIA دارید، شما باید \"irq\" و \"io\" کارت خود را بدانید\n"
+
+#: network/netconnect.pm:389
+#, c-format
+msgid "Continue"
+msgstr "ادامه"
+
+#: network/netconnect.pm:389
+#, c-format
+msgid "Abort"
+msgstr "سقط"
+
+#: network/netconnect.pm:395
+#, c-format
+msgid "Which of the following is your ISDN card?"
+msgstr "کدامیک از اینها کارت ISDN شما است؟"
 
-#: network/netconnect.pm:344
+#: network/netconnect.pm:410
 #, c-format
-msgid "No ISDN PCI card found. Please select one on the next screen."
+msgid "Which protocol do you want to use?"
+msgstr "از کدام پایان‌نامه می‌خواهید استفاده کنید؟"
+
+#: network/netconnect.pm:412 standalone/drakconnect:116
+#: standalone/drakconnect:527 standalone/drakvpn:1140
+#, c-format
+msgid "Protocol"
+msgstr "پایان‌نامه"
+
+#: network/netconnect.pm:421
+#, c-format
+msgid ""
+"Select your provider.\n"
+"If it isn't listed, choose Unlisted."
 msgstr ""
-"هیچ کارت PCI برای شبکه ISDN یافت نشد. لطفاً یکی را در صفحه‌ی بعدی انتخاب کنید."
+"عرضه کننده‌ی اینترنت خود را انتخاب کنید.\n"
+"اگر در لیست نیست، Unlisted را انتخاب کنید."
+
+#: network/netconnect.pm:423 network/netconnect.pm:529
+#: network/netconnect.pm:675
+#, c-format
+msgid "Provider:"
+msgstr "عرضه کننده:"
 
-#: network/netconnect.pm:353
+#: network/netconnect.pm:438
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -9997,140 +9996,117 @@ msgstr ""
 "مودم شما بوسیله‌ی سیستم حمایت نمی‌شود.\n"
 "نگاهی به پایگاه http://www.linmodems.org بیاندازید"
 
-#: network/netconnect.pm:364
-#, fuzzy, c-format
+#: network/netconnect.pm:450
+#, c-format
 msgid "Select the modem to configure:"
-msgstr "انتخاب واسط شبکه"
+msgstr "انتخاب مودم برای پیکربندی:"
 
-#: network/netconnect.pm:403
+#: network/netconnect.pm:498
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "لطفاً درگاه سریالی را که مودم شما به آن وصل است انتخاب کنید."
 
-#: network/netconnect.pm:427
-#, fuzzy, c-format
+#: network/netconnect.pm:527
+#, c-format
 msgid "Select your provider:"
-msgstr "انتخاب صف‌بند چاپگر"
+msgstr "انتخاب عرضه کننده‌اتان:"
 
-#: network/netconnect.pm:429 network/netconnect.pm:599
-#, fuzzy, c-format
-msgid "Provider:"
-msgstr "نمایه:"
-
-#: network/netconnect.pm:481 network/netconnect.pm:482
-#: network/netconnect.pm:483 network/netconnect.pm:508
-#: network/netconnect.pm:525 network/netconnect.pm:541
-#, fuzzy, c-format
-msgid "Manual"
-msgstr "دستورالعمل"
-
-#: network/netconnect.pm:485
-#, fuzzy, c-format
+#: network/netconnect.pm:556
+#, c-format
 msgid "Dialup: account options"
-msgstr "گزینه‌های زنگ‌زدن"
+msgstr "شماره‌گیری: گزینه‌های حساب"
 
-#: network/netconnect.pm:488 standalone/drakconnect:913
+#: network/netconnect.pm:559
 #, c-format
 msgid "Connection name"
 msgstr "نام اتصال"
 
-#: network/netconnect.pm:489 standalone/drakconnect:914
+#: network/netconnect.pm:560
 #, c-format
 msgid "Phone number"
 msgstr "شماره تلفن"
 
-#: network/netconnect.pm:490 standalone/drakconnect:915
+#: network/netconnect.pm:561
 #, c-format
 msgid "Login ID"
 msgstr "شناسه‌ی ثبت‌ورود"
 
-#: network/netconnect.pm:505 network/netconnect.pm:538
-#, fuzzy, c-format
+#: network/netconnect.pm:576 network/netconnect.pm:609
+#, c-format
 msgid "Dialup: IP parameters"
-msgstr "اجزا"
+msgstr "شماره‌گیری: پارامترهای آی‌پی"
 
-#: network/netconnect.pm:508
-#, fuzzy, c-format
+#: network/netconnect.pm:579
+#, c-format
 msgid "IP parameters"
-msgstr "اجزا"
+msgstr "پارامترهای آی‌پی"
 
-#: 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 "نشانی آی‌پی"
 
-#: network/netconnect.pm:510
-#, fuzzy, c-format
+#: network/netconnect.pm:581
+#, c-format
 msgid "Subnet mask"
-msgstr "ماسک شبکه:"
+msgstr "نقاب زیرشبکه"
 
-#: network/netconnect.pm:522
+#: network/netconnect.pm:593
 #, c-format
 msgid "Dialup: DNS parameters"
-msgstr ""
+msgstr "شماره‌گیری: پارامترهای DNS"
 
-#: network/netconnect.pm:525
-#, fuzzy, c-format
+#: network/netconnect.pm:596
+#, c-format
 msgid "DNS"
-msgstr "NIS"
+msgstr "DNS"
 
-#: network/netconnect.pm:526 standalone/drakconnect:918
+#: network/netconnect.pm:597
 #, c-format
 msgid "Domain name"
 msgstr "نام دامنه"
 
-#: 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 "اولین کارگزار DNS (اختیاری)"
 
-#: 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 "دومین کارگزار DNS (اختیاری)"
 
-#: network/netconnect.pm:529
-#, fuzzy, c-format
+#: network/netconnect.pm:600
+#, c-format
 msgid "Set hostname from IP"
-msgstr "نام میزبان یا IP چاپگر"
+msgstr "گذاردن نام میزبان از آی‌پی"
 
-#: network/netconnect.pm:541 standalone/drakconnect:317
-#: standalone/drakconnect:912
+#: network/netconnect.pm:612 standalone/drakconnect:336
 #, c-format
 msgid "Gateway"
 msgstr "دروازه"
 
-#: network/netconnect.pm:542
-#, fuzzy, c-format
+#: network/netconnect.pm:613
+#, c-format
 msgid "Gateway IP address"
-msgstr "نشانی IP"
-
-#: network/netconnect.pm:567
-#, fuzzy, c-format
-msgid "ADSL configuration"
-msgstr "تنظیمات LAN "
+msgstr "نشانی آی‌پی دروازه"
 
-#: network/netconnect.pm:567 network/netconnect.pm:746
+#: network/netconnect.pm:637
 #, c-format
-msgid "Select the network interface to configure:"
-msgstr "انتخاب واسط شبکه برای پیکربندی کردن:"
+msgid "ADSL configuration"
+msgstr "پیکربندی ADSL"
 
-#: network/netconnect.pm:568 network/netconnect.pm:748 network/shorewall.pm:77
-#: standalone/drakconnect:602 standalone/drakgw:218 standalone/drakvpn:217
+#: network/netconnect.pm:673
 #, c-format
-msgid "Net Device"
-msgstr "دستگاه شبکه"
-
-#: network/netconnect.pm:597
-#, fuzzy, c-format
 msgid "Please choose your ADSL provider"
-msgstr "لطفا کشور خود را انتخاب نمایید."
+msgstr "لطفا عرضه کننده‌ی ADSL خود را انتخاب کنید"
 
-#: network/netconnect.pm:616
+#: network/netconnect.pm:691
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10141,32 +10117,32 @@ msgstr ""
 "می‌توانید آن را از طریق یک دیسکچه یا قسمت‌بندی ویندوز ارائه کنید،\n"
 "یا آن را بعداً انجام دهید."
 
-#: network/netconnect.pm:620 network/netconnect.pm:625
+#: network/netconnect.pm:695 network/netconnect.pm:700
 #, c-format
 msgid "Use a floppy"
 msgstr "استفاده از یک دیسکچه"
 
-#: network/netconnect.pm:620 network/netconnect.pm:629
+#: network/netconnect.pm:695 network/netconnect.pm:704
 #, c-format
 msgid "Use my Windows partition"
 msgstr "استفاده از قسمت‌بندی ویندوز من"
 
-#: network/netconnect.pm:620 network/netconnect.pm:633
+#: network/netconnect.pm:695 network/netconnect.pm:708
 #, c-format
 msgid "Do it later"
 msgstr "بعداً انجام بده"
 
-#: network/netconnect.pm:640
+#: network/netconnect.pm:715
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr "کپی کردن Firmware شکست خورد، پرونده‌ی %s یافت نشد"
 
-#: network/netconnect.pm:647
+#: network/netconnect.pm:722
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "کپی کردن Firmware موفق بود"
 
-#: network/netconnect.pm:662
+#: network/netconnect.pm:737
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10179,22 +10155,22 @@ msgstr ""
 "%s\n"
 "و به mgmt.o در /usr/share/speedtouch کپی کنید"
 
-#: network/netconnect.pm:719
+#: network/netconnect.pm:790
 #, c-format
 msgid "Virtual Path ID (VPI):"
-msgstr ""
+msgstr "شناسه‌ی مسیر مجازی (VPI):"
 
-#: network/netconnect.pm:720
+#: network/netconnect.pm:791
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
-msgstr ""
+msgstr "شناسه‌ی مدار مجازی (VCI):"
 
-#: network/netconnect.pm:721
-#, fuzzy, c-format
+#: network/netconnect.pm:793
+#, c-format
 msgid "Encapsulation :"
-msgstr "کلید رمزی"
+msgstr "کپسول سازی :"
 
-#: network/netconnect.pm:736
+#: network/netconnect.pm:810
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10202,18 +10178,12 @@ msgid ""
 "\n"
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
+"مودم ECI Hi-Focus بدلیل اشکال انتشار راه‌انداز دوگانی نمی‌تواند پشتیبانی "
+"گردد.\n"
+"\n"
+"می‌توانید راه‌اندازی را در http://eciadsl.flashtux.org/ پیدا کنید"
 
-#: network/netconnect.pm:753
-#, fuzzy, c-format
-msgid "No wireless network adapter on your system!"
-msgstr "هیچ کارت شبکه بر سیستم شما!"
-
-#: network/netconnect.pm:754 standalone/drakgw:240 standalone/drakpxe:137
-#, c-format
-msgid "No network adapter on your system!"
-msgstr "هیچ کارت شبکه بر سیستم شما!"
-
-#: network/netconnect.pm:766
+#: network/netconnect.pm:837
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
@@ -10225,24 +10195,35 @@ msgstr ""
 "براحتی نگهداشتن دستگاه پیکربندی شده را بپذیرید.\n"
 "پیرایش مناطق زیر باعث ارجحیت بر این پیکربندی خواهد شد."
 
-#: network/netconnect.pm:784
-#, fuzzy, c-format
+#: network/netconnect.pm:850 network/netconnect.pm:1222
+#, c-format
+msgid ""
+"Congratulations, the network and Internet configuration is finished.\n"
+"\n"
+msgstr ""
+"تبریک می‌گوییم، پیکربندی شبکه و اینترنت به پایان رسید.\n"
+"\n"
+
+#: network/netconnect.pm:864
+#, c-format
 msgid "Zeroconf hostname resolution"
-msgstr "نام میزبان Zeroconf "
+msgstr "بازیابی نام میزبان Zeroconf"
 
-#: network/netconnect.pm:785 network/netconnect.pm:816
-#, fuzzy, c-format
+#: network/netconnect.pm:865 network/netconnect.pm:899
+#, c-format
 msgid "Configuring network device %s (driver %s)"
-msgstr "در حال تنظیم دستگاه شبکه %s"
+msgstr "پیکربندی دستگاه %s شبکه (راه‌انداز %s)"
 
-#: network/netconnect.pm:786
+#: network/netconnect.pm:866
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
 "Please choose the one you want to use"
 msgstr ""
+"پایان‌نامه‌های بدنبال آمده می‌توانند برای پیکربندی اتصال ایثرنت استفاده گردند. "
+"لطفاً آن را که می‌خواهید استفاده کنید انتخاب نمایید"
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:900
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10253,89 +10234,89 @@ msgstr ""
 "هر آیتم باید مانند یک نشانی IP به صورت عدد-نقطه‌ای\n"
 "وارد گردد (مثال، ۱.۲.۳.۴)"
 
-#: network/netconnect.pm:824
+#: network/netconnect.pm:907
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "تعیین کردن نام میزبان از نشانی DHCP"
 
-#: network/netconnect.pm:825
+#: network/netconnect.pm:908
 #, c-format
 msgid "DHCP host name"
 msgstr "نام میزبان DHCP"
 
-#: 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 "نقاب شبکه"
 
-#: 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 "ردیابی شناسه‌ی کارت شبکه (مفید برای رایانه‌های همراه)"
 
-#: network/netconnect.pm:833 standalone/drakconnect:390
+#: network/netconnect.pm:916 standalone/drakconnect:413
 #, c-format
 msgid "Network Hotplugging"
 msgstr "اتصال‌گرم شبکه"
 
-#: network/netconnect.pm:834 standalone/drakconnect:384
+#: network/netconnect.pm:917 standalone/drakconnect:407
 #, c-format
 msgid "Start at boot"
 msgstr "شروع در آغازگری"
 
-#: network/netconnect.pm:836 standalone/drakconnect:768
+#: network/netconnect.pm:919 standalone/drakconnect:810
 #, c-format
 msgid "DHCP client"
 msgstr "کارگیر DHCP"
 
-#: 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 "نشانی آی‌پی باید در قالب ۱.۲.۳.۴باشد"
 
-#: network/netconnect.pm:849
+#: network/netconnect.pm:932
 #, c-format
 msgid "Warning : IP address %s is usually reserved !"
 msgstr "هشدار : نشانی آی‌پی %s معمولاً رزرو شده است!"
 
-#: 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 "لطفاً پارامترهای بی‌سیم را برای این کارت وارد کنید:"
 
-#: network/netconnect.pm:882 standalone/drakconnect:355
+#: network/netconnect.pm:965 standalone/drakconnect:378
 #, c-format
 msgid "Operating Mode"
 msgstr "حالت کاری"
 
-#: network/netconnect.pm:884 standalone/drakconnect:356
+#: network/netconnect.pm:967 standalone/drakconnect:379
 #, c-format
 msgid "Network name (ESSID)"
-msgstr ""
+msgstr "نام شبکه (ESSID)"
 
-#: network/netconnect.pm:885 standalone/drakconnect:357
+#: network/netconnect.pm:968 standalone/drakconnect:380
 #, c-format
 msgid "Network ID"
 msgstr "شناسه‌ی شبکه"
 
-#: network/netconnect.pm:886 standalone/drakconnect:358
+#: network/netconnect.pm:969 standalone/drakconnect:381
 #, c-format
 msgid "Operating frequency"
 msgstr "فرکانس کاری"
 
-#: network/netconnect.pm:887 standalone/drakconnect:359
+#: network/netconnect.pm:970 standalone/drakconnect:382
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "آستانه‌ی حساسیت"
 
-#: network/netconnect.pm:888 standalone/drakconnect:360
+#: network/netconnect.pm:971 standalone/drakconnect:383
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (in 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 "
@@ -10344,7 +10325,7 @@ msgstr ""
 "فرکانس باید پسوند k, M یا G داشته باشد (برای مثال، \"2.46G\" برای فرکانس "
 "2.46 GHz)، یا به قدر کافی '0' (صفر) اضافه کنید."
 
-#: 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 "
@@ -10353,12 +10334,12 @@ msgstr ""
 "میزان باید پسوند k, M یا G (برای مثال, \"11M\" برای 11M) داشته باشد, یا بقدر "
 "کافی '0' (صفر) اضافه کنید."
 
-#: 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 "
@@ -10371,18 +10352,24 @@ msgid ""
 "fixed\n"
 "or off."
 msgstr ""
+"RTS/CTS دست‌دادنی را قبل از مخابره‌ی هر پاکت برای اطمینان از آماده بودن تونل\n"
+"اضافه می‌کند. این هزینه را زیاد کرده ولی توانایی اجرا را در صورت وجود\n"
+"گره‌های مخفی یا گره‌های فعال بسیار زیاد افزایش می‌دهد. این پارامتر\n"
+"اندازه‌ی کوچک‌ترین پاکتی را که گره برایش RTS می‌فرستد تعیین می‌کند،\n"
+"مقداری برابر با حداکثر اندازه‌ی پاکت طرح را از کار می‌اندازد. همچنین\n"
+"این پارامتر را می‌توانید به خودکار، ثابت یا خاموش بگذارید."
 
-#: network/netconnect.pm:919 standalone/drakconnect:372
+#: network/netconnect.pm:1002 standalone/drakconnect:395
 #, c-format
 msgid "Fragmentation"
 msgstr "درهم‌ریختگی"
 
-#: network/netconnect.pm:920 standalone/drakconnect:373
+#: network/netconnect.pm:1003 standalone/drakconnect:396
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr "آرگومان‌های اضافی فرمان iwconfig"
 
-#: network/netconnect.pm:921
+#: network/netconnect.pm:1004
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -10398,12 +10385,12 @@ msgstr ""
 "برای اطلاعات بیشتر نگاهی به صفحه‌ی دستورالعمل 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 "آرگومان‌های اضافی فرمان iwspy"
 
-#: 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"
@@ -10422,12 +10409,12 @@ msgstr ""
 "\n"
 "برای اطلاعات بیشتر نگاهی به صفحه‌ی دستورالعمل iwpspy(8) بیاندازید."
 
-#: network/netconnect.pm:937 standalone/drakconnect:375
+#: network/netconnect.pm:1020 standalone/drakconnect:398
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr "آرگومان‌های اضافی فرمان Iwpriv"
 
-#: network/netconnect.pm:938
+#: network/netconnect.pm:1021
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10457,7 +10444,7 @@ msgstr ""
 "\n"
 "دستورالعمل iwpriv(8( را برای اطلاعات بیشتر مطالعه کنید"
 
-#: network/netconnect.pm:965
+#: network/netconnect.pm:1048
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system.\n"
@@ -10466,12 +10453,12 @@ msgstr ""
 "هیچ کارت شبکه‌ی ایثرنت در سیستم شما شناسایی نشده است.\n"
 "نمی‌توانم این نوع ارتباط را برپاسازی کنم."
 
-#: 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 "انتخاب کردن واسط شبکه"
 
-#: network/netconnect.pm:970
+#: network/netconnect.pm:1053
 #, c-format
 msgid ""
 "Please choose which network adapter you want to use to connect to Internet."
@@ -10479,7 +10466,7 @@ msgstr ""
 "لطفاً کارت شبکه‌ای را که می‌خواهید برای اتصال به اینترنت استفاده کنید انتخاب "
 "کنید."
 
-#: network/netconnect.pm:991
+#: network/netconnect.pm:1074
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10492,67 +10479,67 @@ msgstr ""
 "مانند ``mybox.mylab.myco.com''.\n"
 "همجنین می‌توانید نشانی آی‌پی دروازه را اگر آن را دارید وارد کنید."
 
-#: 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 "در آخر می‌توانید نشانی‌های آی‌پی کارگزار DNS خود را تایپ کنید."
 
-#: network/netconnect.pm:997
-#, fuzzy, c-format
+#: network/netconnect.pm:1080 standalone/drakconnect:923
+#, c-format
 msgid "Host name (optional)"
-msgstr "اولین کارگزار DNS (دلخواه)"
+msgstr "نام میزبان (اختیاری)"
 
-#: network/netconnect.pm:997
+#: network/netconnect.pm:1080
 #, c-format
 msgid "Host name"
 msgstr "نام میزبان"
 
-#: network/netconnect.pm:998
-#, fuzzy, c-format
+#: network/netconnect.pm:1082
+#, c-format
 msgid "DNS server 1"
-msgstr "کارگزار DNS "
+msgstr "کارگزار ۱ DNS"
 
-#: network/netconnect.pm:999
-#, fuzzy, c-format
+#: network/netconnect.pm:1083
+#, c-format
 msgid "DNS server 2"
-msgstr "کارگزار DNS "
+msgstr "کارگزار ۲ DNS"
 
-#: network/netconnect.pm:1000
-#, fuzzy, c-format
+#: network/netconnect.pm:1084
+#, c-format
 msgid "DNS server 3"
-msgstr "کارگزار DNS "
+msgstr "کارگزار ۳ DNS"
 
-#: network/netconnect.pm:1001
-#, fuzzy, c-format
+#: network/netconnect.pm:1085
+#, c-format
 msgid "Search domain"
-msgstr "دامنه NIS "
+msgstr "دامنه‌ی جستجو"
 
-#: 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 ""
+msgstr "بوسیله‌ی پیش‌فرض دامنه‌ی جستجو از نام میزبان کاملاً معتبر گذاشته خواهد شد"
 
-#: network/netconnect.pm:1003
+#: network/netconnect.pm:1087
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "دروازه (%s)"
 
-#: network/netconnect.pm:1005
+#: network/netconnect.pm:1089
 #, c-format
 msgid "Gateway device"
 msgstr "دستگاه دروازه"
 
-#: network/netconnect.pm:1014
+#: network/netconnect.pm:1098
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "نشانی کارگزار DNS باید در قالب ۱.۲.۳.۴باشد"
 
-#: 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 "نشانی دروازه باید در قالب ۱.۲.۳.۴باشد"
 
-#: 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 "
@@ -10561,17 +10548,17 @@ msgstr ""
 "نام میزبان Zeroconf را که همان خواهد بود که ماشین شما به ماشین‌های دیگر بر "
 "روی شبکه برخواهد گرداند وارد کنید:"
 
-#: network/netconnect.pm:1031
+#: network/netconnect.pm:1115
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "نام میزبان Zeroconf"
 
-#: network/netconnect.pm:1034
+#: network/netconnect.pm:1118
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "نام میزبان Zeroconf نباید دارای یک "
 
-#: network/netconnect.pm:1044
+#: network/netconnect.pm:1128
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10582,32 +10569,32 @@ msgstr ""
 "آن را که می‌خواهید استفاده کنید انتخاب نمایید.\n"
 "\n"
 
-#: network/netconnect.pm:1046
+#: network/netconnect.pm:1130
 #, c-format
 msgid "Internet connection"
 msgstr "اتصال اینترنت"
 
-#: network/netconnect.pm:1054
+#: network/netconnect.pm:1144
 #, c-format
 msgid "Configuration is complete, do you want to apply settings ?"
 msgstr "پیکربندی تکمیل شد، آیا می‌خواهید آنها را بکار ببندید؟"
 
-#: network/netconnect.pm:1070
+#: network/netconnect.pm:1154
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "آیا می‌خواهید اتصال را در آغازگری برقرار کنید؟"
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1166
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it ?"
 msgstr "شبکه باید دوباره راه‌اندازی گردد. می‌خواهید آن را راه‌اندازی مجدد کنید؟"
 
-#: network/netconnect.pm:1100 network/netconnect.pm:1165
+#: network/netconnect.pm:1173 network/netconnect.pm:1238
 #, c-format
 msgid "Network Configuration"
 msgstr "پیکربندی شبکه"
 
-#: network/netconnect.pm:1101
+#: network/netconnect.pm:1174
 #, c-format
 msgid ""
 "A problem occured while restarting the network: \n"
@@ -10618,27 +10605,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 "آیا می‌خواهید سعی کنید اکنون به اینترنت اتصال برقرار کنید؟"
 
-#: network/netconnect.pm:1118 standalone/drakconnect:958
+#: network/netconnect.pm:1190 standalone/drakconnect:955
 #, c-format
 msgid "Testing your connection..."
 msgstr "آزمایش اتصال شما..."
 
-#: network/netconnect.pm:1134
+#: network/netconnect.pm:1206
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "سیستم اکنون با اینترنت اتصال دارد."
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1207
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "به دلایل امنیتی، اکنون قطع خواهد شد."
 
-#: network/netconnect.pm:1136
+#: network/netconnect.pm:1208
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -10647,16 +10634,7 @@ msgstr ""
 "بنظر نمی‌رسد که سیستم به شبکه‌ی اینترنت وصل شده باشد.\n"
 "سعی کنید اتصال خود را دوباره پیکربندی کنید."
 
-#: network/netconnect.pm:1150
-#, c-format
-msgid ""
-"Congratulations, the network and Internet configuration is finished.\n"
-"\n"
-msgstr ""
-"تبریک می‌گوییم، پیکربندی شبکه و اینترنت به پایان رسید.\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 "
@@ -10665,7 +10643,7 @@ msgstr ""
 "بعد از انجام این کار، سفارش می‌کنیم که محیط گرافیک ایکس را دوباره راه‌اندازی "
 "کنید تا از اشکالات مربوط به نام میزبان جلوگیری شود."
 
-#: network/netconnect.pm:1154
+#: network/netconnect.pm:1226
 #, c-format
 msgid ""
 "Problems occured during configuration.\n"
@@ -10676,7 +10654,7 @@ msgstr ""
 "امتحان کنید. اگر اتصال شما برقرار نشد شاید بخواهید پیکربندی را دوباره شروع "
 "کنید."
 
-#: network/netconnect.pm:1166
+#: network/netconnect.pm:1239
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10688,37 +10666,46 @@ msgstr ""
 "بر دکمه‌ی تأیید برای نگهداشتن پیکربندیتان یا بر حذف برای پیکربندی مجدد اتصال "
 "شبکه و اینترنت کلیک کنید.\n"
 
-#: network/network.pm:314
+#: network/netconnect.pm:1327
+#, c-format
+msgid ""
+"An unexpected error has happened:\n"
+"%s"
+msgstr ""
+"خطائی غیرمنتظره‌ای رخ داده است:\n"
+"%s"
+
+#: network/network.pm:315
 #, c-format
 msgid "Proxies configuration"
 msgstr "پیکربندی پراکسی‌ها"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "FTP proxy"
 msgstr "پراکسی FTP"
 
-#: network/network.pm:319
+#: network/network.pm:320
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "پراکسی باید مانند http://... باشد"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "نشانی URL باید با 'ftp:' یا 'http' شروع شود:"
 
-#: network/shorewall.pm:26
+#: network/shorewall.pm:28
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "پیکربندی دیوارآتش شناسایی شد!"
 
-#: network/shorewall.pm:27
+#: network/shorewall.pm:29
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
@@ -10727,30 +10714,29 @@ msgstr ""
 "هشدار! پیکربندی دیوارآتشی شناسایی شده است. ممکن است به قدری ترمیم‌های دستی "
 "بعد از نصب احتیاج داشته باشید."
 
-#: 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 ""
-"لطفاًً نام واسطی را که به اینترنت اتصال دارد وارد کنید.                \n"
-"                   \n"
+"لطفاً نام واسطی را که به اینترنت اتصال دارد را وارد کنید.\n"
+"\n"
 "نمونه‌ها:\n"
-"                    ppp+ برای مودم یا اتصالات DSL, \n"
-"                    eth0, یا eth1 برای اتصال با کابل, \n"
-"                    ippp+ برای یک اتصال isdn.\n"
+"\t\tppp+ برای مودم یا اتصالات DSL, \n"
+"\t\teth0, یا eth1 برای اتصالات با کابل, \n"
+"\t\tippp+ برای یک اتصال isdn.\n"
 
-#: network/tools.pm:207
+#: network/tools.pm:205
 #, c-format
 msgid "Insert floppy"
 msgstr "دیسکچه را داخل کنید"
 
-#: 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 "
@@ -10759,22 +10745,22 @@ msgstr ""
 "دیسکچه‌ی قالب‌بندی شده‌ی FAT را در گرداننده‌ی %s با %s در شاخه‌ی ریشه داخل کرده و "
 "%s را فشار دهید"
 
-#: network/tools.pm:209
+#: network/tools.pm:207
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "خطای دستیابی به دیسکچه، نمی‌توان دستگاه %s را سوار کرد؟"
 
-#: partition_table.pm:642
+#: partition_table.pm:644
 #, c-format
 msgid "mount failed: "
 msgstr "سوارسازی شکست خورد: "
 
-#: partition_table.pm:747
+#: partition_table.pm:749
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "قسمت‌بندی مضاعف بر این پایگاه حمایت نمی‌شود"
 
-#: 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"
@@ -10785,22 +10771,22 @@ msgstr ""
 "حل، انتقال قسمت‌بندی‌های اولیه‌ی شما بنحوی است که آن سوراخ نزدیک به قسمت‌بندی‌های "
 "مضاعف قرار داده شود."
 
-#: partition_table.pm:852
+#: partition_table.pm:854
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "بازسازی از پرونده‌ی %s شکست خورد: %s"
 
-#: partition_table.pm:854
+#: partition_table.pm:856
 #, c-format
 msgid "Bad backup file"
 msgstr "پرونده‌ی پشتیبان خراب"
 
-#: partition_table.pm:874
+#: partition_table.pm:876
 #, c-format
 msgid "Error writing to file %s"
 msgstr "خطا هنگام نوشتن در پرونده‌ی %s"
 
-#: partition_table/raw.pm:181
+#: partition_table/raw.pm:187
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -10837,70 +10823,70 @@ msgstr "خوب"
 msgid "maybe"
 msgstr "شاید"
 
-#: printer/cups.pm:87
+#: printer/cups.pm:103
 #, c-format
 msgid "(on %s)"
 msgstr "(بر %s)"
 
-#: printer/cups.pm:87
+#: printer/cups.pm:103
 #, c-format
 msgid "(on this machine)"
 msgstr "(بر این ماشین)"
 
-#: printer/cups.pm:99 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:197
 #, c-format
 msgid "Configured on other machines"
 msgstr "پیکربندی شده بر ماشین‌های دیگر"
 
-#: printer/cups.pm:101
+#: printer/cups.pm:117
 #, c-format
 msgid "On CUPS server \"%s\""
 msgstr "بر کارگزار CUPS \"%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 " (پیش‌فرض)"
 
-#: printer/data.pm:21
+#: printer/data.pm:22
 #, c-format
 msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - چاپ, بدون صف"
 
-#: 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 "شبح چاپگر خطی - LPD"
 
-#: 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"
 
-#: 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 - سیستم چاپ مشترک یونیکس"
 
 #: 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 "مدل ناشناس"
@@ -10920,7 +10906,7 @@ msgstr "چاپگر از راه دور"
 msgid "Printer on remote CUPS server"
 msgstr "چاپگر بر روی کارگزار از راه دور CUPS "
 
-#: 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"
@@ -10940,7 +10926,7 @@ msgstr "چاپگر بر روی کارگزار SMB/Windows 95/98/NT"
 msgid "Printer on NetWare server"
 msgstr "چاپگر بر روی کارگزار NetWare "
 
-#: 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 "نشانی اینترنتی دستگاه چاپگر را وارد کنید"
@@ -10951,8 +10937,8 @@ msgid "Pipe job into a command"
 msgstr "هدایت کار بدرون یک فرمان"
 
 #: 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 "مدل ناشناس"
@@ -10962,12 +10948,12 @@ msgstr "مدل ناشناس"
 msgid "Configured on this machine"
 msgstr "پیکربندی شده بر این ماشین"
 
-#: printer/main.pm:337 printer/printerdrake.pm:948
+#: printer/main.pm:337 printer/printerdrake.pm:963
 #, c-format
 msgid " on parallel port #%s"
 msgstr " بر روی درگاه موازی #%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 #%s"
@@ -11037,8 +11023,8 @@ msgstr "، استفاده از فرمان %s"
 msgid "Parallel port #%s"
 msgstr "درگاه موازی #%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 #%s"
@@ -11108,8 +11094,8 @@ msgstr "از فرمان %s استفاده می‌شود"
 msgid "URI: %s"
 msgstr "نشانی اینترنتی: %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 "چاپگر خام (بدون راه‌انداز)"
@@ -11168,7 +11154,7 @@ msgstr "پیکربندی چاپگر CUPS"
 #, 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 ""
 "در اینجا می‌توانید انتخاب کنید که آیا چاپگرهای مرتبط به این ماشین می‌توانند در "
 "دسترس ماشین‌های از راه دور قرار گیرند و بوسیله‌ی کدامیک از آنها."
@@ -11202,8 +11188,8 @@ msgstr "اشتراک چاپگر بر میزبان‌ها/شبکه‌ها: "
 msgid "Custom configuration"
 msgstr "پیکربندی اختصاصی"
 
-#: 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 "هیچ ماشین‌های از راه دور"
@@ -11412,7 +11398,7 @@ msgstr "آی‌پی کارگزار وجود ندارد!"
 msgid "The entered IP is not correct.\n"
 msgstr "آی‌پی وارد شده درست نمی‌باشد.\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 "شماره‌ی درگاه باید یک عدد صحیح باشد!"
@@ -11422,36 +11408,37 @@ msgstr "شماره‌ی درگاه باید یک عدد صحیح باشد!"
 msgid "This server is already in the list, it cannot be added again.\n"
 msgstr "این کارگزار از قبل در لیست وجود دارد و نمی تواند دوباره اضافه گردد.\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 "درگاه"
 
 #: 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 "چاپگردرایک"
@@ -11482,35 +11469,39 @@ msgstr ""
 "چاپگرهای روی کارگزارهای از راه دور CUPS لازم نیست اینجا پیکربندی شوند؛ این "
 "چاپگرها بطور خودکار شناسایی خواهند شد."
 
-#: 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"
+"هشدار: هیچ اتصال فعال شبکه‌ی محلی وجود ندارد، چاپگرهای از راه دور نه می‌توانند "
+"شناسایی و نه آزمایش شوند!"
 
 #: printer/printerdrake.pm:515
 #, c-format
-msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
-msgstr "شناسایی-خودکار چاپگر (چاپگرهای محلی، TCP/Socket, و SMB) "
+msgid ""
+"Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
+msgstr "شناسایی-خودکار چاپگر (چاپگرهای محلی، TCP/Socket, و SMB و URI دستگاه)"
 
 #: printer/printerdrake.pm:545
 #, c-format
 msgid "Checking your system..."
 msgstr "بررسی سیستم‌تان..."
 
-#: printer/printerdrake.pm:560
+#: printer/printerdrake.pm:561
 #, c-format
 msgid "and one unknown printer"
 msgstr "و یک چاپگر ناشناس"
 
-#: printer/printerdrake.pm:562
+#: printer/printerdrake.pm:563
 #, c-format
 msgid "and %d unknown printers"
 msgstr "و %d چاپگر ناشناس"
 
-#: printer/printerdrake.pm:566
+#: printer/printerdrake.pm:567
 #, c-format
 msgid ""
 "The following printers\n"
@@ -11523,7 +11514,7 @@ msgstr ""
 "%s%s\n"
 "مستقیماًً به سیستم شما وصل شده‌اند"
 
-#: printer/printerdrake.pm:568
+#: printer/printerdrake.pm:569
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11536,7 +11527,7 @@ msgstr ""
 "%s%s\n"
 "مستقیما به سیستم شما وصل شده است"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:570
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11549,7 +11540,7 @@ msgstr ""
 "%s%s\n"
 "مستقیماً به سیستم شما وصل شده است"
 
-#: printer/printerdrake.pm:573
+#: printer/printerdrake.pm:574
 #, c-format
 msgid ""
 "\n"
@@ -11558,7 +11549,7 @@ msgstr ""
 "\n"
 "یک چاپگر ناشناس به سیستم‌تان مستقیما وصل است"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:575
 #, c-format
 msgid ""
 "\n"
@@ -11567,18 +11558,18 @@ msgstr ""
 "\n"
 "%d چاپگر ناشناس که مستقیماً به سیستم‌تان وصل شده‌اند وجود دارند"
 
-#: printer/printerdrake.pm:577
+#: printer/printerdrake.pm:578
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr "هیچ چاپگری که مستقیما به ماشین شما وصل شده باشد پیدا نشد"
 
-#: printer/printerdrake.pm:580
+#: printer/printerdrake.pm:581
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr "(مطمئن شوید که تمام چاپگرها وصل و روشن شده‌اند).\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 "
@@ -11587,22 +11578,22 @@ msgstr ""
 "آیا می‌خواهید چاپ کردن را بر چاپگرهای ذکر شده در بالا یا بر چاپگرهای بر شبکه‌ی "
 "محلی فعال کنید؟\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 "آیا می‌خواهید چاپ کردن را بر چاپگرهای شبکه محلی فعال کنید؟\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 "آیا می‌خواهید چاپ کردن را بر چاپگرهای ذکر شده در بالا فعال کنید؟\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 "آیا مطمئن هستید که می‌خواهید چاپ کردن را روی این ماشین برپاسازی کنید؟\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 "
@@ -11611,48 +11602,48 @@ msgstr ""
 "توجه: بستگی به مدل چاپگر و سیستم چاپی تا %d مگابایت نرم‌افزار اضافه نصب خواهد "
 "شد. "
 
-#: printer/printerdrake.pm:622
+#: printer/printerdrake.pm:629
 #, c-format
 msgid "Searching for new printers..."
 msgstr "جستجو برای چاپگرهای جدید..."
 
-#: printer/printerdrake.pm:706
+#: printer/printerdrake.pm:713
 #, c-format
 msgid "Configuring printer ..."
 msgstr "پیکربندی چاپگر ..."
 
-#: 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 "پیکربندی چاپگر \"%s\"..."
 
-#: 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 "روشن"
 
-#: 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 "گزینش مدل چاپگر"
 
-#: 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 "مدل چاپگر شما چیست؟"
 
-#: printer/printerdrake.pm:736
+#: printer/printerdrake.pm:743
 #, c-format
 msgid ""
 "\n"
@@ -11665,7 +11656,7 @@ msgstr ""
 "Printerdrake نتوانست مدل چاپگرتان %s را تعیین کند. لطفاً مدل درست را از لیست "
 "انتخاب کنید."
 
-#: 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 "
@@ -11674,21 +11665,21 @@ msgstr ""
 "اگر چاپگر در لیست نیست، یک همخوان (دستورالعمل چاپگر را ببینید) یا یک شبیه به "
 "آن را انتخاب کنید."
 
-#: 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 "پیکربندی برنامه‌های کاربردی..."
 
-#: 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 "افزودن یک چاپگر جدید"
 
-#: printer/printerdrake.pm:825
+#: printer/printerdrake.pm:832
 #, c-format
 msgid ""
 "\n"
@@ -11710,7 +11701,7 @@ msgstr ""
 "آن از شما اطلاعات لازمه را برای برپاسازی می‌پرسد و راه‌اندازهای چاپگرهای "
 "موجود، گزینه‌های راه‌انداز و انواع اتصال چاپگر را در دسترس شما قرار می‌دهد."
 
-#: printer/printerdrake.pm:838
+#: printer/printerdrake.pm:845
 #, c-format
 msgid ""
 "\n"
@@ -11747,7 +11738,7 @@ msgstr ""
 "وقتی آماده شدید بر \"بعدی\" کلیک کرده و اگر نمی‌خواهید چاپگرتان را اکنون "
 "برپاسازی کنید بر \"لغو\" کلیک کنید."
 
-#: printer/printerdrake.pm:847
+#: printer/printerdrake.pm:854
 #, c-format
 msgid ""
 "\n"
@@ -11774,7 +11765,7 @@ msgstr ""
 "وقتی آماده شدید بر \"بعد\" کلیک کنید، و اگر نمی‌خواهید چاپگر خود را اکنون "
 "برپاسازی کنید بر \"لغو\" کلیک کنید."
 
-#: printer/printerdrake.pm:855
+#: printer/printerdrake.pm:862
 #, c-format
 msgid ""
 "\n"
@@ -11810,7 +11801,7 @@ msgstr ""
 "وقتی آماده شدید بر \"بعدی\" کلیک کرده و اگر نمی‌خواهید چاپگر(ها) خود را اکنون "
 "برپاسازی کنید بر \"لغو\" کلیک کنید."
 
-#: printer/printerdrake.pm:864
+#: printer/printerdrake.pm:871
 #, c-format
 msgid ""
 "\n"
@@ -11836,23 +11827,23 @@ msgstr ""
 "وقتی آماده شدید بر \"بعدی\" کلیک کرده، و اگر نمی‌خواهید چاپگر خود را اکنون "
 "برپاسازی کنید بر \"لغو\" کلیک کنید."
 
-#: printer/printerdrake.pm:873
+#: printer/printerdrake.pm:880
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "شناسایی-خودکار چاپگرهای وصل شده به این رایانه"
 
-#: printer/printerdrake.pm:876
+#: printer/printerdrake.pm:883
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "شناسایی-خودکار چاپگرهای وصل شده به شبکه‌ی محلی"
 
-#: printer/printerdrake.pm:879
+#: printer/printerdrake.pm:886
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr "کشف-خودکار چاپگرهای وصل شده به ماشین‌هایی ویندوز مایکروسافت"
 
-#: printer/printerdrake.pm:895
-#, fuzzy, c-format
+#: printer/printerdrake.pm:902
+#, c-format
 msgid ""
 "\n"
 "Congratulations, your printer is now installed and configured!\n"
@@ -11865,63 +11856,79 @@ msgid ""
 "select \"Printer\" in the \"Hardware\" section of the %s Control Center."
 msgstr ""
 "\n"
-"تبریکات، چاپگر شما اکنون نصب و تنظیم شده است!\n"
+"تبریک می‌گوئیم، چاپگرتان اکنون نصب و پیکربندی شده است!\n"
 "\n"
-"شما می‌توانید با استفاده از فرمان \"چاپ\" برنامه‌ی خود (معمولاً در فهرست "
-"\"پرونده\" ) چاپ نمایید.\n"
+"شما می‌توانید با استفاده از فرمان \"چاپ\" برنامه‌ی خود (معمولاً در منوی \"پرونده"
+"\" ) چاپ کنید.\n"
 "\n"
-"اگر می‌خواهید یک چاپگر را اضافه، بردارید یا بازنامی کنید، یا اگر می خواهید "
-"تنظیم های گزینه پیش‌فرض خود را تغییر دهید (سینی کاغذ، کیفیت چاپ، ...)، \"چاپگر"
-"\" را در \"سخت‌افزار\" در قسمت مرکز کنترل مان‌درایک انتخاب نمایید."
+"اگر می‌خواهید چاپگری را اضافه، بردارید یا بازنامی کنید، یا اگر می خواهید "
+"تنظیمات گزینه‌ی پیش‌فرض را تغییر دهید (سینی درونداد کاغذ، کیفیت چاپ، ...)، "
+"\"چاپگر\" را در قسمت \"سخت‌افزار\" مرکز کنترل %s انتخاب کنید."
 
-#: 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 "بسته‌های %s نتوانستند نصب شوند!"
+
+#: printer/printerdrake.pm:939
+#, c-format
+msgid "Skipping Windows/SMB server auto-detection"
+msgstr "از قلم انداختن شناسایی-خودکار کارگزار SMB/ویندوز"
+
+#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
 #, c-format
 msgid "Printer auto-detection"
 msgstr "شناسایی-خودکار چاپگر"
 
-#: printer/printerdrake.pm:930
+#: printer/printerdrake.pm:945
 #, c-format
 msgid "Detecting devices..."
 msgstr "شناسایی دستگاه‌ها..."
 
-#: printer/printerdrake.pm:952
+#: printer/printerdrake.pm:967
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr "، چاپگر شبکه‌ای \"%s\"، درگاه %s"
 
-#: printer/printerdrake.pm:954
+#: printer/printerdrake.pm:969
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", چاپگر \"%s\" روی کارگزار SMB/ویندوز \"%s\""
 
-#: printer/printerdrake.pm:958
+#: printer/printerdrake.pm:973
 #, c-format
 msgid "Detected %s"
 msgstr "شناسایی شده %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 "چاپگر بر درگاه موازی #%s"
 
-#: printer/printerdrake.pm:966
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "چاپگر شبکه‌ای \"%s\"، درگاه %s"
 
-#: printer/printerdrake.pm:968
+#: printer/printerdrake.pm:983
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "چاپگر \"%s\" بر کارگزار SMB/Windows \"%s\""
 
-#: printer/printerdrake.pm:1047
+#: printer/printerdrake.pm:1062
 #, c-format
 msgid "Local Printer"
 msgstr "چاپگر محلی"
 
-#: printer/printerdrake.pm:1048
+#: printer/printerdrake.pm:1063
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -11934,32 +11941,32 @@ msgstr ""
 "LPT2:, ..., اولین چاپگرUSB : /dev/usb/lp0, دومین چاپگرUSB: /dev/usb/"
 "lp1, ...)."
 
-#: printer/printerdrake.pm:1052
+#: printer/printerdrake.pm:1067
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "باید نام دستگاهی یا پرونده‌ای را وارد کنید!"
 
-#: printer/printerdrake.pm:1061
+#: printer/printerdrake.pm:1076
 #, c-format
 msgid "No printer found!"
 msgstr "هیچ چاپگری یافت نشد!"
 
-#: printer/printerdrake.pm:1069
+#: printer/printerdrake.pm:1084
 #, c-format
 msgid "Local Printers"
 msgstr "چاپگرهای محلی"
 
-#: printer/printerdrake.pm:1070
+#: printer/printerdrake.pm:1085
 #, c-format
 msgid "Available printers"
 msgstr "چاپگرهای موجود"
 
-#: 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 "چاپگرهای بدنبال آمده شناسایی-خودکار شده‌اند. "
 
-#: 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 "
@@ -11968,19 +11975,19 @@ msgstr ""
 "اگر این آن نیست که می‌خواهید پیکربندی کنید، نام دستگاهی/پرونده‌ای را در خط "
 "درونداد وارد کنید"
 
-#: 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 ""
 "بطور گزینشی می‌توانید نام دستگاهی/نام پرونده‌ای را در خط درونداد مشخص کنید"
 
-#: 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 "این لیستی از تمام چاپگرهای شناسایی-خودکار شده است."
 
-#: 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 "
@@ -11989,7 +11996,7 @@ msgstr ""
 "لطفاً چاپگری را که می‌خواهید برپاسازی کنید یا نام دستگاه/نام پرونده را در خط "
 "درونداد وارد کنید"
 
-#: 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 "
@@ -11998,7 +12005,7 @@ msgstr ""
 "لطفا چاپگری که کارهای چاپی باید به آن فرستاده شوند انتخاب کرده یا نام "
 "دستگاهی/نام پرونده‌ای را در خط درونداد وارد کنید"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1100
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -12009,12 +12016,12 @@ msgstr ""
 "یا شما پیکربندی چاپگر اختصاصی را ترجیح می‌دهید، \"پیکربندی دستی\" را روشن "
 "کنید."
 
-#: printer/printerdrake.pm:1086
+#: printer/printerdrake.pm:1101
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "در حال حاضر، هیچ امکان جایگزین در دسترس نیست"
 
-#: printer/printerdrake.pm:1089
+#: printer/printerdrake.pm:1104
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -12026,12 +12033,12 @@ msgstr ""
 "خودکار عمل خواهد کرد. اگر چاپگر شما درست شناسایی نشده یا شما پیکربندی "
 "اختصاصی چاپگر را ترجیح می‌دهید، \"تنظیم دستی\" را روشن کنید."
 
-#: printer/printerdrake.pm:1090
+#: printer/printerdrake.pm:1105
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "لطفاً چاپگری را که کارهای چاپی باید به آن برود انتخاب کنید."
 
-#: 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 "
@@ -12040,12 +12047,12 @@ msgstr ""
 "لطفا درگاهی را که چاپگر شما به آن وصل است انتخاب کنید یا نام دستگاهی/نام "
 "پرونده‌ای را در خط درونداد وارد کنید"
 
-#: printer/printerdrake.pm:1093
+#: printer/printerdrake.pm:1108
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "لطفا درگاهی را که چاپگر شما به آن وصل شده است انتخاب کنید."
 
-#: printer/printerdrake.pm:1095
+#: printer/printerdrake.pm:1110
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -12054,17 +12061,26 @@ msgstr ""
 " (گذرگاه‌های موازی: /dev/lp0, /dev/lp1, ..., برابر با LPT1:, LPT2:, ..., "
 "اولین چاپگر  USB: /dev/usb/lp0, دومین چاپگر  USB: /dev/usb/lp1, ...)."
 
-#: printer/printerdrake.pm:1099
+#: printer/printerdrake.pm:1114
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "باید چاپگری/دستگاهی را انتخاب/وارد کنید!"
 
-#: 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 "سقط"
+
+#: printer/printerdrake.pm:1189
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "گرینه‌های چاپگر lpd از راه دور"
 
-#: 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 "
@@ -12073,66 +12089,65 @@ msgstr ""
 "برای استفاده از چاپگر از راه دور lpd، باید نام میزبان کارگزار چاپگر و نام "
 "چاپگر روی آن کارگزار را عرضه کنید."
 
-#: printer/printerdrake.pm:1170
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "Remote host name"
 msgstr "نام میزبان از راه دور"
 
-#: printer/printerdrake.pm:1171
+#: printer/printerdrake.pm:1192
 #, c-format
 msgid "Remote printer name"
 msgstr "نام چاپگر از راه دور"
 
-#: printer/printerdrake.pm:1174
+#: printer/printerdrake.pm:1195
 #, c-format
 msgid "Remote host name missing!"
 msgstr "نام میزبان از راه دور وجود ندارد!"
 
-#: printer/printerdrake.pm:1178
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "نام چاپگر از راه دور وجود ندارد!"
 
-#: 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 "اطلاعات"
 
-#: printer/printerdrake.pm:1200 printer/printerdrake.pm:1714
+#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "مدل شناسایی شده: %s %s"
 
-#: printer/printerdrake.pm:1276 printer/printerdrake.pm:1516
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
 #, c-format
 msgid "Scanning network..."
 msgstr "پویش شبکه..."
 
-#: 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 "، چاپگر \"%s\" بر کارگزار \"%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 "چاپگر \"%s\" بر کارگزار \"%s\""
 
-#: printer/printerdrake.pm:1332
+#: printer/printerdrake.pm:1366
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "گزینه‌های چاپگر SMB (ویندوز ۹۸/NT)"
 
-#: 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 "
@@ -12145,7 +12160,7 @@ msgstr ""
 "اشتراک چاپگری که می‌خواهید به آن دستیابی پیدا کنید و هر نام کاربر، گذرواژه، و "
 "اطلاعات گروه‌کار را عرضه کنید."
 
-#: printer/printerdrake.pm:1334
+#: printer/printerdrake.pm:1368
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -12154,47 +12169,47 @@ msgstr ""
 "اگر چاپگر مورد نظر شناسایی-خودکار شده است، آن را از لیست انتخاب کرده و سپس "
 "نام کاربر، گذرواژه و/یا گروه کار را اگر لازم است اضافه کنید."
 
-#: printer/printerdrake.pm:1336
+#: printer/printerdrake.pm:1370
 #, c-format
 msgid "SMB server host"
 msgstr "میزبان کارگزار SMB"
 
-#: printer/printerdrake.pm:1337
+#: printer/printerdrake.pm:1371
 #, c-format
 msgid "SMB server IP"
 msgstr "نشانی آی‌پی کارگزار SMB"
 
-#: printer/printerdrake.pm:1338
+#: printer/printerdrake.pm:1372
 #, c-format
 msgid "Share name"
 msgstr "نام اشتراک"
 
-#: printer/printerdrake.pm:1341
+#: printer/printerdrake.pm:1375
 #, c-format
 msgid "Workgroup"
 msgstr "گروه کاری"
 
-#: printer/printerdrake.pm:1343
+#: printer/printerdrake.pm:1377
 #, c-format
 msgid "Auto-detected"
 msgstr "شناسایی-خودکار شده"
 
-#: printer/printerdrake.pm:1353
+#: printer/printerdrake.pm:1387
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "یا نام کارگزار یا آی‌پی کارگزار باید داده شود!"
 
-#: printer/printerdrake.pm:1357
+#: printer/printerdrake.pm:1391
 #, c-format
 msgid "Samba share name missing!"
 msgstr "نام اشتراک Samba وجود ندارد!"
 
-#: printer/printerdrake.pm:1363
+#: printer/printerdrake.pm:1397
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "هشدار امنیتی!"
 
-#: 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 "
@@ -12236,7 +12251,7 @@ msgstr ""
 "Printerdrake برپاسازی کنید. \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 "
@@ -12248,7 +12263,7 @@ msgstr ""
 "و چاپ کردن از این ماشین را با نوع اتصال \"%s\" در Printerdrake برپاسازی "
 "کنید.\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) "
@@ -12261,12 +12276,12 @@ msgstr ""
 "\n"
 "آیا واقعا می‌خواهید به برپاسازی این چاپگر ادامه دهید؟"
 
-#: printer/printerdrake.pm:1449
+#: printer/printerdrake.pm:1489
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "گزینه‌های چاپگر NetWare "
 
-#: 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 "
@@ -12279,42 +12294,42 @@ msgstr ""
 "چاپگری که می‌خواهید به آن دسترسی یابید و هر نام کاربر و واژه رمز قابل استفاده "
 "را عرضه کنید."
 
-#: printer/printerdrake.pm:1451
+#: printer/printerdrake.pm:1491
 #, c-format
 msgid "Printer Server"
 msgstr "کارگزار‌ چاپگر"
 
-#: printer/printerdrake.pm:1452
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Print Queue Name"
 msgstr "نام صف چاپ"
 
-#: printer/printerdrake.pm:1457
+#: printer/printerdrake.pm:1497
 #, c-format
 msgid "NCP server name missing!"
 msgstr "نام کارگزار NCP وجود ندارد!"
 
-#: printer/printerdrake.pm:1461
+#: printer/printerdrake.pm:1501
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "نام صف چاپی NCP وجود ندارد!"
 
-#: printer/printerdrake.pm:1527 printer/printerdrake.pm:1547
+#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", میزبان \"%s\", درگاه %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 "میزبان \"%s\", درگاه %s"
 
-#: printer/printerdrake.pm:1571
+#: printer/printerdrake.pm:1618
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "گزینه‌های چاپگر TCP/Socket  "
 
-#: 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 "
@@ -12324,7 +12339,7 @@ msgstr ""
 "آی‌پی و شماره‌ی درگاه اختیاری (پیش‌فرض ۹۱۰۰ است) را در محوطه‌هایی درونداد وارد "
 "کنید."
 
-#: 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 "
@@ -12337,22 +12352,27 @@ msgstr ""
 "JetDirect شماره‌ی درگاه معمولا ۹۱۰۰ است، بر کارگزارهای دیگر آن می‌تواند تفاوت "
 "داشته باشد. به دستورالعمل سخت‌افزار خود مراجعه کنید. "
 
-#: printer/printerdrake.pm:1578
+#: printer/printerdrake.pm:1625
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "نام میزبان یا آی‌پی وجود ندارد!"
 
-#: printer/printerdrake.pm:1601
+#: printer/printerdrake.pm:1648
 #, c-format
 msgid "Printer host name or IP"
 msgstr "نام میزبان یا آی‌پی چاپگر"
 
-#: printer/printerdrake.pm:1649 printer/printerdrake.pm:1651
+#: printer/printerdrake.pm:1704
+#, c-format
+msgid "Refreshing Device URI list..."
+msgstr "نوسازی لیست URI دستگاه..."
+
+#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
 #, c-format
 msgid "Printer Device URI"
 msgstr "نشانی اینترنتی دستگاه چاپگر"
 
-#: 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 "
@@ -12363,17 +12383,17 @@ msgstr ""
 "مشخصات CUPS یا Foomatic را حمایت کند. توجه داشته باشید که همه‌ی انواع URI "
 "بوسیله همه اسپولرها حمایت نمی‌شوند."
 
-#: printer/printerdrake.pm:1668
+#: printer/printerdrake.pm:1731
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "یک URI معتبر باید وارد گردد!"
 
-#: printer/printerdrake.pm:1749
+#: printer/printerdrake.pm:1834
 #, c-format
 msgid "Pipe into command"
 msgstr "لوله بدرون فرمان"
 
-#: 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 "
@@ -12382,17 +12402,17 @@ msgstr ""
 "در اینجا می‌توانید هر خط فرمان ضروری را که کار چاپی باید بدرون لوله شود بجای "
 "فرستاده شدن مستقیم به یک چاپگر مشخص کنید."
 
-#: printer/printerdrake.pm:1751
+#: printer/printerdrake.pm:1836
 #, c-format
 msgid "Command line"
 msgstr "خط فرمان"
 
-#: printer/printerdrake.pm:1755
+#: printer/printerdrake.pm:1840
 #, c-format
 msgid "A command line must be entered!"
 msgstr "خط فرمانی باید وارد شود!"
 
-#: printer/printerdrake.pm:1788
+#: printer/printerdrake.pm:1873
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -12403,58 +12423,73 @@ msgstr ""
 "1100/1200/1220/3200/3300 با پویشگر, DeskJet 450, Sony IJP-V100), یک HP "
 "PhotoSmart یا یک HP LaserJet 2200 می‌باشد؟"
 
-#: printer/printerdrake.pm:1801
+#: printer/printerdrake.pm:1887
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "نصب بسته HPOJ..."
 
-#: 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 ممکن خواهد بود."
+
+#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
 #, c-format
 msgid "Checking device and configuring HPOJ..."
 msgstr "بررسی دستگاه و پیکربندی HPOJ..."
 
-#: printer/printerdrake.pm:1831
+#: printer/printerdrake.pm:1946
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "نصب بسته‌های SANE..."
 
-#: printer/printerdrake.pm:1858
+#: printer/printerdrake.pm:1956
+#, c-format
+msgid "Scanning on the %s will not be possible."
+msgstr "پویشگری بر %s ممکن نخواهد بود."
+
+#: printer/printerdrake.pm:1983
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "نصب بسته‌های mtools ..."
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1990
+#, c-format
+msgid "Photo memory card access on the %s will not be possible."
+msgstr "دستیابی کارت حافظه‌ی عکس بر %s ممکن نخواهد بود."
+
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "پویش بر دستگاه چند-کاره HP"
 
-#: printer/printerdrake.pm:1881
+#: printer/printerdrake.pm:2013
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr "دسترسی کارت حافظه‌ی عکس روی دستگاه چند-کاره‌ی HP"
 
-#: printer/printerdrake.pm:1930
+#: printer/printerdrake.pm:2062
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "در دسترس قرار دادن درگاه چاپگر برای CUPS..."
 
-#: 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 "خواندن بانک اطلاعات چاپگر..."
 
-#: printer/printerdrake.pm:2149
+#: printer/printerdrake.pm:2281
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "نام چاپگر و توضیحات را وارد کنید"
 
-#: 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 "نام چاپگر باید تنها دارای نویسه‌ها، اعداد و خط‌زیر باشد"
 
-#: 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"
@@ -12463,7 +12498,7 @@ msgstr ""
 "چاپگر \"%s\" از قبل وجود دارد، \n"
 "آیا می‌خواهید پیکربندی آن بازنگارش شود؟"
 
-#: printer/printerdrake.pm:2168
+#: printer/printerdrake.pm:2300
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -12472,35 +12507,35 @@ msgstr ""
 "هرچاپگر نامی لازم دارد (برای مثال \"چاپگر\"). محوطه‌های توضیح و مکان لازم "
 "نیستند پر شوند. آنها توضیحاتی برای کاربران هستند."
 
-#: printer/printerdrake.pm:2169
+#: printer/printerdrake.pm:2301
 #, c-format
 msgid "Name of printer"
 msgstr "نام چاپگر"
 
-#: 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 "توصیف"
 
-#: printer/printerdrake.pm:2171 standalone/printerdrake:212
+#: printer/printerdrake.pm:2303 standalone/printerdrake:212
 #: standalone/printerdrake:219
 #, c-format
 msgid "Location"
 msgstr "جایگاه"
 
-#: printer/printerdrake.pm:2188
+#: printer/printerdrake.pm:2320
 #, c-format
 msgid "Preparing printer database..."
 msgstr "آماده کردن بانک اطلاعات چاپگر..."
 
-#: printer/printerdrake.pm:2306
+#: printer/printerdrake.pm:2438
 #, c-format
 msgid "Your printer model"
 msgstr "مدل چاپگر شما"
 
-#: printer/printerdrake.pm:2307
+#: printer/printerdrake.pm:2439
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -12525,18 +12560,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 "مدل درست است"
 
-#: 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 "انتخاب دستی مدل"
 
-#: printer/printerdrake.pm:2340
+#: printer/printerdrake.pm:2472
 #, c-format
 msgid ""
 "\n"
@@ -12551,12 +12586,12 @@ msgstr ""
 "کرده است. مدل درست را وقتی که یک مدل اشتباه یا \"چاپگر خام\" پررنگ شده در "
 "لیست پیدا کنید."
 
-#: printer/printerdrake.pm:2359
+#: printer/printerdrake.pm:2491
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr "نصب کردن پرونده‌ی PPD عرضه‌ی-تولید کننده"
 
-#: printer/printerdrake.pm:2390
+#: printer/printerdrake.pm:2522
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
@@ -12565,7 +12600,7 @@ msgstr ""
 "هر چاپگر پست‌اسکریپت با پرونده‌ی PPD ارائه می‌شود که قابلیت‌ها و گزینه‌های چاپگر "
 "را تشریح می‌کند."
 
-#: 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 "
@@ -12574,12 +12609,12 @@ msgstr ""
 "این پرونده معمولاً در جایی بر سی‌دی با راه‌اندازهای ویندوز و ماک همراه با چاپگر "
 "ارائه می‌گردد."
 
-#: 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 را بر وب‌گاه‌های تولید کنندگان بیابید."
 
-#: 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 "
@@ -12588,7 +12623,7 @@ msgstr ""
 "اگر ویندوز را بر رایانه‌اتان نصب کرده‌اید، می‌توانید پرونده‌ی PPD را بر قسمت‌بندی "
 "ویندوز پیدا کنید."
 
-#: 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 "
@@ -12598,7 +12633,7 @@ msgstr ""
 "نصب پرونده‌ی PPD چاپگر و استفاده از آن هنگام برپاسازی چاپگر همه‌ی گزینه‌های "
 "چاپگر را که توسط سخت‌افزار چاپگر عرضه شده‌اند در دسترس قرار می‌دهد"
 
-#: 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 "
@@ -12607,58 +12642,58 @@ msgstr ""
 "در اینجا می‌توانید پرونده‌ی PPD را برای نصب کردن بر رایانه‌اتان انتخاب کنید، "
 "سپس می‌توانید از آن برای برپاسازی چاپگرتان استفاده کنید."
 
-#: printer/printerdrake.pm:2397
+#: printer/printerdrake.pm:2529
 #, c-format
 msgid "Install PPD file from"
 msgstr "نصب کردن پرونده‌ی PPD از"
 
-#: 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 "دیسکچه"
 
-#: 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 "جای دیگر"
 
-#: printer/printerdrake.pm:2416
+#: printer/printerdrake.pm:2548
 #, c-format
 msgid "Select PPD file"
 msgstr "انتخاب کردن پرونده‌ی PPD"
 
-#: printer/printerdrake.pm:2420
+#: printer/printerdrake.pm:2552
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr "پرونده‌ی PPD %s وجود ندارد یا قابل خواندن نیست!"
 
-#: printer/printerdrake.pm:2426
+#: printer/printerdrake.pm:2558
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr "پرونده‌ی PPD %s با مشخصات PPD مطابقت ندارد!"
 
-#: printer/printerdrake.pm:2437
+#: printer/printerdrake.pm:2569
 #, c-format
 msgid "Installing PPD file..."
 msgstr "نصب پرونده‌ی PPD..."
 
-#: printer/printerdrake.pm:2539
+#: printer/printerdrake.pm:2682
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "پیکربندی چاپگر ویندوز OKI "
 
-#: printer/printerdrake.pm:2540
+#: printer/printerdrake.pm:2683
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -12675,12 +12710,12 @@ msgstr ""
 "آزمایشی چاپگر را به اولین درگاه موازی وصل کنید. در غیر این صورت چاپگر کار "
 "نخواهد کرد. نوع اتصال شما توسط راه‌انداز نادیده گرفته خواهد شد."
 
-#: printer/printerdrake.pm:2564 printer/printerdrake.pm:2593
+#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "پیکربندی چاپگر Lexmark inkjet "
 
-#: printer/printerdrake.pm:2565
+#: printer/printerdrake.pm:2708
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -12693,7 +12728,7 @@ msgstr ""
 "چاپگرتانرا به یک درگاه محلی وصل کرده یا آن را بر ماشینی که به آن وصل است "
 "پیکربندی کنید."
 
-#: printer/printerdrake.pm:2594
+#: printer/printerdrake.pm:2737
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -12714,12 +12749,29 @@ msgstr ""
 "با \"lexmarkmaintain\" چاپ کرده و با این برنامه تنظیم هم‌ترازی سرآیند را "
 "میزان کنید."
 
-#: printer/printerdrake.pm:2597
+#: printer/printerdrake.pm:2746
+#, c-format
+msgid "Lexmark X125 configuration"
+msgstr "پیکربندی  Lexmark X125"
+
+#: 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 ""
+"راه‌اندازاین چاپگر فقط از چاپگران محلی متصل شده از طریق USB حمایت کرده، نه "
+"چاپگران بر ماشین‌های از راه دور یا کارگزارهای چاپ. لطفا چاپگرتان را به یک "
+"درگاه USB محلی وصل کرده یا آن را بر ماشینی که به آن وصل است پیکربندی کنید."
+
+#: printer/printerdrake.pm:2765
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "باردهی-Firmware برای HP LaserJet 1000"
 
-#: printer/printerdrake.pm:2710
+#: printer/printerdrake.pm:2878
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -12736,27 +12788,27 @@ msgstr ""
 "بدرستی تعیین شده باشند. توجه کنید که چاپ با کیفیت/تفکیک‌پذیری خیلی بالا چاپ "
 "کردن را بسیار آهسته می‌کند."
 
-#: printer/printerdrake.pm:2835
+#: printer/printerdrake.pm:3003
 #, c-format
 msgid "Printer default settings"
 msgstr "تنظیمات پیش‌فرض چاپگر"
 
-#: printer/printerdrake.pm:2842
+#: printer/printerdrake.pm:3010
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "گزینه %s باید یک عدد صحیح باشد!"
 
-#: printer/printerdrake.pm:2846
+#: printer/printerdrake.pm:3014
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "گزینه‌ی %s باید یک عدد باشد!"
 
-#: printer/printerdrake.pm:2850
+#: printer/printerdrake.pm:3018
 #, c-format
 msgid "Option %s out of range!"
 msgstr "گزینه‌ی %s خارج از گستره!"
 
-#: printer/printerdrake.pm:2901
+#: printer/printerdrake.pm:3069
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -12765,12 +12817,12 @@ msgstr ""
 "آیا می‌خواهید این چاپگر (\"%s\")\n"
 "را چاپگر پیش‌فرض کنید؟"
 
-#: printer/printerdrake.pm:2916
+#: printer/printerdrake.pm:3084
 #, c-format
 msgid "Test pages"
 msgstr "صفحات آزمایشی"
 
-#: printer/printerdrake.pm:2917
+#: printer/printerdrake.pm:3085
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -12783,47 +12835,57 @@ msgstr ""
 "حافظه کم شاید اصلاً بیرون داده نشود. در بیشتر موارد کافی است که صفحه‌ی آزمایشی "
 "استاندارد را چاپ کنید."
 
-#: printer/printerdrake.pm:2921
+#: printer/printerdrake.pm:3089
 #, c-format
 msgid "No test pages"
 msgstr "بدون صفحات آزمایشی"
 
-#: printer/printerdrake.pm:2922
+#: printer/printerdrake.pm:3090
 #, c-format
 msgid "Print"
 msgstr "چاپ"
 
-#: printer/printerdrake.pm:2947
+#: printer/printerdrake.pm:3115
 #, c-format
 msgid "Standard test page"
 msgstr "صفحه‌ی آزمایشی استاندارد"
 
-#: printer/printerdrake.pm:2950
+#: printer/printerdrake.pm:3118
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "صفحه آزمایشی جایگزین (نامه)"
 
-#: printer/printerdrake.pm:2953
+#: printer/printerdrake.pm:3121
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "صفحه‌ی آزمایشی جایگزین (A4)"
 
-#: printer/printerdrake.pm:2955
+#: printer/printerdrake.pm:3123
 #, c-format
 msgid "Photo test page"
 msgstr "صفحه‌ی آزمایشی عکس"
 
-#: printer/printerdrake.pm:2959
+#: printer/printerdrake.pm:3127
 #, c-format
 msgid "Do not print any test page"
 msgstr "هیچ صفحه‌ی آزمایشی چاپ نشود"
 
-#: printer/printerdrake.pm:2967 printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "چاپ صفحه(های) آزمایشی..."
 
-#: printer/printerdrake.pm:2992
+#: printer/printerdrake.pm:3150
+#, c-format
+msgid "Could not install the %s package!"
+msgstr "بسته‌ی %s نتوانست نصب گردد!"
+
+#: printer/printerdrake.pm:3152
+#, c-format
+msgid "Skipping photo test page."
+msgstr "از قلم انداختن صفحه‌ی آزمایشی عکس"
+
+#: printer/printerdrake.pm:3169
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -12838,7 +12900,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"
@@ -12847,17 +12909,17 @@ msgstr ""
 "صفحه‌ی آزمایشی به چاپگر فرستاده شده است.\n"
 "ممکن است قدری طول بکشد تا چاپگر شروع کند.\n"
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3180
 #, c-format
 msgid "Did it work properly?"
 msgstr "آیا آن بدرستی کار کرد؟"
 
-#: printer/printerdrake.pm:3024 printer/printerdrake.pm:4192
+#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
 #, c-format
 msgid "Raw printer"
 msgstr "چاپگر خام"
 
-#: 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 "
@@ -12870,7 +12932,7 @@ msgstr ""
 "<file>\". ابزار تصویری به شما اجازه می‌دهند که چاپگر را انتخاب کرده و "
 "گزینه‌های تنظیمات را به آسانی پیرایش کنید.\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 "
@@ -12881,8 +12943,8 @@ msgstr ""
 "بسیاری از برنامه‌ها استفاده کنید، ولی در اینجا نام پرونده را ارائه نکنید چرا "
 "که پرونده‌ی برای چاپ شدن توسط برنامه عرضه می‌شود.\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"
@@ -12894,7 +12956,7 @@ msgstr ""
 "فرمان \"%s\"همچنین به شما اجازه‌ی پیرایش تنظیمات گزینه را برای یک کار چاپ "
 "مشخص می‌دهد. فقط تنظیمات مورد نظرتان را به خط فرمان اضافه کنید،\"%s <file>\". "
 
-#: 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 "
@@ -12905,7 +12967,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"
@@ -12914,7 +12976,7 @@ msgstr ""
 "این لیستی از گزینه‌های موجود چاپ برای چاپگر کنونی می‌باشد:\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 "
@@ -12923,8 +12985,8 @@ msgstr ""
 "برای چاپ پرونده‌ای از خط فرمان (پنجره‌ی پایانه) از فرمان \"%s <file>\" استفاده "
 "کنید.\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 "
@@ -12935,7 +12997,7 @@ msgstr ""
 "استفاده کنید. ولی در اینجا نام پرونده را ارائه نکنید چرا که پرونده‌ی برای چاپ "
 "توسط برنامه داده می‌شود.\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 "
@@ -12944,7 +13006,7 @@ msgstr ""
 "برای دریافت لیستی از گزینه‌های موجود برای چاپگر کنونی بر دکمه‌ی \"لیست "
 "گزینه‌های چاپ\" کلیک کنید."
 
-#: 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 "
@@ -12953,7 +13015,7 @@ msgstr ""
 "برای چاپ پرونده‌ای از خط فرمان (پنجره‌ی پایانه) از فرمان \"%s <file>\" یا \"%s "
 "<file>\" استفاده کنید.\n"
 
-#: printer/printerdrake.pm:3095
+#: printer/printerdrake.pm:3272
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -12970,7 +13032,7 @@ msgstr ""
 "بیدرنگ تمام کارهای چاپی را قطع می‌کند. این برای مثال هنگام گیر کردن کاغذ مفید "
 "است.\n"
 
-#: printer/printerdrake.pm:3099
+#: printer/printerdrake.pm:3276
 #, c-format
 msgid ""
 "\n"
@@ -12983,42 +13045,42 @@ msgstr ""
 "چاپی بخصوص می‌دهد. فقط تنظیمات مورد نظر را به خط فرمان اضافه کنید, \"%s <file>"
 "\".\n"
 
-#: printer/printerdrake.pm:3109
+#: printer/printerdrake.pm:3286
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "چاپ/پویش/کارتهای عکس با \"%s\""
 
-#: printer/printerdrake.pm:3110
+#: printer/printerdrake.pm:3287
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "چاپ/پویش بر \"%s\""
 
-#: printer/printerdrake.pm:3112
+#: printer/printerdrake.pm:3289
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "دسترسی به کارت چاپ/عکس بر \"%s\""
 
-#: printer/printerdrake.pm:3113
+#: printer/printerdrake.pm:3290
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "چاپ بر چاپگر \"%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 "بستن"
 
-#: printer/printerdrake.pm:3119
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Print option list"
 msgstr "لیست گزینه‌ی چاپ"
 
-#: printer/printerdrake.pm:3140
+#: printer/printerdrake.pm:3317
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -13040,7 +13102,7 @@ msgstr ""
 "\n"
 "از \"scannerdrake\" برای این دستگاه استفاده نکنید!"
 
-#: printer/printerdrake.pm:3163
+#: printer/printerdrake.pm:3343
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -13062,18 +13124,18 @@ msgstr ""
 "دستگاه‌های کارت عکس دارید پیدا کنید. در \"MtoolsFM\" می‌توانید نویسه‌های دستگاه "
 "را در منطقه‌ی در گوشه‌های راست-بالای لیست‌های پرونده تعویض کنید."
 
-#: printer/printerdrake.pm:3185 printer/printerdrake.pm:3575
+#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
 #, c-format
 msgid "Reading printer data..."
 msgstr "خواندن اطلاعات چاپگر..."
 
-#: 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 "پیکربندی انتقال چاپگر"
 
-#: printer/printerdrake.pm:3206
+#: printer/printerdrake.pm:3386
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -13087,7 +13149,7 @@ msgstr ""
 "و گزینه‌ی تنظیمات پیش‌فرض) در بر گرفته شده ولی کارهای چاپی منتقل نخواهند شد.\n"
 "همه‌ی صف‌های چاپی نمی‌توانند منتقل شوند، این بدلایل بدنبال آمده می‌باشد:\n"
 
-#: printer/printerdrake.pm:3209
+#: printer/printerdrake.pm:3389
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
@@ -13096,7 +13158,7 @@ msgstr ""
 "CUPS از چاپگرهای بر روی کارگزارهای نوول یا چاپگرهایی که داده ها را بصورت "
 "فرمانی بدون-فرم می‌فرستند حمایت نمی‌کند.\n"
 
-#: printer/printerdrake.pm:3211
+#: printer/printerdrake.pm:3391
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -13105,12 +13167,12 @@ msgstr ""
 "PDQ فقط از چاپگرهای محلی،, چاپگرهای از راه دور LPD, و چاپگرهای Socket/TCP "
 "حمایت می‌کند.\n"
 
-#: printer/printerdrake.pm:3213
+#: printer/printerdrake.pm:3393
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPD و LPRng چاپگرهای IPP را حمایت نمی‌کنند.\n"
 
-#: printer/printerdrake.pm:3215
+#: printer/printerdrake.pm:3395
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
@@ -13119,7 +13181,7 @@ msgstr ""
 "صف‌ها با این برنامه ایجاد نشده‌اند یا \"foomatic-configure\" نمی‌تواند منتقل "
 "شود."
 
-#: printer/printerdrake.pm:3216
+#: printer/printerdrake.pm:3396
 #, c-format
 msgid ""
 "\n"
@@ -13130,7 +13192,7 @@ msgstr ""
 "چاپگرهای پیکربندی شده‌ با پرونده‌های PPD که بوسیله تولید کننده آنها یا با "
 "کارگزارهای بومی CUPS عرضه شده‌اند نمی‌توانند منتقل شوند."
 
-#: printer/printerdrake.pm:3217
+#: printer/printerdrake.pm:3397
 #, c-format
 msgid ""
 "\n"
@@ -13141,17 +13203,17 @@ msgstr ""
 "چاپگرهایی را که می‌خواهید انتقال دهید علامت زده و \n"
 "\"انتقال\" را کلیک کنید."
 
-#: printer/printerdrake.pm:3220
+#: printer/printerdrake.pm:3400
 #, c-format
 msgid "Do not transfer printers"
 msgstr "چاپگرها منتقل نشوند"
 
-#: printer/printerdrake.pm:3221 printer/printerdrake.pm:3237
+#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
 #, c-format
 msgid "Transfer"
 msgstr "انتقال"
 
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3413
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -13162,17 +13224,17 @@ msgstr ""
 "بر \"انتقال\" برای بازنگارش آن کلیک کنید.\n"
 "می‌توانید نام جدیدی را تایپ کرده یا این چاپگر را رها کنید."
 
-#: printer/printerdrake.pm:3254
+#: printer/printerdrake.pm:3434
 #, c-format
 msgid "New printer name"
 msgstr "نام جدید چاپگر"
 
-#: printer/printerdrake.pm:3257
+#: printer/printerdrake.pm:3437
 #, c-format
 msgid "Transferring %s..."
 msgstr "انتقال %s..."
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3448
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -13181,28 +13243,28 @@ msgstr ""
 "شما چاپگر پیش‌فرض قبلی خود(\"%s\") را انتقال داده‌اید، آیا آن باید چاپگر "
 "پیش‌فرض در سیستم جدید چاپگری %s گردد؟"
 
-#: printer/printerdrake.pm:3278
+#: printer/printerdrake.pm:3458
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "نوسازی اطلاعات چاپگر..."
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3467
 #, c-format
 msgid "Starting network..."
 msgstr "راه‌اندازی شبکه..."
 
-#: 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 "پیکربندی شبکه اکنون"
 
-#: printer/printerdrake.pm:3329
+#: printer/printerdrake.pm:3509
 #, c-format
 msgid "Network functionality not configured"
 msgstr "کارآرایی شبکه پیکربندی نشده است"
 
-#: printer/printerdrake.pm:3330
+#: printer/printerdrake.pm:3510
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -13215,27 +13277,27 @@ msgstr ""
 "ادامه دهید نخواهید توانست از چاپگر در حال پیکربندی شدن استفاده کنید. چگونه "
 "می‌خواهید پیشروی کنید؟"
 
-#: printer/printerdrake.pm:3333
+#: printer/printerdrake.pm:3513
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "ادامه دادن بدون پیکربندی شبکه"
 
-#: printer/printerdrake.pm:3367
-#, fuzzy, c-format
+#: 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\""
 msgstr ""
-"تنظیم شبکه انجام شده در طول نصب نمی‌تواند حالا شروع شود. لطفا ببینید که آیا "
-"شبکه بعد از آغاز سیستم در دسترسی قرار می‌گیرد و تنظیم را ا استفاده از مرکز "
-"کنترل مان‌درایک، قسمت \"Network & Internet\"/\"Connection\", تصحیح نمایید، و "
-"بعد چاپگر را با استفاده از مرکز کنترل مان‌درایک، قسمت \"Network & Internet\"/"
-"\"Connection\" برپاسازی نمایید."
+"پیکربندی شبکه‌ی انجام شده در طول نصب نمی‌تواند اکنون راه‌اندازی شود. لطفا بررسی "
+"کنید که آیا شبکه بعد از آغازگری سیستم‌تان قابل دستیابی است و پیکربندی را با "
+"استفاده از مرکز کنترل %s، قسمت \"Network & Internet\" /\"Connection\", تصحیح "
+"کنید، و بعد چاپگر را با استفاده از مرکز کنترل %s، قسمت \"Network & Internet"
+"\"/\"Connection\" برپاسازی کنید"
 
-#: printer/printerdrake.pm:3368
+#: printer/printerdrake.pm:3548
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -13245,34 +13307,34 @@ msgstr ""
 "دستیابی شبکه در حال اجرا نبود و نتوانست شروع گردد. لطفا پیکربندی و سخت‌افزار "
 "خود را بررسی کنید. سپس دوباره سعی کنید چاپگر از راه دور خود را پیکربندی کنید."
 
-#: printer/printerdrake.pm:3378
+#: printer/printerdrake.pm:3558
 #, c-format
 msgid "Restarting printing system..."
 msgstr "راه‌اندازی مجدد سیستم چاپ..."
 
-#: printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3597
 #, c-format
 msgid "high"
 msgstr "بالا"
 
-#: printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3597
 #, c-format
 msgid "paranoid"
 msgstr "خیالاتی"
 
-#: printer/printerdrake.pm:3418
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "نصب یک سیستم چاپ در سطح امنیتی %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"
@@ -13290,12 +13352,12 @@ msgstr ""
 "\n"
 "آیا واقعا می‌خواهید چاپ را بر روی این رایانه پیکربندی کنید؟"
 
-#: printer/printerdrake.pm:3453
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "راه‌اندازی سیستم چاپ در زمان آغازگری"
 
-#: printer/printerdrake.pm:3454
+#: printer/printerdrake.pm:3634
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -13315,98 +13377,118 @@ msgstr ""
 "\n"
 "آیا می‌خواهید شروع خودکار سیستم چاپی دوباره روشن شود؟"
 
-#: printer/printerdrake.pm:3475 printer/printerdrake.pm:3690
+#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
 #, c-format
 msgid "Checking installed software..."
 msgstr "بررسی نرم‌افزارهای نصب شده..."
 
-#: printer/printerdrake.pm:3481
+#: printer/printerdrake.pm:3661
 #, c-format
 msgid "Removing %s ..."
 msgstr "حذف %s ..."
 
-#: printer/printerdrake.pm:3488
+#: printer/printerdrake.pm:3665
+#, c-format
+msgid "Could not remove the %s printing system!"
+msgstr "سیستم چاپی %s نتوانست برداشته شود!"
+
+#: printer/printerdrake.pm:3674
 #, c-format
 msgid "Installing %s ..."
 msgstr "نصب %s ..."
 
-#: printer/printerdrake.pm:3535
+#: printer/printerdrake.pm:3678
+#, c-format
+msgid "Could not install the %s printing system!"
+msgstr "سیستم چاپی %s نتوانست نصب گردد!"
+
+#: printer/printerdrake.pm:3727
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "گذاردن چاپگر پیش‌فرض..."
 
-#: printer/printerdrake.pm:3555
+#: printer/printerdrake.pm:3747
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "انتخاب اسپولر چاپگر"
 
-#: printer/printerdrake.pm:3556
+#: printer/printerdrake.pm:3748
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "از چه سیستم چاپی (اسپولر) می‌خواهید استفاده کنید؟"
 
-#: printer/printerdrake.pm:3607
+#: printer/printerdrake.pm:3799
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "شکست در پیکربندی چاپگر \"%s\"!"
 
-#: printer/printerdrake.pm:3620
+#: printer/printerdrake.pm:3812
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "نصب Foomatic..."
 
-#: printer/printerdrake.pm:3806
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3818
+#, c-format
+msgid "Could not install %s packages, %s cannot be started!"
+msgstr "بسته‌های %s نتوانستند نصب گردند، %s نمی‌تواند راه‌اندازی شود!"
+
+#: printer/printerdrake.pm:3910
+#, c-format
+msgid "Could not install necessary packages, %s cannot be started!"
+msgstr "بسته‌های ضروری نتوانستند نصب گردند، %s نمی‌تواند راه‌اندازی شود!"
+
+#: 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 "
 "it. "
 msgstr ""
-"چاپگران بدنبال آمده تنظیم شده است. برای تغییر تنطیمات یک چاپگر، ساختن آن به "
-"پیش‌فرض یا نمایش اطلاعات درباره آن بر آن کلیک-دوگانه نمایید. "
+"چاپگران بدنبال آمده پیکربندی شده‌اند. بر روی چاپگری برای تغییر تنظیماتش؛ساختن "
+"آن به پیش‌فرض یا نمایش اطلاعات درباره آن بر آن دوکلیکه کنید."
 
-#: printer/printerdrake.pm:3834
+#: printer/printerdrake.pm:4039
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "نمایش همه‌ی چاپگران از راه دور موجود CUPS "
 
-#: printer/printerdrake.pm:3835
+#: printer/printerdrake.pm:4040
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr "نوسازی لیست چاپگر (نمایش همه‌ی چاپگرهای از راه دور موجود CUPS)"
 
-#: printer/printerdrake.pm:3845
+#: printer/printerdrake.pm:4050
 #, c-format
 msgid "CUPS configuration"
 msgstr "پیکربندی CUPS"
 
-#: printer/printerdrake.pm:3857
+#: printer/printerdrake.pm:4062
 #, c-format
 msgid "Change the printing system"
 msgstr "تغییر سیستم چاپی"
 
-#: printer/printerdrake.pm:3866
+#: printer/printerdrake.pm:4071
 #, c-format
 msgid "Normal Mode"
 msgstr "حالت عادی"
 
-#: printer/printerdrake.pm:3867
+#: printer/printerdrake.pm:4072
 #, c-format
 msgid "Expert Mode"
 msgstr "حالت کارشناسی"
 
-#: 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 "گزینه‌های چاپگر"
 
-#: printer/printerdrake.pm:4174
+#: printer/printerdrake.pm:4379
 #, c-format
 msgid "Modify printer configuration"
 msgstr "پیرایش پیکربندی چاپگر"
 
-#: printer/printerdrake.pm:4176
+#: printer/printerdrake.pm:4381
 #, c-format
 msgid ""
 "Printer %s\n"
@@ -13415,117 +13497,117 @@ msgstr ""
 "چاپگر %s\n"
 "چه را می‌خواهید در این چاپگر پیرایش کنید؟"
 
-#: printer/printerdrake.pm:4180
+#: printer/printerdrake.pm:4385
 #, c-format
 msgid "Do it!"
 msgstr "انجام بده!"
 
-#: printer/printerdrake.pm:4185 printer/printerdrake.pm:4243
+#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
 #, c-format
 msgid "Printer connection type"
 msgstr "نوع اتصال چاپگر"
 
-#: printer/printerdrake.pm:4186 printer/printerdrake.pm:4247
+#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
 #, c-format
 msgid "Printer name, description, location"
 msgstr "نام ، توضیح، مکان چاپگر"
 
-#: printer/printerdrake.pm:4188 printer/printerdrake.pm:4266
+#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "راه‌انداز ، مدل ،سازنده‌ی چاپگر"
 
-#: printer/printerdrake.pm:4189 printer/printerdrake.pm:4267
+#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "سازنده‌ی چاپگر، مدل"
 
-#: 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 "این چاپگر مانند پیش‌فرض گذارده شود"
 
-#: 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 "افزودن این چاپگر به Star Office/OpenOffice.org/GIMP"
 
-#: 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 "برداشتن این چاپگر از Star Office/OpenOffice.org/GIMP"
 
-#: printer/printerdrake.pm:4199 printer/printerdrake.pm:4295
+#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
 #, c-format
 msgid "Print test pages"
 msgstr "چاپ صفحات آزمایشی"
 
-#: 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 "آموزش استفاده از این چاپگر"
 
-#: printer/printerdrake.pm:4201 printer/printerdrake.pm:4299
+#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
 #, c-format
 msgid "Remove printer"
 msgstr "برداشتن چاپگر"
 
-#: printer/printerdrake.pm:4255
+#: printer/printerdrake.pm:4460
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "برداشتن چاپگر قدیمی \"%s\"..."
 
-#: printer/printerdrake.pm:4286
+#: printer/printerdrake.pm:4491
 #, c-format
 msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
 msgstr "افزودن چاپگر به Star Office/OpenOffice.org/GIMP"
 
-#: printer/printerdrake.pm:4288
+#: printer/printerdrake.pm:4493
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
 msgstr "چاپگر \"%s\" با موفقیت به Star Office/OpenOffice.org/GIMP اضافه شد."
 
-#: printer/printerdrake.pm:4289
+#: printer/printerdrake.pm:4494
 #, c-format
 msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
 msgstr "اضافه کردن چاپگر \"%s\" به گیمپ شکست خورد."
 
-#: printer/printerdrake.pm:4291
+#: printer/printerdrake.pm:4496
 #, c-format
 msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
 msgstr "برداشتن چاپگر از Star Office/OpenOffice.org/GIMP"
 
-#: printer/printerdrake.pm:4293
+#: printer/printerdrake.pm:4498
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
 "GIMP."
 msgstr "چاپگر \"%s\" با موفقیت از Star Office/OpenOffice.org/GIMP برداشته شد."
 
-#: printer/printerdrake.pm:4294
+#: printer/printerdrake.pm:4499
 #, c-format
 msgid ""
 "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
 msgstr ""
 "ناموفق بودن در برداشتن چاپگر \"%s\" از Star Office/OpenOffice.org/GIMP."
 
-#: printer/printerdrake.pm:4338
+#: printer/printerdrake.pm:4543
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "آیا واقعاً می‌خواهید چاپگر \"%s\" را بردارید؟"
 
-#: printer/printerdrake.pm:4342
+#: printer/printerdrake.pm:4547
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "برداشتن چاپگر \"%s\"..."
 
-#: printer/printerdrake.pm:4366
+#: printer/printerdrake.pm:4571
 #, c-format
 msgid "Default printer"
 msgstr "چاپگر پیش‌فرض"
 
-#: printer/printerdrake.pm:4367
+#: printer/printerdrake.pm:4572
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "چاپگر \"%s\" اکنون مانند پیش‌فرض گذارده شده است."
@@ -13555,31 +13637,36 @@ msgstr "قسمت‌بندی‌های کافی برای سطح RAID %d وجود 
 msgid "Could not create directory /usr/share/sane/firmware!"
 msgstr "شاخه‌ی /usr/share/sane/firmware نتوانست ایجاد گردد!"
 
-#: scanner.pm:102
+#: scanner.pm:107
+#, c-format
+msgid "Could not create link /usr/share/sane/%s!"
+msgstr "شاخه‌ی /usr/share/sane/%s نتوانست ایجاد گردد!"
+
+#: scanner.pm:114
 #, c-format
 msgid "Could not copy firmware file %s to /usr/share/sane/firmware!"
 msgstr "پرونده‌ی ثابت‌افزار %s نتوانست به /usr/share/sane/firmware کپی گردد!"
 
-#: scanner.pm:109
+#: scanner.pm:121
 #, c-format
 msgid "Could not set permissions of firmware file %s!"
 msgstr "اجازه‌های پرونده‌ی ثابت‌افزار %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 "پویشگردرایک"
 
-#: 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 "نمی‌توان بسته‌های لازم را برای اشتراک پویشگر(های) شما نصب کرد."
 
-#: scanner.pm:190
+#: scanner.pm:202
 #, c-format
 msgid "Your scanner(s) will not be available for non-root users."
 msgstr "پویشگر(های) شما برای کاربرهای غیر-مدیر در دسترس نخواهد بود."
@@ -13916,7 +14003,7 @@ msgstr "اگر به بله گذاشته شده، نتیجه‌ی بررسی را
 #: security/help.pm:120
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
-msgstr ""
+msgstr "اگر چیزی برای هشدار دادن وجود ندارد پست نفرستید"
 
 #: security/help.pm:121
 #, c-format
@@ -13946,7 +14033,7 @@ msgstr "تعیین مدت تاخیر پوسته. صفر بمعنی هیچ تاخ
 #: security/help.pm:127
 #, c-format
 msgid "Timeout unit is second"
-msgstr ""
+msgstr "واحد زمان وقفه ثانیه است"
 
 #: security/help.pm:129
 #, c-format
@@ -14710,7 +14797,7 @@ msgstr ""
 "هیچ اطلاعات بیشتری\n"
 "درباره‌ی این سرویس، متأسفم."
 
-#: services.pm:226 ugtk2.pm:1139
+#: services.pm:226 ugtk2.pm:1167
 #, c-format
 msgid "Info"
 msgstr "اطلاعات"
@@ -14737,23 +14824,26 @@ msgstr "ایست"
 
 #: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13
 #: share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
-#, fuzzy, c-format
-msgid "<b>Congratulations for choosing Mandrake Linux!</b>"
-msgstr "برای انتخاب لینوکس مان‌درایک از شما متشکریم"
+#, c-format
+msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
+msgstr "<b>برای انتخاب لینوکس ماندرایک به شما تبریک می‌گوئیم!</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
-#, fuzzy, c-format
+#, c-format
 msgid "Welcome to the Open Source world!"
-msgstr "به دنیای منبع آزاد خوش آمدید."
+msgstr "به دنیای منبع باز خوش آمدید!"
 
 #: 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 ""
+"سیستم عامل لینوکس ماندرایک جدیدتان و بسیاری از برنامه‌هایش نتیجه‌ی همکاری بین "
+"برنامه‌سازان نرم‌افزار ماندرایک و یاری دهندگان لینوکس ماندرایک در همه‌ی جهان "
+"است."
 
 #: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
 #: share/advertising/ppp-01.pl:19
@@ -14762,11 +14852,12 @@ msgid ""
 "We would like to thank everyone who participated in the development of this "
 "latest release."
 msgstr ""
+"می‌خواهیم از همه‌ی کسانی که در تولید این آخرین پخش شرکت داشتند سپاسگزاری کنیم."
 
 #: share/advertising/dis-02.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Discovery</b>"
-msgstr "راه‌انداز"
+msgstr "<b>اکتشاف</b>"
 
 #: share/advertising/dis-02.pl:15
 #, c-format
@@ -14775,16 +14866,18 @@ msgid ""
 "includes a hand-picked selection of premium software for Office, Multimedia "
 "and Internet activities."
 msgstr ""
+"اکتشاف آسان‌ترین و کاربر-دوستانه‌ترین انتشار لینوکس است. آن مجموعه‌ی دست-چین "
+"شده‌ای را از نرم‌افزار دفتری، چند‌رسانه‌ای و فعالیت‌های اینترنت را شامل می‌شود."
 
 #: share/advertising/dis-02.pl:17
 #, c-format
 msgid "The menu is task-oriented, with a single selected application per task."
-msgstr ""
+msgstr "منو کار-گرا است، با یک برنامه‌ی انتخاب شده‌ی تکی برای هر کاری"
 
 #: share/advertising/dis-03.pl:13
 #, c-format
 msgid "<b>The KDE Choice</b>"
-msgstr ""
+msgstr "<b>گزینش کدئی</b>"
 
 #: share/advertising/dis-03.pl:15
 #, c-format
@@ -14792,11 +14885,12 @@ msgid ""
 "The powerful Open Source graphical desktop environment KDE is the desktop of "
 "choice for the Discovery Pack."
 msgstr ""
+"محیط رومیزی گرافیکی منبع باز قدرتمند کدئی گزینش رومیزی برای پاکت اکتشاف است."
 
 #: share/advertising/dis-04.pl:13
 #, c-format
 msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
-msgstr ""
+msgstr "<b>OpenOffice.org</b>: دسته‌‌بندی کامل دفتر لینوکس."
 
 #: share/advertising/dis-04.pl:15
 #, c-format
@@ -14804,6 +14898,8 @@ msgid ""
 "<b>WRITER</b> is a powerful word processor for creating all types of text "
 "documents. Documents may include images, diagrams and tables."
 msgstr ""
+"<b>WRITER</b> واژه پرداز قدرتمندی برای ایجاد همه نوع از نوشتجات متنی است. "
+"نوشتجات می‌توانند تصاویر، نمودارها و جدول‌ها را ضمیمه کنند."
 
 #: share/advertising/dis-04.pl:16
 #, c-format
@@ -14811,6 +14907,8 @@ msgid ""
 "<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
 "analyze and manage all of your data."
 msgstr ""
+"<b>CALC</b> برگ‌حساب پر-قابلیتی است که شما را در محاسبه‌، آنالیز و سازماندهی "
+"همه‌ی داده‌های‌تان قادر می‌سازد."
 
 #: share/advertising/dis-04.pl:17
 #, c-format
@@ -14818,6 +14916,7 @@ msgid ""
 "<b>IMPRESS</b> is the fastest, most powerful way to create effective "
 "multimedia presentations."
 msgstr ""
+"<b>IMPRESS</b> سریع‌ترین، قدرتمندترین راه ایجاد معرفی‌های چندرسانه‌ای مؤثر است."
 
 #: share/advertising/dis-04.pl:18
 #, c-format
@@ -14825,16 +14924,17 @@ msgid ""
 "<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
 "illustrations."
 msgstr ""
+"<b>DRAW</b> هر چیزی را از نمودارهای ساده‌ تا تصاویر ۳بعدی پویا را تولید می‌کند."
 
 #: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Surf The Internet</b>"
-msgstr "اینترنت"
+msgstr "<b>موج سواری اینترنت</b>"
 
 #: share/advertising/dis-05.pl:15
 #, c-format
 msgid "Discover the new integrated personal information suite KDE Kontact."
-msgstr ""
+msgstr "اکتشاف تماس کدئی دسته‌بندی اطلاعات شخصی جدید."
 
 #: share/advertising/dis-05.pl:17
 #, c-format
@@ -14843,62 +14943,64 @@ msgid ""
 "address book, a calendar and scheduling program, plus a tool for taking "
 "notes!"
 msgstr ""
+"بیش از یک کارگیر پست الکترونیکی پر-قابلیت، <b>Kontact</b> همچنین دفتر نشانی "
+"تقویم و برنامه‌ی زمان‌بندی، بعلاوه‌ی ابزاری برای یادداشت برداری را دارا می‌باشد!"
 
 #: share/advertising/dis-06.pl:15
 #, c-format
 msgid "You can also:"
-msgstr ""
+msgstr "همچنین می‌توانید:"
 
 #: share/advertising/dis-06.pl:16
 #, c-format
 msgid "\t- browse the Web"
-msgstr ""
+msgstr "\t- مرور وب"
 
 #: share/advertising/dis-06.pl:17
 #, c-format
 msgid "\t- chat"
-msgstr ""
+msgstr "\t- گپ"
 
 #: share/advertising/dis-06.pl:18
 #, c-format
 msgid "\t- organize a video-conference"
-msgstr ""
+msgstr "\t- سازماندهی کنفرانس-ویدیوئی"
 
 #: share/advertising/dis-06.pl:19
 #, c-format
 msgid "\t- create your own Web site"
-msgstr ""
+msgstr "\t- ایجاد کردن وب‌گاه خودتان"
 
 #: share/advertising/dis-06.pl:20
 #, c-format
 msgid "\t- ..."
-msgstr ""
+msgstr "\t- ..."
 
 #: share/advertising/dis-07.pl:13
 #, c-format
 msgid "<b>Multimedia</b>: Software for every need!"
-msgstr ""
+msgstr "<b>چندرسانه‌ای</b>: نرم‌افزاری برای هر نیاز!"
 
 #: share/advertising/dis-07.pl:15
 #, c-format
 msgid "Listen to audio CDs with <b>KsCD</b>."
-msgstr ""
+msgstr "گوش دادن به سی‌دی‌های شنیداری با <b>KsCD</b>."
 
 #: share/advertising/dis-07.pl:17
 #, c-format
 msgid "Listen to music files and watch videos with <b>Totem</b>."
-msgstr ""
+msgstr "گوش دادن به پرونده‌های موزیک و تماشا کردن ویدیو با <b>تاتم</b>."
 
 #: share/advertising/dis-07.pl:19
 #, c-format
 msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
-msgstr ""
+msgstr "نما و ویرایش تصاویر وعکس‌ها با <b>GQview</b> و <b>The Gimp!</b>"
 
 #: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
 #: share/advertising/pwp-07.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Mandrake Control Center</b>"
-msgstr "مرکز کنترل مان‌درایک"
+msgstr "<b>مرکز کنترل ماندرایک</b>"
 
 #: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
 #: share/advertising/pwp-07.pl:15
@@ -14907,6 +15009,8 @@ msgid ""
 "The Mandrake Control Center is an essential collection of Mandrake-specific "
 "utilities for simplifying the configuration of your computer."
 msgstr ""
+"مرکز کنترل ماندرایک مجموعه‌‌ی اساسی از وسایل مخصوص ماندرایک برای آسان کردن "
+"پیکربندی رایانه‌اتان است."
 
 #: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
 #: share/advertising/pwp-07.pl:17
@@ -14917,12 +15021,15 @@ msgid ""
 "Network and Internet, adjusting the security level of your computer, and "
 "just about everything related to the system."
 msgstr ""
+"شما بیدرنگ از این مجموعه از وسایل سودمند برای پیکربندی آسان دستگاه‌های "
+"سخت‌افزار، مشخص کردن نقاط سوارسازی، برپاسازی شبکه و اینترنت، میزان کردن سطح "
+"امنیتی رایانه‌اتان و هر چیز دیگر مربوط به سیستم قدردانی خواهید کرد."
 
 #: share/advertising/dis-09.pl:13 share/advertising/dwd-06.pl:13
 #: share/advertising/ppp-09.pl:13 share/advertising/pwp-08.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>MandrakeStore</b>"
-msgstr "مرکز کنترل مان‌درایک"
+msgstr "<b>فروشگاه ماندرایک</b>"
 
 #: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
 #: share/advertising/pwp-08.pl:15
@@ -14931,18 +15038,20 @@ msgid ""
 "Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
 "full service e-commerce platform."
 msgstr ""
+"یافتن همه‌ی محصولات و خدمات فروشگاه ماندرایک در <b>فروشگاه ماندرایک</b> -- "
+"پایگاه تجارت-الکترونیکی با خدمات کامل ما."
 
 #: share/advertising/dis-09.pl:17 share/advertising/dwd-06.pl:19
 #: share/advertising/ppp-09.pl:17 share/advertising/pwp-08.pl:17
 #, c-format
 msgid "Stop by today at <b>www.mandrakestore.com</b>"
-msgstr ""
+msgstr "امروز به <b>www.mandrakestore.com</b> سری بزنید"
 
 #: share/advertising/dis-10.pl:13 share/advertising/ppp-10.pl:13
 #: share/advertising/pwp-09.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "Become a <b>MandrakeClub</b> member!"
-msgstr "یک کارشناس مان‌درایک شوید"
+msgstr "عضو <b>باشگاه ماندرایک</b> شوید!"
 
 #: share/advertising/dis-10.pl:15 share/advertising/ppp-10.pl:15
 #: share/advertising/pwp-09.pl:15
@@ -14951,30 +15060,32 @@ msgid ""
 "Take advantage of valuable benefits, products and services by joining "
 "MandrakeClub, such as:"
 msgstr ""
+"بوسیله پیوستن به باشگاه ماندرایک از خدمات، محصولات و منافع با ارزش بهره "
+"ببرید، مانند:"
 
 #: share/advertising/dis-10.pl:16 share/advertising/dwd-07.pl:16
 #: share/advertising/ppp-10.pl:17 share/advertising/pwp-09.pl:16
-#, fuzzy, c-format
+#, c-format
 msgid "\t- Full access to commercial applications"
-msgstr "دسترسی به ابزار تالیف برنامه"
+msgstr "\tدستیابی کامل به برنامه‌های تجاری"
 
 #: share/advertising/dis-10.pl:17 share/advertising/dwd-07.pl:17
 #: share/advertising/ppp-10.pl:18 share/advertising/pwp-09.pl:17
 #, c-format
 msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
-msgstr ""
+msgstr "\t- لیست آینه‌ی بارگیری مخصوص برای اعضای باشگاه ماندرایک"
 
 #: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
 #: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
-#, fuzzy, c-format
-msgid "\t- Voting for software to put in Mandrake Linux"
-msgstr "برای انتخاب لینوکس مان‌درایک از شما متشکریم"
+#, c-format
+msgid "\t- Voting for software to put in Mandrakelinux"
+msgstr "\t- رأی دادن برای نرم‌افزار برای گذاشتن در لینوکس ماندرایک"
 
 #: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
 #: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
 #, c-format
 msgid "\t- Special discounts for products and services at MandrakeStore"
-msgstr ""
+msgstr "\t- تخفیف‌های مخصوص برای محصولات و خدمات در فروشگاه ماندرایک"
 
 #: share/advertising/dis-10.pl:20 share/advertising/dwd-07.pl:20
 #: share/advertising/ppp-04.pl:21 share/advertising/ppp-06.pl:19
@@ -14982,24 +15093,24 @@ msgstr ""
 #: share/advertising/pwp-09.pl:20
 #, c-format
 msgid "\t- Plus much more"
-msgstr ""
+msgstr "\t- بعلاوه‌ی بسیاری بیشتر"
 
 #: share/advertising/dis-10.pl:22 share/advertising/dwd-07.pl:22
 #: share/advertising/ppp-10.pl:23 share/advertising/pwp-09.pl:22
 #, c-format
 msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
-msgstr ""
+msgstr "برای اطلاعات بیشتر، لطفاً از <b>www.mandrakeclub.com</b> دیدار کنید"
 
 #: share/advertising/dis-11.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "Do you require assistance?"
-msgstr "آیا شما هیچ واسط %s دارید؟"
+msgstr "آیا به دستیار نیاز دارید؟"
 
 #: share/advertising/dis-11.pl:15 share/advertising/dwd-08.pl:16
 #: share/advertising/ppp-11.pl:15 share/advertising/pwp-10.pl:15
 #, c-format
 msgid "<b>MandrakeExpert</b> is the primary source for technical support."
-msgstr ""
+msgstr "<b>کارشناس ماندرایک</b> منبع نخست برای پشتیبانی فنی است."
 
 #: share/advertising/dis-11.pl:17 share/advertising/dwd-08.pl:18
 #: share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
@@ -15008,20 +15119,25 @@ msgid ""
 "If you have Linux questions, subscribe to MandrakeExpert at <b>www."
 "mandrakeexpert.com</b>"
 msgstr ""
+"اگر سؤالات لینوکسی دارید، در کارشناس ماندرایک در <b>www. mandrakeexpert.com</"
+"b> مشترک شوید"
 
 #: 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 ""
+"لینوکس ماندرایک به مدل منبع باز متعهد بوده و مجوز GPL را محترم می‌شمارد. این "
+"توزیع جدید نتیجه‌ی همکاری بین تیم توسعه دهندگان نرم‌افزار ماندرایک و جامعه‌ی "
+"یاری دهندگان لینوکس ماندرایک در همه‌ی جهان است."
 
 #: share/advertising/dwd-02.pl:13
 #, c-format
-msgid "<b>Join the Mandrake Linux community!</b>"
-msgstr ""
+msgid "<b>Join the Mandrakelinux community!</b>"
+msgstr "<b>به جامعه‌ی لینوکس ماندرایک بپیوندید!</b>"
 
 #: share/advertising/dwd-02.pl:15
 #, c-format
@@ -15029,6 +15145,8 @@ msgid ""
 "If you would like to get involved, please subscribe to the \"Cooker\" "
 "mailing list by visiting <b>mandrake-linux.com/cooker</b>"
 msgstr ""
+"اگر مایل هستید همکاری کنید، لطفاُ به لیست پستی \"Cooker\" بوسیله‌ی دیدار از "
+"<b>mandrake-linux.com/cooker</b> مشترک شوید"
 
 #: share/advertising/dwd-02.pl:17
 #, c-format
@@ -15036,43 +15154,54 @@ msgid ""
 "To learn more about our dynamic community, please visit <b>www.mandrake-"
 "linux.com</b>!"
 msgstr ""
+"برای آموختن بیشتر درباره‌ی جامعه‌ی پویای ما، لطفاً از <b>www.mandrake-linux."
+"com</b> دیدار کنید!"
 
 #: share/advertising/dwd-03.pl:13
 #, c-format
-msgid "<b>What is Mandrake Linux?</b>"
-msgstr ""
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "<b>لینوکس ماندرایک چیست؟</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 ""
+"لینوکس ماندرایک توزیع منبع بازی است که از هزاران برنامه از دنیای نرم‌افزار "
+"آزاد ایجاد گردیده است. لینوکس ماندرایک یکی از رایج‌ترین توزیع‌های لینوکس در "
+"همه‌ی جهان است "
 
 #: 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 ""
+"لینوکس ماندرایک شامل رومیزی‌های گرافیکی مشهور کدئی و گنوم می‌باشد، بعلاوه‌ی "
+"آخرین نسخ از برنامه‌های منبع باز محبوب."
 
 #: 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 ""
+"لینوکس ماندرایک بطور گسترده معروف به کاربر-دوستانه‌ترین و دارای آسان‌ترین نصب "
+"و انتشار آسان لینوکس است."
 
 #: share/advertising/dwd-04.pl:15
 #, c-format
 msgid "Find out about our <b>Personal Solutions</b>:"
-msgstr ""
+msgstr "دریافتن درباره‌ی <b>راه حل‌های شخصی</b> ما"
 
 #: share/advertising/dwd-04.pl:16
 #, c-format
-msgid "\t- Find out Mandrake Linux on a bootable CD with <b>MandrakeMove</b>"
+msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
 msgstr ""
+"\t- دریافتن درباره‌ی لینوکس ماندرایک بر سی‌دی قابل آغازگری با <b>MandrakeMove</"
+"b>"
 
 #: share/advertising/dwd-04.pl:17
 #, c-format
@@ -15080,6 +15209,8 @@ msgid ""
 "\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
 "<b>Discovery</b> perfectly meets your needs"
 msgstr ""
+"\t- اگر از لینوکس بیشتر برای کارهای دفتری، اینترنت و چندرسانه‌ای استفاده می "
+"کنید، <b>اکتشاف</b> کاملاً جوابگوی احتیاجات شماست "
 
 #: share/advertising/dwd-04.pl:18
 #, c-format
@@ -15087,6 +15218,8 @@ msgid ""
 "\t- If you appreciate the largest selection of software including powerful "
 "development tools, <b>PowerPack</b> is for you"
 msgstr ""
+"\t- اگر خواهان بزرگترین مجموعه از نرم‌افزار شامل ابزارهای برنامه‌سازی قدرتمند "
+"هستید، <b>پاکت نیرو</b> بدرد شما می‌خورد"
 
 #: share/advertising/dwd-04.pl:19
 #, c-format
@@ -15094,11 +15227,13 @@ msgid ""
 "\t- If you require a full-featured Linux solution customized for small to "
 "medium-sized networks, choose <b>PowerPack+</b>"
 msgstr ""
+"\t- اگر راه حلی لینوکسی اختصاصی برای شبکه‌های کوچک تا متوسط را نیاز دارید، "
+"<b>PowerPack+</b> انتخاب کنید"
 
 #: share/advertising/dwd-05.pl:13
 #, c-format
 msgid "Find out also our <b>Business Solutions</b>!"
-msgstr ""
+msgstr "دریافتن درباره‌ی <b>راه حل‌های شغلی</b> ما!"
 
 #: share/advertising/dwd-05.pl:15
 #, c-format
@@ -15107,6 +15242,9 @@ msgid ""
 "complete \"all-in-one\" solution that includes everything needed to rapidly "
 "deploy world-class Linux server applications."
 msgstr ""
+"<b>کارگزار چندشرکتی</b>: راه حل ایده‌آلی برای شرکتهای بسیار بزرگ. آن راه حل "
+"کامل \"همه-در-یک\" است که شامل هر چیز مورد نیاز برای گسترش سریع برنامه‌های "
+"کارگزار لینوکس درجه-یک می‌باشد."
 
 #: share/advertising/dwd-05.pl:17
 #, c-format
@@ -15115,14 +15253,19 @@ msgid ""
 "provide multi-VPN as well as multi-DMZ functionalities. It is the perfect "
 "high performance security solution."
 msgstr ""
+"<b>دیوارآتش چند شبکه‌ای</b>: بر پایه‌ی لینوکس ۲٬۴ \"هسته‌ی امت\" برای عرضه‌ی "
+"multi-VPN همچنین کارآرایی‌های multi-DMZ. آن راه حل امن پر قابلیت کاملی است."
 
 #: share/advertising/dwd-05.pl:19
 #, 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>: قدرت و سرعت یک کلاستر لینوکس آمیخته با استواری و "
+"سهولت در استفاده‌ی توزیع مشهور لینوکس ماندرایک. ترکیبی یگانه برای کارآرایی "
+"HPC غیرقابل مقایسه."
 
 #: share/advertising/dwd-06.pl:15
 #, c-format
@@ -15130,6 +15273,8 @@ msgid ""
 "Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
 "commerce platform."
 msgstr ""
+"یافتن همه‌ی محصولات نرم‌افزار ماندرایک در <b>فروشگاه ماندرایک</b> -- پایگاه "
+"تجارت الکترونیکی تمام خدمات ما."
 
 #: share/advertising/dwd-06.pl:17
 #, c-format
@@ -15138,11 +15283,13 @@ msgid ""
 "professional support, from 1 to 50 incidents, take the one which meets "
 "perfectly your needs!"
 msgstr ""
+"دریافتن پشتیبانی حوادث اگر مشکلی دارید، از پشتیبانی استاندارد تا حرفه‌ای، از "
+"۱ تا ۵۰ حوادث، آن را که جوابگوی کامل احتیاجات شماست را بگیرید!"
 
 #: share/advertising/dwd-07.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "یک کارشناس مان‌درایک شوید"
+msgstr "<b>عضو باشگاه ماندرایک شوید!</b>"
 
 #: share/advertising/dwd-07.pl:15
 #, c-format
@@ -15150,22 +15297,24 @@ msgid ""
 "Take advantage of valuable benefits, products and services by joining "
 "Mandrake Club, such as:"
 msgstr ""
+"بهره گیری از فواید باارزش، محصولات و خدمات بوسیله‌ی پیوستن به باشگاه "
+"ماندرایک، مانند:"
 
 #: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
 #: share/advertising/pwp-10.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Do you require assistance?</b>"
-msgstr "آیا شما هیچ واسط %s دارید؟"
+msgstr "<b>آیا به دستیار نیاز دارید؟</b>"
 
 #: share/advertising/dwd-09.pl:16
 #, c-format
 msgid "<b>Note</b>"
-msgstr ""
+msgstr "<b>توجه</b>"
 
 #: share/advertising/dwd-09.pl:18
 #, c-format
-msgid "This is the Mandrake Linux <b>Download version</b>."
-msgstr ""
+msgid "This is the Mandrakelinux <b>Download version</b>."
+msgstr "این <b>نسخه‌ی بارگیری</b> لینوکس ماندرایک است."
 
 #: share/advertising/dwd-09.pl:20
 #, c-format
@@ -15174,19 +15323,24 @@ msgid ""
 "therefore may not work with certain modems (such as some ADSL and RTC) and "
 "video cards (such as ATI® and NVIDIA®)."
 msgstr ""
+"نسخه‌ی بارگیری آزاد شامل نرم‌افزار تجاری نبوده، و بنابرین ممکن است با بعضی از "
+"مودم‌ها (مانند ADSL و RTC) و کارتهای ویدیو (مانند ATI® و NVIDIA®) کار نکند."
 
 #: 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 ""
+"توزیع لینوکس ماندرایک جدیدتان و بسیاری از برنامه‌هایش نتیجه‌ی همکاریهای بین "
+"توسعه دهندگان نرم‌افزار ماندرایک و یاری دهندگان لینوکس ماندرایک در همه‌ی جهان "
+"است."
 
 #: share/advertising/ppp-02.pl:13
 #, c-format
 msgid "<b>PowerPack+</b>"
-msgstr ""
+msgstr "<b>PowerPack+</b>"
 
 #: share/advertising/ppp-02.pl:15
 #, c-format
@@ -15195,37 +15349,44 @@ msgid ""
 "networks. PowerPack+ increases the value of the standard PowerPack by adding "
 "a comprehensive selection of world-class server applications."
 msgstr ""
+"PowerPack+ راه حل پر قابلیت لینوکس برای شبکه‌های کوچک تا متوسط است. PowerPack"
+"+ ارزش PowerPack استاندارد را با افزودن قسمت گسترده‌ای از برنامه‌های کارگزار "
+"کلاس-جهانی افزایش می‌دهد."
 
 #: share/advertising/ppp-02.pl:17
 #, c-format
 msgid ""
-"It is the only Mandrake Linux product that includes the groupware solution."
-msgstr ""
+"It is the only Mandrakelinux product that includes the groupware solution."
+msgstr "آن تنها محصول لینوکس ماندرایک است که شامل راه حل گروه‌افزار است."
 
 #: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "کلید رمزگذاری سیستم پرونده خود را انتخاب نمایید"
+msgstr "<b>محیط رومیزی گرافیکی‌تان را انتخاب کنید!</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 ""
+"وقتی برای اولین بار بدرون سیستم لینوکس ماندرایک‌تان ثبت‌ورود می‌کنید، می‌توانید "
+"میان چندین محیط رومیزی گرافیکی محبوب یکی را انتخاب کنید، از جمله: کدئی، "
+"گنوم، ویندو می‌کر، آیس‌وی‌ام و بقیه."
 
 #: 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 ""
+"در فهرست لینوکس ماندرایک برنامه‌هایی را برای همه‌ی کارها پیدا خواهید کرد:"
 
 #: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
 #, c-format
 msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
-msgstr ""
+msgstr "\t- ایجاد کردن، ویرایش و اشتراک نوشتجات دفتری با <b>OpenOffice.org</b>"
 
 #: share/advertising/ppp-04.pl:16
 #, c-format
@@ -15233,27 +15394,31 @@ msgid ""
 "\t- Take charge of your personal data with the integrated personal "
 "information suites: <b>Kontact</b> and <b>Evolution</b>"
 msgstr ""
+"\t- کنترل داده‌های شخصی‌تان را با دسته برنامه‌های اطلاعات شخصی <b>تماس</b> و "
+"<b>تکامل</b> در دست بگیرید"
 
 #: share/advertising/ppp-04.pl:17
 #, c-format
 msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
-msgstr ""
+msgstr "\t- مرورگری وب با <b>موزیلا و کانکرر</b>"
 
 #: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
 #, c-format
 msgid "\t- Participate in online chat with <b>Kopete</b>"
-msgstr ""
+msgstr "\t- شریک شدن در گپ‌زدن اینترنتی با <b>Kopete</b>"
 
 #: share/advertising/ppp-04.pl:19
 #, c-format
 msgid ""
 "\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
 msgstr ""
+"\t- گوش دادن به سی‌دی‌های شنیداری و پرونده‌های موزیک با <b>KsCD</b> و <b>تاتم</"
+"b>"
 
 #: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
 #, c-format
 msgid "\t- Edit images and photos with <b>The Gimp</b>"
-msgstr ""
+msgstr "\t- ویرایش تصاویر و عکس‌ها با <b>گیمپ</b>"
 
 #: share/advertising/ppp-05.pl:13
 #, c-format
@@ -15261,55 +15426,58 @@ msgid ""
 "PowerPack+ includes everything needed for developing and creating your own "
 "software, including:"
 msgstr ""
+"PowerPack+ دارای همه‌ی چیزهای مورد نیاز برای توسعه و ایجاد نرم‌افزار خودتان، "
+"از جمله:"
 
 #: share/advertising/ppp-05.pl:15 share/advertising/pwp-05.pl:16
 #, c-format
 msgid ""
 "\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
 "Environment for C++ programming"
-msgstr ""
+msgstr "\t- <b>Kdevelop</b>: محیط توسعه‌ی آسان و پرقابلیت برای برنامه‌نویسی C++"
 
 #: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
 #, c-format
 msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
-msgstr ""
+msgstr "\t- <b>GCC</b>: the GNU Compiler Collection"
 
 #: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
 #, c-format
 msgid "\t- <b>GDB</b>: the GNU Project debugger"
-msgstr ""
+msgstr "\t- <b>GDB</b>: اشکال‌زدای پروژه‌ی گنو"
 
 #: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
 #, c-format
 msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
-msgstr ""
+msgstr "\t- <b>Emacs</b>: ویرایشگر نمایش زمان حقیقی و قابل اختصاصی‌سازی"
 
 #: share/advertising/ppp-05.pl:19
 #, c-format
 msgid ""
 "\t- <b>Xemacs</b>: open source text editor and application development system"
-msgstr ""
+msgstr "\t- <b>Xemacs</b>: ویرایشگر متن منبع باز و سیستم توسعه برنامه"
 
 #: share/advertising/ppp-05.pl:20
 #, c-format
 msgid ""
 "\t- <b>Vim</b>: advanced text editor with more features than standard Vi"
 msgstr ""
+"\t- <b>Vim</b>: ویرایشگر متن پیشرفته با قابلیت‌های بیشتری از Vi استاندارد"
 
 #: share/advertising/ppp-06.pl:13
 #, c-format
 msgid "<b>Discover the full-featured groupware solution!</b>"
-msgstr ""
+msgstr "<b>دریافتن راه حل گروه‌افزار پر-قابلیت!</b>"
 
 #: share/advertising/ppp-06.pl:15
 #, c-format
 msgid "It includes both server and client features for:"
-msgstr ""
+msgstr "آن دارای قابلیت‌های کارگزار و کارگیر است برای:"
 
 #: share/advertising/ppp-06.pl:16
 #, c-format
 msgid "\t- Sending and receiving emails"
-msgstr ""
+msgstr "\t- فرستادن و دریافت کردن پست الکترونیکی"
 
 #: share/advertising/ppp-06.pl:17
 #, c-format
@@ -15317,32 +15485,34 @@ msgid ""
 "\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
 "receiving), Task Requests (sending and receiving)"
 msgstr ""
+"\t- تقویم، لیست کار، یادآوری، تماس‌ها، درخواست ملاقات (فرستادن و دریافت کردن)"
+"، درخواست‌های کار (فرستادن و دریافت کردن)"
 
 #: share/advertising/ppp-06.pl:18
 #, c-format
 msgid "\t- Address Book (server and client)"
-msgstr ""
+msgstr "\t دفتر آدرس (کارگزار و کارگیر("
 
 #: share/advertising/ppp-07.pl:13
 #, c-format
 msgid ""
 "Empower your business network with <b>premier server solutions</b> including:"
-msgstr ""
+msgstr "قدرت بخشی به شبکه‌ی شغلی‌تان با <b>راه حلهای کارگزار پیشرو</b> از جمله:"
 
 #: share/advertising/ppp-07.pl:15
 #, c-format
 msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
-msgstr ""
+msgstr "\t- <b>سامبا</b>: خدمات چاپ و پرونده برای کارگیرهای ویندوز"
 
 #: share/advertising/ppp-07.pl:16
-#, fuzzy, c-format
+#, c-format
 msgid "\t- <b>Apache</b>: The most widely used Web server"
-msgstr "کارگزار اینترنت آپاچ"
+msgstr "\t- <b>آپاچی</b>: بیشترین کارگزار وب مورد استفاده"
 
 #: share/advertising/ppp-07.pl:17
 #, c-format
 msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
-msgstr ""
+msgstr "\t- <b>MySQL</b>: محبوب‌ترین بانک اطلاعاتی منبع باز جهان"
 
 #: share/advertising/ppp-07.pl:18
 #, c-format
@@ -15350,25 +15520,28 @@ msgid ""
 "\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
 "transparent version control system"
 msgstr ""
+"\t- <b>CVS</b>: سیستم نسخه‌های متقارن، سیستم کنترل نسخه شبکه-شفاف منبع-باز"
 
 #: share/advertising/ppp-07.pl:19
 #, c-format
 msgid ""
 "\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
-msgstr ""
+msgstr "\t- <b>ProFTPD</b>: نرم‌اقزار کارگزار FTP با مجوز-GPL قابل پیکربندی"
 
 #: share/advertising/ppp-07.pl:20
 #, c-format
 msgid "\t- And others"
-msgstr ""
+msgstr "\t- و بقیه"
 
 #: 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 ""
+"توزیع لینوکس ماندرایک جدیدتان نتیجه‌ی همکاری میان توسعه دهندگان نرم‌افزار "
+"ماندرایک و یاری دهندگان لینوکس ماندرایک در تمام جهان است."
 
 #: share/advertising/pwp-01.pl:19
 #, c-format
@@ -15376,11 +15549,13 @@ msgid ""
 "We would like to thank everyone who participated in the development of our "
 "latest release."
 msgstr ""
+"مایل هستیم از همه‌ی کسانی که در توسعه‌ی آخرین انتشار ما شریک بودند سپاسگزاری "
+"کنیم."
 
 #: share/advertising/pwp-02.pl:13
 #, c-format
 msgid "<b>PowerPack</b>"
-msgstr ""
+msgstr "<b>PowerPack</b>"
 
 #: share/advertising/pwp-02.pl:15
 #, c-format
@@ -15390,13 +15565,18 @@ msgid ""
 "includes thousands of applications - everything from the most popular to the "
 "most technical."
 msgstr ""
+"PowerPack محصول رومیزی لینوکس برجسته‌ی نرم‌افزار ماندرایک. علاوه بر آسان‌ترین و "
+"کاربر-دوستانه‌ترین بودن توزیع لینوکس، PowerPack دارای هزاران برنامه است - هر "
+"چیزی از محبوب‌ترین تا فنی‌ترین."
 
 #: 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 ""
+"در منوی لینوکس ماندرایک برای همه‌‌ی کارهایتان برنامه‌ای آسان برای استفاده پیدا "
+"خواهید کرد:"
 
 #: share/advertising/pwp-04.pl:16
 #, c-format
@@ -15404,21 +15584,24 @@ msgid ""
 "\t- Take charge of your personal data with the integrated personal "
 "information suites <b>Kontact</b> and <b>Evolution</b>"
 msgstr ""
+"\t- کنترل داده‌های شخصی‌تان را با دسته برنامه‌ی اطلاعات شخصی <b>تماس</b> و "
+"<b>تکامل</b> در دست گیرید"
 
 #: share/advertising/pwp-04.pl:17
 #, c-format
 msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
-msgstr ""
+msgstr "\t- مرورگری وب با <b>موزیلا</b> و <b>کانکرر</b>"
 
 #: share/advertising/pwp-04.pl:19
 #, c-format
 msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
 msgstr ""
+"\t- گوش دادن به سی‌دی‌های شنیداری و پرونده‌های موزیک با KsCD و <b>تاتم</b>"
 
 #: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Development tools</b>"
-msgstr "برنامه‌سازی"
+msgstr "<b> ابزارهای برنامه‌سازی</b>"
 
 #: share/advertising/pwp-05.pl:15
 #, c-format
@@ -15426,24 +15609,27 @@ msgid ""
 "PowerPack includes everything needed for developing and creating your own "
 "software, including:"
 msgstr ""
+"PowerPack دارای همه‌ی چیزهای مورد نیاز برای توسعه و ایجاد نرم‌افزار خودتان "
+"است، از جمله:"
 
 #: share/advertising/pwp-06.pl:15
 #, c-format
 msgid "And of course the editors!"
-msgstr ""
+msgstr "و البته ویرایشگران!"
 
 #: share/advertising/pwp-06.pl:17
 #, c-format
 msgid ""
 "\t- <b>Xemacs</b>: another open source text editor and application "
 "development system"
-msgstr ""
+msgstr "\t- <b>Xemacs</b>: ویرایشگرمتن منبع باز و سیستم توسعه برنامه"
 
 #: share/advertising/pwp-06.pl:18
 #, c-format
 msgid ""
 "\t- <b>Vim</b>: an advanced text editor with more features than standard Vi"
 msgstr ""
+"\t- <b>Vim</b>: ویرایشگر متن پیشرفته‌ای با قابلیت‌های بیشتری از Vi استاندارد"
 
 #: standalone.pm:21
 #, c-format
@@ -15512,6 +15698,11 @@ msgid ""
 "  --splash          - enable to configure boot theme\n"
 "default mode: offer to configure autologin feature"
 msgstr ""
+"[--boot] [--splash]\n"
+"گزینه‌ها:\n"
+"  --boot            - قادر ساختن پیکربندی بارگذار آغازگر\n"
+"  --splash          - قادر ساختن پیکربندی طرح آغازگری\n"
+"حالت پیش‌فرض: پیکربندی قابلیت ثبت‌ورود خودکار را عرضه می‌دارد"
 
 #: standalone.pm:57
 #, c-format
@@ -15540,9 +15731,15 @@ msgid ""
 "  --internet        - configure internet\n"
 "  --wizard          - like --add"
 msgstr ""
+"[--add]\n"
+"  --add             - جادوگر \"افزودن واسط شبکه\"\n"
+"  --del             - جادوگر \"حذف واسط شبکه\"\n"
+"  --skip-wizard     - سازمان‌دهی اتصالات\n"
+"  --internet        - پیکربندی اینترنت\n"
+"  --wizard          - مانند --add"
 
 #: standalone.pm:69
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Font Importation and monitoring application\n"
@@ -15558,17 +15755,19 @@ msgid ""
 "                 : name_of_application like  so for staroffice \n"
 "                 : and gs for ghostscript for only this one."
 msgstr ""
-"برنامه‌ی زیرنظرگیری و واردات قلم نگارش                                     \n"
+"\n"
+"برنامه‌ی پایشگری و واردات قلم نگارش                                     \n"
+"\n"
+"گزینه‌ها:\n"
 "--واردات_ویندوز : واردات از تمام قسمت‌بندی‌های موجود ویندوز.\n"
-"--قلم‌هاـxls      : همه قلم‌هایی که قبلاً از xls وجود دارد را نشان می‌دهد\n"
-"--قوی         : تایید قوی قلم.\n"
-"--نصب        : پذیرش هر پرونده قلم و هر شاخه.\n"
-"--نصب‌برداری      : نصب‌برداری هر قلم یا شاخه قلم.\n"
+"--قلم‌هاـxls      : همه قلم‌هایی که از قبل از xls وجود دارد را نشان می‌دهد\n"
+"--نصب        : پذیرش هر پرونده‌ی قلم و هر شاخه‌ای.\n"
+"--نصب‌برداری      : نصب‌برداری هر قلمی یا شاخه‌ی قلم.\n"
 "--جایگزینی        : جایگزینی همه قلم‌هایی که قبلاً وجود دارند\n"
 "--برنامه    : صفر هیچ برنامه.\n"
-"                 : 1 همه برنامه موجود حمایت شده.\n"
-"                 : نام_برنامه  مانند staroffice \n"
-" so برای                  : و gs برای ghostscript فقط برای این یکی."
+"                 : 1 همه برنامه‌های موجود حمایت شده.\n"
+"                 : نام_برنامه مانند so برای staroffice \n"
+"                 : و gs برای ghostscript فقط برای این یکی."
 
 #: standalone.pm:84
 #, c-format
@@ -15700,17 +15899,17 @@ msgstr "لطفا خارج شوید سپس از Ctrl-Alt-BackSpace استفاده
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "باید ثبت خروج کرده و باز برگردید برای اینکه تغییرات تأثیر کنند"
 
-#: standalone/drakTermServ:71
+#: standalone/drakTermServ:77
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "بیفایده بدون کارگزار پایانه"
 
-#: 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"
 
-#: standalone/drakTermServ:121
+#: standalone/drakTermServ:134
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -15719,78 +15918,79 @@ msgstr ""
 "%s: %s به نام میزبان، نشانی MAC، آی‌پی, تصویر-nbi، 0/1 برای THIN_CLIENT, 0/1 "
 "برای پیکربندی محلی نیاز دارد\n"
 
-#: standalone/drakTermServ:128
+#: standalone/drakTermServ:141
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: %s نیاز به نام میزبان دارد...\n"
 
-#: standalone/drakTermServ:140
+#: standalone/drakTermServ:153
 #, c-format
 msgid "You must be root to read configuration file. \n"
 msgstr "شما باید برای خواندن پرونده‌ی پیکربندی مدیر سیستم باشید.\n"
 
-#: standalone/drakTermServ:219 standalone/drakTermServ:488
-#: standalone/drakfont:572
+#: standalone/drakTermServ:238 standalone/drakTermServ:511
+#: standalone/drakfont:575
 #, c-format
 msgid "OK"
 msgstr "تأیید"
 
-#: standalone/drakTermServ:235
-#, fuzzy, c-format
-msgid "Terminal Server Configuration"
-msgstr "تنظیمات کارگزار پایانه مان‌درایک"
-
-#: standalone/drakTermServ:240
+#: standalone/drakTermServ:249 standalone/drakTermServ:252
 #, c-format
-msgid "DrakTermServ"
-msgstr "DrakTermServ"
+msgid "Terminal Server Configuration"
+msgstr "پیکربندی کارگزار پایانه"
 
-#: standalone/drakTermServ:264
+#: standalone/drakTermServ:267
 #, c-format
 msgid "Enable Server"
 msgstr "بکاراندازی کارگزار"
 
-#: standalone/drakTermServ:270
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Disable Server"
 msgstr "از کاراندازی کارگزار"
 
-#: standalone/drakTermServ:278
+#: standalone/drakTermServ:281
 #, c-format
 msgid "Start Server"
 msgstr "راه‌اندازی کارگزار"
 
-#: standalone/drakTermServ:284
+#: standalone/drakTermServ:287
 #, c-format
 msgid "Stop Server"
 msgstr "توقف کارگزار"
 
-#: standalone/drakTermServ:292
+#: standalone/drakTermServ:295
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Etherboot Floppy/ISO"
 
-#: standalone/drakTermServ:296
+#: standalone/drakTermServ:299
 #, c-format
 msgid "Net Boot Images"
 msgstr "تصاویر آغازگری شبکه"
 
-#: standalone/drakTermServ:302
+#: standalone/drakTermServ:305
 #, c-format
 msgid "Add/Del Users"
 msgstr "افزودن/حذف کاربرها"
 
-#: standalone/drakTermServ:306
+#: standalone/drakTermServ:309
 #, c-format
 msgid "Add/Del Clients"
 msgstr "افزودن/حذف کارگیرها"
 
-#: standalone/drakTermServ:317 standalone/drakbug:54
+#: standalone/drakTermServ:320 standalone/drakbug:54
 #, c-format
 msgid "First Time Wizard"
 msgstr "جادوگر بار اول"
 
-#: 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 مانند dm تعریف شده است,کاربر gdm به /etc/passwd$$CLIENT$$ افزوده می‌شود"
+
+#: standalone/drakTermServ:358
 #, c-format
 msgid ""
 "\n"
@@ -15812,65 +16012,95 @@ msgid ""
 "    e) Ask you to make a boot floppy.\n"
 "    f) If it's thin clients, ask if you want to restart KDM.\n"
 msgstr ""
-
-#: standalone/drakTermServ:387
-#, fuzzy, c-format
+"\n"
+" روال این جادوگر:\n"
+" \t1) از شما برای انتخاب کارگیرهای 'لاغر' یا 'چاق' سؤال می‌شود.\n"
+"\t2) برپاسازی dhcp.\n"
+"\t\n"
+"بعد از انجام این مراحل, جادوگر سپس:\n"
+"\t\n"
+"    a) ساختن "
+"همهnbis.                                                                \n"
+"    b) فعال ساختن "
+"کارگزار.                                                          \n"
+"    c) راه‌اندازی "
+"کارگزار.                                                     \n"
+"    d) هم‌گاه‌سازی پرونده‌های سایه تا همه‌ی کاربران, همچنین مدیر, \n"
+"        به پرونده‌ی shadow$$CLIENT$$ اضافه "
+"شوند.                                              \n"
+"    e) از شما برای ساختن دیسکچه‌ی آغازگر سؤال می‌شود.\n"
+"    f) اگر آن کارگیر لاغر است, از شما برای راه‌اندازی مجدد KDM سؤال می‌شود.\n"
+
+#: standalone/drakTermServ:403
+#, c-format
 msgid "Cancel Wizard"
-msgstr "شروع جادوگر "
+msgstr "لغو جادوگر"
 
-#: standalone/drakTermServ:399
+#: standalone/drakTermServ:415
 #, c-format
 msgid "Please save dhcpd config!"
-msgstr ""
+msgstr "لطفاً پیکربندی dhcpd را ذخیره کنید!"
 
-#: standalone/drakTermServ:427
+#: standalone/drakTermServ:443
+#, c-format
+msgid "Use thin clients."
+msgstr "استفاده از کارگیرهای لاغر."
+
+#: 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."
 msgstr ""
+"لطفا نوع کارگیر را انتخاب کنید.\n"
+"    کارگیرهای 'لاغر' همه چیز را با استفاده از نمایش کارگیر بر روی پردازه/"
+"حافظه‌ی کارگزار اجرا می‌کند.\n"
+"    کارگیرهای 'چاق' از پردازه/حافظه‌ی خودشان ولی سیستم‌پرونده‌ی کارگزار استفاده "
+"می‌کنند."
 
-#: standalone/drakTermServ:433
-#, fuzzy, c-format
-msgid "Allow thin clients."
-msgstr "اجازه به کارگیرهای نازک"
+#: standalone/drakTermServ:457 standalone/drakTermServ:1071
+#, c-format
+msgid "Sync client X keyboard settings with server."
+msgstr "هم‌گاه‌سازی تنظیمات صفحه‌کلید ایکس کارگیر با کارگزار."
 
-#: standalone/drakTermServ:441
+#: standalone/drakTermServ:464
 #, c-format
 msgid "Creating net boot images for all kernels"
-msgstr ""
+msgstr "ایجاد تصاویر آغازگری شبکه برای همه‌ی هسته‌ها"
 
-#: 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 "این چند دقیقه زمان می‌برد."
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:466
-#, fuzzy, c-format
+#: standalone/drakTermServ:469 standalone/drakTermServ:489
+#, c-format
 msgid "Done!"
-msgstr "انجام شد"
+msgstr "انجام شد!"
 
-#: standalone/drakTermServ:452
+#: standalone/drakTermServ:475
 #, c-format
 msgid "Syncing server user list with client list, including root."
-msgstr ""
+msgstr "هم‌گاه‌سازی لیست کاربر کارگزار با لیست کارگیر، شامل مدیر."
 
-#: standalone/drakTermServ:472
+#: standalone/drakTermServ:495
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
 "be restarted. Restart now?"
 msgstr ""
+"برای اینکه تغییرات ایجاد شده برای کارگیرهای لاغر بکار افتند، مدیر نمایش باید "
+"راه‌اندازی مجدد گردد. اکنون راه‌اندازی شود؟"
 
-#: standalone/drakTermServ:507
+#: standalone/drakTermServ:530
 #, c-format
-msgid "drakTermServ Overview"
-msgstr "پیش‌نمای drakTermServ"
+msgid "Terminal Server Overview"
+msgstr "پیش‌نمای کارگزار پایانه"
 
-#: standalone/drakTermServ:508
+#: standalone/drakTermServ:531
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -15896,7 +16126,7 @@ msgstr ""
 "        \t\tdhcpd.conf کشیده می‌شود, شما باید حداقل یک هسته‌ی کامل تصاویر "
 "etherboot را ایجاد کنید."
 
-#: standalone/drakTermServ:514
+#: standalone/drakTermServ:537
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -15930,7 +16160,7 @@ msgstr ""
 "        \t\tیک قطعه‌ی نمونه dhcpd.conf برای حمایت یک کارگیر بدون دیسک شبیه "
 "زیر است:"
 
-#: standalone/drakTermServ:532
+#: standalone/drakTermServ:555
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -16002,7 +16232,7 @@ msgstr ""
 "      توجه: شما باید کارگزار را بعد از افزودن یا تغییر کارگیرها متوقف/شروع "
 "نمایید."
 
-#: standalone/drakTermServ:552
+#: standalone/drakTermServ:575
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -16033,7 +16263,7 @@ msgstr ""
 "\t\t\t\n"
 "\t\t\tبا تایین SUBNET/MASK برای شبکه شما می‌باشد."
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:587
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -16050,7 +16280,7 @@ msgstr ""
 "        \t\tبوسیله افزودن یا برداشتن کاربران سیستم از این پرونده در این مورد "
 "کمک می‌کند."
 
-#: standalone/drakTermServ:568
+#: standalone/drakTermServ:591
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -16067,7 +16297,7 @@ msgstr ""
 "پیکربندی سخت‌افزاری محلی کارگیر، \n"
 "        \t\tdrakTermServ به ایجاد این پرونده‌ها کمک می‌کند."
 
-#: standalone/drakTermServ:573
+#: standalone/drakTermServ:596
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -16101,7 +16331,7 @@ msgstr ""
 "کارگیر پیکربندی شد،\n"
 "        پیکربندی محلی می‌تواند خاموش شود."
 
-#: standalone/drakTermServ:582
+#: standalone/drakTermServ:605
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -16154,7 +16384,7 @@ msgstr ""
 "        \t\t /var/lib/tftpboot تغییر می‌دهد, جایی که mkinitrd-net تصاویر خود "
 "را می‌گذارد."
 
-#: standalone/drakTermServ:603
+#: standalone/drakTermServ:626
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
@@ -16185,57 +16415,62 @@ msgstr ""
 "        \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 "دیسکچه آغازگری"
 
-#: standalone/drakTermServ:640
+#: standalone/drakTermServ:663
 #, c-format
 msgid "Boot ISO"
 msgstr "Boot ISO"
 
-#: standalone/drakTermServ:642
-#, fuzzy, c-format
+#: standalone/drakTermServ:665
+#, c-format
 msgid "PXE Image"
-msgstr "تصویر"
+msgstr "تصویر PXE"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:734
+#, c-format
+msgid "Default kernel version"
+msgstr "نسخه‌ی هسته‌ی پیش‌فرض"
+
+#: standalone/drakTermServ:761
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "ساختن کل هسته -->"
 
-#: standalone/drakTermServ:730
+#: standalone/drakTermServ:768
 #, c-format
 msgid "No kernel selected!"
 msgstr "هیچ هسته‌ای انتخاب نشده است!"
 
-#: standalone/drakTermServ:733
+#: standalone/drakTermServ:771
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "ساخت یک NIC -->"
 
-#: standalone/drakTermServ:737
+#: standalone/drakTermServ:775
 #, c-format
 msgid "No NIC selected!"
 msgstr "هیچ کارت شبکه، NIC، انتخاب نشده!"
 
-#: standalone/drakTermServ:740
+#: standalone/drakTermServ:778
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "ساخت تمام هسته‌ها -->"
 
-#: standalone/drakTermServ:747
+#: standalone/drakTermServ:786
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- حذف"
 
-#: standalone/drakTermServ:754
+#: standalone/drakTermServ:793
 #, c-format
 msgid "Delete All NBIs"
 msgstr "حذف همه NBIs"
 
-#: standalone/drakTermServ:841
+#: standalone/drakTermServ:880
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -16246,27 +16481,27 @@ msgstr ""
 "آن که در بانک اطلاعات کارگزار پایانه وجود دارد.\n"
 "حذف/افزودن مجدد کاربر به کارگزار پایانه برای قادر شدن به ثبت‌ورود."
 
-#: standalone/drakTermServ:846
+#: standalone/drakTermServ:885
 #, c-format
 msgid "Add User -->"
 msgstr "افزودن کاربر-->"
 
-#: standalone/drakTermServ:852
+#: standalone/drakTermServ:891
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- حذف کاربر"
 
-#: standalone/drakTermServ:888
+#: standalone/drakTermServ:927
 #, c-format
 msgid "type: %s"
 msgstr "نوع: %s"
 
-#: standalone/drakTermServ:892
+#: standalone/drakTermServ:931
 #, c-format
 msgid "local config: %s"
 msgstr "پیکربندی محلی: %s"
 
-#: standalone/drakTermServ:922
+#: standalone/drakTermServ:961
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -16275,67 +16510,67 @@ msgstr ""
 "اجازه دادن به پیکربندی\n"
 "محلی سخت‌افزار."
 
-#: standalone/drakTermServ:931
+#: standalone/drakTermServ:970
 #, c-format
 msgid "No net boot images created!"
 msgstr "هیچ تصویر آغازگری شبکه ایجاد نشده است!"
 
-#: standalone/drakTermServ:949
+#: standalone/drakTermServ:988
 #, c-format
 msgid "Thin Client"
 msgstr "کارگیر نازک"
 
-#: standalone/drakTermServ:953
+#: standalone/drakTermServ:992
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "اجازه دادن به کارگیرهای لاغر"
 
-#: standalone/drakTermServ:954
+#: standalone/drakTermServ:993
 #, c-format
 msgid "Add Client -->"
 msgstr "افزودن کارگیر -->"
 
-#: standalone/drakTermServ:968
+#: standalone/drakTermServ:1007
 #, c-format
 msgid "type: fat"
 msgstr "نوع: چاق"
 
-#: standalone/drakTermServ:969
+#: standalone/drakTermServ:1008
 #, c-format
 msgid "type: thin"
 msgstr "نوع: لاغر"
 
-#: standalone/drakTermServ:976
+#: standalone/drakTermServ:1015
 #, c-format
 msgid "local config: false"
 msgstr "تنظیم محلی: نادرست"
 
-#: standalone/drakTermServ:977
+#: standalone/drakTermServ:1016
 #, c-format
 msgid "local config: true"
 msgstr "تنظیم محلی: درست"
 
-#: standalone/drakTermServ:985
+#: standalone/drakTermServ:1024
 #, c-format
 msgid "<-- Edit Client"
 msgstr "ویرایش کارگیر -->"
 
-#: standalone/drakTermServ:1011
+#: standalone/drakTermServ:1050
 #, c-format
 msgid "Disable Local Config"
 msgstr "از کاراندازی پیکربندی محلی"
 
-#: standalone/drakTermServ:1018
+#: standalone/drakTermServ:1057
 #, c-format
 msgid "Delete Client"
 msgstr "حذف کارگیر"
 
-#: standalone/drakTermServ:1027
+#: standalone/drakTermServ:1066
 #, c-format
 msgid "dhcpd Config..."
 msgstr "پیکربندی dhcpd ..."
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1082
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -16344,57 +16579,69 @@ msgstr ""
 "نیاز به راه‌اندازی مجدد مدیر نمایش برای فعال شدن تمام تغییرات است.\n"
 "(راه‌اندازی مجدد سرویس dm - در کنسول) "
 
-#: standalone/drakTermServ:1084
+#: standalone/drakTermServ:1122
+#, c-format
+msgid "Thin clients won't work with autologin. Disable autologin?"
+msgstr ""
+"کارگیرهای نازک با ثبت‌ورود خودکار کار نمی‌کنند. ثبت‌ورود خودکار از کار انداخته "
+"شود؟"
+
+#: standalone/drakTermServ:1138
+#, c-format
+msgid "All clients will use %s"
+msgstr "همه‌ی کارگیرها از %s استفاده خواهند کرد"
+
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Subnet:"
 msgstr "زیرشبکه:"
 
-#: standalone/drakTermServ:1091
+#: standalone/drakTermServ:1175
 #, c-format
 msgid "Netmask:"
 msgstr "نقاب شبکه:"
 
-#: standalone/drakTermServ:1098
+#: standalone/drakTermServ:1182
 #, c-format
 msgid "Routers:"
 msgstr "مسیریاب‌ها:"
 
-#: standalone/drakTermServ:1105
+#: standalone/drakTermServ:1189
 #, c-format
 msgid "Subnet Mask:"
 msgstr "نقاب زیرشبکه:"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1196
 #, c-format
 msgid "Broadcast Address:"
 msgstr "نشانی پخش همگانی:"
 
-#: standalone/drakTermServ:1119
+#: standalone/drakTermServ:1203
 #, c-format
 msgid "Domain Name:"
 msgstr "نام دامنه:"
 
-#: standalone/drakTermServ:1127
+#: standalone/drakTermServ:1211
 #, c-format
 msgid "Name Servers:"
 msgstr "کارگزارهای نام:"
 
-#: standalone/drakTermServ:1138
+#: standalone/drakTermServ:1222
 #, c-format
 msgid "IP Range Start:"
 msgstr "شروع گستره‌ی آی‌پی:"
 
-#: standalone/drakTermServ:1139
+#: standalone/drakTermServ:1223
 #, c-format
 msgid "IP Range End:"
 msgstr "پایان گستره‌ی آی‌پی:"
 
-#: standalone/drakTermServ:1191
+#: standalone/drakTermServ:1275
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "پیکربندی کارگزار dhcpd"
 
-#: standalone/drakTermServ:1192
+#: standalone/drakTermServ:1276
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -16405,135 +16652,135 @@ msgstr ""
 "شما استخراج شده‌اند.\n"
 "شما می‌توانید در صورت نیاز آنها را پیرایش کنید."
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1279
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr "استخر نشانی آی‌پی پویا:"
 
-#: standalone/drakTermServ:1208
+#: standalone/drakTermServ:1292
 #, c-format
 msgid "Write Config"
 msgstr "نگارش پیکربندی"
 
-#: standalone/drakTermServ:1326
+#: standalone/drakTermServ:1411
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "لطفاً دیسکچه‌ای را داخل کنید:"
 
-#: standalone/drakTermServ:1330
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr "نتوانستم به دیسکچه دستیابی پیدا کنم!"
 
-#: standalone/drakTermServ:1332
+#: standalone/drakTermServ:1417
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "دیسکچه می‌تواند اکنون برداشته شود"
 
-#: standalone/drakTermServ:1335
+#: standalone/drakTermServ:1420
 #, c-format
 msgid "No floppy drive available!"
 msgstr "هیچ دستگاه دیسکچه‌ای در دسترس نیست!"
 
-#: standalone/drakTermServ:1340
-#, fuzzy, c-format
+#: standalone/drakTermServ:1425
+#, c-format
 msgid "PXE image is %s/%s"
-msgstr "تصویر ISO آغازگر شبکه %s می‌باشد"
+msgstr "تصویر PXE /%s%s است"
 
-#: standalone/drakTermServ:1342
-#, fuzzy, c-format
+#: standalone/drakTermServ:1427
+#, c-format
 msgid "Error writing %s/%s"
-msgstr "خطا هنگام نوشتن در پرونده %s"
+msgstr "خطا در نگارش %s/%s"
 
-#: standalone/drakTermServ:1351
+#: standalone/drakTermServ:1436
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "تصویر ISO آغازگر شبکه %s است"
 
-#: standalone/drakTermServ:1353
+#: standalone/drakTermServ:1438
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "اشکالی رخ داد! - آیا mkisofs نصب شده است؟"
 
-#: standalone/drakTermServ:1372
+#: standalone/drakTermServ:1458
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "احتیاج به ایجاد پرونده‌ی /etc/dhcpd.conf در ابتدا!"
 
-#: standalone/drakTermServ:1533
+#: standalone/drakTermServ:1619
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
-msgstr ""
+msgstr "%s گذرواژه‌ی بد در کارگزار پایانه - بازنگارش...\n"
 
-#: standalone/drakTermServ:1551
-#, fuzzy, c-format
+#: standalone/drakTermServ:1637
+#, c-format
 msgid "%s is not a user..\n"
-msgstr "%s یافت نشد...\n"
+msgstr "%s یک کاربر نیست...\n"
 
-#: standalone/drakTermServ:1552
-#, fuzzy, c-format
+#: standalone/drakTermServ:1638
+#, c-format
 msgid "%s is already a Terminal Server user\n"
-msgstr "قبلا %s استفاده می‌شود\n"
+msgstr "%s از قبل کاربر کارگزار پایانه است\n"
 
-#: standalone/drakTermServ:1554
+#: standalone/drakTermServ:1640
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
-msgstr ""
+msgstr "افزودن %s به کارگزار پایانه شکست خورد!\n"
 
-#: standalone/drakTermServ:1556
-#, fuzzy, c-format
+#: standalone/drakTermServ:1642
+#, c-format
 msgid "%s added to Terminal Server\n"
-msgstr "بیفایده بدون کارگزار پایانه"
+msgstr "%s به کارگزار پایانه اضافه شد\n"
 
-#: standalone/drakTermServ:1608
-#, fuzzy, c-format
+#: standalone/drakTermServ:1694
+#, c-format
 msgid "Deleted %s...\n"
-msgstr "شناسایی شده %s"
+msgstr "%s حذف گردید...\n"
 
-#: standalone/drakTermServ:1610 standalone/drakTermServ:1687
+#: standalone/drakTermServ:1696 standalone/drakTermServ:1773
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s یافت نشد...\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 از قبل استفاده می‌شود\n"
 
-#: standalone/drakTermServ:1658
+#: standalone/drakTermServ:1744
 #, c-format
 msgid "Can't open %s!"
 msgstr "نمی‌توان %s را باز کرد!"
 
-#: standalone/drakTermServ:1715
+#: standalone/drakTermServ:1801
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr ""
 "پرونده‌های /etc/hosts.allow و /etc/hosts.deny از قبل پیکربندی شده‌اند - بدون "
 "تغییر"
 
-#: standalone/drakTermServ:1872
+#: standalone/drakTermServ:1958
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "پیکربندی تغییر کرده است - آیا clusternfs/dhcpd دوباره راه‌اندازی شود؟ "
 
-#: standalone/drakautoinst:37
+#: standalone/drakautoinst:38
 #, c-format
 msgid "Error!"
 msgstr "خطا!"
 
-#: standalone/drakautoinst:38
+#: standalone/drakautoinst:39
 #, c-format
 msgid "I can't find needed image file `%s'."
 msgstr "نمی‌توانم تصویر مورد نیاز `%s' را پیدا کنم."
 
-#: standalone/drakautoinst:40
+#: standalone/drakautoinst:41
 #, c-format
 msgid "Auto Install Configurator"
 msgstr "پیکربند نصب خودکار"
 
-#: standalone/drakautoinst:41
+#: standalone/drakautoinst:42
 #, c-format
 msgid ""
 "You are about to configure an Auto Install floppy. This feature is somewhat "
@@ -16560,22 +16807,22 @@ msgstr ""
 "\n"
 "تأیید را برای ادامه فشار دهید؟"
 
-#: standalone/drakautoinst:59
+#: standalone/drakautoinst:60
 #, c-format
 msgid "replay"
 msgstr "بازنوازی"
 
-#: standalone/drakautoinst:59 standalone/drakautoinst:68
+#: standalone/drakautoinst:60 standalone/drakautoinst:69
 #, c-format
 msgid "manual"
 msgstr "دستورالعمل"
 
-#: standalone/drakautoinst:63
+#: standalone/drakautoinst:64
 #, c-format
 msgid "Automatic Steps Configuration"
 msgstr "پیکربندی گام‌های خودکار"
 
-#: standalone/drakautoinst:64
+#: standalone/drakautoinst:65
 #, c-format
 msgid ""
 "Please choose for each step whether it will replay like your install, or it "
@@ -16584,12 +16831,23 @@ msgstr ""
 "لطفاً برای هر گام انتخاب کنید که آیا آن مانند نصب شما بازخوانی می‌شود، یا آن "
 "دستی خواهد بود"
 
-#: standalone/drakautoinst:76 standalone/drakautoinst:77
+#: standalone/drakautoinst:77 standalone/drakautoinst:78
+#: standalone/drakautoinst:92
 #, c-format
 msgid "Creating auto install floppy"
 msgstr "ایجاد دیسکچه نصب خودکار"
 
-#: standalone/drakautoinst:141
+#: standalone/drakautoinst:90
+#, c-format
+msgid "Insert another blank floppy in drive %s (for drivers disk)"
+msgstr "دیسکچه‌ی خالی دیگری را در گرداننده‌ی %s داخل کنید (برای دیسک راه‌اندازها)"
+
+#: standalone/drakautoinst:91
+#, c-format
+msgid "Creating auto install floppy (drivers disk)"
+msgstr "ایجاد دیسکچه نصب خودکار (دیسک راه‌اندازها)"
+
+#: standalone/drakautoinst:158
 #, c-format
 msgid ""
 "\n"
@@ -16602,13 +16860,13 @@ msgstr ""
 "\n"
 "پارامترهای نصب-خودکار در قسمت‌های در سمت چپ در دسترس هستند"
 
-#: 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 "تبریک می‌گوئیم!"
 
-#: standalone/drakautoinst:236
+#: standalone/drakautoinst:253
 #, c-format
 msgid ""
 "The floppy has been successfully generated.\n"
@@ -16617,37 +16875,37 @@ msgstr ""
 "دیسکچه با موفقیت تولید شد.\n"
 "اکنون میتوانید نصب را دوباره بازنوازی کنید."
 
-#: standalone/drakautoinst:272
+#: standalone/drakautoinst:289
 #, c-format
 msgid "Auto Install"
 msgstr "نصب خودکار"
 
-#: standalone/drakautoinst:341
+#: standalone/drakautoinst:358
 #, c-format
 msgid "Add an item"
 msgstr "افزودن یک آیتم"
 
-#: standalone/drakautoinst:348
+#: standalone/drakautoinst:365
 #, c-format
 msgid "Remove the last item"
 msgstr "برداشتن آخرین آیتم"
 
-#: standalone/drakbackup:87
+#: standalone/drakbackup:88
 #, c-format
 msgid "hd"
 msgstr "hd"
 
-#: standalone/drakbackup:87
+#: standalone/drakbackup:88
 #, c-format
 msgid "tape"
 msgstr "نوار"
 
-#: standalone/drakbackup:158
+#: standalone/drakbackup:112
 #, c-format
 msgid "No devices found"
 msgstr "هیچ دستگاهی یافت نشد"
 
-#: standalone/drakbackup:196
+#: standalone/drakbackup:154
 #, c-format
 msgid ""
 "Expect is an extension to the Tcl scripting language that allows interactive "
@@ -16656,12 +16914,12 @@ msgstr ""
 "Expect الحاقی به زبان دست‌نویسی Tcl بوده که نشست‌های گفتگوئی بدون دخالتکاربر "
 "را تحقق می‌بخشد."
 
-#: standalone/drakbackup:197
+#: standalone/drakbackup:155
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr "انبار کردن گذرواژه برای این سیستم در پیکربندی drakbackup."
 
-#: standalone/drakbackup:198
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
@@ -16670,16 +16928,7 @@ msgstr ""
 "برای یک سی‌دی چندنشستی، فقط اولین نشست cdrw پاک خواهد شد. در غیر این صورت "
 "cdrw قبل از هر ذخیره‌ی پشتیبان پاک می‌شود "
 
-#: 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 ""
-"این از همان ترکیب خط فرمان برنامه‌ی 'cdrecord' استفاده می‌کند. 'cdrecord -"
-"scanbus' شماره‌ی دستگاه را نیز به شما نشان می‌دهد."
-
-#: standalone/drakbackup:200
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
@@ -16688,7 +16937,7 @@ msgstr ""
 "این گزینه پرونده‌هایی را که تغییر کرده‌اند ذخیره خواهد کرد. رفتار دقیق بستگی "
 "به این دارد که آیا حالت افزایشی یا تفاوتی استفاده می‌شود."
 
-#: standalone/drakbackup:201
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
@@ -16697,7 +16946,7 @@ msgstr ""
 "ذخیره‌های پشتیبان افزایشی فقط پرونده‌هایی که تغییر کرده‌اند یا از آخرین بار "
 "ذخیره‌ی پشتیبان جدید هستند را ذخیره می‌کند."
 
-#: standalone/drakbackup:202
+#: standalone/drakbackup:159
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
@@ -16706,17 +16955,17 @@ msgstr ""
 "ذخیره‌های پشتیبان تفاوتی پرونده‌هایی که تغییر کرده‌اند یا جدیدتر از ذخیره "
 "پشتیبان پایه اصلی هستند را ذخیره می‌کند."
 
-#: standalone/drakbackup:203
-#, fuzzy, c-format
+#: standalone/drakbackup:160
+#, c-format
 msgid ""
 "This should be a local user or email addresse that you want the backup "
 "results sent to. You will need to define a functioning mail server."
 msgstr ""
-"این باید یک لیست جداشونده با ویرگول کاربرهای محلی یا نشانی‌های پست الکترونیکی "
-"که شما می‌خواهید نتایج ذخیره‌های پشتیبان به آنها فرستاده شود باشد. شما به یک "
-"تنظیم انتقال پست کارآرا بر روی سیستم خود احتیاج خواهید داشت."
+"این باید کاربری محلی یا نشانی‌ پست الکترونیکی باشد که می‌خواهید نتایج "
+"ذخیره‌هایپشتیبان به آن فرستاده شود. شما باید کارگزار پست کارآرائی را مشخص "
+"کنید."
 
-#: standalone/drakbackup:204
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -16725,7 +16974,7 @@ msgstr ""
 "پرونده‌ها یا کارت‌های برنده‌ی فهرست شده در یک پرونده‌ی backupignore. در نوک یک "
 "درخت شاخه ذخیره‌ی پشتیبان نخواهند شد."
 
-#: standalone/drakbackup:205
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -16736,7 +16985,7 @@ msgstr ""
 "سپس به رسانه‌های دیگر منتقل می‌شوند. بکار انداختن این گزینه پرونده‌های بسته‌بندی "
 "شده بر دیسک را بعد از ذخیره پشتیبان برخواهد داشت."
 
-#: standalone/drakbackup:206
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -16746,7 +16995,7 @@ msgstr ""
 "بعضی پایان‌نامه‌ها مانند rsync ممکن است در قسمت کارگزار تنظیم شوند.بجای "
 "استفاده از مسیر شاخه، شما از نام 'module' برای مسیر سرویس استفاده خواهید کرد."
 
-#: standalone/drakbackup:207
+#: standalone/drakbackup:164
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
@@ -16755,39 +17004,51 @@ msgstr ""
 "اختصاصی به شما اجازه‌ی مشخص کردن روز و زمان خودتان را می‌دهد. گزینه‌های دیگر از "
 "قسمت‌های اجرایی در /etc/crontab استفاده می‌کنند."
 
-#: standalone/drakbackup:604
+#: standalone/drakbackup:396
+#, c-format
+msgid "No media selected for cron operation."
+msgstr "هیچ رسانه‌ای برای عملیات cron انتخاب نشده است."
+
+#: standalone/drakbackup:400
+#, c-format
+msgid "No interval selected for cron operation."
+msgstr "هیچ گستره‌ای برای عملیات cron انتخاب نشده است."
+
+#: standalone/drakbackup:447
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr "Cron هنوز برای non-root در دسترس نیست"
 
-#: 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\" نه پست معتبری است و نه کاربر محلی موجود"
 
-#: 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 "
 "a complete email address!"
 msgstr ""
+"\"%s\" کاربر محلی است، ولی شما یک smtp محلی را انتخاب نکردید، بنابرین باید "
+"از نشانی کامل پست ایکترونیکی استفاده کنید!"
 
-#: standalone/drakbackup:728
+#: standalone/drakbackup:545
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr "لیست کاربر معتبر تغییر کرده است، پرونده‌ی پیکربندی بازنگارش می‌شود."
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:547
 #, c-format
 msgid "Old user list:\n"
 msgstr "لیست کاربر قدیمی:\n"
 
-#: standalone/drakbackup:732
+#: standalone/drakbackup:549
 #, c-format
 msgid "New user list:\n"
 msgstr "لیست کاربر جدید:\n"
 
-#: standalone/drakbackup:779
+#: standalone/drakbackup:594
 #, c-format
 msgid ""
 "\n"
@@ -16796,7 +17057,7 @@ msgstr ""
 "\n"
 "                      گزارش پشتیبان‌درایک \n"
 
-#: standalone/drakbackup:780
+#: standalone/drakbackup:595
 #, c-format
 msgid ""
 "\n"
@@ -16805,7 +17066,7 @@ msgstr ""
 "\n"
 "                    گزارش شبح پشتیبان‌درایک\n"
 
-#: standalone/drakbackup:786
+#: standalone/drakbackup:601
 #, c-format
 msgid ""
 "\n"
@@ -16818,14 +17079,14 @@ 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 "کل پیشروی"
 
-#: standalone/drakbackup:865
-#, fuzzy, c-format
+#: standalone/drakbackup:678
+#, c-format
 msgid ""
 "%s exists, delete?\n"
 "\n"
@@ -16834,45 +17095,45 @@ msgid ""
 msgstr ""
 "%s وجود دارد, حذف شود?\n"
 "\n"
-"هشدار: اگر شما قبلا این پروسه را انجام داده‌اید شما احتمالا\n"
-" احتیاج به پاک کردن ورودی از کلیدهای معتبر روی کارگزار دارید ."
+"اگر شما از قبل این پروسه را انجام داده‌اید احتمالا احتیاج\n"
+"به پاک کردن ورودی از کلیدهای معتبر بر کارگزار دارید."
 
-#: standalone/drakbackup:874
+#: standalone/drakbackup:687
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "تولید کلید‌ها ممکن است چند لحظه‌ای طول بکشد."
 
-#: standalone/drakbackup:881
-#, fuzzy, c-format
+#: standalone/drakbackup:694
+#, c-format
 msgid "Cannot spawn %s."
-msgstr "خطا: نمی‌توان %s را ریزش کرد."
+msgstr "نمی‌توان %s را ریزش کرد."
 
-#: standalone/drakbackup:898
+#: standalone/drakbackup:711
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "هیچ اعلان گذرواژه بر %s در درگاه %s"
 
-#: standalone/drakbackup:899
+#: standalone/drakbackup:712
 #, c-format
 msgid "Bad password on %s"
 msgstr "گذرواژه‌ی بد بر %s"
 
-#: standalone/drakbackup:900
+#: standalone/drakbackup:713
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "اجازه‌ی انتقال %s به %s داده نشد"
 
-#: standalone/drakbackup:901
+#: standalone/drakbackup:714
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "نمی‌توانم %s را بر %s پیدا کنم"
 
-#: standalone/drakbackup:904
+#: standalone/drakbackup:718
 #, c-format
 msgid "%s not responding"
 msgstr "%s جواب نمی‌دهد"
 
-#: standalone/drakbackup:908
+#: standalone/drakbackup:722
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -16889,47 +17150,47 @@ msgstr ""
 "\n"
 "بدون سؤال برای گذرواژه امتحان کنید."
 
-#: standalone/drakbackup:953
+#: standalone/drakbackup:766
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "وب‌گاه از راه دور WebDAV از قبل هم‌گاه است!"
 
-#: standalone/drakbackup:957
+#: standalone/drakbackup:770
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr "انتقال WebDAV شکست خورد!"
 
-#: standalone/drakbackup:978
+#: standalone/drakbackup:791
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "هیج رسانه‌ی CDR/DVDR در دستگاه!"
 
-#: standalone/drakbackup:982
+#: standalone/drakbackup:795
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "بنظر نمی‌رسد که رسانه قابل ضبط کردن باشد!"
 
-#: standalone/drakbackup:986
+#: standalone/drakbackup:799
 #, c-format
 msgid "Not erasable media!"
 msgstr "رسانه پاک‌شونده نیست!"
 
-#: standalone/drakbackup:1027
+#: standalone/drakbackup:840
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr "پاک کردن رسانه ممکن است چند لحظه‌ای طول بکشد."
 
-#: standalone/drakbackup:1103
+#: standalone/drakbackup:898
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "اشکال اجازه‌ی دستیابی به سی‌دی."
 
-#: standalone/drakbackup:1130
+#: standalone/drakbackup:925
 #, c-format
 msgid "No tape in %s!"
 msgstr "هیچ نواری در %s!"
 
-#: standalone/drakbackup:1232
+#: standalone/drakbackup:1025
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
@@ -16938,37 +17199,37 @@ msgstr ""
 "بیش از سهمیه ذخیره‌ی پشتیبان!\n"
 "%d مگابایت استفاده شده در حالی که %d مگابایت در نظر گرفته شده است."
 
-#: standalone/drakbackup:1251 standalone/drakbackup:1305
+#: standalone/drakbackup:1044 standalone/drakbackup:1077
 #, c-format
 msgid "Backup system files..."
 msgstr "ذخیره‌ی پشتیبان پرونده‌های سیستم..."
 
-#: standalone/drakbackup:1306 standalone/drakbackup:1368
+#: standalone/drakbackup:1078 standalone/drakbackup:1119
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "پرونده‌های ذخیره پشتیبان دیسک‌سخت..."
 
-#: standalone/drakbackup:1367
+#: standalone/drakbackup:1118
 #, c-format
 msgid "Backup User files..."
 msgstr "ذخیره‌ی پشتیبان پرونده‌های کاربر..."
 
-#: standalone/drakbackup:1421
+#: standalone/drakbackup:1153
 #, c-format
 msgid "Backup Other files..."
 msgstr "ذخیره‌ی پشتیبان پرونده‌های دیگر..."
 
-#: standalone/drakbackup:1422
+#: standalone/drakbackup:1154
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "پیشروی ذخیره‌ی پشتیبان دیسک‌سخت..."
 
-#: standalone/drakbackup:1427
+#: standalone/drakbackup:1159
 #, c-format
 msgid "No changes to backup!"
 msgstr "هیچ تغییری برای ذخیره‌ی پشتیبان!"
 
-#: standalone/drakbackup:1445 standalone/drakbackup:1469
+#: standalone/drakbackup:1177 standalone/drakbackup:1201
 #, c-format
 msgid ""
 "\n"
@@ -16979,7 +17240,7 @@ msgstr ""
 "فعالیت‌های Drakbackup از طریق %s:\n"
 "\n"
 
-#: standalone/drakbackup:1454
+#: standalone/drakbackup:1186
 #, c-format
 msgid ""
 "\n"
@@ -16990,22 +17251,19 @@ msgstr ""
 " اشکال اتصالی FTP: فرستادن پرونده‌های ذخیره‌ی پشتیبان شما از طریق FTP ممکن "
 "نشد.\n"
 
-#: standalone/drakbackup:1455
-#, fuzzy, c-format
+#: standalone/drakbackup:1187
+#, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
 msgstr ""
-"خطا هنگام فرستادن پرونده از طریق FTP.\n"
-"لطفا تنظیم FTP خود را تصحیح نمایید."
+"خطا هنگام فرستادن پرونده از طریق FTP. لطفاً پیکربندی FTP خود را درست کنید."
 
-#: standalone/drakbackup:1457
-#, fuzzy, c-format
+#: standalone/drakbackup:1189
+#, c-format
 msgid "file list sent by FTP: %s\n"
-msgstr ""
-"لیست پرونده فرستاده شده توسط FTP: %s\n"
-" "
+msgstr "َلیست پرونده‌ی فرستاده شده توسط FTP: %s\n"
 
-#: standalone/drakbackup:1474
+#: standalone/drakbackup:1206
 #, c-format
 msgid ""
 "\n"
@@ -17016,7 +17274,7 @@ msgstr ""
 "فعالیت‌های Drakbackup از طریق CD:\n"
 "\n"
 
-#: standalone/drakbackup:1479
+#: standalone/drakbackup:1211
 #, c-format
 msgid ""
 "\n"
@@ -17027,41 +17285,27 @@ msgstr ""
 "فعالیت‌های Drakbackup از طریق نوار:\n"
 "\n"
 
-#: standalone/drakbackup:1488
-#, fuzzy, c-format
+#: standalone/drakbackup:1220
+#, c-format
 msgid "Error sending mail. Your report mail was not sent."
-msgstr ""
-"خطا هنگام فرستادن پست.\n"
-"  گزارش پست شما فرستاده نشد.\n"
-"  لطفا sendmail را تنظیم نمایید"
+msgstr "خطا هنگام فرستادن پست. پست گزارش‌تان فرستاده نشد."
 
-#: standalone/drakbackup:1489
+#: standalone/drakbackup:1221
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr "خطا هنگام فرستادن پست.\n"
 
-#: standalone/drakbackup:1518
+#: standalone/drakbackup:1249
 #, c-format
 msgid "Can't create catalog!"
 msgstr "نمی‌توان شاخه را ایجاد نمود!"
 
-#: standalone/drakbackup:1639
-#, c-format
-msgid "Can't create log file!"
-msgstr "نمی‌توان پرونده‌ی ثبت را ایجاد نمود!"
-
-#: standalone/drakbackup:1656 standalone/drakbackup:1667
-#: standalone/drakfont:584
-#, c-format
-msgid "File Selection"
-msgstr "انتخاب پرونده"
-
-#: standalone/drakbackup:1695
+#: standalone/drakbackup:1455
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "پرونده‌ها و شاخه‌ها را انتخاب کرده و بر 'تأیید' کلیک کنید"
 
-#: standalone/drakbackup:1723
+#: standalone/drakbackup:1484
 #, c-format
 msgid ""
 "\n"
@@ -17070,7 +17314,7 @@ msgstr ""
 "\n"
 "لطفاً تمام گزینه‌هایی را که نیاز دارید بررسی کنید.\n"
 
-#: standalone/drakbackup:1724
+#: standalone/drakbackup:1485
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
@@ -17078,36 +17322,36 @@ msgstr ""
 "این گزینه‌ها می‌توانند تمام پرونده‌های در شاخه‌ی /etc شما را ذخیره‌ی پشتیبان و "
 "بازسازی کنند.\n"
 
-#: standalone/drakbackup:1725
+#: standalone/drakbackup:1486
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "ذخیره‌ی پشتیبانی پرونده های سیستم‌تان. (شاخه‌ی /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 ""
 "استفاده از ذخیره‌ی پشتیبانی افزایشی/تفاوتی (ذخیرهای قدیمی جایگزین نشوند)"
 
-#: 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 "استفاده از ذخیره‌های پشتیبان افزایشی"
 
-#: 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 "استفاده از ذخیره‌ی پشتیبان تفاوتی"
 
-#: standalone/drakbackup:1730
+#: standalone/drakbackup:1491
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "پرونده‌های حساس ضمیمه نشوند ( مثل passwd, group, fstab)"
 
-#: standalone/drakbackup:1731
+#: standalone/drakbackup:1492
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -17116,187 +17360,173 @@ msgstr ""
 "با این گزینه شما قادر به بازسازی هر نسخه\n"
 "از شاخه /etc خود خواهید شد."
 
-#: standalone/drakbackup:1762
+#: standalone/drakbackup:1523
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr ""
 "لطفاً همه‌ی کاربرانی را که می‌خواهید ضمیمه‌ی ذخیره‌ی پشتیبان خود کرده انتخاب کنید."
 
-#: standalone/drakbackup:1789
+#: standalone/drakbackup:1550
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "حافظه‌ی پنهان مرورگر ضمیمه نشود"
 
-#: standalone/drakbackup:1844 standalone/drakfont:650
+#: standalone/drakbackup:1605 standalone/drakfont:656
 #, c-format
 msgid "Remove Selected"
 msgstr "برداشتن انتخاب شده است"
 
-#: standalone/drakbackup:1891 standalone/drakbackup:1895
-#, c-format
-msgid "Under Devel ... please wait."
-msgstr "تحت تهیه ... لطفاً صبر کنید."
-
-#: standalone/drakbackup:1909
-#, c-format
-msgid "Windows (FAT32)"
-msgstr "ویندوز (فات ۳۲)"
-
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1668
 #, c-format
 msgid "Users"
 msgstr "کاربران"
 
-#: standalone/drakbackup:1961
+#: standalone/drakbackup:1688
 #, c-format
 msgid "Use network connection to backup"
 msgstr "استفاده از ارتباط شبکه برای ذخیره‌ی پشتیبان"
 
-#: standalone/drakbackup:1963
+#: standalone/drakbackup:1690
 #, c-format
 msgid "Net Method:"
 msgstr "روش شبکه:"
 
-#: standalone/drakbackup:1967
+#: standalone/drakbackup:1694
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "استفاده از Expect برای SSH"
 
-#: standalone/drakbackup:1968
+#: standalone/drakbackup:1695
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "ایجاد/انتقال کلیدهای ذخیره پشتیبان برای SSH"
 
-#: standalone/drakbackup:1970
+#: standalone/drakbackup:1697
 #, c-format
 msgid "Transfer Now"
 msgstr "انتقال اکنون"
 
-#: standalone/drakbackup:1972
+#: standalone/drakbackup:1699
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "کلیدهای (نه پشتیبان‌درایک) دیگری از قبل وجود دارند"
 
-#: standalone/drakbackup:1975
+#: standalone/drakbackup:1702
 #, c-format
 msgid "Host name or IP."
 msgstr "نام میزبان یا آی‌پی"
 
-#: standalone/drakbackup:1980
+#: standalone/drakbackup:1707
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr "شاخه‌ی (یا بخش) برای گذاشتن ذخیره‌ی پشتیبانی بر این میزبان."
 
-#: standalone/drakbackup:1985
+#: standalone/drakbackup:1712
 #, c-format
 msgid "Login name"
 msgstr "نام ثبت‌ورود"
 
-#: standalone/drakbackup:1992
+#: standalone/drakbackup:1719
 #, c-format
 msgid "Remember this password"
 msgstr "بخاطر سپردن این گذرواژه"
 
-#: standalone/drakbackup:2004
+#: standalone/drakbackup:1735
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "نام میزبان، نام کاربر و گذرواژه لازم است!"
 
-#: standalone/drakbackup:2106
+#: standalone/drakbackup:1833
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "استفاده از CD/DVDROM برای ذخیره‌ی پشتیبانی"
 
-#: standalone/drakbackup:2109
+#: standalone/drakbackup:1836
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "انتخاب اندازه‌ی رسانه‌های CD/DVD (در مگابایت)"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:1841
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "انتخاب اندازه‌ی رسانه‌های CD/DVD"
 
-#: standalone/drakbackup:2121
+#: standalone/drakbackup:1848
 #, c-format
 msgid "Multisession CD"
 msgstr "سی‌دی چند نشستی"
 
-#: standalone/drakbackup:2123
+#: standalone/drakbackup:1850
 #, c-format
 msgid "CDRW media"
 msgstr "رسانه‌ی CDRW"
 
-#: standalone/drakbackup:2128
+#: standalone/drakbackup:1856
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "پاک کردن رسانه‌های RW (اولین نشست)"
 
-#: standalone/drakbackup:2129
+#: standalone/drakbackup:1857
 #, c-format
 msgid " Erase Now "
 msgstr "اکنون پاک شوند"
 
-#: standalone/drakbackup:2136
+#: standalone/drakbackup:1863
 #, c-format
 msgid "DVD+RW media"
 msgstr "رسانه‌ی DVD+RW"
 
-#: standalone/drakbackup:2138
+#: standalone/drakbackup:1865
 #, c-format
 msgid "DVD-R media"
 msgstr "رسانه‌ی DVD-R"
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:1867
 #, c-format
 msgid "DVDRAM device"
 msgstr "دستگاه DVDRAM"
 
-#: standalone/drakbackup:2145
-#, c-format
-msgid ""
-"Enter your CD Writer device name\n"
-" ex: 0,1,0"
-msgstr ""
-"نام دستگاه سی‌دی‌نگارخود را وارد کنید\n"
-"مثال: ۰، ۱، ۰"
-
-#: standalone/drakbackup:2177
+#: standalone/drakbackup:1898
 #, c-format
 msgid "No CD device defined!"
 msgstr "هیچ دستگاه CD معین نشده!"
 
-#: standalone/drakbackup:2227
+#: standalone/drakbackup:1945
 #, c-format
 msgid "Use tape to backup"
 msgstr "استفاده از نوار برای ذخیره‌ی پشتیبان"
 
-#: standalone/drakbackup:2230
+#: standalone/drakbackup:1948
 #, c-format
 msgid "Device name to use for backup"
 msgstr "نام دستگاه مورد استفاده برای ذخیره‌ی پشتیبان"
 
-#: standalone/drakbackup:2237
+#: standalone/drakbackup:1954
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr " بدون بازگرد به اول نوار بعد از ذخیره‌ی پشتیبان"
 
-#: standalone/drakbackup:2243
+#: standalone/drakbackup:1960
 #, c-format
 msgid "Erase tape before backup"
 msgstr "پاک کردن نوار قبل از ذخیره‌ی پشتیبان"
 
-#: standalone/drakbackup:2249
+#: standalone/drakbackup:1966
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "بیرون دادن نوار بعد از ذخیره‌ی پشتیبان"
 
-#: standalone/drakbackup:2317
+#: standalone/drakbackup:2033
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "شاخه‌ای را برای ذخیره به آن وارد کنید:"
 
-#: standalone/drakbackup:2326
+#: standalone/drakbackup:2037
+#, c-format
+msgid "Directory to save to"
+msgstr "شاخه‌ای را برای ذخیره به آن"
+
+#: standalone/drakbackup:2042
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -17305,312 +17535,308 @@ msgstr ""
 "حداکثر اندازه‌ی مجاز\n"
 "برای Drakbackup (مگابایت)"
 
-#: 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 "HardDrive / NFS"
 
-#: standalone/drakbackup:2420 standalone/drakbackup:2425
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2127 standalone/drakbackup:2132
+#: standalone/drakbackup:2137
 #, c-format
 msgid "hourly"
 msgstr "ساعتی"
 
-#: standalone/drakbackup:2421 standalone/drakbackup:2426
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2128 standalone/drakbackup:2133
+#: standalone/drakbackup:2137
 #, c-format
 msgid "daily"
 msgstr "روزانه"
 
-#: standalone/drakbackup:2422 standalone/drakbackup:2427
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2129 standalone/drakbackup:2134
+#: standalone/drakbackup:2137
 #, c-format
 msgid "weekly"
 msgstr "هفته‌ای"
 
-#: standalone/drakbackup:2423 standalone/drakbackup:2428
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2130 standalone/drakbackup:2135
+#: standalone/drakbackup:2137
 #, c-format
 msgid "monthly"
 msgstr "ماهانه"
 
-#: standalone/drakbackup:2424 standalone/drakbackup:2429
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2131 standalone/drakbackup:2136
+#: standalone/drakbackup:2137
 #, c-format
 msgid "custom"
 msgstr "اختصاصی"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "January"
 msgstr "ژانویه"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "February"
 msgstr "فوریه"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "March"
 msgstr "مارس"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "April"
 msgstr "آوریل"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "May"
 msgstr "مه"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "June"
 msgstr "ژوئن"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "July"
 msgstr "ژوئیه"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "August"
 msgstr "اوت"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "September"
 msgstr "سپتامبر"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "October"
 msgstr "اكتبر"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "November"
 msgstr "نوامبر"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "December"
 msgstr "دسامبر"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Sunday"
 msgstr "یک‌شنبه"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Monday"
 msgstr "دوشنبه"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Tuesday"
 msgstr "سه‌شنبه"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Wednesday"
 msgstr "چهارشنبه"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Thursday"
 msgstr "پنج‌شنبه"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Friday"
 msgstr "جمعه"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Saturday"
 msgstr "شنبه"
 
-#: standalone/drakbackup:2478
+#: standalone/drakbackup:2185
 #, c-format
 msgid "Use daemon"
 msgstr "استفاده از شبح"
 
-#: standalone/drakbackup:2483
+#: standalone/drakbackup:2190
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "لطفاً زمان بین دفعات هر ذخیره‌ی پشتیبان را انتخاب کنید"
 
-#: standalone/drakbackup:2489
+#: standalone/drakbackup:2196
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "ورودی اختصاصی setup/crontab:"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2201
 #, c-format
 msgid "Minute"
 msgstr "دقیقه"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Hour"
 msgstr "ساعت"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2209
 #, c-format
 msgid "Day"
 msgstr "روز"
 
-#: standalone/drakbackup:2506
+#: standalone/drakbackup:2213
 #, c-format
 msgid "Month"
 msgstr "ماه"
 
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2217
 #, c-format
 msgid "Weekday"
 msgstr "روزهفته"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2223
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "لطفا رسانه‌ها را برای ذخیره پشتیبان انتخاب کنید."
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2230
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr "لطفاً مطمئن شوید که شبح cron در سرویس‌های شما وجود دارد."
 
-#: standalone/drakbackup:2524
+#: standalone/drakbackup:2231
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr "توجه کنید که اکنون همه‌ی رسانه‌های شبکه از دیسک‌سخت نیز استفاده می‌کنند."
 
-#: standalone/drakbackup:2571
+#: standalone/drakbackup:2281
 #, c-format
-msgid "Use tar and bzip2 (rather than tar and gzip)"
-msgstr "استفاده از tar و bzip2 (بجای tar و gzip)"
+msgid "Please choose the compression type"
+msgstr "لطفا نوع فشرده‌سازی را انتخاب کنید:"
 
-#: standalone/drakbackup:2572
+#: standalone/drakbackup:2285
 #, c-format
 msgid "Use .backupignore files"
 msgstr "استفاده از پرونده‌های .backupignore"
 
-#: standalone/drakbackup:2574
+#: standalone/drakbackup:2287
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "فرستادن گزارش پستی بعد از هر ذخیره پشتیبانی به: "
 
-#: standalone/drakbackup:2580
-#, fuzzy, c-format
+#: standalone/drakbackup:2293
+#, c-format
 msgid "SMTP server for mail:"
-msgstr "میزبان کارگزار SMB"
+msgstr "کارگزار SMTP برای پست:"
 
-#: standalone/drakbackup:2585
+#: standalone/drakbackup:2298
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr "حذف پرونده‌های tar شده‌ی دیسک‌سخت بعد از ذخیره‌ی پشتیبانی به رسانه دیگری."
 
-#: standalone/drakbackup:2624
+#: standalone/drakbackup:2338
 #, c-format
 msgid "What"
 msgstr "چه"
 
-#: standalone/drakbackup:2629
+#: standalone/drakbackup:2343
 #, c-format
 msgid "Where"
 msgstr "کجا"
 
-#: standalone/drakbackup:2634
+#: standalone/drakbackup:2348
 #, c-format
 msgid "When"
 msgstr "چه وقتی"
 
-#: standalone/drakbackup:2639
+#: standalone/drakbackup:2353
 #, c-format
 msgid "More Options"
 msgstr "گزینه‌های بیشتری"
 
-#: standalone/drakbackup:2651
-#, fuzzy, c-format
+#: standalone/drakbackup:2366
+#, c-format
 msgid "Backup destination not configured..."
-msgstr "کارآرایی شبکه پیکربندی نشده است"
+msgstr "مقصد ذخیره‌ی پشتیبانی پیکربندی نشده است..."
 
-#: standalone/drakbackup:2667 standalone/drakbackup:4731
+#: standalone/drakbackup:2385 standalone/drakbackup:4413
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "پیکربندی Drakbackup "
 
-#: standalone/drakbackup:2684
+#: standalone/drakbackup:2402
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "لطفاً مکان ذخیره‌ی پشتیبان را انتخاب کنید"
 
-#: standalone/drakbackup:2686
-#, fuzzy, c-format
+#: standalone/drakbackup:2404
+#, c-format
 msgid "Hard Drive used to prepare backups for all media"
-msgstr "حذف پرونده‌های tar شده‌ی دیسک بعد از ذخیره پشتیبانی به رسانه دیگری."
+msgstr ""
+"دیسک سخت برای آماده کردن ذخیره‌های پشتیبانی برای همه‌ی رسانه‌ها استفاده گردید"
 
-#: standalone/drakbackup:2694
+#: standalone/drakbackup:2412
 #, c-format
 msgid "Across Network"
 msgstr "در طول شبکه"
 
-#: standalone/drakbackup:2702
+#: standalone/drakbackup:2420
 #, c-format
 msgid "On CD-R"
 msgstr "On CD-R"
 
-#: standalone/drakbackup:2710
+#: standalone/drakbackup:2428
 #, c-format
 msgid "On Tape Device"
 msgstr "بر دستگاه نوار"
 
-#: standalone/drakbackup:2738
-#, c-format
-msgid "Please select media for backup..."
-msgstr "لطفاً رسانه را برای ذخیره‌ی پشتیبان انتخاب کنید..."
-
-#: standalone/drakbackup:2760
+#: standalone/drakbackup:2468
 #, c-format
 msgid "Backup Users"
 msgstr "ذخیره‌ی پشتیبان کاربرها"
 
-#: standalone/drakbackup:2761
+#: standalone/drakbackup:2469
 #, c-format
 msgid " (Default is all users)"
 msgstr "(پیش‌فرض همه‌ی کاربران است)"
 
-#: standalone/drakbackup:2773
+#: standalone/drakbackup:2481
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "لطفاًً آنچه را که می‌خواهید ذخیره‌ی پشتیبانی کنید انتخاب کنید"
 
-#: standalone/drakbackup:2774
+#: standalone/drakbackup:2482
 #, c-format
 msgid "Backup System"
 msgstr "سیستم ذخیره‌ی پشتیبان"
 
-#: standalone/drakbackup:2776
+#: standalone/drakbackup:2484
 #, c-format
 msgid "Select user manually"
 msgstr "انتخاب دستی کاربر"
 
-#: standalone/drakbackup:2805
+#: standalone/drakbackup:2513
 #, c-format
 msgid "Please select data to backup..."
 msgstr "لطفاً داده‌ها را برای ذخیره پشتیبان انتخاب کنید..."
 
-#: standalone/drakbackup:2879
+#: standalone/drakbackup:2585
 #, c-format
 msgid ""
 "\n"
@@ -17619,7 +17845,7 @@ msgstr ""
 "\n"
 "منابع ذخیره پشتیبانی: \n"
 
-#: standalone/drakbackup:2880
+#: standalone/drakbackup:2586
 #, c-format
 msgid ""
 "\n"
@@ -17628,7 +17854,7 @@ msgstr ""
 "\n"
 "- پرونده‌های سیستم:\n"
 
-#: standalone/drakbackup:2882
+#: standalone/drakbackup:2588
 #, c-format
 msgid ""
 "\n"
@@ -17637,7 +17863,7 @@ msgstr ""
 "\n"
 "- پرونده‌های کاربر:\n"
 
-#: standalone/drakbackup:2884
+#: standalone/drakbackup:2590
 #, c-format
 msgid ""
 "\n"
@@ -17646,7 +17872,7 @@ msgstr ""
 "\n"
 "- پرونده‌های دیگر:\n"
 
-#: standalone/drakbackup:2886
+#: standalone/drakbackup:2592
 #, c-format
 msgid ""
 "\n"
@@ -17655,12 +17881,12 @@ msgstr ""
 "\n"
 "- ذخیره بر دیسک‌سخت در مسیر: %s\n"
 
-#: standalone/drakbackup:2887
+#: standalone/drakbackup:2593
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tمحدود کردن استفاده ازدیسک تا %s مگابایت\n"
 
-#: standalone/drakbackup:2890
+#: standalone/drakbackup:2596
 #, c-format
 msgid ""
 "\n"
@@ -17669,17 +17895,17 @@ msgstr ""
 "\n"
 "- حذف پرونده‌های tar بر دیسک‌سخت بعد از ذخیره‌ی پشتیبان.\n"
 
-#: standalone/drakbackup:2894
+#: standalone/drakbackup:2600
 #, c-format
 msgid "NO"
 msgstr "نه"
 
-#: standalone/drakbackup:2895
+#: standalone/drakbackup:2601
 #, c-format
 msgid "YES"
 msgstr "بله"
 
-#: standalone/drakbackup:2896
+#: standalone/drakbackup:2602
 #, c-format
 msgid ""
 "\n"
@@ -17688,22 +17914,22 @@ msgstr ""
 "\n"
 "- نگارش به CD"
 
-#: 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 "بر دستگاه: %s "
 
-#: standalone/drakbackup:2899
+#: standalone/drakbackup:2605
 #, c-format
 msgid " (multi-session)"
 msgstr "(چند-نشستی)"
 
-#: standalone/drakbackup:2900
+#: standalone/drakbackup:2606
 #, c-format
 msgid ""
 "\n"
@@ -17712,12 +17938,12 @@ msgstr ""
 "\n"
 "- ذخیره بر نوار در دستگاه: %s"
 
-#: standalone/drakbackup:2901
+#: standalone/drakbackup:2607
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tپاک کردن=%s"
 
-#: standalone/drakbackup:2904
+#: standalone/drakbackup:2610
 #, c-format
 msgid ""
 "\n"
@@ -17726,7 +17952,7 @@ msgstr ""
 "\n"
 "- ذخیره از %s بر میزبان: %s\n"
 
-#: standalone/drakbackup:2905
+#: standalone/drakbackup:2611
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -17735,7 +17961,7 @@ msgstr ""
 "\t\t نام کاربر: %s\n"
 "\t\t در مسیر: %s \n"
 
-#: standalone/drakbackup:2906
+#: standalone/drakbackup:2612
 #, c-format
 msgid ""
 "\n"
@@ -17744,37 +17970,42 @@ msgstr ""
 "\n"
 "- گزینه‌ها:\n"
 
-#: standalone/drakbackup:2907
+#: standalone/drakbackup:2613
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tپرونده‌های سیستم ضمیمه نشوند\n"
 
-#: standalone/drakbackup:2910
+#: standalone/drakbackup:2615
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\tذخیره‌های پشتیبانی از tar و bzip2 استفاده می‌کنند\n"
 
-#: standalone/drakbackup:2912
+#: standalone/drakbackup:2616
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tذخیره‌ها از tar و gzip استفاده می‌کنند\n"
 
-#: standalone/drakbackup:2915
+#: standalone/drakbackup:2617
+#, c-format
+msgid "\tBackups use tar only\n"
+msgstr "\tذخیره‌ها فقط از tar استفاده می‌کنند\n"
+
+#: standalone/drakbackup:2619
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\tاستفاده از پرونده های .backupignore\n"
 
-#: standalone/drakbackup:2916
+#: standalone/drakbackup:2620
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\tفرستادن پست به %s\n"
 
-#: standalone/drakbackup:2917
-#, fuzzy, c-format
+#: standalone/drakbackup:2621
+#, c-format
 msgid "\tUsing SMTP server %s\n"
-msgstr "بر کارگزار CUPS  \"%s\""
+msgstr "\tاستفاده از کارگزار SMTP %s\n"
 
-#: standalone/drakbackup:2919
+#: standalone/drakbackup:2623
 #, c-format
 msgid ""
 "\n"
@@ -17783,47 +18014,47 @@ msgstr ""
 "\n"
 "- شبح (%s) از طریق:\n"
 
-#: standalone/drakbackup:2920
+#: standalone/drakbackup:2624
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-دستگاه دیسک.\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-نوار \n"
 
-#: standalone/drakbackup:2923
+#: standalone/drakbackup:2627
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-شبکه توسط FTP.\n"
 
-#: standalone/drakbackup:2924
+#: standalone/drakbackup:2628
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-شبکه بوسیله SSH.\n"
 
-#: standalone/drakbackup:2925
+#: standalone/drakbackup:2629
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-شبکه توسط rsync.\n"
 
-#: standalone/drakbackup:2926
+#: standalone/drakbackup:2630
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-شبکه بوسیله webdav.\n"
 
-#: standalone/drakbackup:2928
+#: standalone/drakbackup:2632
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr "بدون پیکربندی، لطفاً جادوگر یا پیشرفته را کلیک کنید.\n"
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2637
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -17832,33 +18063,27 @@ msgstr ""
 "لیست داده‌های برای ذخیره:\n"
 "\n"
 
-#: standalone/drakbackup:2935
-#, fuzzy, c-format
+#: standalone/drakbackup:2639
+#, c-format
 msgid "- Restore System Files.\n"
-msgstr ""
-"\n"
-"- پرونده‌های سیستم:\n"
+msgstr "- بازنشاندن پرونده‌های سیستم.\n"
 
-#: standalone/drakbackup:2937 standalone/drakbackup:2947
+#: standalone/drakbackup:2641 standalone/drakbackup:2651
 #, c-format
 msgid "   - from date: %s %s\n"
-msgstr ""
+msgstr "   - از تاریخ: %s %s\n"
 
-#: standalone/drakbackup:2940
-#, fuzzy, c-format
+#: standalone/drakbackup:2644
+#, c-format
 msgid "- Restore User Files: \n"
-msgstr ""
-"\n"
-"- پرونده‌های کاربر:\n"
+msgstr "- بازنشاندن پرونده‌های کاربر: \n"
 
-#: standalone/drakbackup:2945
-#, fuzzy, c-format
+#: standalone/drakbackup:2649
+#, c-format
 msgid "- Restore Other Files: \n"
-msgstr ""
-"\n"
-"- پرونده‌های دیگر:\n"
+msgstr "- بازنشاندن پرونده‌های دیگر: \n"
 
-#: standalone/drakbackup:3121
+#: standalone/drakbackup:2830
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -17867,124 +18092,136 @@ msgstr ""
 "‌لیست داده‌های خراب شده:\n"
 "\n"
 
-#: standalone/drakbackup:3123
+#: standalone/drakbackup:2832
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "لطفاً علامت را برداشته یا آن را دفعه‌ی بعد بردارید."
 
-#: standalone/drakbackup:3133
+#: standalone/drakbackup:2842
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "پرونده‌های پشتیبانی خراب شده‌اند"
 
-#: standalone/drakbackup:3154
+#: standalone/drakbackup:2863
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "          تمام داده‌های انتخاب شده‌ی شما             "
 
-#: standalone/drakbackup:3155
+#: standalone/drakbackup:2864
 #, c-format
 msgid "          Successfuly Restored on %s       "
 msgstr "          با موفقیت در %s بازگذاری شد      "
 
-#: standalone/drakbackup:3270
+#: standalone/drakbackup:2987
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         تنظیمات بازسازی       "
 
-#: standalone/drakbackup:3298
+#: standalone/drakbackup:3015
 #, c-format
 msgid "OK to restore the other files."
 msgstr "تایید بازسازی پرونده‌های دیگر."
 
-#: standalone/drakbackup:3316
+#: standalone/drakbackup:3031
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr "لیست کاربر برای بازسازی (فقط آخرین تاریخ برای کاربر مهم است)"
 
-#: standalone/drakbackup:3382
-#, fuzzy, c-format
+#: standalone/drakbackup:3098
+#, c-format
 msgid "Please choose the date to restore:"
-msgstr "لطفاً تاریخ را برای بازسازی انتخاب نمایید"
+msgstr "لطفاً تاریخ را برای بازنشانی انتخاب کنید:"
 
-#: standalone/drakbackup:3420
+#: standalone/drakbackup:3135
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "بازسازی از دیسک."
 
-#: standalone/drakbackup:3422
+#: standalone/drakbackup:3137
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "شاخه‌ی انبار ذخیره‌های پشتیبان را وارد نمایید"
 
-#: standalone/drakbackup:3478
+#: standalone/drakbackup:3141
+#, c-format
+msgid "Directory with backups"
+msgstr "شاخه‌‌ی با ذخیره‌های پشتیبانی"
+
+#: standalone/drakbackup:3194
 #, c-format
 msgid "Select another media to restore from"
 msgstr "یک رسانه‌ی دیگر را برای بازسازی از آن انتخاب نمایید"
 
-#: standalone/drakbackup:3480
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Other Media"
 msgstr "رسانه دیگر"
 
-#: standalone/drakbackup:3485
+#: standalone/drakbackup:3201
 #, c-format
 msgid "Restore system"
 msgstr "بازسازی سیستم"
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3202
 #, c-format
 msgid "Restore Users"
 msgstr "بازسازی کاربران"
 
-#: standalone/drakbackup:3487
+#: standalone/drakbackup:3203
 #, c-format
 msgid "Restore Other"
 msgstr "بازسازی دیگر"
 
-#: standalone/drakbackup:3489
+#: standalone/drakbackup:3205
+#, c-format
+msgid "Select path to restore (instead of /)"
+msgstr "انتخاب کردن مسیر برای بازسازی (بجای /)"
+
+#: standalone/drakbackup:3209 standalone/drakbackup:3490
 #, c-format
-msgid "select path to restore (instead of /)"
-msgstr "انتخاب مسیر برای بازسازی (بجای /)"
+msgid "Path To Restore To"
+msgstr "مسیر برای بازسازی به آنجا"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3212
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr "انجام ذخیره پشتیبان قبل از بازسازی (فقط برای ذخیره‌های پشتیبان افزایشی)"
 
-#: standalone/drakbackup:3495
+#: standalone/drakbackup:3214
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "برداشتن شاخه‌های کاربر قبل از بازسازی."
 
-#: standalone/drakbackup:3575
-#, fuzzy, c-format
+#: standalone/drakbackup:3298
+#, c-format
 msgid "Filename text substring to search for (empty string matches all):"
-msgstr "نام پرونده‌ی متن برای جستجو:"
+msgstr "نام‌پرونده‌ متن زیررشته‌ی برای جستجو (رشته‌ی خالی همه را تطابق می‌کند):"
 
-#: standalone/drakbackup:3578
+#: standalone/drakbackup:3301
 #, c-format
 msgid "Search Backups"
 msgstr "جستجوی ذخیره‌های پشتیبان‌"
 
-#: standalone/drakbackup:3597
-#, fuzzy, c-format
+#: standalone/drakbackup:3320
+#, c-format
 msgid "No matches found..."
-msgstr "تصویری یافت نشد"
+msgstr "هیچ تطابقی یافت نشد..."
 
-#: standalone/drakbackup:3601
+#: standalone/drakbackup:3324
 #, c-format
 msgid "Restore Selected"
 msgstr "بازسازی انتخاب شده"
 
-#: standalone/drakbackup:3735
+#: standalone/drakbackup:3458
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
 "Ctrl-Click files to select multiple files."
 msgstr ""
+"برای دیدن پرونده‌های پشتیبانی تاریخ/زمان را کلیک کنید.\n"
+"برای انتخاب چندین پرونده با فشردن کلید مهار پرونده‌ها را کلیک کنید."
 
-#: standalone/drakbackup:3741
+#: standalone/drakbackup:3464
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -17993,7 +18230,7 @@ msgstr ""
 "بازسازی ورودی\n"
 "کاتالوگ انتخاب شده"
 
-#: standalone/drakbackup:3750
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18002,26 +18239,17 @@ msgstr ""
 "بازسازی پرونده‌های \n"
 "انتخاب شده"
 
-#: standalone/drakbackup:3766
-#, c-format
-msgid ""
-"Change\n"
-"Restore Path"
-msgstr ""
-"تغییر\n"
-"بازسازی مسیر"
-
-#: standalone/drakbackup:3833
+#: standalone/drakbackup:3550
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "پرونده‌های ذخیره پشتیبان در %s پیدا نشد."
 
-#: standalone/drakbackup:3846
+#: standalone/drakbackup:3563
 #, c-format
 msgid "Restore From CD"
 msgstr "بازسازی از سی‌دی"
 
-#: standalone/drakbackup:3846
+#: standalone/drakbackup:3563
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -18030,17 +18258,17 @@ msgstr ""
 "سی‌دی با برچسب %s را بدرون دستگاه \n"
 "سی‌دی در نقطه‌ی سوارسازی /mnt/cdrom داخل کنید"
 
-#: standalone/drakbackup:3848
+#: standalone/drakbackup:3565
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "برچسب سی‌دی درست نیست. برچسب دیسک %s است."
 
-#: standalone/drakbackup:3858
+#: standalone/drakbackup:3575
 #, c-format
 msgid "Restore From Tape"
 msgstr "بازسازی از نوار"
 
-#: standalone/drakbackup:3858
+#: standalone/drakbackup:3575
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -18049,215 +18277,220 @@ msgstr ""
 "نوار با برچسپ %s رادر دستگاه \n"
 "نوار %s وارد کنید"
 
-#: standalone/drakbackup:3860
+#: standalone/drakbackup:3577
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "برچسب نادرست نوار. برچسب نوار %s است."
 
-#: standalone/drakbackup:3871
+#: standalone/drakbackup:3588
 #, c-format
 msgid "Restore Via Network"
 msgstr "بازسازی از طریق شبکه"
 
-#: standalone/drakbackup:3871
+#: standalone/drakbackup:3588
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "بازسازی از طریق پایان‌نامه‌ی شبکه: %s"
 
-#: standalone/drakbackup:3872
+#: standalone/drakbackup:3589
 #, c-format
 msgid "Host Name"
 msgstr "نام میزبان"
 
-#: standalone/drakbackup:3873
+#: standalone/drakbackup:3590
 #, c-format
 msgid "Host Path or Module"
 msgstr "بخش یا مسیر میزبان"
 
-#: standalone/drakbackup:3880
+#: standalone/drakbackup:3597
 #, c-format
 msgid "Password required"
 msgstr "گذرواژه لازم است"
 
-#: standalone/drakbackup:3886
+#: standalone/drakbackup:3603
 #, c-format
 msgid "Username required"
 msgstr "نام‌کاربر لازم است"
 
-#: standalone/drakbackup:3889
+#: standalone/drakbackup:3606
 #, c-format
 msgid "Hostname required"
 msgstr "نام میزبان لازم است"
 
-#: standalone/drakbackup:3894
+#: standalone/drakbackup:3611
 #, c-format
 msgid "Path or Module required"
 msgstr "مسیر یا بخش لازم است"
 
-#: standalone/drakbackup:3907
+#: standalone/drakbackup:3624
 #, c-format
 msgid "Files Restored..."
 msgstr "بازسازی پرونده‌ها..."
 
-#: standalone/drakbackup:3910
+#: standalone/drakbackup:3627
 #, c-format
 msgid "Restore Failed..."
 msgstr "بازسازی شکست خورد..."
 
-#: standalone/drakbackup:4015 standalone/drakbackup:4031
-#, fuzzy, c-format
+#: standalone/drakbackup:3737 standalone/drakbackup:3754
+#, c-format
 msgid "%s not retrieved..."
-msgstr "%s یافت نشد...\n"
+msgstr "%s دریافت نشد..."
 
-#: standalone/drakbackup:4155 standalone/drakbackup:4228
+#: standalone/drakbackup:3880 standalone/drakbackup:3953
 #, c-format
 msgid "Search for files to restore"
 msgstr "جستجو برای پرونده‌ها برای بازسازی"
 
-#: standalone/drakbackup:4160
+#: standalone/drakbackup:3885
 #, c-format
 msgid "Restore all backups"
 msgstr "بازسازی همه‌ی ذخیره‌های پشتیبان"
 
-#: standalone/drakbackup:4169
+#: standalone/drakbackup:3894
 #, c-format
 msgid "Custom Restore"
 msgstr "بازسازی اختصاصی"
 
-#: standalone/drakbackup:4174 standalone/drakbackup:4224
+#: standalone/drakbackup:3899 standalone/drakbackup:3949
 #, c-format
 msgid "Restore From Catalog"
 msgstr "بازسازی از پوشه"
 
-#: standalone/drakbackup:4196
+#: standalone/drakbackup:3921
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "نمی‌توان ذخیره‌های پشتیبان را برای بازسازی پیدا کرد...\n"
 
-#: standalone/drakbackup:4197
+#: standalone/drakbackup:3922
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "تصدیق کنید که %s مسیر درست است"
 
-#: standalone/drakbackup:4198
+#: standalone/drakbackup:3923
 #, c-format
 msgid " and the CD is in the drive"
 msgstr "و سی‌دی درون دستگاه می‌باشد"
 
-#: standalone/drakbackup:4200
+#: standalone/drakbackup:3925
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 "ذخیره‌های پشتیبان بر رسانه‌ی غیر قابل سوارسازی - از پوشه برای بازسازی استفاده "
 "کنید"
 
-#: standalone/drakbackup:4216
+#: standalone/drakbackup:3941
 #, c-format
 msgid "CD in place - continue."
 msgstr "سی‌دی در محل خود - ادامه."
 
-#: standalone/drakbackup:4221
+#: standalone/drakbackup:3946
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "مرور به انبار جدید بازسازی"
 
-#: standalone/drakbackup:4258
+#: standalone/drakbackup:3947
+#, c-format
+msgid "Directory To Restore From"
+msgstr "شاخه‌ی برای بازسازی از آنجا"
+
+#: standalone/drakbackup:3986
 #, c-format
 msgid "Restore Progress"
 msgstr "پیشروی بازسازی"
 
-#: standalone/drakbackup:4292 standalone/drakbackup:4404
-#: standalone/logdrake:175
+#: standalone/drakbackup:4016 standalone/drakbackup:4123
+#: standalone/logdrake:174
 #, c-format
 msgid "Save"
 msgstr "ذخیره"
 
-#: standalone/drakbackup:4378
+#: standalone/drakbackup:4099
 #, c-format
 msgid "Build Backup"
 msgstr "ساختن ذخیره‌ی پشتیبان"
 
-#: standalone/drakbackup:4430 standalone/drakbackup:4829
+#: standalone/drakbackup:4147 standalone/drakbackup:4512
 #, c-format
 msgid "Restore"
 msgstr "بازسازی"
 
-#: standalone/drakbackup:4600
+#: standalone/drakbackup:4277
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "بسته‌های بدنبال آمده لازم است نصب شوند:\n"
 
-#: standalone/drakbackup:4622
+#: standalone/drakbackup:4304
 #, c-format
 msgid "Please select data to restore..."
 msgstr "لطفاً داده‌های برای بازسازی را انتخاب کنید..."
 
-#: standalone/drakbackup:4662
+#: standalone/drakbackup:4344
 #, c-format
 msgid "Backup system files"
 msgstr "ذخیره‌ی پشتیبان پرونده‌های سیستم"
 
-#: standalone/drakbackup:4665
+#: standalone/drakbackup:4347
 #, c-format
 msgid "Backup user files"
 msgstr "ذخیره‌ی پشتیبان پرونده‌های کاربر"
 
-#: standalone/drakbackup:4668
+#: standalone/drakbackup:4350
 #, c-format
 msgid "Backup other files"
 msgstr "ذخیره‌ی پشتیبانی پرونده‌های دیگر"
 
-#: standalone/drakbackup:4671 standalone/drakbackup:4707
+#: standalone/drakbackup:4353 standalone/drakbackup:4389
 #, c-format
 msgid "Total Progress"
 msgstr "پیشروی کل"
 
-#: standalone/drakbackup:4699
+#: standalone/drakbackup:4381
 #, c-format
 msgid "Sending files by FTP"
 msgstr "فرستادن پرونده‌ها بوسیله FTP"
 
-#: standalone/drakbackup:4702
+#: standalone/drakbackup:4384
 #, c-format
 msgid "Sending files..."
 msgstr "فرستادن پرونده‌ها..."
 
-#: standalone/drakbackup:4772
+#: standalone/drakbackup:4455
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "ذخیره‌ی پشتیبان هم اکنون از پرونده‌ی پیکربندی"
 
-#: standalone/drakbackup:4777
+#: standalone/drakbackup:4460
 #, c-format
 msgid "View Backup Configuration."
 msgstr "نمای پیکربندی ذخیره‌ی پشتیبان."
 
-#: standalone/drakbackup:4803
+#: standalone/drakbackup:4486
 #, c-format
 msgid "Wizard Configuration"
 msgstr "جادوگر پیکربندی"
 
-#: standalone/drakbackup:4808
+#: standalone/drakbackup:4491
 #, c-format
 msgid "Advanced Configuration"
 msgstr "پیکربندی پیشرفته"
 
-#: standalone/drakbackup:4813
+#: standalone/drakbackup:4496
 #, c-format
 msgid "View Configuration"
 msgstr "نمای پیکربندی"
 
-#: standalone/drakbackup:4817
+#: standalone/drakbackup:4500
 #, c-format
 msgid "View Last Log"
 msgstr "نمای آخرین ثبت"
 
-#: standalone/drakbackup:4822
+#: standalone/drakbackup:4505
 #, c-format
 msgid "Backup Now"
 msgstr "ذخیره‌ی پشتیبان اکنون"
 
-#: standalone/drakbackup:4826
+#: standalone/drakbackup:4509
 #, c-format
 msgid ""
 "No configuration file found \n"
@@ -18266,67 +18499,69 @@ msgstr ""
 "هیچ پرونده‌ی پیکربندی یافت نشد \n"
 "لطفاً جادوگر یا پیشرفته را کلیک کنید."
 
-#: 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 "گزینش تم آغازگری گرافیکی"
 
-#: standalone/drakboot:56
+#: standalone/drakboot:57
 #, c-format
 msgid "System mode"
 msgstr "حالت سیستم"
 
-#: 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 "/_پرونده"
 
-#: standalone/drakboot:67 standalone/drakfloppy:47 standalone/logdrake:76
+#: standalone/drakboot:68 standalone/drakfloppy:47 standalone/logdrake:77
 #, c-format
 msgid "/File/_Quit"
 msgstr "/پرونده/_خروج"
 
-#: 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 "نصب تم‌ها"
 
-#: standalone/drakboot:119
+#: standalone/drakboot:120
 #, c-format
 msgid "Create new theme"
 msgstr "ایجاد تم‌ جدید"
 
-#: standalone/drakboot:133
+#: standalone/drakboot:134
 #, c-format
 msgid "Use graphical boot"
 msgstr "استفاده از آغازگری گرافیکی"
 
-#: standalone/drakboot:138
+#: 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."
 msgstr ""
+"بارگذار آغازگر سیستم‌تان در حالت framebuffer نیست. برای فعال کردن آغازگری "
+"تصویری، حالت ویدیوی گرافیکی را از ابزار پیکربندی بارگذار آغازگری انتخاب کنید."
 
-#: standalone/drakboot:145
-#, fuzzy, c-format
+#: standalone/drakboot:146
+#, c-format
 msgid "Theme"
-msgstr "تم‌ها"
+msgstr "طرح"
 
-#: standalone/drakboot:147
+#: standalone/drakboot:149
 #, c-format
 msgid ""
 "Display theme\n"
@@ -18335,32 +18570,32 @@ msgstr ""
 "نمایش تم \n"
 "در کنسول"
 
-#: standalone/drakboot:156
+#: standalone/drakboot:158
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "راه‌اندازی محیط گرافیکی هنگام شروع سیستم‌تان"
 
-#: standalone/drakboot:164
-#, c-format
-msgid "Yes, I want autologin with this (user, desktop)"
-msgstr "بله، من ثبت‌ورود خودکار را با این (کاربر، رومیزی) می‌خواهم"
-
-#: standalone/drakboot:165
+#: standalone/drakboot:166
 #, c-format
 msgid "No, I don't want autologin"
 msgstr "نه، ثبت‌ورود خودکار را نمی‌خواهم"
 
-#: standalone/drakboot:171
+#: standalone/drakboot:167
+#, c-format
+msgid "Yes, I want autologin with this (user, desktop)"
+msgstr "بله، من ثبت‌ورود خودکار را با این (کاربر، رومیزی) می‌خواهم"
+
+#: standalone/drakboot:173
 #, c-format
 msgid "Default user"
 msgstr "کاربر پیش‌فرض"
 
-#: standalone/drakboot:172
+#: standalone/drakboot:174
 #, c-format
 msgid "Default desktop"
 msgstr "رومیزی پیش‌فرض"
 
-#: standalone/drakboot:236
+#: standalone/drakboot:238
 #, c-format
 msgid "Installation of %s failed. The following error occured:"
 msgstr "نصب %s موفق نبود. خطای بدنبال آمده رخ داد:"
@@ -18615,12 +18850,12 @@ msgstr "بکار انداختن پایان‌نامه‌ی زمان شبکه"
 msgid "Server:"
 msgstr "کارگزار‌:"
 
-#: standalone/drakclock:125 standalone/drakclock:137
+#: standalone/drakclock:129 standalone/drakclock:141
 #, c-format
 msgid "Reset"
 msgstr "بازنشاندن"
 
-#: standalone/drakclock:200
+#: standalone/drakclock:204
 #, c-format
 msgid ""
 "We need to install ntp package\n"
@@ -18633,214 +18868,203 @@ msgstr ""
 "\n"
 "آیا می‌خواهید ntp را نصب کنید؟"
 
-#: standalone/drakconnect:78
+#: standalone/drakconnect:81
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "پیکربندی شبکه (%d سازوارگر)"
 
-#: standalone/drakconnect:89 standalone/drakconnect:686
+#: standalone/drakconnect:92 standalone/drakconnect:728
 #, c-format
 msgid "Gateway:"
 msgstr "دروازه:"
 
-#: standalone/drakconnect:89 standalone/drakconnect:686
+#: standalone/drakconnect:92 standalone/drakconnect:728
 #, c-format
 msgid "Interface:"
 msgstr "واسط:"
 
-#: standalone/drakconnect:93 standalone/net_monitor:105
+#: standalone/drakconnect:96 standalone/net_monitor:105
 #, c-format
 msgid "Wait please"
 msgstr "لطفاً صبر کنید"
 
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116
 #, c-format
 msgid "Interface"
 msgstr "واسط‌"
 
-#: standalone/drakconnect:113 standalone/drakconnect:502
-#: standalone/drakvpn:1136
-#, c-format
-msgid "Protocol"
-msgstr "پایان‌نامه"
-
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116 standalone/drakups:233
 #, c-format
 msgid "Driver"
 msgstr "راه‌انداز"
 
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116
 #, c-format
 msgid "State"
 msgstr "وضعیت"
 
-#: standalone/drakconnect:130
+#: standalone/drakconnect:133
 #, c-format
 msgid "Hostname: "
 msgstr "نام میزبان: "
 
-#: standalone/drakconnect:132
+#: standalone/drakconnect:135
 #, c-format
 msgid "Configure hostname..."
 msgstr "پیکربندی نام میزبان..."
 
-#: standalone/drakconnect:146 standalone/drakconnect:727
+#: standalone/drakconnect:149 standalone/drakconnect:769
 #, c-format
 msgid "LAN configuration"
 msgstr "پیکربندی LAN"
 
-#: standalone/drakconnect:151
+#: standalone/drakconnect:154
 #, c-format
 msgid "Configure Local Area Network..."
 msgstr "پیکربندی شبکه‌ی منطقه‌ای محلی..."
 
-#: standalone/drakconnect:159 standalone/drakconnect:228
-#: standalone/drakconnect:232
+#: standalone/drakconnect:162 standalone/drakconnect:237
+#: standalone/drakconnect:241
 #, c-format
 msgid "Apply"
 msgstr "اعمال"
 
-#: 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 "سازماندهی اتصالات"
+
+#: 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 ""
+msgstr "TCP/IP"
 
-#: standalone/drakconnect:254 standalone/drakconnect:263
-#: standalone/drakconnect:277 standalone/drakconnect:421
-#: standalone/drakconnect:425 standalone/drakconnect:540
-#, fuzzy, c-format
+#: standalone/drakconnect:263 standalone/drakconnect:272
+#: standalone/drakconnect:292 standalone/drakconnect:444
+#: standalone/drakconnect:448 standalone/drakconnect:576
+#, c-format
 msgid "Account"
-msgstr "درباره"
+msgstr "حساب"
 
-#: 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 ""
+msgstr "بی‌سیم"
 
-#: standalone/drakconnect:325
+#: standalone/drakconnect:344
 #, c-format
 msgid "DNS servers"
 msgstr "کارگزارهای DNS"
 
-#: standalone/drakconnect:332
+#: standalone/drakconnect:351
 #, c-format
 msgid "Search Domain"
 msgstr "دامنه‌ی جستجو"
 
-#: standalone/drakconnect:338
+#: standalone/drakconnect:359
 #, c-format
 msgid "static"
 msgstr "ثابت"
 
-#: 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 "پایگاه اینترنت"
+msgstr "کنترل جریان"
 
-#: standalone/drakconnect:463
+#: standalone/drakconnect:483
 #, c-format
-msgid "Tone dialing"
-msgstr ""
+msgid "Line termination"
+msgstr "پایان دادن خط"
 
-#: standalone/drakconnect:463
+#: standalone/drakconnect:493
 #, c-format
-msgid "Pulse dialing"
-msgstr ""
-
-#: standalone/drakconnect:468
-#, fuzzy, c-format
 msgid "Use lock file"
-msgstr "انتخاب پرونده"
+msgstr "استفاده از پرونده‌ی قفل"
 
-#: standalone/drakconnect:471
-#, fuzzy, c-format
+#: standalone/drakconnect:496
+#, c-format
 msgid "Modem timeout"
-msgstr "مدت تاخیر پوسته"
+msgstr "زمان وقفه‌ی مودم"
 
-#: standalone/drakconnect:475
+#: standalone/drakconnect:500
 #, c-format
 msgid "Wait for dialup tone before dialing"
-msgstr ""
+msgstr "انتظار برای نوای شماره‌گیری پیش از شماره گرفتن"
 
-#: standalone/drakconnect:478
-#, fuzzy, c-format
+#: standalone/drakconnect:503
+#, c-format
 msgid "Busy wait"
-msgstr "کویت"
+msgstr "اشغال است، صبر کنید"
 
-#: standalone/drakconnect:482
-#, fuzzy, c-format
+#: standalone/drakconnect:507
+#, c-format
 msgid "Modem sound"
-msgstr "مودم"
+msgstr "صوت مودم"
 
-#: standalone/drakconnect:483
-#, fuzzy, c-format
+#: standalone/drakconnect:508
+#, c-format
 msgid "Enable"
-msgstr "فعال"
+msgstr "بکار انداختن"
 
-#: standalone/drakconnect:483
-#, fuzzy, c-format
+#: standalone/drakconnect:508
+#, c-format
 msgid "Disable"
-msgstr "غیر‌فعال سازی"
+msgstr "از کار انداختن"
 
-#: standalone/drakconnect:522 standalone/harddrake2:58
+#: standalone/drakconnect:558 standalone/harddrake2:58
 #, c-format
 msgid "Media class"
 msgstr "رده‌ی رسانه"
 
-#: standalone/drakconnect:523 standalone/drakfloppy:140
+#: standalone/drakconnect:559 standalone/drakfloppy:140
 #, c-format
 msgid "Module name"
 msgstr "نام بخش"
 
-#: standalone/drakconnect:524
+#: standalone/drakconnect:560
 #, c-format
 msgid "Mac Address"
 msgstr "نشانی Mac"
 
-#: standalone/drakconnect:525 standalone/harddrake2:21
+#: standalone/drakconnect:561 standalone/harddrake2:21
 #, c-format
 msgid "Bus"
 msgstr "گذرگاه"
 
-#: standalone/drakconnect:526 standalone/harddrake2:29
+#: standalone/drakconnect:562 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr "مکان بر گذرگاه"
 
-#: 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 ""
-"خطائی غیرمنتظره‌ای رخ داده است:\n"
-"%s"
+"هیچ کارت شبکه‌ی ایثرنتی بر سیستم شما شناسایی نشد. لطفاً ابزار پیکربندی "
+"سخت‌افزار را اجرا کنید."
 
-#: standalone/drakconnect:597
+#: standalone/drakconnect:638
 #, c-format
 msgid "Remove a network interface"
 msgstr "برداشتن واسط شبکه"
 
-#: standalone/drakconnect:601
+#: standalone/drakconnect:642
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "انتخاب واسط شبکه برای برداشتن:"
 
-#: standalone/drakconnect:617
+#: standalone/drakconnect:656
 #, c-format
 msgid ""
 "An error occured while deleting the \"%s\" network interface:\n"
@@ -18851,53 +19075,53 @@ msgstr ""
 "\n"
 "%s"
 
-#: standalone/drakconnect:619
+#: standalone/drakconnect:658
 #, c-format
 msgid ""
 "Congratulations, the \"%s\" network interface has been succesfully deleted"
 msgstr "تبریک می‌گوئیم، واسط شبکه‌ی \"%s\" با موفقیت حذف شده است"
 
-#: standalone/drakconnect:636
+#: standalone/drakconnect:675
 #, c-format
 msgid "No Ip"
 msgstr "هیچ آی‌پی"
 
-#: standalone/drakconnect:637
+#: standalone/drakconnect:676
 #, c-format
 msgid "No Mask"
 msgstr "بدون ماسک"
 
-#: standalone/drakconnect:638 standalone/drakconnect:798
+#: standalone/drakconnect:677 standalone/drakconnect:840
 #, c-format
 msgid "up"
 msgstr "بالا"
 
-#: standalone/drakconnect:638 standalone/drakconnect:798
+#: standalone/drakconnect:677 standalone/drakconnect:840
 #, c-format
 msgid "down"
 msgstr "پایین"
 
-#: standalone/drakconnect:677 standalone/net_monitor:415
+#: standalone/drakconnect:718 standalone/net_monitor:415
 #, c-format
 msgid "Connected"
 msgstr "وصل شده"
 
-#: standalone/drakconnect:677 standalone/net_monitor:415
+#: standalone/drakconnect:718 standalone/net_monitor:415
 #, c-format
 msgid "Not connected"
 msgstr "متصل نشده"
 
-#: standalone/drakconnect:678
+#: standalone/drakconnect:720
 #, c-format
 msgid "Disconnect..."
 msgstr "قطع اتصال..."
 
-#: standalone/drakconnect:678
+#: standalone/drakconnect:720
 #, c-format
 msgid "Connect..."
 msgstr "اتصال..."
 
-#: standalone/drakconnect:707
+#: standalone/drakconnect:749
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
@@ -18905,17 +19129,17 @@ msgid ""
 msgstr ""
 "هشدار، اتصال اینترنتی دیگری شناسایی شده است، شاید با استفاده از شبکه‌ی شما"
 
-#: standalone/drakconnect:723
+#: standalone/drakconnect:765
 #, c-format
 msgid "Deactivate now"
 msgstr "اکنون غیرفعال شود"
 
-#: standalone/drakconnect:723
+#: standalone/drakconnect:765
 #, c-format
 msgid "Activate now"
 msgstr "اکنون فعال شود"
 
-#: standalone/drakconnect:731
+#: standalone/drakconnect:773
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -18924,27 +19148,27 @@ msgstr ""
 "شما هیچ واسط پیکربندی شده‌ای ندارید.\n"
 "آنها را ابتدا بوسیله‌ی کلیک بر 'پیکربندی' پیکربندی کنید"
 
-#: standalone/drakconnect:745
+#: standalone/drakconnect:787
 #, c-format
 msgid "LAN Configuration"
 msgstr "پیکربندی LAN"
 
-#: standalone/drakconnect:757
+#: standalone/drakconnect:799
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "سازوارگر %s: %s"
 
-#: standalone/drakconnect:766
+#: standalone/drakconnect:808
 #, c-format
 msgid "Boot Protocol"
 msgstr "پایان‌نامه آغازگری"
 
-#: standalone/drakconnect:767
+#: standalone/drakconnect:809
 #, c-format
 msgid "Started on boot"
 msgstr "راه‌اندازی شده در آغازگری"
 
-#: standalone/drakconnect:803
+#: standalone/drakconnect:845
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
@@ -18953,7 +19177,7 @@ msgstr ""
 "این واسط هنوز پیکربندی نشده است.\n"
 "دستیار \"افزودن واسطی\" را از مرکز کنترل ماندرایک اجرا کنید"
 
-#: standalone/drakconnect:858
+#: standalone/drakconnect:900
 #, c-format
 msgid ""
 "You don't have any configured Internet connection.\n"
@@ -18962,47 +19186,32 @@ msgstr ""
 "شما هیچ اتصال اینترنتی پیکربندی شده ندارید.\n"
 "لطفاً \"دستیابی اینترنت\" را در مرکز کنترل اجرا کنید."
 
-#: standalone/drakconnect:866
+#: standalone/drakconnect:908
 #, c-format
 msgid "Internet connection configuration"
 msgstr "پیکربندی اتصال اینترنت"
 
-#: standalone/drakconnect:907
+#: standalone/drakconnect:926
 #, c-format
-msgid "Provider dns 1 (optional)"
-msgstr "عرضه کننده dns  ۱ (اختیاری)"
+msgid "Third DNS server (optional)"
+msgstr "سومین کارگزار DNS (اختیاری)"
 
-#: standalone/drakconnect:908
-#, c-format
-msgid "Provider dns 2 (optional)"
-msgstr "عرضه کننده dns ۲ (اختیاری)"
-
-#: standalone/drakconnect:921
-#, c-format
-msgid "Ethernet Card"
-msgstr "کارت ایثرنت"
-
-#: standalone/drakconnect:922
-#, c-format
-msgid "DHCP Client"
-msgstr "کارگیر DHCP"
-
-#: standalone/drakconnect:951
+#: standalone/drakconnect:948
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "پیکربندی اتصال اینترنت"
 
-#: standalone/drakconnect:952
+#: standalone/drakconnect:949
 #, c-format
 msgid "Internet access"
 msgstr "دستیابی اینترنت"
 
-#: standalone/drakconnect:954 standalone/net_monitor:87
+#: standalone/drakconnect:951 standalone/net_monitor:87
 #, c-format
 msgid "Connection type: "
 msgstr "نوع اتصال: "
 
-#: standalone/drakconnect:957
+#: standalone/drakconnect:954
 #, c-format
 msgid "Status:"
 msgstr "وضعیت:"
@@ -19143,109 +19352,109 @@ msgstr ""
 "\n"
 "<span foreground=\"Red\"><tt>%s</tt></span>"
 
-#: standalone/drakfont:181
+#: standalone/drakfont:183
 #, c-format
 msgid "Search installed fonts"
 msgstr "جستجو برای قلم‌های نصب شده"
 
-#: standalone/drakfont:183
+#: standalone/drakfont:185
 #, c-format
 msgid "Unselect fonts installed"
 msgstr "قلم‌های انتخاب نشده نصب شد"
 
-#: standalone/drakfont:206
+#: standalone/drakfont:208
 #, c-format
 msgid "parse all fonts"
 msgstr "تجزیه‌ی همه‌ی قلم‌ها"
 
-#: standalone/drakfont:208
+#: standalone/drakfont:210
 #, c-format
 msgid "No fonts found"
 msgstr "هیچ قلمی یافت نشد"
 
-#: 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 "انجام شد"
 
-#: standalone/drakfont:221
+#: standalone/drakfont:223
 #, c-format
 msgid "Could not find any font in your mounted partitions"
 msgstr "نمی‌توان هیچ قلمی را در قسمت‌بندی‌های سوار شده یافت"
 
-#: standalone/drakfont:254
+#: standalone/drakfont:256
 #, c-format
 msgid "Reselect correct fonts"
 msgstr "انتخاب مجدد قلم‌های درست"
 
-#: standalone/drakfont:257
+#: standalone/drakfont:259
 #, c-format
 msgid "Could not find any font.\n"
 msgstr "نمی‌توان هیچ قلمی را یافت.\n"
 
-#: standalone/drakfont:267
+#: standalone/drakfont:269
 #, c-format
 msgid "Search for fonts in installed list"
 msgstr "جستجو برای قلم‌ها در لیست نصب شده"
 
-#: standalone/drakfont:292
+#: standalone/drakfont:294
 #, c-format
 msgid "%s fonts conversion"
 msgstr "تبدیل قلم‌های %s"
 
-#: standalone/drakfont:321
+#: standalone/drakfont:323
 #, c-format
 msgid "Fonts copy"
 msgstr "کپی قلم‌ها"
 
-#: standalone/drakfont:324
+#: standalone/drakfont:326
 #, c-format
 msgid "True Type fonts installation"
 msgstr "نصب قلم‌های نوع حقیقی"
 
-#: standalone/drakfont:331
+#: standalone/drakfont:333
 #, c-format
 msgid "please wait during ttmkfdir..."
 msgstr "لطفاً در طول ttmkfdir صبر کنید..."
 
-#: standalone/drakfont:332
+#: standalone/drakfont:334
 #, c-format
 msgid "True Type install done"
 msgstr "نصب نوع حقیقی انجام شد"
 
-#: standalone/drakfont:338 standalone/drakfont:353
+#: standalone/drakfont:340 standalone/drakfont:355
 #, c-format
 msgid "type1inst building"
 msgstr "ساختن type1inst "
 
-#: standalone/drakfont:347
+#: standalone/drakfont:349
 #, c-format
 msgid "Ghostscript referencing"
 msgstr "Ghostscript referencing"
 
-#: standalone/drakfont:357
+#: standalone/drakfont:359
 #, c-format
 msgid "Suppress Temporary Files"
 msgstr "فشرده‌سازی پرونده‌های موقت"
 
-#: standalone/drakfont:360
+#: standalone/drakfont:362
 #, c-format
 msgid "Restart XFS"
 msgstr "راه‌اندازی مجدد XFS"
 
-#: standalone/drakfont:406 standalone/drakfont:416
+#: standalone/drakfont:408 standalone/drakfont:418
 #, c-format
 msgid "Suppress Fonts Files"
 msgstr "فشرده‌سازی پرونده‌های قلم‌ها"
 
-#: standalone/drakfont:418
+#: standalone/drakfont:420
 #, c-format
 msgid "xfs restart"
 msgstr "راه‌اندازی مجدد xfs "
 
-#: standalone/drakfont:426
+#: standalone/drakfont:428
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -19260,32 +19469,32 @@ msgstr ""
 "- شما می‌توانید قلم‌ها را به روش عادی نصب کنید. بندرت قلم‌های اشکال‌دار ممکن است "
 "کارگزار X شما را متوقف کنند."
 
-#: 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 "لیست قلم"
 
-#: standalone/drakfont:490
+#: standalone/drakfont:493
 #, c-format
 msgid "About"
 msgstr "درباره"
 
-#: standalone/drakfont:492 standalone/drakfont:681 standalone/drakfont:719
+#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
 #, c-format
 msgid "Uninstall"
 msgstr "نصب‌برداری"
 
-#: standalone/drakfont:493
+#: standalone/drakfont:496
 #, c-format
 msgid "Import"
 msgstr "واردات"
 
-#: standalone/drakfont:509
+#: standalone/drakfont:512
 #, c-format
 msgid ""
 "Copyright (C) 2001-2002 by MandrakeSoft \n"
@@ -19306,7 +19515,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"
@@ -19341,7 +19550,7 @@ msgstr ""
 " along with this program; if not, write to the Free Software\n"
 " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: standalone/drakfont:534
+#: standalone/drakfont:537
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -19372,12 +19581,12 @@ msgstr ""
 "\t  by Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
 "             Convert ttf font files to afm and pfb fonts\n"
 
-#: standalone/drakfont:553
+#: standalone/drakfont:556
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "انتخاب برنامه‌هایی که قلم‌ها را حمایت خواهند کرد:"
 
-#: standalone/drakfont:554
+#: standalone/drakfont:557
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -19392,195 +19601,195 @@ msgstr ""
 "- شما می‌توانید قلم‌ها را به روش عادی نصب کنید. بندرت قلم‌های اشکال‌دار ممکن است "
 "کارگزار X شما را متوقف کنند. "
 
-#: 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 "چاپگرهای عمومی"
 
-#: standalone/drakfont:583
+#: standalone/drakfont:586
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "انتخاب پرونده یا شاخه‌ی حاوی قلم و کلیک کردن بر 'افزودن'"
 
-#: standalone/drakfont:597
+#: standalone/drakfont:587
+#, c-format
+msgid "File Selection"
+msgstr "انتخاب پرونده"
+
+#: standalone/drakfont:600
 #, c-format
 msgid "You've not selected any font"
 msgstr "شما هیچ قلمی را انتخاب نکرده‌اید"
 
-#: standalone/drakfont:646
+#: standalone/drakfont:652
 #, c-format
 msgid "Import fonts"
 msgstr "واردات قلم‌ها"
 
-#: standalone/drakfont:651
-#, fuzzy, c-format
+#: standalone/drakfont:657
+#, c-format
 msgid "Install fonts"
-msgstr "نصب‌برداری قلم‌های نگارش"
+msgstr "نصب‌ کردن قلم‌ها"
 
-#: standalone/drakfont:686
+#: standalone/drakfont:692
 #, c-format
 msgid "click here if you are sure."
 msgstr "اینجا را اگر مطمئنید کلیک کنید."
 
-#: standalone/drakfont:688
+#: standalone/drakfont:694
 #, c-format
 msgid "here if no."
 msgstr "اینجا را اگر نه."
 
-#: standalone/drakfont:727
+#: standalone/drakfont:733
 #, c-format
 msgid "Unselected All"
 msgstr "همه انتخاب نشده‌اند"
 
-#: standalone/drakfont:730
+#: standalone/drakfont:736
 #, c-format
 msgid "Selected All"
 msgstr "همه انتخاب شده‌اند"
 
-#: standalone/drakfont:733
+#: standalone/drakfont:739
 #, c-format
 msgid "Remove List"
 msgstr "برداشتن لیست"
 
-#: standalone/drakfont:744 standalone/drakfont:763
+#: standalone/drakfont:750 standalone/drakfont:769
 #, c-format
 msgid "Importing fonts"
 msgstr "وارد کردن قلم‌ها"
 
-#: standalone/drakfont:748 standalone/drakfont:768
+#: standalone/drakfont:754 standalone/drakfont:774
 #, c-format
 msgid "Initial tests"
 msgstr "آزمایش‌های شروعی"
 
-#: standalone/drakfont:749
+#: standalone/drakfont:755
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "کپی قلم‌ها بر سیستم‌تان"
 
-#: standalone/drakfont:750
+#: standalone/drakfont:756
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "نصب و تبدیل قلم‌ها"
 
-#: standalone/drakfont:751
+#: standalone/drakfont:757
 #, c-format
 msgid "Post Install"
 msgstr "بعد از نصب"
 
-#: standalone/drakfont:769
+#: standalone/drakfont:775
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "برداشتن قلم‌ها از سیستم‌تان"
 
-#: standalone/drakfont:770
+#: standalone/drakfont:776
 #, c-format
 msgid "Post Uninstall"
 msgstr "بعد از نصب‌برداری"
 
-#: standalone/drakgw:59 standalone/drakgw:190
+#: standalone/drakgw:58 standalone/drakgw:193
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "اشتراک اتصال اینترنت"
 
-#: standalone/drakgw:117 standalone/drakvpn:49
-#, fuzzy, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "متاسفم، ما فقط هسته‌ی ۲.۴را حمایت می‌کنیم."
-
-#: standalone/drakgw:128
+#: standalone/drakgw:124
 #, c-format
-msgid "Internet Connection Sharing currently enabled"
-msgstr "اشتراک اتصال اینترنت در حال حاضر بکار افتاده است"
+msgid "Internet Connection Sharing currently disabled"
+msgstr "اشتراک اتصال اینترنت اکنون از کار افتاده است"
 
-#: 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 ""
-"برپاسازی اشتراک اتصال اینترنت از قبل انجام شده است.\n"
-"آن در حال حاضر بکار افتاده است.\n"
+"برپاسازی اشتراک اتصال اینترنت از قبل انجام شده است. \n"
+"در حال حاضر از کار افتاده است.\n"
 "\n"
-"چه کار می‌خواهید انجام دهید؟"
+"چکار دوست دارید بکنید؟"
 
-#: standalone/drakgw:133 standalone/drakvpn:99
+#: standalone/drakgw:129 standalone/drakvpn:125
 #, c-format
-msgid "disable"
-msgstr "ازکاراندازی"
+msgid "enable"
+msgstr "بکاراندازی"
 
-#: 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 "پیکربندی مجدد"
 
-#: 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 "اخراج"
 
 #: standalone/drakgw:136
 #, c-format
-msgid "Disabling servers..."
-msgstr "ازکاراندازی کارگزارها..."
+msgid "Enabling servers..."
+msgstr "بکاراندازی کارگزارها..."
 
-#: standalone/drakgw:150
+#: standalone/drakgw:148
 #, c-format
-msgid "Internet Connection Sharing is now disabled."
-msgstr "اشتراک اتصال اینترنت اکنون از کار افتاده است."
+msgid "Internet Connection Sharing is now enabled."
+msgstr "اشتراک اتصال اینترنت اکنون بکار افتاده است."
 
-#: standalone/drakgw:157
+#: standalone/drakgw:151
 #, c-format
-msgid "Internet Connection Sharing currently disabled"
-msgstr "اشتراک اتصال اینترنت اکنون از کار افتاده است"
+msgid "Internet Connection Sharing currently enabled"
+msgstr "اشتراک اتصال اینترنت در حال حاضر بکار افتاده است"
 
-#: 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 ""
-"برپاسازی اشتراک اتصال اینترنت از قبل انجام شده است. \n"
-"در حال حاضر از کار افتاده است.\n"
+"برپاسازی اشتراک اتصال اینترنت از قبل انجام شده است.\n"
+"آن در حال حاضر بکار افتاده است.\n"
 "\n"
-"چکار دوست دارید بکنید؟"
+"چه کار می‌خواهید انجام دهید؟"
 
-#: standalone/drakgw:162 standalone/drakvpn:125
+#: standalone/drakgw:156 standalone/drakvpn:99
 #, c-format
-msgid "enable"
-msgstr "بکاراندازی"
+msgid "disable"
+msgstr "ازکاراندازی"
 
-#: standalone/drakgw:169
+#: standalone/drakgw:159
 #, c-format
-msgid "Enabling servers..."
-msgstr "بکاراندازی کارگزارها..."
+msgid "Disabling servers..."
+msgstr "ازکاراندازی کارگزارها..."
 
-#: standalone/drakgw:175
+#: standalone/drakgw:174
 #, c-format
-msgid "Internet Connection Sharing is now enabled."
-msgstr "اشتراک اتصال اینترنت اکنون بکار افتاده است."
+msgid "Internet Connection Sharing is now disabled."
+msgstr "اشتراک اتصال اینترنت اکنون از کار افتاده است."
 
-#: standalone/drakgw:191
+#: standalone/drakgw:194
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -19603,48 +19812,27 @@ msgstr ""
 "توجه: شما به یک کارت شبکه برای برپاسازی یک شبکه محوطه محلی (LAN) احتیاج "
 "دارید."
 
-#: 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 ""
-"لطفاً نام واسطی را که به اینترنت اتصال دارد را وارد کنید.\n"
-"\n"
-"نمونه‌ها:\n"
-"\t\tppp+ برای مودم یا اتصالات DSL, \n"
-"\t\teth0, یا eth1 برای اتصالات با کابل, \n"
-"\t\tippp+ برای یک اتصال isdn.\n"
-
-#: standalone/drakgw:230
+#: standalone/drakgw:237
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "واسط %s (با استفاده از %s)"
 
-#: standalone/drakgw:231
+#: standalone/drakgw:238
 #, c-format
 msgid "Interface %s"
 msgstr "واسط‌ %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 ""
-"هیچ کارت شبکه‌ی ایثرنتی بر سیستم شما شناسایی نشد. لطفاً ابزار پیکربندی "
-"سخت‌افزار را اجرا کنید."
+msgid "No network adapter on your system!"
+msgstr "هیچ کارت شبکه بر سیستم شما!"
 
-#: standalone/drakgw:247
+#: standalone/drakgw:254
 #, c-format
 msgid "Network interface"
 msgstr "واسط شبکه"
 
-#: standalone/drakgw:248
+#: standalone/drakgw:255
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -19659,19 +19847,19 @@ msgstr ""
 "\n"
 "من بزودی شبکه‌ی محلی‌تان را با آن کارت برپاسازی می‌کنم."
 
-#: standalone/drakgw:255
+#: standalone/drakgw:262
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "لطفا کارت شبکه‌ای که به شبکه محلی شما وصل خواهد شد را انتخاب کنید."
 
-#: standalone/drakgw:283
+#: standalone/drakgw:291
 #, c-format
 msgid "Network interface already configured"
 msgstr "واسط شبکه از قبل پیکربندی شده است"
 
-#: standalone/drakgw:284
+#: standalone/drakgw:292
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -19686,27 +19874,27 @@ msgstr ""
 "\n"
 "شما می‌توانید آن را دستی انجام داده ولی باید بدانید که چکار دارید می‌کنید."
 
-#: standalone/drakgw:289
+#: standalone/drakgw:297
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "پیکربندی مجدد خودکار"
 
-#: standalone/drakgw:289
+#: standalone/drakgw:297
 #, c-format
 msgid "No (experts only)"
 msgstr "نه (فقط کارشناسان)"
 
-#: standalone/drakgw:290
+#: standalone/drakgw:298
 #, c-format
 msgid "Show current interface configuration"
 msgstr "نشان دادن پیکربندی واسط کنونی"
 
-#: standalone/drakgw:291
+#: standalone/drakgw:299
 #, c-format
 msgid "Current interface configuration"
 msgstr "پیکربندی واسط کنونی"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:300
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -19723,7 +19911,7 @@ msgstr ""
 "مشخصه آی‌پی: %s\n"
 "راه‌انداز: %s"
 
-#: standalone/drakgw:305
+#: standalone/drakgw:313
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -19751,104 +19939,104 @@ msgstr ""
 "(مجدد) کنم.\n"
 "\n"
 
-#: standalone/drakgw:312
+#: standalone/drakgw:320
 #, c-format
 msgid "Local Network adress"
 msgstr "نشانی شبکه‌ی محلی"
 
-#: standalone/drakgw:316
-#, fuzzy, c-format
+#: standalone/drakgw:324
+#, c-format
 msgid ""
 "DHCP Server Configuration.\n"
 "\n"
 "Here you can select different options for the DHCP server configuration.\n"
 "If you don't know the meaning of an option, simply leave it as it is."
 msgstr ""
-"تنظیم کارگزارDHCP .\n"
-"\n"
-"در اینجا می‌توانید گزینه‌های مختلفی برای کارگزار DHCP انتخاب نمایید.\n"
-"اگر شما معنی یک گزینه را نمی‌دانید، آن را به حال خود بگذارید.\n"
+"پیکربندی کارگزارDHCP.\n"
 "\n"
+"در اینجا می‌توانید گزینه‌های مختلفی برای پیکربندی کارگزار DHCP انتخاب کنید.\n"
+"اگر شما معنی یک گزینه را نمی‌دانید، آن را به حال خود بگذارید."
 
-#: standalone/drakgw:320
+#: standalone/drakgw:328
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "آی‌پی (این) کارگزار DHCP"
 
-#: standalone/drakgw:321
+#: standalone/drakgw:329
 #, c-format
 msgid "The DNS Server IP"
 msgstr "آی‌پی کارگزار DNS"
 
-#: standalone/drakgw:322
+#: standalone/drakgw:330
 #, c-format
 msgid "The internal domain name"
 msgstr "نام دامنه‌ی داخلی"
 
-#: standalone/drakgw:323
+#: standalone/drakgw:331
 #, c-format
 msgid "The DHCP start range"
 msgstr "شروع گستره‌ی DHCP"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:332
 #, c-format
 msgid "The DHCP end range"
 msgstr "پایان گستره‌ی DHCP"
 
-#: standalone/drakgw:325
+#: standalone/drakgw:333
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "اجاره دادن پیش‌فرض (ثانیه)"
 
-#: standalone/drakgw:326
+#: standalone/drakgw:334
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "حداکثر اجاره (ثانیه)"
 
-#: standalone/drakgw:327
+#: standalone/drakgw:335
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "پیکربندی مجدد واسط و کارگزار DHCP"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:342
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr "شبکه‌ی محلی با `.0' تمام نشد، فرود می‌آید."
 
-#: standalone/drakgw:344
+#: standalone/drakgw:352
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "احتمال اختلال نشانی LAN در پیکربندی کنونی %s یافت شد!\n"
 
-#: standalone/drakgw:354
+#: standalone/drakgw:362
 #, c-format
 msgid "Configuring..."
 msgstr "پیکربندی..."
 
-#: standalone/drakgw:355
+#: standalone/drakgw:363
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "پیکربندی دست‌نویس‌ها، نصب نرم‌افزار، راه‌اندازی کارگزارها..."
 
-#: 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 "اشکالات نصب بسته %s"
 
-#: standalone/drakgw:584
-#, fuzzy, c-format
+#: standalone/drakgw:595
+#, c-format
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
 "Area Network, using automatic network configuration (DHCP) and\n"
 " a Transparent Proxy Cache server (SQUID)."
 msgstr ""
-"همه چیز تنظیم شده است. \n"
-"شما می‌توانید ارتباط اینترنت خود را با رایانه‌های دیگر در شبکه محلی خود از "
-"طریق تنظیم خودکار شبکه ( DHCP) شریک شوید."
+"همه چیز پیکربندی شده است.\n"
+"شما می‌توانید ارتباط اینترنت خود را با رایانه‌های دیگر بر شبکه‌ی محلی‌اتان با "
+"استفاده از پیکربندی خودکار شبکه ( DHCP) یا کارگزار انبارچه‌ی پراکسی شفاف "
+"(SQUID) شریک شوید."
 
 #: standalone/drakhelp:17
-#, fuzzy, c-format
+#, c-format
 msgid ""
 " drakhelp 0.1\n"
 "Copyright (C) 2003-2004 MandrakeSoft.\n"
@@ -19858,8 +20046,8 @@ msgid ""
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003 MandrakeSoft.\n"
-"این یک نرم‌افزار آزاد بوده و ممکن است تحت شرایط GNU GPL انتشار مجدد گردد.\n"
+"Copyright (C) 2003-2004 MandrakeSoft.\n"
+"این یک نرم‌افزار آزاد بوده و ممکن است تحت شروط GNU GPL انتشار مجدد گردد.\n"
 "\n"
 "طرز استفاده: \n"
 
@@ -19923,7 +20111,7 @@ msgstr "تنظیمات سیستم & اختصاصی"
 msgid "Editable"
 msgstr "قابل ویرایش"
 
-#: standalone/drakperm:48 standalone/drakperm:315
+#: standalone/drakperm:48 standalone/drakperm:314
 #, c-format
 msgid "Path"
 msgstr "مسیر"
@@ -19938,7 +20126,7 @@ msgstr "کاربر"
 msgid "Group"
 msgstr "گروه"
 
-#: standalone/drakperm:48 standalone/drakperm:327
+#: standalone/drakperm:48 standalone/drakperm:326
 #, c-format
 msgid "Permissions"
 msgstr "اجازه‌ها"
@@ -19999,7 +20187,8 @@ msgstr "افزودن یک قاعده‌ی جدید در آخر"
 msgid "Delete selected rule"
 msgstr "حذف قواعد انتخاب‌شده"
 
-#: 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"
@@ -20099,12 +20288,12 @@ msgstr "کاربر کنونی"
 msgid "When checked, owner and group won't be changed"
 msgstr "اگر علامت زده شده، مالک و گروه تغییر نخواهند کرد"
 
-#: standalone/drakperm:301
+#: standalone/drakperm:300
 #, c-format
 msgid "Path selection"
 msgstr "انتخاب مسیر"
 
-#: standalone/drakperm:321
+#: standalone/drakperm:320
 #, c-format
 msgid "Property"
 msgstr "مشخصات"
@@ -20241,7 +20430,7 @@ msgstr "همه"
 msgid "LOCAL"
 msgstr "محلی"
 
-#: standalone/draksec:44
+#: standalone/draksec:44 standalone/drakvpn:1144
 #, c-format
 msgid "default"
 msgstr "پیش‌فرض"
@@ -20261,7 +20450,7 @@ msgstr "نه"
 msgid "yes"
 msgstr "بله"
 
-#: standalone/draksec:70
+#: standalone/draksec:81
 #, c-format
 msgid ""
 "Here, you can setup the security level and administrator of your machine.\n"
@@ -20352,32 +20541,32 @@ msgstr ""
 "می‌باشد،\n"
 "اما سیستم کاملاً بسته بوده و قابلیت‌های امنیتی در حد اعلای خود می‌باشند."
 
-#: standalone/draksec:118
+#: standalone/draksec:129
 #, c-format
 msgid "(default value: %s)"
 msgstr "(مقدار پیش‌فرض: %s)"
 
-#: standalone/draksec:159
+#: standalone/draksec:170
 #, c-format
 msgid "Security Level:"
 msgstr "سطح امنیت:"
 
-#: standalone/draksec:162
+#: standalone/draksec:173
 #, c-format
 msgid "Security Alerts:"
 msgstr "هشدارهای امنیتی:"
 
-#: standalone/draksec:166
+#: standalone/draksec:177
 #, c-format
 msgid "Security Administrator:"
 msgstr "مدیر امنیت:"
 
-#: standalone/draksec:168
+#: standalone/draksec:179
 #, c-format
 msgid "Basic options"
 msgstr "گزینه‌های پایه"
 
-#: standalone/draksec:181
+#: standalone/draksec:192
 #, c-format
 msgid ""
 "The following options can be set to customize your\n"
@@ -20386,27 +20575,27 @@ msgstr ""
 "گزینه‌های بدنبال آمده می‌توانند برای اختصاصی کردن امنیت سیستم‌تان انتخاب \n"
 "شوند. اگر احتیاج به توضیح دارید، نگاهی به راهنما بیاندازید.\n"
 
-#: standalone/draksec:183
+#: standalone/draksec:194
 #, c-format
 msgid "Network Options"
 msgstr "گزینه‌های شبکه"
 
-#: standalone/draksec:183
+#: standalone/draksec:194
 #, c-format
 msgid "System Options"
 msgstr "گزینه‌ها‌ی سیستم"
 
-#: standalone/draksec:229
+#: standalone/draksec:240
 #, c-format
 msgid "Periodic Checks"
 msgstr "بررسی‌های متناوب"
 
-#: standalone/draksec:247
+#: standalone/draksec:258
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "لطفاً صبر کنید، در حال گذاردن سطح امنیتی..."
 
-#: standalone/draksec:253
+#: standalone/draksec:264
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "لطفا صبر کنید، در حال گذاشتن گزینه‌های امنیتی..."
@@ -20438,7 +20627,7 @@ msgstr ""
 "http://www.linux-mandrake.com/en/hardware.php3"
 
 #: standalone/draksound:55
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -20449,8 +20638,9 @@ msgstr ""
 "\n"
 "\n"
 "\n"
-"توجه: اگر شما یک کارت صوتی ISA PnP ندارید, شما باید از برنامه sndconfig "
-"استفاده کنید.  فقط دستور \"sndconfig\" را در پایانه وارد نمایید."
+"توجه: اگر شما یک کارت صوتی ISA PnP دارید, باید از alsaconf یا برنامه‌ی "
+"sndconfig استفاده کنید.  فقط \"alsaconf\" یا \"sndconfig\" را در کنسول تایپ "
+"کنید."
 
 #: standalone/draksplash:21
 #, c-format
@@ -20461,37 +20651,37 @@ msgstr ""
 "بسته‌ی 'ImageMagick' برای تکمیل پیکربندی لازم است.\n"
 "برای نصب 'ImageMagick' بر \"تأیید\" یا برای ترک کردن بر \"لغو\" کلیک کنید"
 
-#: standalone/draksplash:67
+#: standalone/draksplash:68
 #, c-format
 msgid "first step creation"
 msgstr "اولین گام تولید"
 
-#: standalone/draksplash:70
+#: standalone/draksplash:71
 #, c-format
 msgid "final resolution"
 msgstr "تفکیک‌پذیری نهایی"
 
-#: standalone/draksplash:71 standalone/draksplash:165
+#: standalone/draksplash:72
 #, c-format
 msgid "choose image file"
 msgstr "انتخاب پرونده‌ی تصویر"
 
-#: standalone/draksplash:72
+#: standalone/draksplash:73
 #, c-format
 msgid "Theme name"
 msgstr "نام تم"
 
-#: standalone/draksplash:77
+#: standalone/draksplash:78
 #, c-format
 msgid "Browse"
 msgstr "مرور"
 
-#: standalone/draksplash:87 standalone/draksplash:153
+#: standalone/draksplash:93 standalone/draksplash:158
 #, c-format
 msgid "Configure bootsplash picture"
 msgstr "پیکربندی عکس تصویرآغازگر"
 
-#: standalone/draksplash:90
+#: standalone/draksplash:96
 #, c-format
 msgid ""
 "x coordinate of text box\n"
@@ -20500,7 +20690,7 @@ msgstr ""
 "مختصات افقی جعبه متن\n"
 "در تعداد نویسه‌ها"
 
-#: standalone/draksplash:91
+#: standalone/draksplash:97
 #, c-format
 msgid ""
 "y coordinate of text box\n"
@@ -20509,17 +20699,17 @@ msgstr ""
 "مختصات عمودی جعبه متن \n"
 "به تعداد نویسه‌ها"
 
-#: standalone/draksplash:92
+#: standalone/draksplash:98
 #, c-format
 msgid "text width"
 msgstr "عرض متن"
 
-#: standalone/draksplash:93
+#: standalone/draksplash:99
 #, c-format
 msgid "text box height"
 msgstr "ارتفاع جعبه متن"
 
-#: standalone/draksplash:94
+#: standalone/draksplash:100
 #, c-format
 msgid ""
 "the progress bar x coordinate\n"
@@ -20528,7 +20718,7 @@ msgstr ""
 "مختصات x گوشه‌ی چپ بالای\n"
 "نوار پیشروی"
 
-#: standalone/draksplash:95
+#: standalone/draksplash:101
 #, c-format
 msgid ""
 "the progress bar y coordinate\n"
@@ -20537,99 +20727,267 @@ msgstr ""
 "مختصات y گوشه‌ی چپ بالای\n"
 "نوار پیشروی"
 
-#: standalone/draksplash:96
+#: standalone/draksplash:102
 #, c-format
 msgid "the width of the progress bar"
 msgstr "عرض نوار پیشروی"
 
-#: standalone/draksplash:97
+#: standalone/draksplash:103
 #, c-format
 msgid "the height of the progress bar"
 msgstr "ارتفاع نوار پیشروی"
 
-#: standalone/draksplash:98
+#: standalone/draksplash:104
 #, c-format
 msgid "the color of the progress bar"
 msgstr "رنگ نوار پیشروی"
 
-#: standalone/draksplash:113
+#: standalone/draksplash:119
 #, c-format
 msgid "Preview"
 msgstr "پیش‌نما"
 
-#: standalone/draksplash:115
+#: standalone/draksplash:121
 #, c-format
 msgid "Save theme"
 msgstr "ذخیره‌ی تم"
 
-#: standalone/draksplash:116
+#: standalone/draksplash:122
 #, c-format
 msgid "Choose color"
 msgstr "انتخاب رنگ"
 
-#: standalone/draksplash:119
+#: standalone/draksplash:125
 #, c-format
 msgid "Display logo on Console"
 msgstr "نمایش ثبت‌ورود بر کنسول"
 
-#: standalone/draksplash:120
+#: standalone/draksplash:126
 #, c-format
 msgid "Make kernel message quiet by default"
 msgstr "پیغام‌های هسته را بوسیله‌ی پیش‌فرض ساکت کن"
 
-#: standalone/draksplash:156 standalone/draksplash:320
-#: standalone/draksplash:448
+#: standalone/draksplash:161 standalone/draksplash:319
+#: standalone/draksplash:462
 #, c-format
 msgid "Notice"
 msgstr "توجه"
 
-#: 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 "این تم هنوز یک تصویر آغازی را در %s ندارد!"
 
-#: standalone/draksplash:162
+#: standalone/draksplash:167
 #, c-format
 msgid "choose image"
 msgstr "انتخاب تصویر"
 
-#: standalone/draksplash:204
+#: standalone/draksplash:209
 #, c-format
 msgid "saving Bootsplash theme..."
 msgstr "در حال ذخیره‌ی تم تصویرآغاز..."
 
-#: standalone/draksplash:428
+#: standalone/draksplash:443
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "مجموعه رنگ نوار‌پیشروی"
 
-#: standalone/draksplash:448
+#: standalone/draksplash:462
 #, c-format
 msgid "You must choose an image file first!"
 msgstr "باید نخست پرونده‌ی تصویری را انتخاب کنید!"
 
-#: standalone/draksplash:453
+#: standalone/draksplash:467
 #, c-format
 msgid "Generating preview ..."
 msgstr "تولید پیش‌نما..."
 
-#: standalone/draksplash:499
+#: standalone/draksplash:512
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr "تصویرآغازی %s پیش‌نمای (%s) "
 
+#: standalone/drakups:63
+#, c-format
+msgid "Connected through a serial port or an usb cable"
+msgstr "از طریق درگاه سریال یا کابل usb متصل شده است"
+
+#: standalone/drakups:69
+#, c-format
+msgid "Add an UPS device"
+msgstr "افزودن یک دستگاه UPS"
+
+#: 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 خوش آمدید.\n"
+"\n"
+"در اینجا می‌توانی UPS جدیدی را به سیستم‌تان اضافه کنید.\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 ""
+"ما دستگاه UPS را اضافه خواهیم کرد.\n"
+"\n"
+"آیا ترجیح می‌دهید دستگاه‌های UPS متصل شده به این ماشین شناسائی‌خودکار شوند یا؟"
+
+#: standalone/drakups:82
+#, c-format
+msgid "Autodetection"
+msgstr "شناسائی خودکار"
+
+#: standalone/drakups:90 standalone/harddrake2:134
+#, c-format
+msgid "Detection in progress"
+msgstr "شناسایی در پیشروی است"
+
+#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479
+#: standalone/logdrake:485
+#, c-format
+msgid "Congratulations"
+msgstr "تبریک می‌گوئیم!"
+
+#: standalone/drakups:109
+#, c-format
+msgid "The wizard successfully added the following UPS devices:"
+msgstr "جادوگر با موفقیت دستگاه‌های UPS بدنبال آمده را اضافه کرد:"
+
+#: standalone/drakups:111
+#, c-format
+msgid "No new UPS devices was found"
+msgstr "هیچ دستگاه UPS جدیدی یافت نشد"
+
+#: standalone/drakups:116 standalone/drakups:128
+#, c-format
+msgid "UPS driver configuration"
+msgstr "پیکربندی راه‌انداز UPS"
+
+#: standalone/drakups:116
+#, c-format
+msgid "Please select your UPS model."
+msgstr "لطفا مدل UPS خود را انتخاب کنید."
+
+#: standalone/drakups:117
+#, c-format
+msgid "Manufacturer / Model:"
+msgstr "سازنده‌ / مدل:"
+
+#: 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 ""
+"ما در حال پیکربندی UPS \"%s\" از \"%s\" هستیم.\n"
+"لطفا نام، راه‌انداز و درگاه آن را پر کنید."
+
+#: standalone/drakups:133
+#, c-format
+msgid "Name:"
+msgstr "نام:"
+
+#: standalone/drakups:133
+#, c-format
+msgid "The name of your ups"
+msgstr "نام ups شما"
+
+#: standalone/drakups:134
+#, c-format
+msgid "The driver that manage your ups"
+msgstr "راه‌اندازی که ups شما را سازماندهی می‌کند"
+
+#: standalone/drakups:135
+#, c-format
+msgid "Port:"
+msgstr "درگاه:"
+
+#: standalone/drakups:137
+#, c-format
+msgid "The port on which is connected your ups"
+msgstr "نوع درگاهی که ups شما به آن وصل شده است"
+
+#: standalone/drakups:144
+#, c-format
+msgid "The wizard successfully configured the new \"%s\" UPS device."
+msgstr "جادوگر با موفقیت دستگاه UPS \"%s\" جدید را پیکربندی کرد."
+
+#: standalone/drakups:232
+#, c-format
+msgid "UPS devices"
+msgstr "دستگاه‌های UPS"
+
+#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266
+#: standalone/harddrake2:63
+#, c-format
+msgid "Name"
+msgstr "نام"
+
+#: standalone/drakups:250
+#, c-format
+msgid "UPS users"
+msgstr "کاربران UPS"
+
+#: standalone/drakups:265
+#, c-format
+msgid "Access Control Lists"
+msgstr "لیست‌های کنترل دستیابی"
+
+#: standalone/drakups:266
+#, c-format
+msgid "IP mask"
+msgstr "ماسک آی‌پی"
+
+#: standalone/drakups:277
+#, c-format
+msgid "Rules"
+msgstr "قواعد"
+
+#: standalone/drakups:278
+#, c-format
+msgid "Action"
+msgstr "کنش"
+
+#: standalone/drakups:278 standalone/drakvpn:1144 standalone/harddrake2:57
+#, c-format
+msgid "Level"
+msgstr "سطح"
+
+#: standalone/drakups:278
+#, c-format
+msgid "ACL name"
+msgstr "نام ACL"
+
+#: 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 "به ابزار پیکربندی UPS خوش آمدید"
+
 #: standalone/drakvpn:71
-#, fuzzy, c-format
+#, c-format
 msgid "DrakVPN"
-msgstr "دوراک (US)"
+msgstr "DrakVPN"
 
 #: standalone/drakvpn:93
-#, fuzzy, c-format
+#, c-format
 msgid "The VPN connection is enabled."
-msgstr "اشتراک ارتباط اینترنت اکنون فعال است."
+msgstr "اتصال VPN بکار افتاده است."
 
 #: standalone/drakvpn:94
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The setup of a VPN connection has already been done.\n"
 "\n"
@@ -20637,28 +20995,29 @@ msgid ""
 "\n"
 "What would you like to do ?"
 msgstr ""
-"تنظیم اشتراک ارتباط اینترنت قبلا انجام شده است. \n"
-"آن در حال حاضر فعال می‌باشد. \n"
+"برپاسازی اتصال VPN از قبل انجام شده است.\n"
 "\n"
-"چه کار می‌خواهید انجام بدهید؟"
+"آن در حال حاضر بکار افتاده است.\n"
+"\n"
+"چکار می‌خواهید بکنید؟"
 
 #: standalone/drakvpn:103
-#, fuzzy, c-format
+#, c-format
 msgid "Disabling VPN..."
-msgstr "غیرفعال سازی کارگزارها..."
+msgstr "از کار انداختن VPN..."
 
 #: standalone/drakvpn:112
-#, fuzzy, c-format
+#, c-format
 msgid "The VPN connection is now disabled."
-msgstr "اشتراک ارتباط اینترنت اکنون غیر فعال است."
+msgstr "اتصال VPN اکنون از کار افتاده است."
 
 #: standalone/drakvpn:119
-#, fuzzy, c-format
+#, c-format
 msgid "VPN connection currently disabled"
-msgstr "اشتراک ارتباط اینترنت اکنون غیرفعال شده است"
+msgstr "اتصال VPN در حال حاضر از کار افتاده است"
 
 #: standalone/drakvpn:120
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The setup of a VPN connection has already been done.\n"
 "\n"
@@ -20666,25 +21025,26 @@ msgid ""
 "\n"
 "What would you like to do ?"
 msgstr ""
-"تنظیم اشتراک ارتباط اینترنت قبلا انجام شده است. \n"
-"در حال حاضر غیرفعال است. \n"
+"برپاسازی اتصال VPN از قبل انجام شده است.\n"
 "\n"
-"چکار دوست دارید بکنید؟"
+"آن در حال حاضر از کار افتاده است.\n"
+"\n"
+"چکار می‌خواهید بکنید؟"
 
 #: standalone/drakvpn:133
-#, fuzzy, c-format
+#, c-format
 msgid "Enabling VPN..."
-msgstr "در حال فعال کردن کارگزارها..."
+msgstr "بکار انداختن VPN..."
 
 #: standalone/drakvpn:139
-#, fuzzy, c-format
+#, c-format
 msgid "The VPN connection is now enabled."
-msgstr "اشتراک ارتباط اینترنت اکنون فعال است."
+msgstr "اتصال VPN اکنون بکار افتاده است."
 
-#: standalone/drakvpn:153 standalone/drakvpn:179
+#: standalone/drakvpn:153 standalone/drakvpn:181
 #, c-format
 msgid "Simple VPN setup."
-msgstr ""
+msgstr "برپاسازی ساده‌ی VPN."
 
 #: standalone/drakvpn:154
 #, c-format
@@ -20701,8 +21061,19 @@ msgid ""
 "Make sure you have configured your Network/Internet access using\n"
 "drakconnect before going any further."
 msgstr ""
+"شما در شرف پیکربندی رایانه‌اتان برای استفاده از اتصال VPN هستید.\n"
+"\n"
+"با این قابلیت، رایانه‌های بر شبکه‌ی محلی‌اتان و رایانه‌های بر شبکه‌های\n"
+"خصوصی از راه دور می‌توانند منابع خود را از طریق دیوارهای آتش خود\n"
+"بر روی اینترنت از راه امنی شریک شوند.\n"
+"\n"
+"ارتبالات بر روی اینترنت رمزی شده است. رایانه‌های محلی و از راه دور\n"
+"بنظر می‌آیند که بر روی یک شبکه وجود دارند.\n"
+"\n"
+"مطمئن شوید که دستیابی اینترنت/شبکه‌اتان را با استفاده از drakconnect\n"
+"قبل از پیشروی پیکربندی کرده‌اید."
 
-#: standalone/drakvpn:180
+#: standalone/drakvpn:182
 #, c-format
 msgid ""
 "VPN connection.\n"
@@ -20717,13 +21088,24 @@ msgid ""
 "Please read AT LEAST the ipsec-howto docs\n"
 "before going any further."
 msgstr ""
+"اتصال VPN.\n"
+"\n"
+" این برنامه بر پایه‌ی پروژه‌های بدنبال آمده است:\n"
+" - FreeSwan: \t\t\thttp://www.freeswan.org/\n"
+" - Super-FreeSwan: \t\thttp://www.freeswan.ca/\n"
+" - ipsec-tools: \t\t\thttp://ipsec-tools.sourceforge.net/\n"
+" - ipsec-howto: \t\thttp://www.ipsec-howto.org\n"
+" - نوشتجات و صفحات دستوالعمل‌ همراه با بسته‌ی%s\n"
+"\n"
+"لطفاً حداقل نوشتجات چگونگی-ipsec را قبل از پیشروی\n"
+"بخوانید."
 
-#: standalone/drakvpn:192
-#, fuzzy, c-format
+#: standalone/drakvpn:194
+#, c-format
 msgid "Kernel module."
-msgstr "برداشتن یک بخش"
+msgstr "ماژول هسته."
 
-#: standalone/drakvpn:193
+#: standalone/drakvpn:195
 #, c-format
 msgid ""
 "The kernel need to have ipsec support.\n"
@@ -20732,23 +21114,28 @@ msgid ""
 "\n"
 "This kernel has '%s' support."
 msgstr ""
+"هسته نیاز به پشتیبانی ipsec دارد.\n"
+"\n"
+"شما نسخه‌ی هسته‌ی %s را اجرا می‌کنید.\n"
+"\n"
+"این هسته از '%s' پشتیبانی می‌کند."
 
-#: standalone/drakvpn:288
-#, fuzzy, c-format
+#: standalone/drakvpn:290
+#, c-format
 msgid "Security Policies"
-msgstr "گوشزد امنیتی:"
+msgstr "سیاست‌های امنیتی"
 
-#: standalone/drakvpn:288
+#: standalone/drakvpn:290
 #, c-format
 msgid "IKE daemon racoon"
-msgstr ""
+msgstr "IKE daemon racoon"
 
-#: standalone/drakvpn:291 standalone/drakvpn:302
-#, fuzzy, c-format
+#: standalone/drakvpn:293 standalone/drakvpn:304
+#, c-format
 msgid "Configuration file"
-msgstr "تنظیمات"
+msgstr "پرونده‌ی پیکربندی"
 
-#: standalone/drakvpn:292
+#: standalone/drakvpn:294
 #, c-format
 msgid ""
 "Configuration step !\n"
@@ -20759,8 +21146,15 @@ msgid ""
 "\n"
 "What would you like to configure ?\n"
 msgstr ""
+"گام پیکربندی !\n"
+"\n"
+"شما نیاز به مشخص کردن سیاست‌های امنیتی و سپس\n"
+"به پیکربندی شبح (IKE) معاوضه کلید خودکار دارید.\n"
+"شبح KAME IKE که از آن استفاده می‌کنیم 'racoon' نام دارد.\n"
+"\n"
+"چه را می‌خواهید پیکربندی کنید؟\n"
 
-#: standalone/drakvpn:303
+#: standalone/drakvpn:305
 #, c-format
 msgid ""
 "Next, we will configure the %s file.\n"
@@ -20768,13 +21162,17 @@ msgid ""
 "\n"
 "Simply click on Next.\n"
 msgstr ""
+"بعد، ما پرونده‌ی %s را پیکربندی خواهیم کرد.\n"
+"\n"
+"\n"
+"فقط بعدی را کلیک کنید.\n"
 
-#: standalone/drakvpn:321 standalone/drakvpn:681
-#, fuzzy, c-format
+#: standalone/drakvpn:323 standalone/drakvpn:683
+#, c-format
 msgid "%s entries"
-msgstr ", %s بندها"
+msgstr "ورودی‌های %s"
 
-#: standalone/drakvpn:322
+#: standalone/drakvpn:324
 #, c-format
 msgid ""
 "The %s file contents\n"
@@ -20787,24 +21185,37 @@ msgid ""
 "\n"
 "What would you like to do ?\n"
 msgstr ""
+"محتویات پرونده‌ی %s \n"
+"بدرون بندهایی تقسیم شده‌اند.\n"
+"\n"
+"اکنون می‌توانید :\n"
+"\n"
+"  - بندها را نمایش، افزوده، ویرایش یا بردارید، سپس\n"
+"  - تغییرات را بسپارید\n"
+"\n"
+"چکار می‌خواهید بکنید؟\n"
 
-#: standalone/drakvpn:329 standalone/drakvpn:690
-#, fuzzy, c-format
-msgid "Display"
-msgstr "روزانه"
+#: standalone/drakvpn:331 standalone/drakvpn:692
+#, c-format
+msgid ""
+"_:display here is a verb\n"
+"Display"
+msgstr "نمایش"
 
-#: standalone/drakvpn:329 standalone/drakvpn:690
-#, fuzzy, c-format
+#: standalone/drakvpn:331 standalone/drakvpn:692
+#, c-format
 msgid "Commit"
-msgstr "فشرده"
+msgstr "سپردن"
 
-#: standalone/drakvpn:343 standalone/drakvpn:347 standalone/drakvpn:705
-#: standalone/drakvpn:709
-#, fuzzy, c-format
-msgid "Display configuration"
-msgstr "تنظیمات LAN "
+#: standalone/drakvpn:345 standalone/drakvpn:349 standalone/drakvpn:707
+#: standalone/drakvpn:711
+#, c-format
+msgid ""
+"_:display here is a verb\n"
+"Display configuration"
+msgstr "پیکربندی نمایش"
 
-#: standalone/drakvpn:348
+#: standalone/drakvpn:350
 #, c-format
 msgid ""
 "The %s file does not exist.\n"
@@ -20813,13 +21224,18 @@ msgid ""
 "\n"
 "You'll have to go back and choose 'add'.\n"
 msgstr ""
+"پرونده‌ی %s وجود ندارد.\n"
+"\n"
+"این باید پیکربندی جدیدی باشد.\n"
+"\n"
+"باید به عقب برگشته و 'افزودن' را انتخاب کنید.\n"
 
-#: standalone/drakvpn:364
+#: standalone/drakvpn:366
 #, c-format
 msgid "ipsec.conf entries"
-msgstr ""
+msgstr "ورودی‌های ipsec.conf"
 
-#: standalone/drakvpn:365
+#: standalone/drakvpn:367
 #, c-format
 msgid ""
 "The %s file contains different sections.\n"
@@ -20833,28 +21249,38 @@ msgid ""
 "\n"
 "Choose the section you would like to add.\n"
 msgstr ""
+"پرونده‌ی %s دارای چندین بند است.\n"
+"\n"
+"اسکلت آن این است :\t'config setup' \n"
+"\t\t\t\t\t'conn default' \n"
+"\t\t\t\t\t'normal1'\n"
+"\t\t\t\t\t'normal2' \n"
+"\n"
+"اکنون می‌توانید یکی از این بندها را اضافه کنید.\n"
+"\n"
+"بندی را که می‌خواهید اضافه کنید انتخاب نمایید.\n"
 
-#: standalone/drakvpn:372
-#, fuzzy, c-format
+#: standalone/drakvpn:374
+#, c-format
 msgid "config setup"
-msgstr "تنظیم مجدد"
+msgstr "برپاسازی پیکربندی"
 
-#: standalone/drakvpn:372
-#, fuzzy, c-format
+#: standalone/drakvpn:374
+#, c-format
 msgid "conn %default"
-msgstr "پیش‌فرض"
+msgstr "conn %default"
 
-#: standalone/drakvpn:372
-#, fuzzy, c-format
+#: standalone/drakvpn:374
+#, c-format
 msgid "normal conn"
-msgstr "حالت عادی"
+msgstr "normal conn"
 
-#: standalone/drakvpn:378 standalone/drakvpn:419 standalone/drakvpn:506
-#, fuzzy, c-format
+#: standalone/drakvpn:380 standalone/drakvpn:421 standalone/drakvpn:508
+#, c-format
 msgid "Exists !"
-msgstr "خروج"
+msgstr "وجود دارد !"
 
-#: standalone/drakvpn:379 standalone/drakvpn:420
+#: standalone/drakvpn:381 standalone/drakvpn:422
 #, c-format
 msgid ""
 "A section with this name already exists.\n"
@@ -20863,8 +21289,13 @@ msgid ""
 "You'll have to go back and add another section\n"
 "or change its name.\n"
 msgstr ""
+"بندی با این نام از قبل وجود دارد.\n"
+"نام‌های بند باید یگانه باشند.\n"
+"\n"
+"باید به عقب برگشته و بند دیگری را افزوده\n"
+"یا نام آن را تغییر دهید.\n"
 
-#: standalone/drakvpn:396
+#: standalone/drakvpn:398
 #, c-format
 msgid ""
 "This section has to be on top of your\n"
@@ -20875,38 +21306,45 @@ msgid ""
 "\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
+"این بند باید در نوک پرونده‌ی %s\n"
+"شما باشد.\n"
+"\n"
+"مطمئن شوید که همه‌ی بندهای دیگر این بند\n"
+"برپاسازی پیکربندی را دنبال می‌کنند.\n"
+"\n"
+"وقتی انجام دادید ادامه یا قبلی را انتخاب کنید.\n"
 
-#: standalone/drakvpn:401
-#, fuzzy, c-format
+#: standalone/drakvpn:403
+#, c-format
 msgid "interfaces"
-msgstr "واسط‌"
+msgstr "واسط‌‌ها"
 
-#: standalone/drakvpn:402
+#: standalone/drakvpn:404
 #, c-format
 msgid "klipsdebug"
-msgstr ""
+msgstr "klipsdebug"
 
-#: standalone/drakvpn:403
+#: standalone/drakvpn:405
 #, c-format
 msgid "plutodebug"
-msgstr ""
+msgstr "plutodebug"
 
-#: standalone/drakvpn:404
+#: standalone/drakvpn:406
 #, c-format
 msgid "plutoload"
-msgstr ""
+msgstr "plutoload"
 
-#: standalone/drakvpn:405
+#: standalone/drakvpn:407
 #, c-format
 msgid "plutostart"
-msgstr ""
+msgstr "plutostart"
 
-#: standalone/drakvpn:406
+#: standalone/drakvpn:408
 #, c-format
 msgid "uniqueids"
-msgstr ""
+msgstr "uniqueids"
 
-#: standalone/drakvpn:440
+#: standalone/drakvpn:442
 #, c-format
 msgid ""
 "This is the first section after the config\n"
@@ -20918,53 +21356,60 @@ msgid ""
 "them here, globally, you can define them in each\n"
 "section.\n"
 msgstr ""
+"این اولین بند بعد از پیکربندی برپاسازی یک است.\n"
+"\n"
+"در اینجا تنظیمات پیش‌فرض را مشخص می‌کنید.\n"
+"همه‌ی بندهای دیگر این یکی را دنبال خواهند کرد.\n"
+"تنظیمات در چپ اختیاری هستند. اگر آنها در اینجا مشخص\n"
+"نگردند، بطور جهانی، می‌توانید آنها را در هر بند مشخص\n"
+"کنید.\n"
 
-#: standalone/drakvpn:447
+#: standalone/drakvpn:449
 #, c-format
-msgid "pfs"
-msgstr ""
+msgid "PFS"
+msgstr "PFS"
 
-#: standalone/drakvpn:448
+#: standalone/drakvpn:450
 #, c-format
 msgid "keyingtries"
-msgstr ""
+msgstr "keyingtries"
 
-#: standalone/drakvpn:449
+#: standalone/drakvpn:451
 #, c-format
 msgid "compress"
-msgstr ""
+msgstr "فشرده‌سازی"
 
-#: standalone/drakvpn:450
+#: standalone/drakvpn:452
 #, c-format
 msgid "disablearrivalcheck"
-msgstr ""
+msgstr "disablearrivalcheck"
 
-#: standalone/drakvpn:451 standalone/drakvpn:490
-#, fuzzy, c-format
+#: standalone/drakvpn:453 standalone/drakvpn:492
+#, c-format
 msgid "left"
-msgstr "حذف"
+msgstr "چپ"
 
-#: standalone/drakvpn:452 standalone/drakvpn:491
+#: standalone/drakvpn:454 standalone/drakvpn:493
 #, c-format
 msgid "leftcert"
-msgstr ""
+msgstr "leftcert"
 
-#: standalone/drakvpn:453 standalone/drakvpn:492
+#: standalone/drakvpn:455 standalone/drakvpn:494
 #, c-format
 msgid "leftrsasigkey"
-msgstr ""
+msgstr "leftrsasigkey"
 
-#: standalone/drakvpn:454 standalone/drakvpn:493
+#: standalone/drakvpn:456 standalone/drakvpn:495
 #, c-format
 msgid "leftsubnet"
-msgstr ""
+msgstr "leftsubnet"
 
-#: standalone/drakvpn:455 standalone/drakvpn:494
+#: standalone/drakvpn:457 standalone/drakvpn:496
 #, c-format
 msgid "leftnexthop"
-msgstr ""
+msgstr "leftnexthop"
 
-#: standalone/drakvpn:484
+#: standalone/drakvpn:486
 #, c-format
 msgid ""
 "Your %s file has several sections, or connections.\n"
@@ -20972,48 +21417,52 @@ msgid ""
 "You can now add a new section.\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"پرونده‌ی %s شما چندین بند، یا اتصالات دارد.\n"
+"\n"
+"اکنون می‌توانید بند تازه‌ای را اضافه کنید.\n"
+"وقتی انجام دادید ادامه را برای نگارش داده‌ها انتخاب کنید.\n"
 
-#: standalone/drakvpn:487
-#, fuzzy, c-format
+#: standalone/drakvpn:489
+#, c-format
 msgid "section name"
-msgstr "نام ارتباط"
+msgstr "نام بخش"
 
-#: standalone/drakvpn:488
-#, fuzzy, c-format
+#: standalone/drakvpn:490
+#, c-format
 msgid "authby"
-msgstr "مسیر"
+msgstr "authby"
 
-#: standalone/drakvpn:489
-#, fuzzy, c-format
+#: standalone/drakvpn:491
+#, c-format
 msgid "auto"
-msgstr "درباره"
+msgstr "خودکار"
 
-#: standalone/drakvpn:495
-#, fuzzy, c-format
+#: standalone/drakvpn:497
+#, c-format
 msgid "right"
-msgstr "بالا"
+msgstr "راست"
 
-#: standalone/drakvpn:496
-#, fuzzy, c-format
+#: standalone/drakvpn:498
+#, c-format
 msgid "rightcert"
-msgstr "بالاتر"
+msgstr "rightcert"
 
-#: standalone/drakvpn:497
+#: standalone/drakvpn:499
 #, c-format
 msgid "rightrsasigkey"
-msgstr ""
+msgstr "rightrsasigkey"
 
-#: standalone/drakvpn:498
+#: standalone/drakvpn:500
 #, c-format
 msgid "rightsubnet"
-msgstr ""
+msgstr "rightsubnet"
 
-#: standalone/drakvpn:499
+#: standalone/drakvpn:501
 #, c-format
 msgid "rightnexthop"
-msgstr ""
+msgstr "rightnexthop"
 
-#: standalone/drakvpn:507
+#: standalone/drakvpn:509
 #, c-format
 msgid ""
 "A section with this name already exists.\n"
@@ -21022,8 +21471,13 @@ msgid ""
 "You'll have to go back and add another section\n"
 "or change the name of the section.\n"
 msgstr ""
+"بندی با این نام از قبل وجود دارد.\n"
+"نام‌های بند باید یگانه باشند.\n"
+"\n"
+"شما باید به عقب برگشته و بند دیگری را اضافه کرده\n"
+"یا نام بند را عوض کنید.\n"
 
-#: standalone/drakvpn:539
+#: standalone/drakvpn:541
 #, c-format
 msgid ""
 "Add a Security Policy.\n"
@@ -21032,13 +21486,18 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"افزودن سیاست امنیتی.\n"
+"\n"
+"اکنون می‌توانید سیاست امنیتی را اضافه کنید.\n"
+"\n"
+"وقتی انجام دادید ادامه را برای نگارش داده‌ها انتخاب کنید.\n"
 
-#: standalone/drakvpn:572 standalone/drakvpn:822
-#, fuzzy, c-format
+#: standalone/drakvpn:574 standalone/drakvpn:824
+#, c-format
 msgid "Edit section"
-msgstr "انتخاب مسیر"
+msgstr "ویرایش بخش"
 
-#: standalone/drakvpn:573
+#: standalone/drakvpn:575
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21046,19 +21505,23 @@ msgid ""
 "You can choose here below the one you want to edit \n"
 "and then click on next.\n"
 msgstr ""
+"پرونده‌ی %s شما چندین بند یا اتصالات دارد.\n"
+"\n"
+"می‌توانید اینجا در زیر آن را که می‌خواهید ویرایش کنید انتخاب\n"
+"کرده و سپس بعدی را کلیک کنید.\n"
 
-#: standalone/drakvpn:576 standalone/drakvpn:656 standalone/drakvpn:827
-#: standalone/drakvpn:873
-#, fuzzy, c-format
+#: standalone/drakvpn:578 standalone/drakvpn:658 standalone/drakvpn:829
+#: standalone/drakvpn:875
+#, c-format
 msgid "Section names"
-msgstr "نام ارتباط"
+msgstr "نام‌های بخش"
 
-#: standalone/drakvpn:586
-#, fuzzy, c-format
+#: standalone/drakvpn:588
+#, c-format
 msgid "Can't edit !"
-msgstr "نمی‌توان %s را باز کرد!"
+msgstr "نمی‌توان ویرایش کرد!"
 
-#: standalone/drakvpn:587
+#: standalone/drakvpn:589
 #, c-format
 msgid ""
 "You cannot edit this section.\n"
@@ -21068,8 +21531,14 @@ msgid ""
 "of the %s file, and eventually, disable or\n"
 "enable the oportunistic encryption.\n"
 msgstr ""
+"شما نمی‌توانید این بند را ویرایش کنید.\n"
+"\n"
+"این بند برای Freswan 2.X اجباری است.\n"
+"یکی باید نسخه‌ی ۲٬۰ را در نوک پرونده‌ی %s\n"
+"مشخص کرده، و سرانجام، رمزگذاری فرصت‌طلبانه\n"
+"را از کار انداختن یا بکار بیاندازید.\n"
 
-#: standalone/drakvpn:596
+#: standalone/drakvpn:598
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -21077,8 +21546,12 @@ msgid ""
 "You can now edit the config setup section entries.\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"پرونده‌ی %s شما بخش‌های متعددی دارد.\n"
+"\n"
+"اکنون می‌توانید ورودی‌های بخش برپاسازی پیکربندی را ویرایش کنید.\n"
+"وقتی انجام دادید ادامه را برای نگارش داده‌ها انتخاب کنید.\n"
 
-#: standalone/drakvpn:607
+#: standalone/drakvpn:609
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21086,8 +21559,12 @@ msgid ""
 "You can now edit the default section entries.\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"پرونده‌ی %s شما بخش‌ها یا اتصالات متعددی دارد.\n"
+"\n"
+"اکنون می‌توانید ورودی‌های بخش پیش‌فرض را ویرایش کنید.\n"
+"وقتی انجام دادید ادامه را برای نگارش داده‌ها انتخاب کنید.\n"
 
-#: standalone/drakvpn:620
+#: standalone/drakvpn:622
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21096,8 +21573,13 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"پرونده‌ی %s شما بخش‌ها یا اتصالات متعددی دارد.\n"
+"\n"
+"اکنون می‌توانید ورودی‌های بخش عادی را ویرایش کنید.\n"
+"\n"
+"وقتی انجام دادید ادامه را برای نگارش داده‌ها انتخاب کنید.\n"
 
-#: standalone/drakvpn:641
+#: standalone/drakvpn:643
 #, c-format
 msgid ""
 "Edit a Security Policy.\n"
@@ -21106,13 +21588,18 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"ویرایش سیاست امنیتی.\n"
+"\n"
+"اکنون می‌توانید سیاست امنیتی را اضافه کنید.\n"
+"\n"
+"وقتی انجام دادید ادامه را برای نگارش داده‌ها انتخاب کنید.\n"
 
-#: standalone/drakvpn:652 standalone/drakvpn:869
-#, fuzzy, c-format
+#: standalone/drakvpn:654 standalone/drakvpn:871
+#, c-format
 msgid "Remove section"
-msgstr "برداشتن لیست"
+msgstr "برداشتن بخش"
 
-#: standalone/drakvpn:653 standalone/drakvpn:870
+#: standalone/drakvpn:655 standalone/drakvpn:872
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21120,8 +21607,12 @@ msgid ""
 "You can choose here below the one you want to remove\n"
 "and then click on next.\n"
 msgstr ""
+"پرونده‌ی %s شما بخش‌ها یا اتصالات متعددی دارد.\n"
+"\n"
+"اینجا در زیر می‌توانید آن را که می‌خواهید بردارید انتخاب\n"
+"کرده و سپس بعدی را کلیک کنید.\n"
 
-#: standalone/drakvpn:682
+#: standalone/drakvpn:684
 #, c-format
 msgid ""
 "The racoon.conf file configuration.\n"
@@ -21134,8 +21625,16 @@ msgid ""
 "  - remove \t\t (remove an existing section)\n"
 "  - commit \t\t (writes the changes to the real file)"
 msgstr ""
+"پیکربندی پرونده‌ی racoon.conf.\n"
+"\n"
+"محتویات این پرونده بدرون بندها تقسیم شده‌اند.\n"
+"اکنون می‌توانید :   - display \t\t (نمایش دادن محتویات پرونده)\n"
+"  - add\t\t\t (افزودن یک بند)\n"
+"  - edit \t\t\t (پارامترهای بندی را پیرایش کنید)\n"
+"  - remove \t\t (بند موجودی را بردارید)\n"
+"  - commit \t\t (تغییرات را به پرونده‌ی حقیقی نگارش کنید)"
 
-#: standalone/drakvpn:710
+#: standalone/drakvpn:712
 #, c-format
 msgid ""
 "The %s file does not exist\n"
@@ -21144,13 +21643,18 @@ msgid ""
 "\n"
 "You'll have to go back and choose configure.\n"
 msgstr ""
+"پرونده‌ی %s وجود ندارد\n"
+"\n"
+"این باید پیکربندی جدیدی باشد.\n"
+"\n"
+"باید به عقب برگشته و پیکربندی را انتخاب کنید.\n"
 
-#: standalone/drakvpn:724
+#: standalone/drakvpn:726
 #, c-format
 msgid "racoonf.conf entries"
-msgstr ""
+msgstr "ورودی‌های racoonf.conf"
 
-#: standalone/drakvpn:725
+#: standalone/drakvpn:727
 #, c-format
 msgid ""
 "The 'add' sections step.\n"
@@ -21162,23 +21666,31 @@ msgid ""
 "\n"
 "Choose the section you would like to add.\n"
 msgstr ""
+"مرحله‌ی بخش‌های 'افزودن'.\n"
+"\n"
+"اینجا در زیر ساختار پرونده‌ی racoon.conf است :\n"
+"\t'مسیر'\n"
+"\t'از راه دور'\n"
+"\t'sainfo' \n"
+"\n"
+"بخشی را که می‌خواهید اضافه کنید انتخاب نمائید.\n"
 
-#: standalone/drakvpn:731
-#, fuzzy, c-format
+#: standalone/drakvpn:733
+#, c-format
 msgid "path"
 msgstr "مسیر"
 
-#: standalone/drakvpn:731
-#, fuzzy, c-format
+#: standalone/drakvpn:733
+#, c-format
 msgid "remote"
-msgstr "برداشتن"
+msgstr "از راه دور"
 
-#: standalone/drakvpn:731
-#, fuzzy, c-format
+#: standalone/drakvpn:733
+#, c-format
 msgid "sainfo"
-msgstr "اسپانول"
+msgstr "sainfo"
 
-#: standalone/drakvpn:739
+#: standalone/drakvpn:741
 #, c-format
 msgid ""
 "The 'add path' section step.\n"
@@ -21187,13 +21699,18 @@ msgid ""
 "\n"
 "Put your mouse over the certificate entry to obtain online help."
 msgstr ""
+"مرحله‌ی بخش 'افزودن مسیر'.\n"
+"\n"
+"بخشهای مسیر باید در بالای پرونده‌ی racoon.conf شما باشند.\n"
+"\n"
+"برای دریافت راهنمایی موشی خود را بر روی ورودی گواهینامه بگذارید."
 
-#: standalone/drakvpn:742
-#, fuzzy, c-format
+#: standalone/drakvpn:744
+#, c-format
 msgid "path type"
-msgstr "تغییر نوع"
+msgstr "نوع مسیر"
 
-#: standalone/drakvpn:746
+#: standalone/drakvpn:748
 #, c-format
 msgid ""
 "path include path : specifies a path to include\n"
@@ -21216,13 +21733,32 @@ msgid ""
 "of the identifier and the shared secret key which are used at\n"
 "Pre-shared key authentication method in phase 1."
 msgstr ""
+"path include path : specifies a path to include\n"
+"a file. See File Inclusion.\n"
+"\tExample: path include '/etc/racoon'\n"
+"\n"
+"path pre_shared_key file : specifies a file containing\n"
+"pre-shared key(s) for various ID(s). See Pre-shared key File.\n"
+"\tExample: path pre_shared_key '/etc/racoon/psk.txt' ;\n"
+"\n"
+"path certificate path : racoon(8) will search this directory\n"
+"if a certificate or certificate request is received.\n"
+"\tExample: path certificate '/etc/cert' ;\n"
+"\n"
+"File Inclusion : include file \n"
+"other configuration files can be included.\n"
+"\tExample: include \"remote.conf\" ;\n"
+"\n"
+"Pre-shared key File : Pre-shared key file defines a pair\n"
+"of the identifier and the shared secret key which are used at\n"
+"Pre-shared key authentication method in phase 1."
 
-#: standalone/drakvpn:766
-#, fuzzy, c-format
+#: standalone/drakvpn:768 standalone/drakvpn:861
+#, c-format
 msgid "real file"
-msgstr "انتخاب پرونده"
+msgstr "پرونده‌ی حقیقی"
 
-#: standalone/drakvpn:789
+#: standalone/drakvpn:791
 #, c-format
 msgid ""
 "Make sure you already have the path sections\n"
@@ -21231,8 +21767,13 @@ msgid ""
 "You can now choose the remote settings.\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
+"مطمئن شوید از قبل مسیر بخش‌ها را بر بالای\n"
+"پرونده‌ی racoon.conf خود دارید.\n"
+"\n"
+"اکنون می‌توانید تنظیمات از راه دور را انتخاب کنید.\n"
+"وقتی انجام دادید ادامه یا قبلی را انتخاب کنید.\n"
 
-#: standalone/drakvpn:806
+#: standalone/drakvpn:808
 #, c-format
 msgid ""
 "Make sure you already have the path sections\n"
@@ -21241,8 +21782,13 @@ msgid ""
 "You can now choose the sainfo settings.\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
+"مطمئن شوید که مسیر بخش‌ها را از قبل در بالای\n"
+"پرونده‌ی %s خود دارید.\n"
+"\n"
+"اکنون می‌توانید تنظیمات sainfo را انتخاب کنید.\n"
+"وقتی انجام دادید ادامه یا قبلی را انتخاب کنید.\n"
 
-#: standalone/drakvpn:823
+#: standalone/drakvpn:825
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21250,8 +21796,12 @@ msgid ""
 "You can choose here in the list below the one you want\n"
 "to edit and then click on next.\n"
 msgstr ""
+"پرونده‌ی %s شما بخش‌ها یا اتصالات متعددی دارد.\n"
+"\n"
+"اینجا در زیر می‌توانید آن را که می‌خواهید ویرایش کنید\n"
+"انتخاب کرده و سپس بر بعدی کلیک کنید.\n"
 
-#: standalone/drakvpn:834
+#: standalone/drakvpn:836
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -21261,8 +21811,14 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"پرونده %s شما بخش‌های متعددی دارد.\n"
+"\n"
+"\n"
+"اکنون می‌توانید ورودی‌های بخش از راه دور را ویرایش کنید\n"
+"\n"
+"وقتی انجام دادید ادامه را برای نگارش داده‌ها انتخاب کنید.\n"
 
-#: standalone/drakvpn:843
+#: standalone/drakvpn:845
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -21271,8 +21827,13 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data."
 msgstr ""
+"پرونده‌ی %s بخش‌های متعددی دارد.\n"
+"\n"
+"اکنون می‌توانید ورودی‌های بخش sainfo را ویرایش کنید.\n"
+"\n"
+"وقتی انجام دادید ادامه را برای نگارش داده‌ها انتخاب کنید."
 
-#: standalone/drakvpn:851
+#: standalone/drakvpn:853
 #, c-format
 msgid ""
 "This section has to be on top of your\n"
@@ -21285,18 +21846,22 @@ msgid ""
 "\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
+"این بخش باید بر بالای پرونده‌ی %s\n"
+"باشد.\n"
+"\n"
+"مطمئن شوید همه‌ی بخش‌های دیگر این\n"
+"مسیر بخش‌ها را دنبال می‌کنند.\n"
+"\n"
+"اکنون می‌توانید مسیر ورودی‌های را ویرایش کنید.\n"
+"\n"
+"وقتی انجام دادید ادامه یا قبلی را انتخاب کنید.\n"
 
-#: standalone/drakvpn:858
+#: standalone/drakvpn:860
 #, c-format
 msgid "path_type"
-msgstr ""
+msgstr "path_type"
 
-#: standalone/drakvpn:859
-#, fuzzy, c-format
-msgid "real_file"
-msgstr "انتخاب پرونده"
-
-#: standalone/drakvpn:899
+#: standalone/drakvpn:901
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -21307,13 +21872,20 @@ msgid ""
 "You should make sure that that the tunnels shorewall\n"
 "section is configured."
 msgstr ""
+"همه چیز پیکربندی شده است.\n"
+"\n"
+"اکنون می‌توانید منابع را از طریق اینترنت، به روش امنی،\n"
+"با استفاده از VPN مشترک شوید.\n"
+"\n"
+"باید مطمئن شوید که بخش shorewall تونل‌ها\n"
+"پیکربندی شده است."
 
-#: standalone/drakvpn:919
+#: standalone/drakvpn:921
 #, c-format
 msgid "Sainfo source address"
-msgstr ""
+msgstr "نشانی منبع sainfo"
 
-#: standalone/drakvpn:920
+#: standalone/drakvpn:922
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21335,13 +21907,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 (source_id destination_id | anonymous) { statements }\n"
+"defines the parameters of the IKE phase 2\n"
+"(IPsec-SA establishment).\n"
+"\n"
+"source_id and destination_id are constructed like:\n"
+"\n"
+"\taddress address [/ prefix] [[port]] ul_proto\n"
+"\n"
+"Examples : \n"
+"\n"
+"sainfo anonymous (accepts connections from anywhere)\n"
+"\tleave blank this entry if you want anonymous\n"
+"\n"
+"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
+"\t203.178.141.209 is the source address\n"
+"\n"
+"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"
 
-#: standalone/drakvpn:937
-#, fuzzy, c-format
+#: standalone/drakvpn:939
+#, c-format
 msgid "Sainfo source protocol"
-msgstr "پایان‌نامه‌ی اروپایی"
+msgstr "پایان‌نامه‌ی منبع sainfo"
 
-#: standalone/drakvpn:938
+#: standalone/drakvpn:940
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21360,13 +21950,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 (source_id destination_id | anonymous) { statements }\n"
+"defines the parameters of the IKE phase 2\n"
+"(IPsec-SA establishment).\n"
+"\n"
+"source_id and destination_id are constructed like:\n"
+"\n"
+"\taddress address [/ prefix] [[port]] ul_proto\n"
+"\n"
+"Examples : \n"
+"\n"
+"sainfo anonymous (accepts connections from anywhere)\n"
+"\tleave blank this entry if you want anonymous\n"
+"\n"
+"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
+"\tthe first 'any' allows any protocol for the source"
 
-#: standalone/drakvpn:952
+#: standalone/drakvpn:954
 #, c-format
 msgid "Sainfo destination address"
-msgstr ""
+msgstr "نشانی مقصد sainfo"
 
-#: standalone/drakvpn:953
+#: standalone/drakvpn:955
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21388,13 +21993,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 (source_id destination_id | anonymous) { statements }\n"
+"defines the parameters of the IKE phase 2\n"
+"(IPsec-SA establishment).\n"
+"\n"
+"source_id and destination_id are constructed like:\n"
+"\n"
+"\taddress address [/ prefix] [[port]] ul_proto\n"
+"\n"
+"Examples : \n"
+"\n"
+"sainfo anonymous (accepts connections from anywhere)\n"
+"\tleave blank this entry if you want anonymous\n"
+"\n"
+"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
+"\t203.178.141.218 is the destination address\n"
+"\n"
+"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"
 
-#: standalone/drakvpn:970
-#, fuzzy, c-format
+#: standalone/drakvpn:972
+#, c-format
 msgid "Sainfo destination protocol"
-msgstr "ابزار در بسترسازی ویندوز"
+msgstr "پایان‌نامه‌ی مقصد sainfo"
 
-#: standalone/drakvpn:971
+#: standalone/drakvpn:973
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21413,13 +22036,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 (source_id destination_id | anonymous) { statements }\n"
+"defines the parameters of the IKE phase 2\n"
+"(IPsec-SA establishment).\n"
+"\n"
+"source_id and destination_id are constructed like:\n"
+"\n"
+"\taddress address [/ prefix] [[port]] ul_proto\n"
+"\n"
+"Examples : \n"
+"\n"
+"sainfo anonymous (accepts connections from anywhere)\n"
+"\tleave blank this entry if you want anonymous\n"
+"\n"
+"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
+"\tthe last 'any' allows any protocol for the destination"
 
-#: standalone/drakvpn:985
+#: standalone/drakvpn:987
 #, c-format
 msgid "PFS group"
-msgstr ""
+msgstr "گروه PFS"
 
-#: standalone/drakvpn:987
+#: standalone/drakvpn:989
 #, c-format
 msgid ""
 "define the group of Diffie-Hellman exponentiations.\n"
@@ -21428,13 +22066,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 ""
+"گروهی از توان‌های Diffie-Hellman را مشخص می‌کند.\n"
+"اگر PFS را نیاز ندارید پس می‌توانید این دستور را از قلم بیاندازید.\n"
+"هر پیشنهادی پذیرفته خواهد شد اگر یکی را مشخص نکنید.\n"
+"گروه یکی از اینهاست: modp768, modp1024, modp1536.\n"
+"یا می‌توانید ۱٬ ۲٬ یا ۵ را مانند شماره‌ی گروه DH مشخص کنید."
 
-#: standalone/drakvpn:992
-#, fuzzy, c-format
+#: standalone/drakvpn:994
+#, c-format
 msgid "Lifetime number"
-msgstr "یک عدد"
+msgstr "شماره‌ی زمان‌عمر"
 
-#: standalone/drakvpn:993
+#: standalone/drakvpn:995
 #, c-format
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
@@ -21454,13 +22097,29 @@ msgid ""
 "\n"
 "So, here, the lifetime numbers are 1, 1, 30, 30, 60 and 12.\n"
 msgstr ""
+"طول عمر زمان مشخصی را که در معامله‌های فاز ۱\n"
+"پیشنهاد خواهد شد تعیین می‌کند.  هر پیشنهادی پذیرفته\n"
+"خواهد شد، و مشخصه(ها) به همتا پیشنهاد نخواهد شد\n"
+"اگر آن(ها) را تعیین نکنید.  آنها می‌توانند تکی در هر\n"
+"پیشنهادی تعیین گردند.\n"
+"\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"
+"پس در اینجا شماره‌های طول عمر 1, 1, 30, 30, 60 و 12 هستند.\n"
 
-#: standalone/drakvpn:1009
+#: standalone/drakvpn:1011
 #, c-format
 msgid "Lifetime unit"
-msgstr ""
+msgstr "واحد زمان‌عمر"
 
-#: standalone/drakvpn:1011
+#: standalone/drakvpn:1013
 #, c-format
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
@@ -21481,28 +22140,50 @@ msgid ""
 "So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and "
 "'hour'.\n"
 msgstr ""
+"طول عمر زمان مشخصی را که در معامله‌های فاز ۱\n"
+"پیشنهاد خواهد شد تعیین می‌کند.  هر پیشنهادی پذیرفته\n"
+"خواهد شد، و مشخصه(ها) به همتا پیشنهاد نخواهد شد\n"
+"اگر آن(ها) را تعیین نکنید.  آنها می‌توانند تکی در هر\n"
+"پیشنهادی تعیین گردند.\n"
+"\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"
+"پس در اینجا واحدهای طول عمر 'min', 'min', 'sec', 'sec', 'sec' و 'hour' "
+"هستند.\n"
 
-#: standalone/drakvpn:1027 standalone/drakvpn:1112
-#, fuzzy, c-format
+#: standalone/drakvpn:1029 standalone/drakvpn:1114
+#, c-format
 msgid "Encryption algorithm"
-msgstr "اعتبارسنجی"
+msgstr "الگوریتم رمزگذاری"
 
-#: standalone/drakvpn:1029
-#, fuzzy, c-format
+#: standalone/drakvpn:1031
+#, c-format
 msgid "Authentication algorithm"
-msgstr "اعتبارسنجی"
+msgstr "الگوریتم تأیید هویت"
 
-#: standalone/drakvpn:1031
+#: standalone/drakvpn:1033
 #, c-format
 msgid "Compression algorithm"
-msgstr ""
+msgstr "الگوریتم فشرده‌سازی"
+
+#: standalone/drakvpn:1034
+#, c-format
+msgid "deflate"
+msgstr "تورم‌زدایی"
 
-#: standalone/drakvpn:1039
-#, fuzzy, c-format
+#: standalone/drakvpn:1041
+#, c-format
 msgid "Remote"
-msgstr "برداشتن"
+msgstr "از راه دور"
 
-#: standalone/drakvpn:1040
+#: standalone/drakvpn:1042
 #, c-format
 msgid ""
 "remote (address | anonymous) [[port]] { statements }\n"
@@ -21516,13 +22197,23 @@ msgid ""
 "remote anonymous\n"
 "remote ::1 [8000]"
 msgstr ""
+"remote (address | anonymous) [[port]] { statements }\n"
+"پارامترهای فاز ۱ IKE را برای هر گره‌ی از راه دور مشخص می‌سازد.\n"
+"درگاه پیش‌فرض ۵۰۰ است.  اگر گمنام مشخص شده،\n"
+"عبارت به همه‌ی همتاهایی که با هیچ دستور از راه دوری\n"
+"تطابق ندارند گذاشته می‌شوند.\n"
+"\n"
+"مثال‌ها : \n"
+"\n"
+"remote anonymous\n"
+"remote ::1 [8000]"
 
-#: standalone/drakvpn:1048
-#, fuzzy, c-format
+#: standalone/drakvpn:1050
+#, c-format
 msgid "Exchange mode"
-msgstr "حالت شماره‌گیری"
+msgstr "حالت معاوضه"
 
-#: standalone/drakvpn:1050
+#: standalone/drakvpn:1052
 #, c-format
 msgid ""
 "defines the exchange mode for phase 1 when racoon is the\n"
@@ -21532,13 +22223,28 @@ msgid ""
 "modes are acceptable. The first exchange mode is what\n"
 "racoon uses when it is the initiator.\n"
 msgstr ""
+"حالت مبادله برای فاز ۱ را وقتی racoon مقداردهنده باشد\n"
+"مشخص می‌کند. این بمعنی حالت مبادله‌ی قابل پذیرش است\n"
+"وقتی racoon جوابگوست. بیش از یک حالت می‌تواند بوسیله‌ی\n"
+"جداسازی آنها با ویرگول مشخص گردد. اولین حالت مبادله آن\n"
+"است که racoon وقتی مقداردهنده است از آن استفاده می‌کند.\n"
 
-#: standalone/drakvpn:1056
-#, fuzzy, c-format
+#: standalone/drakvpn:1058
+#, c-format
 msgid "Generate policy"
-msgstr "امنیت"
+msgstr "تولید سیاست"
 
-#: standalone/drakvpn:1058
+#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#, c-format
+msgid "off"
+msgstr "خاموش"
+
+#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#, c-format
+msgid "on"
+msgstr "روشن"
+
+#: standalone/drakvpn:1060
 #, c-format
 msgid ""
 "This directive is for the responder.  Therefore you\n"
@@ -21556,73 +22262,91 @@ msgid ""
 "tiator and the responder.  This directive is ignored in\n"
 "the initiator case.  The default value is off."
 msgstr ""
+"این دستور برای جواب‌دهنده است.  بنابرین باید\n"
+"غیرفعال را روشن کنید تا racoon(8) جواب‌دهنده\n"
+"بشود.  اگر جواب‌دهنده هیچ سیاستی در SPD در طول\n"
+"معامله‌ی فاز ۲ ندارد، و دستور روشن شده است، پس\n"
+"پس racoon(8) اولین پیشنهاد را در بارپرداخت SA از\n"
+"مقداردهنده خواهد گزید، و ورودی‌های سیاست را از\n"
+"پیشنهاد تولید می‌کند.  آن برای معامله با کارگیری که\n"
+"نشانی آی‌پی پویا دارد مفید است.  توجه کنید که سیاست\n"
+"نامناسب ممکن است بدرون SPD جواب‌دهنده بوسیله‌ی\n"
+"مقداردهنده نصب شده باشد. اگر چنین سیاستهایی بدلیل\n"
+"عدم تطابق میان مقداردهنده و جواب‌دهنده نصب شده باشد\n"
+"ارتباطات دیگر ممکن است شکست بخورد.  این دستور در مورد\n"
+"مقداردهنده نادیده گرفته شده است. مقدار پیش‌فرض خاموش است."
 
-#: standalone/drakvpn:1072
-#, fuzzy, c-format
+#: standalone/drakvpn:1074
+#, c-format
 msgid "Passive"
-msgstr "فلسطین"
+msgstr "غیر فعال"
 
-#: 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 ""
+"اگر نمی‌خواهید معامله را شروع کنید، این را به\n"
+"روشن بگذارید.  مقدار پیش‌فرض به روشن خاموش\n"
+"است. آن برای یک کارگزار مفید است."
 
-#: standalone/drakvpn:1077
+#: standalone/drakvpn:1079
 #, c-format
 msgid "Certificate type"
-msgstr ""
+msgstr "نوع گواهینامه"
 
-#: standalone/drakvpn:1079
-#, fuzzy, c-format
+#: standalone/drakvpn:1081
+#, c-format
 msgid "My certfile"
-msgstr "انتخاب پرونده"
+msgstr "پرونده‌ی گواهینامه‌ی من"
 
-#: standalone/drakvpn:1080
-#, fuzzy, c-format
+#: standalone/drakvpn:1082
+#, c-format
 msgid "Name of the certificate"
-msgstr "نام چاپگر"
+msgstr "نام گواهینامه"
 
-#: standalone/drakvpn:1081
+#: standalone/drakvpn:1083
 #, c-format
 msgid "My private key"
-msgstr ""
+msgstr "کلید خصوصی من"
 
-#: standalone/drakvpn:1082
-#, fuzzy, c-format
+#: standalone/drakvpn:1084
+#, c-format
 msgid "Name of the private key"
-msgstr "نام چاپگر"
+msgstr "نام کلید خصوصی"
 
-#: standalone/drakvpn:1083
-#, fuzzy, c-format
+#: standalone/drakvpn:1085
+#, c-format
 msgid "Peers certfile"
-msgstr "انتخاب پرونده"
+msgstr "پرونده‌ی گواهینامه همتاها"
 
-#: standalone/drakvpn:1084
+#: standalone/drakvpn:1086
 #, c-format
 msgid "Name of the peers certificate"
-msgstr ""
+msgstr "نام گواهینامه‌ی همتاها"
 
-#: standalone/drakvpn:1085
-#, fuzzy, c-format
+#: standalone/drakvpn:1087
+#, c-format
 msgid "Verify cert"
-msgstr "خیلی خوب"
+msgstr "تأیید گواهینامه"
 
-#: 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 ""
+"اگر بدلیلی نمی‌خواهید گواهینامه‌ی همتا را تأیید کنید\n"
+"این را خاموش بگذارید. پیش‌فرض روشن است."
 
-#: standalone/drakvpn:1089
+#: standalone/drakvpn:1091
 #, c-format
 msgid "My identifier"
-msgstr ""
+msgstr "شناسه‌گر من"
 
-#: standalone/drakvpn:1090
+#: standalone/drakvpn:1092
 #, c-format
 msgid ""
 "specifies the identifier sent to the remote host and the\n"
@@ -21648,18 +22372,40 @@ msgid ""
 "\n"
 "my_identifier user_fqdn \"myemail@mydomain.com\""
 msgstr ""
+"شناسه‌گر فرستاده شده به میزبان از راه دور را برای معامله‌ی فاز ۱ مشخص می‌کند.  "
+"adress، fqdn،\n"
+"user_fqdn، keyid و asn1dn می‌توانند مانند یک idtype\n"
+"استفاده شوند، مورد استفاده‌ی آنها مانند:\n"
+"\tmy_identifier address [address];\n"
+"\t\tنوع نشانی آی‌پی است.  این پیش‌فرض است.\n"
+"\t\tنوع اگر شناسه‌گری را برای استفاده مشخص نکنید.\n"
+"\tmy_identifier user_fqdn string;\n"
+"\t\tنوع یک USER_FQDN است (نام دامنه‌ی کاملا \n"
+"\t\tمعتبر کاربر).\n"
+"\tmy_identifier fqdn string;\n"
+"\t\tنوع یک FQDN است (نام دامنه‌ی کاملا معتبر).\n"
+"\tmy_identifier keyid file;\n"
+"\t\tنوع یک KEY_ID است.\n"
+"\tmy_identifier asn1dn [string];\n"
+"\t\tنوع یک نام قابل تشخیص ASN.1 است.  اگر\n"
+"\t\tرشته از قلم افتاده باشد, racoon(8) DN را از منطقه‌ی موضوع\n"
+"\t\tدر گواهینامه خواهد گرفت.\n"
+"\n"
+"مثال‌ها : \n"
+"\n"
+"my_identifier user_fqdn \"myemail@mydomain.com\""
 
-#: standalone/drakvpn:1110
-#, fuzzy, c-format
+#: standalone/drakvpn:1112
+#, c-format
 msgid "Peers identifier"
-msgstr "چاپگر"
+msgstr "شناسه‌گر همتا"
 
-#: standalone/drakvpn:1111
-#, fuzzy, c-format
+#: standalone/drakvpn:1113
+#, c-format
 msgid "Proposal"
-msgstr "پایان‌نامه"
+msgstr "پیشنهاد"
 
-#: standalone/drakvpn:1113
+#: standalone/drakvpn:1115
 #, c-format
 msgid ""
 "specify the encryption algorithm used for the\n"
@@ -21670,71 +22416,113 @@ msgid ""
 "\n"
 "For other transforms, this statement should not be used."
 msgstr ""
+"الگوریتم رمزگذاری استفاده شده برای معامله‌ی\n"
+"فاز ۱ را مشخص کنید. این دستور باید تعیین گردد.\n"
+"الگوریتم یکی از اینهاست: \n"
+"\n"
+"des, 3des, blowfish, cast128 for oakley.\n"
+"\n"
+"برای ترانس‌فرم‌های دیگر، این عبارت نباید استفاده شود."
 
-#: standalone/drakvpn:1120
+#: standalone/drakvpn:1122
 #, c-format
 msgid "Hash algorithm"
-msgstr ""
+msgstr "الگوریتم hash"
 
-#: standalone/drakvpn:1121
-#, fuzzy, c-format
+#: standalone/drakvpn:1123
+#, c-format
 msgid "Authentication method"
-msgstr "اعتبارسنجی"
+msgstr "روش تأیید هویت"
 
-#: standalone/drakvpn:1122
-#, fuzzy, c-format
+#: standalone/drakvpn:1124
+#, c-format
 msgid "DH group"
-msgstr "گروه"
+msgstr "گروه DH"
 
-#: standalone/drakvpn:1129
-#, fuzzy, c-format
+#: standalone/drakvpn:1131
+#, c-format
 msgid "Command"
-msgstr "خط فرمان"
+msgstr "فرمان"
 
-#: standalone/drakvpn:1130
+#: standalone/drakvpn:1132
 #, c-format
 msgid "Source IP range"
-msgstr ""
+msgstr "گستره‌ی آی‌پی منبع"
 
-#: standalone/drakvpn:1131
+#: standalone/drakvpn:1133
 #, c-format
 msgid "Destination IP range"
-msgstr ""
+msgstr "گستره‌ی آی‌پی مقصد"
 
-#: standalone/drakvpn:1132
-#, fuzzy, c-format
+#: standalone/drakvpn:1134
+#, c-format
 msgid "Upper-layer protocol"
-msgstr "پایان‌نامه‌ی اروپایی"
+msgstr "پایان‌نامه‌ی لایه‌ی-بالاتر"
 
-#: standalone/drakvpn:1133
-#, fuzzy, c-format
+#: standalone/drakvpn:1134 standalone/drakvpn:1141
+#, c-format
+msgid "any"
+msgstr "هر چه"
+
+#: standalone/drakvpn:1136
+#, c-format
 msgid "Flag"
-msgstr "پرچم‌ها"
+msgstr "پرچم"
 
-#: standalone/drakvpn:1134
-#, fuzzy, c-format
+#: standalone/drakvpn:1137
+#, c-format
 msgid "Direction"
-msgstr "توضیح"
+msgstr "جهت"
 
-#: standalone/drakvpn:1135
+#: standalone/drakvpn:1138
 #, c-format
 msgid "IPsec policy"
-msgstr ""
+msgstr "سیاست IPsec"
 
-#: standalone/drakvpn:1137
-#, fuzzy, c-format
-msgid "Mode"
-msgstr "مدل"
+#: standalone/drakvpn:1138
+#, c-format
+msgid "ipsec"
+msgstr "ipsec"
 
 #: standalone/drakvpn:1138
-#, fuzzy, c-format
+#, c-format
+msgid "discard"
+msgstr "دور انداختن"
+
+#: standalone/drakvpn:1141
+#, c-format
+msgid "Mode"
+msgstr "حالت"
+
+#: standalone/drakvpn:1141
+#, c-format
+msgid "tunnel"
+msgstr "تونل"
+
+#: standalone/drakvpn:1141
+#, c-format
+msgid "transport"
+msgstr "انتقال"
+
+#: standalone/drakvpn:1143
+#, c-format
 msgid "Source/destination"
-msgstr "میز کار"
+msgstr "منبع/مقصد"
 
-#: standalone/drakvpn:1139 standalone/harddrake2:57
+#: standalone/drakvpn:1144
 #, c-format
-msgid "Level"
-msgstr "سطح"
+msgid "require"
+msgstr "ضروری"
+
+#: standalone/drakvpn:1144
+#, c-format
+msgid "use"
+msgstr "استفاده از"
+
+#: standalone/drakvpn:1144
+#, c-format
+msgid "unique"
+msgstr "یگانه"
 
 #: standalone/drakxtv:46
 #, c-format
@@ -22167,11 +22955,6 @@ msgstr "تعداد دکمه‌های موشی"
 
 #: standalone/harddrake2:63
 #, c-format
-msgid "Name"
-msgstr "نام"
-
-#: standalone/harddrake2:63
-#, c-format
 msgid "the name of the CPU"
 msgstr "نام پردازنده"
 
@@ -22231,13 +23014,13 @@ msgstr ""
 "مجبور می‌کند، بنابرین پردازنده قادر به جلوگیری از دستیابی‌های کنترل نشده‌ی هسته "
 "به حافظه‌ی کاربر خواهد بود (این پاسبان اشکال است)"
 
-#: 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 "/_گزینه‌ها"
 
-#: 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
@@ -22285,11 +23068,6 @@ msgstr ""
 
 #: standalone/harddrake2:115
 #, c-format
-msgid "Select a device !"
-msgstr "انتخاب یک دستگاه !"
-
-#: standalone/harddrake2:115
-#, c-format
 msgid ""
 "Once you've selected a device, you'll be able to see the device information "
 "in fields displayed on the right frame (\"Information\")"
@@ -22326,63 +23104,58 @@ msgstr ""
 "<span foreground=\"royalblue3\">نگارنده:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 
-#: standalone/harddrake2:133
-#, c-format
-msgid "Detection in progress"
-msgstr "شناسایی در پیشروی است"
-
-#: standalone/harddrake2:140
+#: standalone/harddrake2:141
 #, c-format
 msgid "Harddrake2 version %s"
 msgstr "نسخه %s Harddrake2"
 
-#: standalone/harddrake2:156
+#: standalone/harddrake2:157
 #, c-format
 msgid "Detected hardware"
 msgstr "سخت‌افزار شناسایی شده"
 
-#: standalone/harddrake2:161
+#: standalone/harddrake2:162
 #, c-format
 msgid "Configure module"
 msgstr "پیکربندی بخش"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:169
 #, c-format
 msgid "Run config tool"
 msgstr "اجرای ابزار پیکربندی"
 
-#: standalone/harddrake2:215
+#: standalone/harddrake2:216
 #, c-format
 msgid "unknown"
 msgstr "ناشناس"
 
-#: standalone/harddrake2:216
+#: standalone/harddrake2:217
 #, c-format
 msgid "Unknown"
 msgstr "نامعلوم"
 
-#: 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 "بر روی دستگاهی در درخت چپ برای نمایش اطلاعات آن در اینجا، کلیک کنید."
 
-#: standalone/harddrake2:282
+#: standalone/harddrake2:286
 #, c-format
 msgid "secondary"
 msgstr "دومین"
 
-#: standalone/harddrake2:282
+#: standalone/harddrake2:286
 #, c-format
 msgid "primary"
 msgstr "اولین"
 
-#: standalone/harddrake2:290
+#: standalone/harddrake2:294
 #, c-format
 msgid "burner"
 msgstr "سوزنده"
 
-#: standalone/harddrake2:290
+#: standalone/harddrake2:294
 #, c-format
 msgid "DVD"
 msgstr "دی‌وی‌دی"
@@ -22402,210 +23175,210 @@ msgstr "آیا می‌خواهید کلید پس‌بر در کنسول حذف 
 msgid "The change is done, but to be effective you must logout"
 msgstr "تغییر انجام شده است، ولی برای مؤثر واقع شدن باید ثبت‌خروج کنید"
 
-#: standalone/logdrake:50
+#: standalone/logdrake:51
 #, c-format
-msgid "Mandrake Tools Explanation"
-msgstr "تشریحات ابزار ماندرایک"
+msgid "Mandrake Tools Logs"
+msgstr "ثبت‌های ابزارهای ماندرایک"
 
-#: standalone/logdrake:51
-#, fuzzy, c-format
+#: standalone/logdrake:52
+#, c-format
 msgid "Logdrake"
-msgstr "logdrake"
+msgstr "Logdrake"
 
-#: standalone/logdrake:64
+#: standalone/logdrake:65
 #, c-format
 msgid "Show only for the selected day"
 msgstr "فقط برای روز انتخاب شده نشان داده شود"
 
-#: standalone/logdrake:71
+#: standalone/logdrake:72
 #, c-format
 msgid "/File/_New"
 msgstr "/پرونده/_جدید"
 
-#: 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 "/پرونده/_باز کردن"
 
-#: 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 "/پرونده/_ذخیره"
 
-#: 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 "/پرونده/ذخیره _بنام"
 
-#: standalone/logdrake:75
+#: standalone/logdrake:76
 #, c-format
 msgid "/File/-"
 msgstr "/پرونده/-"
 
-#: standalone/logdrake:78
+#: standalone/logdrake:79
 #, c-format
 msgid "/Options/Test"
 msgstr "/گزینه‌ها/آزمایش"
 
-#: standalone/logdrake:80
+#: standalone/logdrake:81
 #, c-format
 msgid "/Help/_About..."
 msgstr "/راهنما/_درباره..."
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
-msgstr ""
+msgstr "تأیید هویت"
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
-msgstr ""
+msgstr "کاربر"
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
-msgstr ""
+msgstr "پیغام‌ها"
 
-#: standalone/logdrake:114
+#: standalone/logdrake:113
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
-msgstr ""
+msgstr "Syslog"
 
-#: standalone/logdrake:118
+#: standalone/logdrake:117
 #, c-format
 msgid "search"
 msgstr "جستجو"
 
-#: standalone/logdrake:130
+#: standalone/logdrake:129
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "ابزاری برای پایشگری ثبت‌هایتان"
 
-#: standalone/logdrake:131 standalone/net_monitor:85
+#: standalone/logdrake:130 standalone/net_monitor:85
 #, c-format
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "Matching"
 msgstr "تطابق"
 
-#: standalone/logdrake:137
+#: standalone/logdrake:136
 #, c-format
 msgid "but not matching"
 msgstr "ولی تطبیق نمی‌کند"
 
-#: standalone/logdrake:141
+#: standalone/logdrake:140
 #, c-format
 msgid "Choose file"
 msgstr "انتخاب پرونده"
 
-#: standalone/logdrake:150
+#: standalone/logdrake:149
 #, c-format
 msgid "Calendar"
 msgstr "تقویم"
 
-#: standalone/logdrake:160
+#: standalone/logdrake:159
 #, c-format
 msgid "Content of the file"
 msgstr "محتوای پرونده"
 
-#: standalone/logdrake:164 standalone/logdrake:377
+#: standalone/logdrake:163 standalone/logdrake:429
 #, c-format
 msgid "Mail alert"
 msgstr "اخطار پست"
 
-#: standalone/logdrake:171
+#: standalone/logdrake:170
 #, c-format
 msgid "The alert wizard had unexpectly failled:"
 msgstr "جادوگر اخطار بطور غیرمنتظره‌ای شکست خورد:"
 
-#: standalone/logdrake:219
+#: standalone/logdrake:221
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr "لطفاً صبر کنید، تجزیه‌ی پرونده: %s"
 
-#: standalone/logdrake:355
+#: standalone/logdrake:406
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "کارگزار تورنمای گیتی آپاچی"
 
-#: standalone/logdrake:356
+#: standalone/logdrake:407
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "یابنده‌ی دامنه‌ی نام"
 
-#: standalone/logdrake:357
+#: standalone/logdrake:408
 #, c-format
 msgid "Ftp Server"
 msgstr "کارگزار FTP "
 
-#: standalone/logdrake:358
+#: standalone/logdrake:409
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "پسوند کارگزار پست"
 
-#: standalone/logdrake:359
+#: standalone/logdrake:410
 #, c-format
 msgid "Samba Server"
 msgstr "کارگزار سامبا"
 
-#: standalone/logdrake:360
+#: standalone/logdrake:411
 #, c-format
 msgid "SSH Server"
 msgstr "کارگزار‌ SSH"
 
-#: standalone/logdrake:361
+#: standalone/logdrake:412
 #, c-format
 msgid "Webmin Service"
 msgstr "سرویس Webmin"
 
-#: standalone/logdrake:362
+#: standalone/logdrake:413
 #, c-format
 msgid "Xinetd Service"
 msgstr "سرویس Xinetd"
 
-#: standalone/logdrake:372
-#, fuzzy, c-format
+#: standalone/logdrake:424
+#, c-format
 msgid "Configure the mail alert system"
-msgstr "تنظیم سیستم چاپی CUPS"
+msgstr "پیکربندی سیستم هشدار پست"
 
-#: standalone/logdrake:373
+#: standalone/logdrake:425
 #, c-format
 msgid "Stop the mail alert system"
-msgstr ""
+msgstr "ایست سیستم هشدار پست"
 
-#: standalone/logdrake:380
+#: standalone/logdrake:432
 #, c-format
 msgid "Mail alert configuration"
 msgstr "پیکربندی اخطار پست"
 
-#: standalone/logdrake:381
+#: standalone/logdrake:433
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -22616,17 +23389,17 @@ msgstr ""
 "\n"
 "در اینجا می‌توانید اخطار سیستم را برپاسازی کنید.\n"
 
-#: standalone/logdrake:384
-#, fuzzy, c-format
+#: standalone/logdrake:436
+#, c-format
 msgid "What do you want to do?"
-msgstr "کجا می‌خواهید %s را سوارسازی کنید؟"
+msgstr "چکار می‌خواهید بکنید؟"
 
-#: standalone/logdrake:391
+#: standalone/logdrake:443
 #, c-format
 msgid "Services settings"
 msgstr "تنظیمات سرویس‌ها"
 
-#: standalone/logdrake:392
+#: standalone/logdrake:444
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
@@ -22635,56 +23408,50 @@ msgstr ""
 "اگر یکی از سرویس‌های انتخاب شده دیگر در حال اجرا نباشد اخطاری دریافت خواهید "
 "کرد"
 
-#: standalone/logdrake:399
+#: standalone/logdrake:451
 #, c-format
 msgid "Load setting"
 msgstr "تنظیم بارگذاری"
 
-#: standalone/logdrake:400
+#: standalone/logdrake:452
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "اگر بارگذاری بیش از این مقدار باشد اخطاری دریافت خواهید کرد"
 
-#: standalone/logdrake:401
+#: standalone/logdrake:453
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "بار"
 
-#: standalone/logdrake:406
+#: standalone/logdrake:458
 #, c-format
 msgid "Alert configuration"
 msgstr "پیکربندی اخطار"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:459
 #, c-format
 msgid "Please enter your email address below "
 msgstr "لطفاً نشانی پست الکترونیکی خود را در زیر وارد کنید"
 
-#: standalone/logdrake:408
-#, fuzzy, c-format
+#: standalone/logdrake:460
+#, c-format
 msgid "and enter the name (or the IP) of the SMTP server you whish to use"
 msgstr ""
-"نشانی آی پی و درگاه میزبانی را که می‌خواهید از چاپگر آن استفاده کنید را وارد "
-"کنید."
+"و نام (یا نشانی آی‌پی) کارگزار SMTP را که می‌خواهید استفاده کنید را وارد کنید"
 
-#: standalone/logdrake:427 standalone/logdrake:433
-#, c-format
-msgid "Congratulations"
-msgstr "تبریک می‌گوئیم!"
-
-#: standalone/logdrake:427
+#: standalone/logdrake:479
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr "جادوگر با موفقیت اخطار پست را پیکربندی کرد."
 
-#: standalone/logdrake:433
+#: standalone/logdrake:485
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
-msgstr ""
+msgstr "جادوگر با موفقیت هشدار پستی را از کار انداخت."
 
-#: standalone/logdrake:492
+#: standalone/logdrake:544
 #, c-format
 msgid "Save as.."
 msgstr "ذخیره بنام..."
@@ -22864,9 +23631,9 @@ msgid "Reading data of installed printers..."
 msgstr "در حال خواندن داده‌های چاپگرهای نصب شده..."
 
 #: standalone/printerdrake:129
-#, fuzzy, c-format
+#, c-format
 msgid "%s Printer Management Tool"
-msgstr "مدیریت چاپگر \n"
+msgstr "ابزار مدیریت چاپگر %s"
 
 #: standalone/printerdrake:143 standalone/printerdrake:144
 #: standalone/printerdrake:145 standalone/printerdrake:153
@@ -23000,84 +23767,100 @@ msgstr "نگارندگان: "
 msgid "Printer Management \n"
 msgstr "مدیریت چاپگر \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 ""
+"برای استفاده از پویشگرها باید بسته‌های SANE نصب گردند.\n"
+"\n"
+"آیا می‌خواهید بسته‌های SANE را نصب کنید؟"
+
+#: standalone/scannerdrake:54
+#, c-format
+msgid "Aborting Scannerdrake."
+msgstr "سقط کردن پویشگردرایک."
+
+#: standalone/scannerdrake:59
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr "بسته‌های لازم برای برپاسازی یک پویشگر با پویشگردراک نتوانست نصب گردد."
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:60
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr "پویشگردرایک اکنون راه‌اندازی نخواهد شد."
 
-#: standalone/scannerdrake:60 standalone/scannerdrake:452
+#: standalone/scannerdrake:66 standalone/scannerdrake:459
 #, c-format
 msgid "Searching for configured scanners ..."
 msgstr "جستجو برای پویشگرهای پیکربندی شده..."
 
-#: standalone/scannerdrake:64 standalone/scannerdrake:456
+#: standalone/scannerdrake:70 standalone/scannerdrake:463
 #, c-format
 msgid "Searching for new scanners ..."
 msgstr "جستجو برای پویشگرهای جدید..."
 
-#: standalone/scannerdrake:72 standalone/scannerdrake:478
+#: standalone/scannerdrake:78 standalone/scannerdrake:485
 #, c-format
 msgid "Re-generating list of configured scanners ..."
 msgstr "تولید مجدد لیست پویشگران پیکربندی شده..."
 
-#: standalone/scannerdrake:94 standalone/scannerdrake:135
-#: standalone/scannerdrake:149
-#, fuzzy, c-format
+#: standalone/scannerdrake:100 standalone/scannerdrake:141
+#: standalone/scannerdrake:155
+#, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "این %s توسط این نسخه‌ لینوکس مان‌درایک حمایت نمی‌شود."
+msgstr "%s توسط این نسخه‌ از %s حمایت نمی‌شود."
 
-#: standalone/scannerdrake:97
+#: standalone/scannerdrake:103
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "%s بر %s یافت شد، آیا آن بطور خودکار پیکربندی شود؟"
 
-#: standalone/scannerdrake:109
+#: standalone/scannerdrake:115
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr "%s در بانک اطلاعات پویشگر نیست، دستی پیکربندی شود؟"
 
-#: standalone/scannerdrake:124
+#: standalone/scannerdrake:130
 #, c-format
 msgid "Select a scanner model"
 msgstr "انتخاب یک مدل پویشگر"
 
-#: standalone/scannerdrake:125
+#: standalone/scannerdrake:131
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:126
+#: standalone/scannerdrake:132
 #, c-format
 msgid "Detected model: %s"
 msgstr "مدل شناسایی شده: %s "
 
-#: standalone/scannerdrake:128
+#: standalone/scannerdrake:134
 #, c-format
 msgid ", "
 msgstr ", "
 
-#: standalone/scannerdrake:129
+#: standalone/scannerdrake:135
 #, c-format
 msgid "Port: %s"
 msgstr "درگاه: %s"
 
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:161
 #, c-format
 msgid "The %s is not known by this version of Scannerdrake."
 msgstr "این %s در این نسخه از Scannerdrake ناشناس است."
 
-#: standalone/scannerdrake:163 standalone/scannerdrake:177
+#: standalone/scannerdrake:169 standalone/scannerdrake:183
 #, c-format
 msgid "Do not install firmware file"
 msgstr "پرونده‌ی ثابت‌افزار نصب نشود"
 
-#: 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 "
@@ -23085,12 +23868,12 @@ msgid ""
 msgstr ""
 "ممکن است %s شما نیاز به باردهی ثابت‌افزار خود هر بار که روشن می‌شود داشته باشد."
 
-#: 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 "اگر چنین است، می‌توانید اینکار را بطور خودکار انجام دهید."
 
-#: 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 "
@@ -23099,7 +23882,7 @@ msgstr ""
 "برای اینکار، نیاز دارید پرونده‌ی ثابت‌افزار پویشگر خود را ارائه دهید تا بتواند "
 "نصب گردد."
 
-#: 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 "
@@ -23108,22 +23891,22 @@ msgstr ""
 "پرونده را بر سی‌دی یا دیسکچه‌ی با پویشگر، صفحه‌ی اینترنت تولید کننده، یا بر "
 "قسمت‌بندی ویندوزتان پیدا می‌کنید."
 
-#: standalone/scannerdrake:172 standalone/scannerdrake:231
+#: standalone/scannerdrake:178 standalone/scannerdrake:237
 #, c-format
 msgid "Install firmware file from"
 msgstr "نصب کردن پرونده‌ی ثابت‌افزار از"
 
-#: standalone/scannerdrake:192
+#: standalone/scannerdrake:198
 #, c-format
 msgid "Select firmware file"
 msgstr "انتخاب پرونده‌ی ثابت‌افزار"
 
-#: 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 "پرونده‌ی ثابت‌افزار %s وجود ندارد یا قابل خواندن نیست!"
 
-#: standalone/scannerdrake:218
+#: standalone/scannerdrake:224
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
@@ -23132,7 +23915,7 @@ msgstr ""
 "ممکن است پویشگرهای شما نیاز به باردهی ثابت‌افزار خود هر بار که روشن می‌شوند "
 "داشته باشند."
 
-#: 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 "
@@ -23141,7 +23924,7 @@ msgstr ""
 "برای اینکار، نیاز دارید پرونده‌ی ثابت‌افزار پویشگرهای خود را ارائه دهید تا "
 "بتوانند نصب گردند."
 
-#: standalone/scannerdrake:225
+#: standalone/scannerdrake:231
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
@@ -23150,74 +23933,73 @@ msgstr ""
 "اگر از قبل ثابت‌افزار پویشگرتان را نصب کرده‌اید می‌توانید ثابت‌افزار را در اینجا "
 "بوسیله‌ی پرونده‌ی جدید ثابت‌افزار بروزسازی کنید."
 
-#: standalone/scannerdrake:227
+#: standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware for the"
 msgstr "نصب کردن ثابت‌افزار برای"
 
-#: standalone/scannerdrake:250
+#: standalone/scannerdrake:256
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr "انتخاب کردن پرونده‌ی ثابت‌افزار برای %s"
 
-#: standalone/scannerdrake:276
+#: standalone/scannerdrake:282
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr "پرونده‌ی ثابت‌افزار %s شما با موفقیت نصب گردید."
 
-#: standalone/scannerdrake:286
+#: standalone/scannerdrake:292
 #, c-format
 msgid "The %s is unsupported"
 msgstr "این %s حمایت نشده است"
 
-#: standalone/scannerdrake:291
-#, fuzzy, c-format
+#: standalone/scannerdrake:297
+#, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
 "You can launch printerdrake from the %s Control Center in Hardware section."
 msgstr ""
-"این %s باید بوسیله printerdrake تنظیم گردد.\n"
-"شما می‌توانید printerdrake را از مرکز کنترل مان‌درایک در قسمت سخت‌افزار اجرا "
-"نمایید."
+"%s باید بوسیله printerdrake پیکربندی گردد.\n"
+"می‌توانید printerdrake را از مرکز کنترل %s در قسمت سخت‌افزار اجرا کنید."
 
-#: 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 "درگاه‌های در دسترس شناسایی-خودکار"
 
-#: 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 "لطفاً دستگاهی را که %s شما به آن وصل شده است انتخاب کنید"
 
-#: standalone/scannerdrake:298
+#: standalone/scannerdrake:304
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(یادآوری: درگاه‌های موازی نمی‌توانند پویش خودکار شوند)"
 
-#: standalone/scannerdrake:300 standalone/scannerdrake:345
+#: standalone/scannerdrake:306 standalone/scannerdrake:351
 #, c-format
 msgid "choose device"
 msgstr "انتخاب دستگاه"
 
-#: standalone/scannerdrake:334
+#: standalone/scannerdrake:340
 #, c-format
 msgid "Searching for scanners ..."
 msgstr "جستجو برای پویشگرها..."
 
-#: 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 ""
 "%s شما پیکربندی شده است.\n"
-"شما اکنون می‌توانید با استفاده از \"XSane\" از طریق وسایل چندرسانه‌ای/گرافیک "
-"در منوی برنامه‌ها پویش نوشتار کنید."
+"شما اکنون می‌توانید با استفاده از \"XSane\" یا \"Kooka\" از وسایل چندرسانه‌ای/"
+"گرافیک در منوی برنامه‌ها پویش نوشتار کنید."
 
-#: standalone/scannerdrake:392
+#: standalone/scannerdrake:399
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -23230,7 +24012,7 @@ msgstr ""
 "%s\n"
 "در سیستم‌تان در دسترس می‌باشند.\n"
 
-#: standalone/scannerdrake:393
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -23243,51 +24025,51 @@ msgstr ""
 "%s\n"
 "بر سیستم شما در دسترس می‌باشد.\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 "هیچ پویشگر در دسترسی بر روی سیستم شما یافت نشد.\n"
 
-#: standalone/scannerdrake:413
+#: standalone/scannerdrake:420
 #, c-format
 msgid "Search for new scanners"
 msgstr "جستجو برای پویشگرهای جدید"
 
-#: standalone/scannerdrake:419
+#: standalone/scannerdrake:426
 #, c-format
 msgid "Add a scanner manually"
 msgstr "افزودن دستی یک پویشگر"
 
-#: standalone/scannerdrake:426
+#: standalone/scannerdrake:433
 #, c-format
 msgid "Install/Update firmware files"
 msgstr "نصب/بروزسازی پرونده‌های ثابت‌افزار"
 
-#: standalone/scannerdrake:432
+#: standalone/scannerdrake:439
 #, c-format
 msgid "Scanner sharing"
 msgstr "اشتراک پویشگر"
 
-#: standalone/scannerdrake:491 standalone/scannerdrake:656
+#: standalone/scannerdrake:498 standalone/scannerdrake:663
 #, c-format
 msgid "All remote machines"
 msgstr "تمام ماشین‌های از راه دور"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:806
+#: standalone/scannerdrake:510 standalone/scannerdrake:813
 #, c-format
 msgid "This machine"
 msgstr "این ماشین"
 
-#: 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 ""
 "در اینجا می‌توانید اجازه‌ی دسترسی به پویشگر وصل شده به این ماشین را به "
 "رایانه‌های از راه دور و توسط کدامیک از آنها را انتخاب کنید."
 
-#: standalone/scannerdrake:544
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
@@ -23296,33 +24078,33 @@ msgstr ""
 "می‌توانید در اینجا تصمیم بگیرید که آیا پویشگرهای بر ماشین های از راه دور باید "
 "در دسترس این ماشین قرار بگیرند یا نه. "
 
-#: standalone/scannerdrake:547
+#: standalone/scannerdrake:554
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr "چاپگرهای موجود بر این ماشین قابل دسترسی برای رایانه‌های دیگر هستند"
 
-#: standalone/scannerdrake:549
+#: standalone/scannerdrake:556
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "اشتراک پویشگر به میزبان‌های: "
 
-#: standalone/scannerdrake:563
+#: standalone/scannerdrake:570
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "استفاده از پویشگرهای بر روی رایانه‌های از راه دور"
 
-#: standalone/scannerdrake:566
+#: standalone/scannerdrake:573
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "استفاده از پویشگران بر روی میزبان: "
 
-#: 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 "اشتراک پویشگرهای محلی"
 
-#: standalone/scannerdrake:594
+#: standalone/scannerdrake:601
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
@@ -23331,56 +24113,67 @@ msgstr ""
 "اینها ماشین‌هایی هستند که پویشگر(ها) وصل شده‌ی محلی باید برای آنها در دسترس "
 "قرار گیرد:"
 
-#: standalone/scannerdrake:605 standalone/scannerdrake:755
+#: standalone/scannerdrake:612 standalone/scannerdrake:762
 #, c-format
 msgid "Add host"
 msgstr "افزودن میزبان"
 
-#: standalone/scannerdrake:611 standalone/scannerdrake:761
+#: standalone/scannerdrake:618 standalone/scannerdrake:768
 #, c-format
 msgid "Edit selected host"
 msgstr "ویرایش میزبان انتخاب شده"
 
-#: standalone/scannerdrake:620 standalone/scannerdrake:770
+#: standalone/scannerdrake:627 standalone/scannerdrake:777
 #, c-format
 msgid "Remove selected host"
 msgstr "برداشتن میزبان انتخاب شده"
 
-#: 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 "نام/نشانی آی‌پی میزبان"
 
-#: 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 "میزبانی را که پویشگران محلی باید بر آن در دسترس باشند انتخاب کنید:"
 
-#: 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 "باید یک نام میزبان یا یک نشانی آی‌پی را وارد کنید.\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 "این میزبان از قبل در لیست است، نمی‌توان آن را دوباره اضافه کرد.\n"
 
-#: standalone/scannerdrake:743
+#: standalone/scannerdrake:750
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "استفاده از پویشگرهای از راه دور"
 
-#: standalone/scannerdrake:744
+#: standalone/scannerdrake:751
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr ""
 "اینها ماشین‌هایی هستند که پویشگرها باید از آنها مورد استفاده قرار گیرند:"
 
-#: 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 ""
+"برای مشترک شدن پویشگر(های) محلی باید saned نصب گردد.\n"
+"\n"
+"آیا می‌خواهید بسته‌ی saned را نصب کنید؟"
+
+#: standalone/scannerdrake:912 standalone/scannerdrake:916
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr "پویشگر(های) شما بر شبکه قابل دسترسی نخواهد بود."
@@ -23395,7 +24188,7 @@ msgstr "بعضی دستگاه‌ها در رده‌ی سخت‌افزار \"%s\"
 msgid "Some devices were added: %s\n"
 msgstr "چند دستگاه اضافه شده‌اند: %s\n"
 
-#: standalone/service_harddrake:94
+#: standalone/service_harddrake:98
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "وارسی سخت‌افزار در پیشروی است"
@@ -23490,22 +24283,22 @@ msgstr "نصب بروزسازی‌ها"
 msgid "Exit install"
 msgstr "خروج از نصب"
 
-#: ugtk2.pm:1047
+#: ugtk2.pm:1075
 #, c-format
 msgid "Is this correct?"
 msgstr "آیا این درست است؟"
 
-#: ugtk2.pm:1175
+#: ugtk2.pm:1203
 #, c-format
 msgid "Expand Tree"
 msgstr "گستردن درخت"
 
-#: ugtk2.pm:1176
+#: ugtk2.pm:1204
 #, c-format
 msgid "Collapse Tree"
 msgstr "فرو ریختن درخت"
 
-#: ugtk2.pm:1177
+#: ugtk2.pm:1205
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "تعویض بین ترتیب گروهی و ساده"
@@ -23524,3243 +24317,236 @@ msgstr ""
 msgid "Installation failed"
 msgstr "نصب شکست خورد"
 
-#~ msgid "Compact"
-#~ msgstr "فشرده"
-
-#~ msgid "compact"
-#~ msgstr "فشرده"
-
-#~ msgid "Read-write"
-#~ msgstr "خواندن-نگارش"
-
-#~ msgid "Table"
-#~ msgstr "جدول"
-
-#~ msgid "Unsafe"
-#~ msgstr "ناامن"
-
-#~ 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"
-#~ "terms in it, check the \"%s\" box. If not, simply turn off your computer."
-#~ msgstr ""
-#~ "قبل از ادامه، شما باید شرایط جواز را با دقت بخوانید. آن تمام انتشار "
-#~ "لینوکس\n"
-#~ "ماندرایک را پوشش می‌دهد. اگر شما با همه‌ی شرایط در آن موافقت می‌کنید،\n"
-#~ "جعبه‌ی \"%s\" را علامت بزنید. اگر نه، بسادگی رایانه خود را خاموش کنید."
-
-#~ msgid ""
-#~ "GNU/Linux is a multi-user system, meaning each user may have their own\n"
-#~ "preferences, their own files and so on. You can read the ``Starter "
-#~ "Guide''\n"
-#~ "to learn more about multi-user systems. But unlike \"root\", who is the\n"
-#~ "system administrator, the users you add at this point will not be\n"
-#~ "authorized to change anything except their own files and their own\n"
-#~ "configurations, protecting the system from unintentional or malicious\n"
-#~ "changes that impact on the system as a whole. You will have to create at\n"
-#~ "least one regular user for yourself -- this is the account which you "
-#~ "should\n"
-#~ "use for routine, day-to-day use. Although it is very easy to log in as\n"
-#~ "\"root\" to do anything and everything, it may also be very dangerous! A\n"
-#~ "very simple mistake could mean that your system will not work any more. "
-#~ "If\n"
-#~ "you make a serious mistake as a regular user, the worst that will happen "
-#~ "is\n"
-#~ "that you will lose some information, but not affect the entire system.\n"
-#~ "\n"
-#~ "The first field asks you for a real name. Of course, this is not "
-#~ "mandatory\n"
-#~ "-- you can actually enter whatever you like. DrakX will use the first "
-#~ "word\n"
-#~ "you typed in this field and copy it to the \"%s\" field, which is the "
-#~ "name\n"
-#~ "this user will enter to log onto the system. If you like, you may "
-#~ "override\n"
-#~ "the default and change the username. The next step is to enter a "
-#~ "password.\n"
-#~ "From a security point of view, a non-privileged (regular) user password "
-#~ "is\n"
-#~ "not as crucial as the \"root\" password, but that is no reason to "
-#~ "neglect\n"
-#~ "it by making it blank or too simple: after all, your files could be the\n"
-#~ "ones at risk.\n"
-#~ "\n"
-#~ "Once you click on \"%s\", you can add other users. Add a user for each "
-#~ "one\n"
-#~ "of your friends: your father or your sister, for example. Click \"%s\" "
-#~ "when\n"
-#~ "you have finished adding users.\n"
-#~ "\n"
-#~ "Clicking the \"%s\" button allows you to change the default \"shell\" "
-#~ "for\n"
-#~ "that user (bash by default).\n"
-#~ "\n"
-#~ "When you have finished adding users, you will be asked to choose a user\n"
-#~ "that can automatically log into the system when the computer boots up. "
-#~ "If\n"
-#~ "you are interested in that feature (and do not care much about local\n"
-#~ "security), choose the desired user and window manager, then click \"%s"
-#~ "\".\n"
-#~ "If you are not interested in this feature, uncheck the \"%s\" box."
-#~ msgstr ""
-#~ "لینوکس/گنو یک سیستم چند کاربرانه است، بدین معنی که هر کاربری مشخصات و "
-#~ "پرونده‌های خود را دارا \n"
-#~ "می‌باشد. شما می‌توانید ``راهنمای مبتدی'' را برای آموختن بهتر درباره "
-#~ "سیستم‌های چند کاربرانه مطالعه\n"
-#~ "کنید. ولی برخلاف \"root\"، که مدیر سیستم می‌باشد، کاربرانی را که شما در "
-#~ "این مرحله اضافه \n"
-#~ "می‌کنید اجازه‌ی تغییر چیزی جز پرونده‌ها و تنظیمات خود را ندارند. این برای "
-#~ "حفاظت سیستم از \n"
-#~ "تغییرات غیر مترقبه یا خطرناکی است که تمام سیستم را تحت تاثیر قرار می‌دهد. "
-#~ "شما حداقل باید \n"
-#~ "یک کاربر معمولی برای خود ایجاد کنید -- این حسابی است که شما برای "
-#~ "استفاده‌یروزانه‌ی خود \n"
-#~ "باید از آن استفاده کنید.هرچند خیلی آسان است که مانند \"root\" وارد سیستم "
-#~ "شده و هر \n"
-#~ "کاری را بدون محدودیت انجام داد، ولی ممکن است این خیلی خطرناک باشد! یک "
-#~ "اشتباه \n"
-#~ "کوچک می‌تواند باعث شود که سیستم شما دیگر کار نکند. اگر شما مثل یک کاربر "
-#~ "ساده \n"
-#~ "اشتباه جدی را مرتکب شوید، بدترین چیزی که می‌تواند اتفاق بیافتد از دست دادن "
-#~ "مقداری \n"
-#~ "اطلاعات خواهد بود ولی تاثیری بر تمام سیستم نخواهد گذاشت.\n"
-#~ "\n"
-#~ "اولین منطقه نام حقیقی شما را می‌پرسد. البته این اجباری نیست -- شما "
-#~ "می‌توانید در واقع \n"
-#~ "هر چه می‌خواهید وارد کنید. برنامه نصب DrakX اولین واژه را که در این "
-#~ "منطقه \n"
-#~ "وارد کرده‌اید به منطقه \"%s\" کپی می‌کند که این نامی است که این کاربر برای "
-#~ "ثبت‌ورود به سیستم وارد خواهد کرد.\n"
-#~ "اگر بخواهید می‌توانید پیش‌فرض را نادیده گرفته و نام کاربر را تغییر دهید. "
-#~ "گام بعدی\n"
-#~ "وارد کردن یک گذرواژه است. از نظر امنیتی یک گذرواژه‌ی بدون-امتیاز (عادی) "
-#~ "مانند\n"
-#~ "گذرواژه‌ی \"root\" حساس نیست، ولی این دلیلی برای عدم استفاده از آن و "
-#~ "خالی \n"
-#~ "گذاشتن آن یا تعیین گذرواژه‌ی بسیار ساده نمی‌باشد. بلاخره این پرونده‌های شما "
-#~ "هستند\n"
-#~ "که در معرض خطر هستند.\n"
-#~ "\n"
-#~ "وقتی که شما بر روی \"%s\" کلیک کنید، می‌توانید کاربرهای دیگری را نیز اضافه "
-#~ "کنید.\n"
-#~ "افزودن یک کاربر برای هر یک از دوستان، پدرتان یا خواهرتان برای مثال. \n"
-#~ "بر روی \"%s\" وقتی که افزودن کاربران را تمام کردید  کلیک کنید.\n"
-#~ "\n"
-#~ "با کلیک کردن بر تکمه \"%s\" به شما اجازه تغییر پوسته \"shell\"پیش‌فرض "
-#~ "برای \n"
-#~ "آن کاربر (پیش‌فرض bash) داده خواهد شد.\n"
-#~ "\n"
-#~ "وقتی شما افزودن کاربران را تمام کردید از شما برای انتخاب یک کاربر که "
-#~ "بتواند\n"
-#~ "هنگام آغازگری رایانه بطور خودکار وارد سیستم شود سوال خواهد شد. اگر این "
-#~ "مورد\n"
-#~ "برای شما جالب بوده (و امنیت محلی اهمیت چندانی برای شما ندارد) ، کاربر "
-#~ "دلخواه و\n"
-#~ "محیط گرافیک را انتخاب نموده سپس بر روی \"%s\" کلیک کنید. اگر شما "
-#~ "علاقه‌ای \n"
-#~ " به این مورد ندارید جعبه‌ی \"%s\" را بدون علامت بگذارید."
-
-#~ msgid "Next ->"
-#~ msgstr "بعدی ->"
-
-#~ msgid ""
-#~ "The Mandrake Linux installation is distributed on several CD-ROMs. DrakX\n"
-#~ "knows if a selected package is located on another CD-ROM so it will "
-#~ "eject\n"
-#~ "the current CD and ask you to insert the correct CD as required."
-#~ msgstr ""
-#~ "نصب لینوکس ماندرایک در چند سی‌دی توضیع شده است. برنامه‌ی نصب DrakX \n"
-#~ "می‌داند که اگر بسته‌ی انتخاب شده بر سی‌دی دیگری قرار گرفته باشد بنابرین "
-#~ "سی‌دی\n"
-#~ "کنونی را بیرون داده و از شما می‌خواهد که سی‌دی مورد نیاز را وارد کنید."
-
-#~ msgid ""
-#~ "It is now time to specify which programs you wish to install on your\n"
-#~ "system. There are thousands of packages available for Mandrake Linux, "
-#~ "and\n"
-#~ "to make it simpler to manage the packages have been placed into groups "
-#~ "of\n"
-#~ "similar applications.\n"
-#~ "\n"
-#~ "Packages are sorted into groups corresponding to a particular use of "
-#~ "your\n"
-#~ "machine. Mandrake Linux has four predefined installations available. You\n"
-#~ "can think of these installation classes as containers for various "
-#~ "packages.\n"
-#~ "You can mix and match applications from the various groups, so a\n"
-#~ "``Workstation'' installation can still have applications from the\n"
-#~ "``Development'' group installed.\n"
-#~ "\n"
-#~ " * \"%s\": if you plan to use your machine as a workstation, select one "
-#~ "or\n"
-#~ "more of the applications that are in the workstation group.\n"
-#~ "\n"
-#~ " * \"%s\": if plan on using your machine for programming, choose the\n"
-#~ "appropriate packages from that group.\n"
-#~ "\n"
-#~ " * \"%s\": if your machine is intended to be a server, select which of "
-#~ "the\n"
-#~ "more common services you wish to install on your machine.\n"
-#~ "\n"
-#~ " * \"%s\": this is where you will choose your preferred graphical\n"
-#~ "environment. At least one must be selected if you want to have a "
-#~ "graphical\n"
-#~ "interface available.\n"
-#~ "\n"
-#~ "Moving the mouse cursor over a group name will display a short "
-#~ "explanatory\n"
-#~ "text about that group. If you unselect all groups when performing a "
-#~ "regular\n"
-#~ "installation (as opposed to an upgrade), a dialog will pop up proposing\n"
-#~ "different options for a minimal installation:\n"
-#~ "\n"
-#~ " * \"%s\": install the minimum number of packages possible to have a\n"
-#~ "working graphical desktop.\n"
-#~ "\n"
-#~ " * \"%s\": installs the base system plus basic utilities and their\n"
-#~ "documentation. This installation is suitable for setting up a server.\n"
-#~ "\n"
-#~ " * \"%s\": will install the absolute minimum number of packages "
-#~ "necessary\n"
-#~ "to get a working Linux system. With this installation you will only have "
-#~ "a\n"
-#~ "command line interface. The total size of this installation is about 65\n"
-#~ "megabytes.\n"
-#~ "\n"
-#~ "You can check the \"%s\" box, which is useful if you are familiar with "
-#~ "the\n"
-#~ "packages being offered or if you want to have total control over what "
-#~ "will\n"
-#~ "be installed.\n"
-#~ "\n"
-#~ "If you started the installation in \"%s\" mode, you can unselect all "
-#~ "groups\n"
-#~ "to avoid installing any new package. This is useful for repairing or\n"
-#~ "updating an existing system."
-#~ msgstr ""
-#~ "وقت آن رسیده است که برنامه‌هایی را که می‌خواهید بر سیستم خود نصب کنید را\n"
-#~ "مشخص کنید.هزاران بسته برای لینوکس ماندرایک در دسترس هستند، و برای\n"
-#~ "آسان کردن اداره‌ی آنها برنامه‌های مشابه گروه‌بندی شده‌اند.\n"
-#~ "\n"
-#~ "بسته‌ها به گروه‌هایی مربوط به استفاده‌ای که بر روی ماشین شما دارند مرتب "
-#~ "شده‌اند.\n"
-#~ "لینوکس ماندرایک چهار نصب از پیش تعیین شده را در دسترس دارد. می‌توانید این\n"
-#~ "رده‌های نصب را مانند انبارهای بسته‌های گوناگون تصور کنید. شما می‌توانید "
-#~ "برنامه‌ها را\n"
-#~ "نصب شده ترکیب و تطبیق کرده،بطوری که یک نصب ایستگاه‌کار بتواند برنامه‌هایی "
-#~ "را از\n"
-#~ "گروه برنامه‌سازی را داشته باشد.\n"
-#~ " * \"%s\": اگر شما می‌خواهیداز ماشین خود مانند ایستگاه‌کار استفاده کنید،\n"
-#~ "یک یا چند برنامه که در گروه ایستگاه‌کار وجود دارند را انتخاب کنید.\n"
-#~ "\n"
-#~ " * \"%s\": اگر شما از ماشین خود برای برنامه نویسی استفاده می‌کنید، "
-#~ "بسته‌های \n"
-#~ "متناسب را از آن گروه انتخاب کنید.\n"
-#~ "\n"
-#~ " * \"%s\": اگر ماشین شما قرار است یک کارگزار باشد، سرویس‌های معمول را که \n"
-#~ "می‌خواهید بر ماشین خود نصب کنید انتخاب کنید.\n"
-#~ "\n"
-#~ " * \"%s\": این جایی است که شما می‌توانید محیط گرافیک ترجیح داده‌ی خود را\n"
-#~ "انتخاب کنید. اگر می‌خواهید یک واسط گرافیکی در دسترس داشته باشید حداقل\n"
-#~ "یکی باید انتخاب گردد.\n"
-#~ "\n"
-#~ "حرکت مکان‌نمای موشی روی نام یک گروه متن توضیح کوتاهی را درباره آن گروه "
-#~ "نشان .\n"
-#~ "خواهد داد. اگر شما هنگام اجرای یک نصب معمولی (برخلاف یک ارتقاء) هیچ "
-#~ "گروهی \n"
-#~ "را انتخاب نکنید، یگ گفتگو ظاهر خواهد شد که گزینه‌های گوناگونی را برای یک "
-#~ "نصب \n"
-#~ "حداقل پیشنهاد می‌کند:\n"
-#~ "\n"
-#~ " * \"%s\": نصب حداقل تعداد بسته‌های ممکن برای داشتن یک رومیزی تصویری فعال\n"
-#~ "\n"
-#~ " * \"%s\": نصب سیستم پایه بعلاوه‌ی ابزارهای اصلی و مستندات آنها.\n"
-#~ "این نصب برای برپاسازی یک کارگزار مناسب می‌باشد.\n"
-#~ "\n"
-#~ " * \"%s\": حداقل تعداد مطلق بسته‌های ضروری را برای یک سیستم لینوکس فعال\n"
-#~ "را نصب خواهد نمود. با این نصب شما تنها یک واسط خط فرمان خواهید داشت.\n"
-#~ "اندازه‌ی کل این نصب حدود ۶۵ مگابایت می‌باشد.\n"
-#~ "\n"
-#~ "شما می‌توانید جعبه‌ی \"%s\" را علامت بزنید، که در صورتی که شما با بسته‌های \n"
-#~ "عرضه شده آشنایی داشته باشید یا اگر بخواهید بر آنچه نصب خواهد شد اختیار "
-#~ "کامل\n"
-#~ "داشته باشید مفید است.\n"
-#~ "\n"
-#~ "اگر شما نصب را در حالت \"%s\" شروع کرده‌اید، می‌توانید تمام گروه‌ها را "
-#~ "برای \n"
-#~ "جلوگیری از نصب هیچ بسته‌ی جدید انتخاب نکنید. این برای تعمیر یا بروزسازی "
-#~ "یک\n"
-#~ "سیستم موجود مفید است."
-
-#~ msgid ""
-#~ "If you told the installer that you wanted to individually select "
-#~ "packages,\n"
-#~ "it will present a tree containing all packages classified by groups and\n"
-#~ "subgroups. While browsing the tree, you can select entire groups,\n"
-#~ "subgroups, or individual packages.\n"
-#~ "\n"
-#~ "Whenever you select a package on the tree, a description appears on the\n"
-#~ "right to let you know the purpose of the package.\n"
-#~ "\n"
-#~ "!! If a server package has been selected, either because you "
-#~ "specifically\n"
-#~ "chose the individual package or because it was part of a group of "
-#~ "packages,\n"
-#~ "you will be asked to confirm that you really want those servers to be\n"
-#~ "installed. By default Mandrake Linux will automatically start any "
-#~ "installed\n"
-#~ "services at boot time. Even if they are safe and have no known issues at\n"
-#~ "the time the distribution was shipped, it is entirely possible that that\n"
-#~ "security holes were discovered after this version of Mandrake Linux was\n"
-#~ "finalized. If you do not know what a particular service is supposed to "
-#~ "do\n"
-#~ "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
-#~ "install the listed services and they will be started automatically by\n"
-#~ "default during boot. !!\n"
-#~ "\n"
-#~ "The \"%s\" option is used to disable the warning dialog which appears\n"
-#~ "whenever the installer automatically selects a package to resolve a\n"
-#~ "dependency issue. Some packages have relationships between each other "
-#~ "such\n"
-#~ "that installation of a package requires that some other program is also\n"
-#~ "rerquired to be installed. The installer can determine which packages "
-#~ "are\n"
-#~ "required to satisfy a dependency to successfully complete the "
-#~ "installation.\n"
-#~ "\n"
-#~ "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
-#~ "package list created during a previous installation. This is useful if "
-#~ "you\n"
-#~ "have a number of machines that you wish to configure identically. "
-#~ "Clicking\n"
-#~ "on this icon will ask you to insert a floppy disk previously created at "
-#~ "the\n"
-#~ "end of another installation. See the second tip of last step on how to\n"
-#~ "create such a floppy."
-#~ msgstr ""
-#~ "اگر شما به نصب‌گر گفته‌اید که می‌خواهید بسته‌ها را دانه‌ای انتخاب کنید، \n"
-#~ "آن یک درخت شامل تمام بسته‌های دسته‌بندی شده بوسیله‌ی گروه‌ها و زیرگروه‌ها \n"
-#~ "را عرضه می‌کند. هنگام مرور بر درخت، می‌توانید همه‌ی گروه‌ها، زیرگروه‌ها، \n"
-#~ "یا بسته‌های دانه‌ای را انتخاب کنید. \n"
-#~ "\n"
-#~ "هروقت شما یک بسته را در این درخت انتخاب می‌کنید، یک توضیح در قسمت \n"
-#~ "راست ظاهر شده که کاربرد بسته را معرفی می‌کند. \n"
-#~ "\n"
-#~ "!! اگر یک بسته‌ی کارگزار انتخاب شده باشد، یا اینکه شما مخصوصاً بسته‌ی "
-#~ "دانه‌ای \n"
-#~ "را انتخاب کردید یا برای اینکه آن قسمتی از یک گروه از بسته‌ها باشد، از "
-#~ "شما \n"
-#~ "برای تایید آنکه شما واقعا می‌خواهید آنها را نصب کنید سؤال خواهد شد. \n"
-#~ "پیش‌فرض لینوکس ماندرایک هر سرویس نصب شده‌ای را در زمان آغازگری \n"
-#~ "بطور خودکار اجرا می‌کند. هر چند آنها امن بوده و هیچ اشکالی در زمان "
-#~ "انتشار \n"
-#~ "ندارند، احتمال دارد که سوراخ‌های امنیتی بعد از تکمیل این نسخه لینوکس \n"
-#~ "ماندرایک کشف شوند. اگر شما نمی‌دانید که یک سرویس بخصوص قرار \n"
-#~ "است چکار کند یا چرا نصب شده است، \"%s\" را کلیک کنید. با کلیک \n"
-#~ "بر \"%s\"سرویس‌های فهرست شده نصب خواهند گردید و آنها بوسیله‌ی\n"
-#~ "پیش‌فرض بطور خودکار هنگام آغازگری شروع می‌شوند. !! \n"
-#~ "\n"
-#~ "گزینه‌ی \"%s\" برای از کار انداختن گفتگوی هشدارهایی است که هر وقت برنامه‌ی\n"
-#~ "نصب یک بسته را برای حل یک مشکل وابستگی بطور خودکار انتخاب می‌کند \n"
-#~ "استفاده می‌شود. بعضی از بسته‌ها به هم وابستگی دارند بطوری که نصب یک \n"
-#~ "بسته مستلزم نصب آن بسته‌ی دیگر می‌باشد. برنامه‌ی نصب می‌تواند تعیین کند \n"
-#~ "که کدام بسته برای ارضای یک وابستگی لازم است تا نصب را با موفقیت تکمیل "
-#~ "کند.\n"
-#~ "\n"
-#~ "آن شمایل ریز دیسکچه در پایین فهرست به شما اجازه می دهد که یک \n"
-#~ "فهرست ایجاد شده‌ی از نصب قبلی را بارگذاری کنید. این روش اگر شما \n"
-#~ "تعدادی رایانه را بخواهید بطور یکسان پیکربندی کنید مفید است. کلیک بر این\n"
-#~ "شمایل از شما می‌خواهد که آن دیسکچه‌ای را که در پایان نصب قبلی ایجاد\n"
-#~ "کرده‌اید را داخل کنید. راهنمایی دوم در آخرین مرحله را برای چگونگی ایجاد\n"
-#~ "چنین دیسکچه‌ای را نگاهی بیاندازید."
-
-#~ 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 autodetect 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"
-#~ "\n"
-#~ "When configuring your network, the available connections options are:\n"
-#~ "traditional modem, ISDN modem, ADSL connection, cable modem, and finally "
-#~ "a\n"
-#~ "simple LAN connection (Ethernet).\n"
-#~ "\n"
-#~ "We will not detail each configuration option - just make sure that you "
-#~ "have\n"
-#~ "all the parameters, such as IP address, default gateway, DNS servers, "
-#~ "etc.\n"
-#~ "from your Internet Service Provider or system administrator.\n"
-#~ "\n"
-#~ "You can consult the ``Starter Guide'' chapter about Internet connections\n"
-#~ "for details about the configuration, or simply wait until your system is\n"
-#~ "installed and use the program described there to configure your "
-#~ "connection."
-#~ msgstr ""
-#~ "شما اکنون اتصال اینترنت/شبکه خود را برپاسازی خواهید کرد. اگر می‌خواهید "
-#~ "رایانه\n"
-#~ "خود را به اینترنت یا یک شبکه محلی متصل کنید، بر \"%s\" کلیک کنید. \n"
-#~ "لینوکس ماندرایک سعی خواهد کرد تا دستگاه‌های شبکه و مودم را بطور خودکار \n"
-#~ "شناسائی کند.ا گر این شناسائی موفق نبود، جعبه‌ی \"%s\" را بی‌علامت کنید.\n"
-#~ " شما همچنین تنظیم شبکه را انتخاب نکرده یا آن را بعدا انجام دهید، در هر\n"
-#~ "صورت با کلیک بر دکمه‌ی \"%s\"به مرحله‌ی بعدی خواهید رفت.\n"
-#~ "\n"
-#~ "گزینه‌های ارتباطی برای تنظیم شبکه شما عبارتند از: مودم معمولی، مودم ISDN \n"
-#~ "اتصال ADSL ، مودم کابلی، و در آخر یک اتصال شبکه‌ی محلی LAN (Ethernet) "
-#~ "می‌باشد.\n"
-#~ "\n"
-#~ "ما هر گزینه‌ی پیکربندی را تشریح نخواهیم داد - فقط مطمئن شوید که همه‌ی\n"
-#~ "پارامترهای مورد نیاز از جمله نشانی IP، دروازه‌ی پیش‌فرض، کارگزارهای DNS، \n"
-#~ "و غیره را از شرکت عرضه کننده اینترنت یا مدیر سیستم خود دریافت کرده‌اید.\n"
-#~ "\n"
-#~ "شما می‌توانید برای جزئیات درباره‌ی پیکربندی اتصال اینترنت به فصل راهنمای\n"
-#~ " شروع مراجعه یا صبر کرده تا سیستم نصب شود و از توضیحات داده شده\n"
-#~ "در برنامه برای پیکربندی اتصال خود استفاده کنید."
-
-#~ msgid ""
-#~ "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
-#~ "local time according to the time zone you selected. If the clock on your\n"
-#~ "motherboard is set to local time, you may deactivate this by unselecting\n"
-#~ "\"%s\", which will let GNU/Linux know that the system clock and the\n"
-#~ "hardware clock are in the same timezone. This is useful when the machine\n"
-#~ "also hosts another operating system like Windows.\n"
-#~ "\n"
-#~ "The \"%s\" option will automatically regulate the clock by connecting to "
-#~ "a\n"
-#~ "remote time server on the Internet. For this feature to work, you must "
-#~ "have\n"
-#~ "a working Internet connection. It is best to choose a time server "
-#~ "located\n"
-#~ "near you. This option actually installs a time server that can used by\n"
-#~ "other machines on your local network as well."
-#~ msgstr ""
-#~ "گنو/لینوکس زمان را بر اساس GMT (Greenwich Mean Time) اداره کرده و آن را "
-#~ "به\n"
-#~ "زمان محلی طبق منطقه‌ی زمانی که شما انتخاب کرده‌اید برمی‌گرداند. اگر ساعت "
-#~ "روی\n"
-#~ "کارت‌الکترونیکی مادر بر اساس زمان محلی گذاشته شده باشد، می‌توانید این را از "
-#~ "طریق\n"
-#~ "انتخاب نکردن \"%s\"، که به گنو/لینوکس اجازه می‌دهد که بداند که ساعت سیستم "
-#~ "شما\n"
-#~ "و ساعت سخت‌افزار در یک منطقه‌زمانی قرار دارند غیرفعال کنید. دانستن این "
-#~ "مطلب\n"
-#~ "وقتی که ماشین شما سیستم عامل دیگری نظیر ویندوز را میزبان باشد مفید است.\n"
-#~ "\n"
-#~ "گزینه‌ی \"%s\" ساعت را از طریق ارتباط گرفتن به کارگزار از راه دور زمان بر "
-#~ "اینترنت\n"
-#~ "میزان می‌کند. برای کاربرد این قابلیت شما باید یک اتصال اینترنت فعال داشته "
-#~ "باشید.\n"
-#~ "بهتر است یک کارگزار زمان نزدیک به خود را انتخاب کنید. این گزینه در حقیقت "
-#~ "کارگزار\n"
-#~ "زمانی را نصب می‌کند که می‌تواند بوسیله‌ی رایانه‌های دیگر شبکه‌اتان نیز استفاده "
-#~ "گردد."
-
-#~ msgid ""
-#~ "Graphic Card\n"
-#~ "\n"
-#~ "   The installer will normally automatically detect and configure the\n"
-#~ "graphic card installed on your machine. If it is not the case, you can\n"
-#~ "choose from this list the card you actually have installed.\n"
-#~ "\n"
-#~ "   In the case that different servers are available for your card, with "
-#~ "or\n"
-#~ "without 3D acceleration, you are then asked to choose the server that "
-#~ "best\n"
-#~ "suits your needs."
-#~ msgstr ""
-#~ "کارت گرافیک\n"
-#~ "\n"
-#~ "   برنامه‌ی نصب‌گر معمولا کارت گرافیک نصب شده بر ماشین شما را بطور خودکار\n"
-#~ "شناسایی و تنظیم می‌کند. اگر چنین نشده، می‌توانید کارتی را که خود نصب "
-#~ "کرده‌اید\n"
-#~ "از این لیست انتخاب کنید.\n"
-#~ "\n"
-#~ "   در صورتی که کارگزارهای مختلف برای کارت شما در دسترس هستند، بدون یا با\n"
-#~ "شتاب دهنده‌ی ۳بعدی، از شما برای انتخاب کارگزاری که برای شما مناسب‌تر است\n"
-#~ "سؤال خواهد شد."
-
-#~ msgid ""
-#~ "X (for X Window System) is the heart of the GNU/Linux graphical "
-#~ "interface\n"
-#~ "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-#~ "WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
-#~ "\n"
-#~ "You will be presented with a list of different parameters to change to "
-#~ "get\n"
-#~ "an optimal graphical display: Graphic Card\n"
-#~ "\n"
-#~ "   The installer will normally automatically detect and configure the\n"
-#~ "graphic card installed on your machine. If it is not the case, you can\n"
-#~ "choose from this list the card you actually have installed.\n"
-#~ "\n"
-#~ "   In the case that different servers are available for your card, with "
-#~ "or\n"
-#~ "without 3D acceleration, you are then asked to choose the server that "
-#~ "best\n"
-#~ "suits your needs.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Monitor\n"
-#~ "\n"
-#~ "   The installer will normally automatically detect and configure the\n"
-#~ "monitor connected to your machine. If it is incorrect, you can choose "
-#~ "from\n"
-#~ "this list the monitor you actually have connected to your computer.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Resolution\n"
-#~ "\n"
-#~ "   Here you can choose the resolutions and color depths available for "
-#~ "your\n"
-#~ "hardware. Choose the one that best suits your needs (you will be able to\n"
-#~ "change that after installation though). A sample of the chosen\n"
-#~ "configuration is shown in the monitor.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Test\n"
-#~ "\n"
-#~ "   the system will try to open a graphical screen at the desired\n"
-#~ "resolution. If you can see the message during the test and answer \"%s"
-#~ "\",\n"
-#~ "then DrakX will proceed to the next step. If you cannot see the message, "
-#~ "it\n"
-#~ "means that some part of the autodetected configuration was incorrect and\n"
-#~ "the test will automatically end after 12 seconds, bringing you back to "
-#~ "the\n"
-#~ "menu. Change settings until you get a correct graphical display.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Options\n"
-#~ "\n"
-#~ "   Here you can choose whether you want to have your machine "
-#~ "automatically\n"
-#~ "switch to a graphical interface at boot. Obviously, you want to check\n"
-#~ "\"%s\" if your machine is to act as a server, or if you were not "
-#~ "successful\n"
-#~ "in getting the display configured."
-#~ msgstr ""
-#~ "X (برای سیستم پنجره X ) قلب واسط گرافیکی لینوکس/گنو می‌باشد که تمام "
-#~ "محیط‌های \n"
-#~ "گرافیکی (KDE, GNOME, AfterStep, WindowMaker وغیره) بسته‌بندی شده با \n"
-#~ "لینوکس ماندرایک بر روی آن تکیه دارند.\n"
-#~ "\n"
-#~ "لیستی از پارامترهای گوناگون برای تغییر و تهیه بهترین نمایش تصویری به شما "
-#~ "عرضه\n"
-#~ "خواهد شد: کارت گرافیک\n"
-#~ "\n"
-#~ "   نصب‌گر معمولاً بطور خودکار کارت گرافیک بر روی رایانه‌اتان را شناسائی\n"
-#~ "و پیکربندی خواهد کرد. اگر چنین نشد، می‌توانید کارت خود را از این لیست "
-#~ "انتخاب کنید.\n"
-#~ "\n"
-#~ "   در صورتی که کارگزارهای گوناگونی برای کارت شما وجود دارند، بدون یا با\n"
-#~ "شتاب‌دهنده‌ی ۳بعدی، از شما برای انتخاب کارگزاری که بهتر جوابگوی احتیاجات \n"
-#~ "شما ‌باشد سؤال خواهد شد.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "نمایشگر\n"
-#~ "\n"
-#~ "   نصب کننده معمولاً بطور خودکار نمایشگر وصل شده به رایانه‌اتان را شناسائی\n"
-#~ "و پیکربندی خواهد کرد. اگر چنین نشد، می‌توانید نمایشگر خود را از این لیست "
-#~ "انتخاب کنید.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "تفکیک‌پذیری\n"
-#~ "\n"
-#~ "   در اینجا می‌توانید تفکیک‌پذیری و عمق‌های رنگ موجود را برای سخت‌افزار خود\n"
-#~ "انتخاب کنید. آن را که بهترین جوابگوی احتیاجات شما است را انتخاب کنید (شما "
-#~ "قادر\n"
-#~ "خواهید بود که آن را بعد از نصب تغییر دهید). یک نمونه از پیکربندی انتخاب "
-#~ "شده در\n"
-#~ "نمایشگر نشان داده خواهد شد.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "آزمایش\n"
-#~ "\n"
-#~ "   سیستم تلاش خواهد کرد تا صفحه‌ی گرافیکی را با تفکیک‌پذیری درخواست شده باز "
-#~ "کند.\n"
-#~ "اگر بتوانید پیغام هنگام آزمایش را مشاهده کنید و جواب \"%s\"را بدهید،\n"
-#~ "پس DrakX به مرحله‌ی بعدی ادامه خواهد داد. اگر نتوانید پیغام را ببینید، "
-#~ "بدین\n"
-#~ "معنی است که بعضی از قسمت‌های پیکربندی شناسایئ خودکار صحیح نبوده و آزمایش\n"
-#~ "بعد از ۱۲ ثانیه بطور خودکار تمام شده، شما را به منو برمیگرداند. تنظیمات "
-#~ "را\n"
-#~ "تا وقتی که نمایش گرافیکی درست را بدست نیاورده‌اید تغییر دهید.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "گزینه‌ها\n"
-#~ "\n"
-#~ "   در اینجا می‌توانید تعویض خودکار به واسط گرافیکی را در آغازگری انتخاب "
-#~ "کنید.\n"
-#~ "روشن است که اگر رایانه‌اتان قرار است کارگزار شود، یا اگر شما در پیکربندی "
-#~ "نمایشگر \n"
-#~ "موفق نبوده‌اید بخواهید \"%s\" را علامت بزنید."
-
-#~ msgid ""
-#~ "Resolution\n"
-#~ "\n"
-#~ "   Here you can choose the resolutions and color depths available for "
-#~ "your\n"
-#~ "hardware. Choose the one that best suits your needs (you will be able to\n"
-#~ "change that after installation though). A sample of the chosen\n"
-#~ "configuration is shown in the monitor."
-#~ msgstr ""
-#~ "تفکیک‌پذیری\n"
-#~ "\n"
-#~ "   در اینجا می‌توانید تفکیک‌پذیری و عمق رنگ موجود را برای سخت‌افزار خود "
-#~ "انتخاب \n"
-#~ "کنید. آن را که به دردتان می‌خورد انتخاب کنید (بعد از نصب می‌توانید آن را\n"
-#~ " تغییر دهید). یک نمونه از پیکربندی انتخاب شده در نمایشگر نشان داده می‌شود."
-
-#~ msgid ""
-#~ "In the case that different servers are available for your card, with or\n"
-#~ "without 3D acceleration, you are then asked to choose the server that "
-#~ "best\n"
-#~ "suits your needs."
-#~ msgstr ""
-#~ "در صورتی که کارگزارهای گوناگونی برای کارت شما وجود دارند، بدون یا با\n"
-#~ "شتاب‌دهنده‌ی ۳بعدی ، از شما برای انتخاب مناسب‌ترین کارگزار سؤال \n"
-#~ "خواهد شد."
-
-#~ msgid ""
-#~ "At this point, you need to decide where you want to install the Mandrake\n"
-#~ "Linux operating system on your hard drive. If your hard drive is empty "
-#~ "or\n"
-#~ "if an existing operating system is using all the available space you "
-#~ "will\n"
-#~ "have to partition the drive. Basically, partitioning a hard drive "
-#~ "consists\n"
-#~ "of logically dividing it to create the space needed to install your new\n"
-#~ "Mandrake Linux system.\n"
-#~ "\n"
-#~ "Because the process of partitioning a hard drive is usually irreversible\n"
-#~ "and can lead to lost data if there is an existing operating system "
-#~ "already\n"
-#~ "installed on the drive, partitioning can be intimidating and stressful "
-#~ "if\n"
-#~ "you are an inexperienced user. Fortunately, DrakX includes a wizard "
-#~ "which\n"
-#~ "simplifies this process. Before continuing with this step, read through "
-#~ "the\n"
-#~ "rest of this section and above all, take your time.\n"
-#~ "\n"
-#~ "Depending on your hard drive configuration, several options are "
-#~ "available:\n"
-#~ "\n"
-#~ " * \"%s\": this option will perform an automatic partitioning of your "
-#~ "blank\n"
-#~ "drive(s). If you use this option there will be no further prompts.\n"
-#~ "\n"
-#~ " * \"%s\": the wizard has detected one or more existing Linux partitions "
-#~ "on\n"
-#~ "your hard drive. If you want to use them, choose this option. You will "
-#~ "then\n"
-#~ "be asked to choose the mount points associated with each of the "
-#~ "partitions.\n"
-#~ "The legacy mount points are selected by default, and for the most part "
-#~ "it's\n"
-#~ "a good idea to keep them.\n"
-#~ "\n"
-#~ " * \"%s\": if Microsoft Windows is installed on your hard drive and "
-#~ "takes\n"
-#~ "all the space available on it, you will have to create free space for\n"
-#~ "Linux. To do so, you can delete your Microsoft Windows partition and "
-#~ "data\n"
-#~ "(see ``Erase entire disk'' solution) or resize your Microsoft Windows "
-#~ "FAT\n"
-#~ "partition. Resizing can be performed without the loss of any data, "
-#~ "provided\n"
-#~ "you have previously defragmented the Windows partition and that it uses "
-#~ "the\n"
-#~ "FAT format. Backing up your data is strongly recommended.. Using this\n"
-#~ "option is recommended if you want to use both Mandrake Linux and "
-#~ "Microsoft\n"
-#~ "Windows on the same computer.\n"
-#~ "\n"
-#~ "   Before choosing this option, please understand that after this\n"
-#~ "procedure, the size of your Microsoft Windows partition will be smaller\n"
-#~ "then when you started. You will have less free space under Microsoft\n"
-#~ "Windows to store your data or to install new software.\n"
-#~ "\n"
-#~ " * \"%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"
-#~ "choose this option. Be careful, because you will not be able to undo "
-#~ "your\n"
-#~ "choice after you confirm.\n"
-#~ "\n"
-#~ "   !! If you choose this option, all data on your disk will be "
-#~ "deleted. !!\n"
-#~ "\n"
-#~ " * \"%s\": this will simply erase everything on the drive and begin "
-#~ "fresh,\n"
-#~ "partitioning everything from scratch. All data on your disk will be "
-#~ "lost.\n"
-#~ "\n"
-#~ "   !! If you choose this option, all data on your disk will be lost. !!\n"
-#~ "\n"
-#~ " * \"%s\": choose this option if you want to manually partition your "
-#~ "hard\n"
-#~ "drive. Be careful -- it is a powerful but dangerous choice and you can "
-#~ "very\n"
-#~ "easily lose all your data. That's why this option is really only\n"
-#~ "recommended if you have done something like this before and have some\n"
-#~ "experience. For more instructions on how to use the DiskDrake utility,\n"
-#~ "refer to the ``Managing Your Partitions '' section in the ``Starter\n"
-#~ "Guide''."
-#~ msgstr ""
-#~ "در این مرحله، باید تصمیم بگیرید در کجای دیسک خود می‌خواهید سیستم عامل \n"
-#~ "لینوکس ماندرایک را نصب کنید. اگر دیسک شما خالی یا اگر سیستم عاملی\n"
-#~ "همه‌ی فصای موجود دیسک را در اختیار دارد بایستی دیسک خود را قسمت‌بندی\n"
-#~ "کنید. اساساً، قسمت‌بندی یک دیسک شامل قسمت کردن منطقی آن برای ایجاد\n"
-#~ "فضای لازم برای نصب سیستم لینوکس ماندرایک جدید شما می‌باشد. \n"
-#~ "\n"
-#~ "بدلیل غیر قابل برگشت بودن پردازش قسمت‌بندی و اینکه می‌تواند به از دست رفتن\n"
-#~ "داده‌ها منتهی گردد، مخصوصاً اگر سیستم عاملی از قبل وجود داشته و بر روی "
-#~ "دیسک \n"
-#~ "نصب شده باشد، اگر شما یک کاربر بی‌تجربه‌اید قسمت‌بندی کردن می‌تواند عصبی \n"
-#~ "کننده و هیجان‌آور باشد. خوشبختانه، DrakX یک جادوگر راهنما را برای آسان "
-#~ "ساختن\n"
-#~ "این پردازش ضمیمه دارد. قبل از ادامه به این مرحله بقیه این بخش را بخوانید "
-#~ "و \n"
-#~ "بیش از هر چه وقت کافی را بخود بدهید.\n"
-#~ "\n"
-#~ "بستگی به پیکربندی دیسک شما، چندین گزینه موجود هستند:\n"
-#~ "\n"
-#~ " * \"%s\": این گزینه یک قسمت‌بندی خودکار را بر دستگاه دیسک خالی شما انجام "
-#~ "می‌دهد.\n"
-#~ "اگر شما از این گزینه استفاده کنید دیگر از شما سؤال دیگری نخواهد شد.\n"
-#~ "\n"
-#~ " * \"%s\": جادوگر یک یا چند قسمت‌بندی موجود لینوکس را بر روی دیسک شما "
-#~ "شناسائی\n"
-#~ "کرده است. اگر شما می‌خواهید از آنها استفاده کنید این گزینه را انتخاب "
-#~ "نمایید. سپس\n"
-#~ "از شما پرسیده خواهد شد که نقاط سوارسازی مربوط به هر قسمت‌بندی را انتخاب\n"
-#~ "کنید. نقاط سوارسازی صحیح بوسیله‌ی پیش‌فرض انتخاب خواهند شد، در بیشتر\n"
-#~ "موارد نظر خوبی است که آنها را نگه دارید.\n"
-#~ "\n"
-#~ " * \"%s\": اگر ویندوز مایکروسافت بر دیسک شما نصب شده است و همه فضای "
-#~ "موجود\n"
-#~ "بر آن را در اختیار دارد، شما می‌بایست فضای آزاد برای لینوکس را ایجاد "
-#~ "کنید.\n"
-#~ "برای انجام این کار، می‌توانید قسمت‌بندی و داده‌های ویندوز مایکروسافت\n"
-#~ "را حذف کرده (راه حل ''پاک کردن تمام دیسک'' را ببینید) یا قسمت‌بندی FAT \n"
-#~ "ویندوز مایکروسافت را تغییر اندازه دهید. تغییر اندازه می‌تواند بدون از دست "
-#~ "دادن\n"
-#~ "هیچ داده‌ای به این شرط که شما قبلا قسمت‌بندی ویندوز را نظم داده\n"
-#~ "یا defragmented بشود و اینکه آن از قالب FAT استفاده کند میسر گردد.\n"
-#~ "ذخیره داده‌ها بشدت سفارش می‌شود. استفاده از این گزینه اگر شما می‌خواهید هم\n"
-#~ "لینوکس و هم ویندوز مایکروسافت را بر روی یک رایانه داشته باشید سفارش "
-#~ "می‌شود.\n"
-#~ "\n"
-#~ "   قبل از انتخاب این گزینه، لطفاً توجه کنید که بعد از این پردازش اندازه‌ی\n"
-#~ "قسمت‌بندی ویندوز مایکروسافت شما کوچکتر از وقتی که شروع کرده‌اید خواهد "
-#~ "گردید.\n"
-#~ "شما فضای آزاد کمتری در ویندوز مایکروسافت برای ذخیره‌ی داده‌های خود یا\n"
-#~ "نصب نرم‌افزار جدید خواهید داشت.\n"
-#~ "\n"
-#~ " * \"%s\": اگر می‌خواهید تمام داده‌ها و قسمت‌بندی‌های موجود بر روی دیسک\n"
-#~ "را حذف و آنها را با سیستم لینوکس مان‌درایک جدید خود جایگزین کنید، این \n"
-#~ "گزینه را انتخاب کنید. دقت کنید، شما قادر نخواهید بود انتخاب خود را \n"
-#~ "بعد از تأیید پس بگیرید. \n"
-#~ "\n"
-#~ "   !! اگر شما این گزینه را انتخاب کنید، همه‌ی داده‌ها بر روی دیسک شما حذف "
-#~ "خواهد شد. !! \n"
-#~ "\n"
-#~ " * \"%s\": این همه چیز را از دیسک پاک کرده و از نو شروع به قسمت‌بندی هر \n"
-#~ "چیز از پایه می‌کند. هر داده‌ای بر روی دیسک شما از دست خواهد رفت. \n"
-#~ "\n"
-#~ "   !! اگر شما این گزینه را انتخاب کنید، همه داده‌های بر دیسک شما از دست "
-#~ "خواهند رفت. !! \n"
-#~ "\n"
-#~ " * \"%s\": این گزینه را اگر خودتان می‌خواهید دیسک را قسمت‌بندی کنید انتخاب\n"
-#~ " کنید. دقت کنید -- این گزینه‌ی باقدرت ولی خطرناکی است و شما می‌توانید \n"
-#~ "بسادگی تمام داده‌های خود را از دست بدهید. برای همین این گزینه واقعا فقط \n"
-#~ "اگر شما چنین کاری را قبلا انجام داده‌اید و تجربه دارید سفارش می‌شود. برای \n"
-#~ "راهنمای چگونگی استفاده از وسیله‌ی DiskDrake  به قسمت``مدیریت\n"
-#~ " قسمت‌بندی‌های خود'' در``راهنمای شروع'' مراجعه کنید."
-
-#~ msgid ""
-#~ "There you are. Installation is now complete and your GNU/Linux system is\n"
-#~ "ready to use. Just click \"%s\" to reboot the system. The first thing "
-#~ "you\n"
-#~ "should see after your computer has finished doing its hardware tests is "
-#~ "the\n"
-#~ "bootloader menu, giving you the choice of which operating system to "
-#~ "start.\n"
-#~ "\n"
-#~ "The \"%s\" button shows two more buttons to:\n"
-#~ "\n"
-#~ " * \"%s\": to create an installation floppy disk that will automatically\n"
-#~ "perform a whole installation without the help of an operator, similar to\n"
-#~ "the installation you just configured.\n"
-#~ "\n"
-#~ "   Note that two different options are available after clicking the "
-#~ "button:\n"
-#~ "\n"
-#~ "    * \"%s\". This is a partially automated installation. The "
-#~ "partitioning\n"
-#~ "step is the only interactive procedure.\n"
-#~ "\n"
-#~ "    * \"%s\". Fully automated installation: the hard disk is completely\n"
-#~ "rewritten, all data is lost.\n"
-#~ "\n"
-#~ "   This feature is very handy when installing a number of similar "
-#~ "machines.\n"
-#~ "See the Auto install section on our web site for more information.\n"
-#~ "\n"
-#~ " * \"%s\"(*): saves a list of the packages selected in this "
-#~ "installation.\n"
-#~ "To use this selection with another installation, insert the floppy and\n"
-#~ "start the installation. At the prompt, press the [F1] key and type "
-#~ ">>linux\n"
-#~ "defcfg=\"floppy\" <<.\n"
-#~ "\n"
-#~ "(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
-#~ "\"mformat a:\")"
-#~ msgstr ""
-#~ "بفرمایید. نصب اکنون تکمیل شده است و سیستم گنو/لینوکس آماده‌ی استفاده است.\n"
-#~ "فقط بر \"%s\" کلیک کرده تا سیستم آغازگری مجدد گردد. اولین چیزی که شما بعد "
-#~ "از\n"
-#~ "اینکه رایانه‌ی شما سخت‌افزار خود را آزمایش می‌کند منوی بارگزار آغازگری "
-#~ "است، \n"
-#~ "که به شما اجازه‌ی انتخاب راه‌اندازی یکی از سیستم‌های عامل را می‌دهد. \n"
-#~ "\n"
-#~ "دکمه‌ی \"%s\" دو دکمه‌ی دیگر را نشان می‌دهد که برای: \n"
-#~ "  * \"%s\": ایجاد یک دیسکچه‌ی نصب که تمام نصب را بطور خودکار بدون کمک \n"
-#~ "کسی، شبیه به نصبی که شما اکنون پیکربندی کردید را انجام می‌دهد. \n"
-#~ "\n"
-#~ "   توجه کنید که بعد از کلیک بر این دکمه دو گزینه در دسترس می‌باشند:\n"
-#~ "\n"
-#~ "    * \"%s\". این نصب نسبتاً خودکار است. گام قسمت‌بندی تنها \n"
-#~ "مرحله‌ی گفتگویی است.\n"
-#~ "\n"
-#~ "    * \"%s\". نصب کاملاً خودکار: دیسک سخت کاملاً بازنویسی شده،\n"
-#~ "تمام داده‌ها از دست خواهند رفت.\n"
-#~ "\n"
-#~ "   این قابلیت وقتی چندین ماشین قرار است شبیه به هم نصب شوند مفید است.\n"
-#~ "بخش نصب خودکار را در وب‌گاه ما برای اطلاعات بیشتر مراجعه کنید.\n"
-#~ "\n"
-#~ " * \"%s\"(*): لیستی از بسته‌های انتخاب شده در این نصب را ذخیره می‌کند.\n"
-#~ "برای استفاده از این مجموعه با نصب دیگری، دیسکچه را داخل کرده و نصب\n"
-#~ "را شروع کنید. در اعلان, کلید [F1] را فشار داده و بنویسید\n"
-#~ ">>linux defcfg=\"floppy\" <<.\n"
-#~ "\n"
-#~ "(*) شما به یک دیسکچه‌ی با قالب FAT احتیاج دارید (برای ایجاد آن در لینوکس\n"
-#~ "بنویسید \"mformat a:\")"
-
-#~ msgid "generate auto-install floppy"
-#~ msgstr "تولید دیسکچه‌ی نصب-خودکار"
-
-#~ msgid ""
-#~ "Any partitions that have been newly defined must be formatted for use\n"
-#~ "(formatting means creating a file system).\n"
-#~ "\n"
-#~ "At this time, you may wish to reformat some already existing partitions "
-#~ "to\n"
-#~ "erase any data they contain. If you wish to do that, please select those\n"
-#~ "partitions as well.\n"
-#~ "\n"
-#~ "Please note that it is not necessary to reformat all pre-existing\n"
-#~ "partitions. You must reformat the partitions containing the operating\n"
-#~ "system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
-#~ "reformat partitions containing data that you wish to keep (typically\n"
-#~ "\"/home\").\n"
-#~ "\n"
-#~ "Please be careful when selecting partitions. After formatting, all data "
-#~ "on\n"
-#~ "the selected partitions will be deleted and you will not be able to "
-#~ "recover\n"
-#~ "it.\n"
-#~ "\n"
-#~ "Click on \"%s\" when you are ready to format partitions.\n"
-#~ "\n"
-#~ "Click on \"%s\" if you want to choose another partition for your new\n"
-#~ "Mandrake Linux 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."
-#~ msgstr ""
-#~ "هر قسمت‌بندی که بتازگی مشخص شده باشد باید برای استفاده قالب‌بندی گردد\n"
-#~ "(قالب‌بندی بمعنی ایجاد یک سیستم پرونده می‌باشد).\n"
-#~ "\n"
-#~ "در حال حاضر، ممکن است بخواهید بعضی از قسمت‌بندی‌های موجود را برای\n"
-#~ "برای پاک کردن دادهای بر آنها قالب‌بندی کنید. اگر خیال چنین کاری را دارید،\n"
-#~ "لطفاً آن قسمت‌بندی‌ها را نیز انتخاب کنید.\n"
-#~ "\n"
-#~ "\n"
-#~ "لطفاً توجه کنید که ضروری نیست که تمام قسمت‌بندی‌های موجود قالب‌بندی مجدد\n"
-#~ "شوند. شما باید قسمت‌بندی‌های حاوی سیستم عامل (مانند \"/\", \"/usr\" یا \"/"
-#~ "var\") \n"
-#~ "را قالب‌بندی مجدد کرده اما مجبور به قالب‌بندی مجدد قسمت‌بندی‌های حاوی\n"
-#~ "داده‌هایی که می‌خواهید نگهدارید نیستید (معمولاً \"/home\").\n"
-#~ "\n"
-#~ "لطفاً هنگام انتخاب قسمت‌بندی‌ها دقت کنید. بعد از قالب‌بندی تمام داده‌های\n"
-#~ "روی قسمت‌بندی‌های انتخاب شده حذف خواهند شد و شما قادر به تعمیر آنها نخواهید "
-#~ "بود\n"
-#~ "\n"
-#~ "وقتی برای قالب‌بندی قسمت‌بندی‌ها آماده شدید بر \"%s\" کلیک کنید.\n"
-#~ "\n"
-#~ "اگر می‌خواهید قسمت‌بندی دیگری برای نصب سیستم عامل لینوکس ماندرایک\n"
-#~ "جدید خود انتخاب کنید بر %s کلیک کنید.\n"
-#~ "\n"
-#~ "اگر می‌خواهید قسمت‌بندی‌هایی که باید برای بلوک‌های بد  بر روی دیسک کنترل "
-#~ "شوند\n"
-#~ "را انتخاب کنید بر %s کلیک کنید."
-
-#~ msgid "<- Previous"
-#~ msgstr "<- قبلی"
-
-#~ msgid ""
-#~ "At the time you are installing Mandrake Linux, it is likely that some\n"
-#~ "packages have been updated since the initial release. Bugs may have been\n"
-#~ "fixed, security issues resolved. To allow you to benefit from these\n"
-#~ "updates, you are now able to download them from the Internet. Check \"%s"
-#~ "\"\n"
-#~ "if you have a working Internet connection, or \"%s\" if you prefer to\n"
-#~ "install updated packages later.\n"
-#~ "\n"
-#~ "Choosing \"%s\" will display a list of places from which updates can be\n"
-#~ "retrieved. You should choose one nearer to you. A package-selection tree\n"
-#~ "will appear: review the selection, and press \"%s\" to retrieve and "
-#~ "install\n"
-#~ "the selected package(s), or \"%s\" to abort."
-#~ msgstr ""
-#~ "در زمانی که شما در حال نصب لینوکس مان‌درایک هستید، به احتمال زیاد بعضی \n"
-#~ "از بسته‌ها از زمان شروع نشر خود بروزسازی شده‌اند. اشکالات ممکن است تعمیر \n"
-#~ "شده و مسایل امنیتی رفع شده باشند. برای استفاده از فواید این بروزسازی‌ها، "
-#~ "شما اکنون \n"
-#~ "می‌توانید آنها را از اینترنت بارگیری کنید. \"%s\" را اگر شما یک اتصال "
-#~ "کارآرای\n"
-#~ "اینترنت دارید علامت زده، یا \"%s\" را اگر ترجیح می‌دهید بسته‌ها را بعداً "
-#~ "بروزسازی کنید.\n"
-#~ "\n"
-#~ "انتخاب \"%s\" لیستی از مکان‌هایی که آن بروزسازی‌ها می‌توانند دریافت شوند\n"
-#~ "را نشان خواهد داد. شما باید مکانی را که به شما نزدیکتر است انتخاب کنید.\n"
-#~ "یک درخت مجموعه-بسته ظاهر خواهد شد: مجموعه را مرور کرده، و \"%s\" را "
-#~ "برای \n"
-#~ "دریافت و نصب بسته‌های انتخاب شده، یا \"%s\" را برای ترک فشار دهید."
+#: ../../share/compssUsers:999
+msgid "Office Workstation"
+msgstr "ایستگاه‌کار دفتری"
 
-#~ msgid ""
-#~ "At this point, DrakX will allow you to choose the security level desired\n"
-#~ "for the machine. As a rule of thumb, the security level should be set\n"
-#~ "higher if the machine will contain crucial data, or if it will be a "
-#~ "machine\n"
-#~ "directly exposed to the Internet. The trade-off of a higher security "
-#~ "level\n"
-#~ "is generally obtained at the expense of ease of use.\n"
-#~ "\n"
-#~ "If you do not know what to choose, stay with the default option."
-#~ msgstr ""
-#~ "در این مقطع، DrakX به شما اجازه‌ی انتخاب سطح امنیتی مورد نظر را برای "
-#~ "رایانه\n"
-#~ "می‌دهد. روش معمول این است که اگر رایانه دارای داده‌های مهم خواهد شد، یا "
-#~ "اگر \n"
-#~ "آن رایانه‌ای خواهد بود که مستقیماً در معرض اینترنت قرار می‌گیرد سطح امنیتی "
-#~ "باید\n"
-#~ "بالاتر گذاشته شود. ضرر این معامله در داشتن سطح بالاتر امنیتی عموماً در\n"
-#~ "استفاده‌ی آسان است.\n"
-#~ "\n"
-#~ "اگر نمی‌دانید کدام را انتخاب کنید، گزینه‌ی پیش‌فرض را نگهدارید."
-
-#~ 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"
-#~ "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"
-#~ "\n"
-#~ "To create partitions, you must first select a hard drive. You can select\n"
-#~ "the disk for partitioning by clicking on ``hda'' for the first IDE "
-#~ "drive,\n"
-#~ "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
-#~ "\n"
-#~ "To partition the selected hard drive, you can use these options:\n"
-#~ "\n"
-#~ " * \"%s\": this option deletes all partitions on the selected hard drive\n"
-#~ "\n"
-#~ " * \"%s\": this option enables you to automatically create ext3 and swap\n"
-#~ "partitions in the free space of your hard drive\n"
-#~ "\n"
-#~ "\"%s\": gives access to additional features:\n"
-#~ "\n"
-#~ " * \"%s\": saves the partition table to a floppy. Useful for later\n"
-#~ "partition-table recovery if necessary. It is strongly recommended that "
-#~ "you\n"
-#~ "perform this step.\n"
-#~ "\n"
-#~ " * \"%s\": allows you to restore a previously saved partition table from "
-#~ "a\n"
-#~ "floppy disk.\n"
-#~ "\n"
-#~ " * \"%s\": if your partition table is damaged, you can try to recover it\n"
-#~ "using this option. Please be careful and remember that it doesn't always\n"
-#~ "work.\n"
-#~ "\n"
-#~ " * \"%s\": discards all changes and reloads the partition table that was\n"
-#~ "originally on the hard drive.\n"
-#~ "\n"
-#~ " * \"%s\": unchecking this option will force users to manually mount and\n"
-#~ "unmount removable media such as floppies and CD-ROMs.\n"
-#~ "\n"
-#~ " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-#~ "hard drive. This is recommended if you do not have a good understanding "
-#~ "of\n"
-#~ "partitioning.\n"
-#~ "\n"
-#~ " * \"%s\": use this option to cancel your changes.\n"
-#~ "\n"
-#~ " * \"%s\": allows additional actions on partitions (type, options, "
-#~ "format)\n"
-#~ "and gives more information about the hard drive.\n"
-#~ "\n"
-#~ " * \"%s\": when you are finished partitioning your hard drive, this will\n"
-#~ "save your changes back to disk.\n"
-#~ "\n"
-#~ "When defining the size of a partition, you can finely set the partition\n"
-#~ "size by using the Arrow keys of your keyboard.\n"
-#~ "\n"
-#~ "Note: you can reach any option using the keyboard. Navigate through the\n"
-#~ "partitions using [Tab] and the [Up/Down] arrows.\n"
-#~ "\n"
-#~ "When a partition is selected, you can use:\n"
-#~ "\n"
-#~ " * Ctrl-c to create a new partition (when an empty partition is "
-#~ "selected)\n"
-#~ "\n"
-#~ " * Ctrl-d to delete a partition\n"
-#~ "\n"
-#~ " * Ctrl-m to set the mount point\n"
-#~ "\n"
-#~ "To get information about the different file system types available, "
-#~ "please\n"
-#~ "read the ext2FS chapter from the ``Reference Manual''.\n"
-#~ "\n"
-#~ "If you are installing on a PPC machine, you will want to create a small "
-#~ "HFS\n"
-#~ "``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-#~ "bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-#~ "may find it a useful place to store a spare kernel and ramdisk images "
-#~ "for\n"
-#~ "emergency boot situations."
-#~ msgstr ""
-#~ "در این مقطع، شما مجبور به انتخاب قسمت‌بندی(های) هستید که برای نصب سیستم\n"
-#~ " لینوکس ماندرایک استفاده خواهند شد. اگر قسمت‌بندی‌هایی از قبل مشخص شده‌اند،\n"
-#~ "یا از یک نصب قبلی گنو/لینوکس یا بوسیله ابزار قسمت‌بندی دیگر، می‌توانید\n"
-#~ "از آنها استفاده کنید. در غیر این صورت، قسمت‌بندی‌ها باید ایجاد شوند.\n"
-#~ "\n"
-#~ "برای ایجاد قسمت‌بندی‌ها، باید نخست یک دستگاه دیسک را انتخاب کنید.\n"
-#~ "می‌توانید آن دیسک را بوسیله‌ی کلیک بر ``hda'' برای اولین دستگاه IDE \n"
-#~ " و ``hdb'' را برای دومین، ``sda'' را برای اولین دستگاه SCSI و غیره برای\n"
-#~ "قسمت‌بندی انتخاب کنید.\n"
-#~ "\n"
-#~ "برای قسمت‌بندی دستگاه دیسک انتخاب شده، می‌توانید از این گزینه‌ها استفاده "
-#~ "کنید:\n"
-#~ "\n"
-#~ " * \"%s\": این گزینه تمام قسمت‌بندی‌های روی دیسک انتخاب شده را حذف می‌کند\n"
-#~ "\n"
-#~ " * \"%s\": این گزینه بر روی فضای آزاد دیسک شما بطور خودکار قسمت‌بندی‌های "
-#~ "ext3 و حافظه مبادله را ایجاد می‌کند\n"
-#~ "\"%s\": دستیابی به قابلیت‌های دیگر را فراهم می‌سازد\n"
-#~ "\n"
-#~ " * \"%s\": جدول قسمت‌بندی را بر دیسکچه ذخیره می‌کند. برای بازسازی در "
-#~ "آینده \n"
-#~ "در صورت لزوم مفید است. انجام این مرحله بشدت سفارش می‌شود.\n"
-#~ "\n"
-#~ " * \"%s\": به شما اجازه‌ی باز‌سازی جدول قسمت‌بندی ذخیره شده را از دیسکچه "
-#~ "می‌دهد.\n"
-#~ "\n"
-#~ " * \"%s\": اگر جدول قسمت‌بندی شما خراب شده باشد شما با این گزینه می‌توانید\n"
-#~ "آن را بازسازی کنید. لطفاً دقت کنید و بخاطر داشته باشید که این همیشه درست "
-#~ "کار\n"
-#~ "نمی‌کند.\n"
-#~ "\n"
-#~ " * \"%s\": تمام تغییرات باطل شده و جدول قسمت‌بندی اصلی بر دستگاه دیسک\n"
-#~ "بارگذاری مجدد می‌شود.\n"
-#~ "\n"
-#~ " * \"%s\": غیرفعال کردن این گزینه کاربران را مجبور می‌کند که رسانه‌های "
-#~ "قابل \n"
-#~ "حمل از قبیل دیسکچه و سی‌دی را دستی سوار یا پیاده کنند.\n"
-#~ "\n"
-#~ " * \"%s\": اگر می‌خواهید از یک جادوگر برای قسمت‌بندی دیسک خود استفاده کنید "
-#~ "از\n"
-#~ "این گزینه استفاده کنید. این گزینه اگر شما تجربه‌ی قبلی از قسمت‌بندی کردن "
-#~ "دیسک\n"
-#~ "ندارید سفارش می‌شود.\n"
-#~ "\n"
-#~ " * \"%s\": برای لغو تغییرات خود از این گزینه استفاده کنید.\n"
-#~ "\n"
-#~ " * \"%s\": عملیات بیشتری را بر قسمت‌بندی‌ها اجازه داده(نوع، گزینه‌ها، "
-#~ "قالب‌بندی)\n"
-#~ "و اطلاعات بیشتری را درباره‌ی دستگاه دیسک می‌دهد.\n"
-#~ "\n"
-#~ " * \"%s\": وقتی شما قسمت‌بندی دستگاه دیسک خود را به اتمام رساندید،\n"
-#~ "این تغییرات شما را بر دیسک ذخیره می‌سازد.\n"
-#~ "\n"
-#~ "وقتی اندازه‌ی یک قسمت‌بندی را مشخص می‌کنید، می‌توانید بخوبی از کلیدهای\n"
-#~ "جهت‌نمای صفحه‌کلید خود استفاده کنید.\n"
-#~ "\n"
-#~ "توجه: شما می‌توانید با استفاده از صفحه‌کلید بهر گزینه دسترسی پیدا کنید. در "
-#~ "طول\n"
-#~ "قسمت‌بندی برای صفحه‌نوردی از کلیدهای [جهش] و [بالا/پایین] استفاده کنید.\n"
-#~ "\n"
-#~ "وقتی یک قسمت‌بندی انتخاب شده باشد، می‌توانید از:\n"
-#~ "\n"
-#~ " * Ctrl-c برای ایجاد یک قسمت‌بندی جدید (وقتی یک قسمت‌بندی خالی انتخاب شده "
-#~ "باشد)\n"
-#~ "\n"
-#~ " * Ctrl-d برای حذف یک قسمت‌بندی \n"
-#~ "\n"
-#~ " * Ctrl-m برای تعیین نقطه‌ی سوارسازی\n"
-#~ "\n"
-#~ "برای دریافت اطلاعات درباره انواع سیستم پرونده موجود، لطفاً فصل ext2FS \n"
-#~ "را از ` دستورالعمل مرجع'' بخوانید.\n"
-#~ "\n"
-#~ "اگر شما بر یک ماشین PPC نصب می‌کنید، شما باید یک قسمت‌بندی کوچک HFS \n"
-#~ "``bootstrap'' حداقل ۱ مگابایت که برای بارگذار آغازگر yaboot استفاده می‌شود "
-#~ "را ایجاد کنید\n"
-#~ "اگر شما بطور دلخواه آن قسمت‌بندی را بزرگتر بسازید، مثلاً ۵۰ مگابایت، شما "
-#~ "آن\n"
-#~ "را برای انبار یک هسته یدک و تصاویر ramdisk در شرایط آغازگری اضطراری\n"
-#~ "مفید خواهید یافت."
-
-#~ msgid ""
-#~ "More than one Microsoft partition has been detected on your hard drive.\n"
-#~ "Please choose which one you want to resize in order to install your new\n"
-#~ "Mandrake Linux operating system.\n"
-#~ "\n"
-#~ "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
-#~ "\"Capacity\".\n"
-#~ "\n"
-#~ "\"Linux name\" is structured: \"hard drive type\", \"hard drive number"
-#~ "\",\n"
-#~ "\"partition number\" (for example, \"hda1\").\n"
-#~ "\n"
-#~ "\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-#~ "\"sd\" if it is a SCSI hard drive.\n"
-#~ "\n"
-#~ "\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With "
-#~ "IDE\n"
-#~ "hard drives:\n"
-#~ "\n"
-#~ " * \"a\" means \"master hard drive on the primary IDE controller\";\n"
-#~ "\n"
-#~ " * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
-#~ "\n"
-#~ " * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
-#~ "\n"
-#~ " * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
-#~ "\n"
-#~ "With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
-#~ "\"second lowest SCSI ID\", etc.\n"
-#~ "\n"
-#~ "\"Windows name\" is the letter of your hard drive under Windows (the "
-#~ "first\n"
-#~ "disk or partition is called \"C:\")."
-#~ msgstr ""
-#~ "بیش از یک قسمت‌بندی مایکروسافت بر دیسک‌سخت شما شناسایی شده است. \n"
-#~ "لطفاً آن قسمت‌بندی را که برای نصب سیستم عامل لینوکس ماندرایک می‌خواهید \n"
-#~ "تغییر اندازه دهید انتخاب کنید.\n"
-#~ "\n"
-#~ "هر قسمت‌بندی فهرست شده بدنبال می‌آید: \"نام لینوکس\", \"نام ویندوز\" \n"
-#~ "\"ظرفیت\".\n"
-#~ "\n"
-#~ "\"نام لینوکس\" دارای ساختار: \"نوع دستگاه دیسک\", \"شماره دستگاه دیسک\",\n"
-#~ "\"شماره قسمت‌بندی\" (برای مثال, \"hda1\").\n"
-#~ "\n"
-#~ "\"نوع دستگاه دیسک\" اگر دستگاه دیسک شما یک دستگاه دیسک IDE باشد \"hd\" "
-#~ "است و\n"
-#~ "\"sd\" اگر آن یک دستگاه دیسک SCSI باشد.\n"
-#~ "\n"
-#~ "\"شماره دستگاه دیسک\" همیشه یک حرف الفبا بعد از \"hd\" یا \"sd\"می‌باشد.\n"
-#~ "با دستگاه‌های دیسک IDE:\n"
-#~ "\n"
-#~ " * \"a\" بمعنی \"دیسک ارشد بر کنترل کننده‌ی نخست IDE \";\n"
-#~ "\n"
-#~ " * \"b\" بمعنی \"دیسک برده بر کنترل کننده‌ی نخست IDE \";\n"
-#~ "\n"
-#~ " * \"c\" بمعنی \"دیسک ارشد بر کنترل کننده‌ی دومی IDE \";\n"
-#~ "\n"
-#~ " * \"d\" بمعنی \"دیسک برده بر کنترل کننده‌ی دومی IDE \".\n"
-#~ "\n"
-#~ "با دستگاه‌های دیسک SCSI, یک \"a\" بمعنی \"پایین‌ترین SCSI ID\", یک \"b\" \n"
-#~ "\"پایین‌ترین SCSI ID دومی\", و غیره.\n"
-#~ "\n"
-#~ "\"نام ویندوز\" حرف الفبای دستگاه دیسک شما در ویندوز می‌باشد (اولین\n"
-#~ "دیسک یا قسمت‌بندی \"C:\" نامیده می‌شود)."
-
-#~ msgid ""
-#~ "This step is activated only if an old GNU/Linux partition has been found "
-#~ "on\n"
-#~ "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"
-#~ "\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"
-#~ "system, you should use this option. However, depending on your "
-#~ "partitioning\n"
-#~ "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"
-#~ "partitioning scheme and user data is not altered. Most of other\n"
-#~ "configuration steps remain available, similar to a standard "
-#~ "installation.\n"
-#~ "\n"
-#~ "Using the ``Upgrade'' option should work fine on Mandrake Linux systems\n"
-#~ "running version \"8.1\" or later. Performing an Upgrade on versions "
-#~ "prior\n"
-#~ "to Mandrake Linux version \"8.1\" is not recommended."
-#~ msgstr ""
-#~ "این گام فقط در صورتی که یک قسمت‌بندی قدیمی لینوکس/گنو بر ماشین شما یافت "
-#~ "شود فعال می‌گردد. \n"
-#~ "\n"
-#~ "DrakX اکنون احتیاج دارد بداند که آیا شما می‌خواهید نصب جدیدی یا ارتقاء\n"
-#~ "سیستم لینوکس مان‌درایک موجود را انجام دهید: \n"
-#~ "\n"
-#~ " * \"%s\": در مجموع سیستم قدیمی را کاملاً پاک می‌کند. اگر می‌خواهید روش\n"
-#~ "قسمت‌بندی دستگاه‌های دیسک خود را تغییر داده، یا سیستم پرونده را تغییر "
-#~ "دهید، \n"
-#~ "شما بایستی از این گزینه استفاده کنید. هرچند، بستگی به طرح قسمت‌بندیتان،\n"
-#~ "می‌توانید از بر-نگارش بعضی از داده‌های موجود خود جلوگیری کنید.\n"
-#~ "\n"
-#~ " * \"%s\": این رده‌ی نصب به شما اجازه می‌دهد تا بسته‌های نصب شده‌ی کنونی "
-#~ "لینوکس\n"
-#~ "مان‌درایک را بروزسازی کنید. طرح قسمت‌بندی کنونی شما و داده‌های کاربر دست\n"
-#~ "نخواهند خورد و بیشتر مراحل پیکربندی در دسترس باقی خواهند بود، \n"
-#~ "شبیه به یک نصب استاندارد..\n"
-#~ "\n"
-#~ "استفاده از گزینه‌ی ``ارتقاء'' باید برای سیستم‌های لینوکس مان‌درایک نسخه \"8.1"
-#~ "\"\n"
-#~ "یا بعدی کارآرایی خوبی داشته باشد. اجرای ارتقاء بر نسخ پیشتر از لینوکس\n"
-#~ "ماندرایک ۸٬۱ سفارش نمی‌شود."
-
-#~ msgid ""
-#~ "Depending on the default language you chose in Section , DrakX will\n"
-#~ "automatically select a particular type of keyboard configuration. "
-#~ "However,\n"
-#~ "you may not have a keyboard that corresponds exactly to your language: "
-#~ "for\n"
-#~ "example, if you are an English speaking Swiss person, you may have a "
-#~ "Swiss\n"
-#~ "keyboard. Or if you speak English but are located in Quebec, you may "
-#~ "find\n"
-#~ "yourself in the same situation where your native language and keyboard "
-#~ "do\n"
-#~ "not match. In either case, this installation step will allow you to "
-#~ "select\n"
-#~ "an appropriate keyboard from a list.\n"
-#~ "\n"
-#~ "Click on the \"%s\" button to be presented with the complete list of\n"
-#~ "supported keyboards.\n"
-#~ "\n"
-#~ "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
-#~ "dialog will allow you to choose the key binding that will switch the\n"
-#~ "keyboard between the Latin and non-Latin layouts."
-#~ msgstr ""
-#~ "بنابر زبان پیش‌فرض که در این قسمت انتخاب کرده‌اید، DrakX یک نوع بخصوص\n"
-#~ "پیکربندی صفحه‌کلید را بطور خودکار انتخاب می‌کند. اگر چه ممکن است شما\n"
-#~ "صفحه‌کلیدی را که دقیقاً مطابق زبانتان باشد نداشته باشید: برای مثال، اگر "
-#~ "شما\n"
-#~ "یک شخص انگلیسی سوئیسی زبان باشید، ممکن است یک صفحه‌کلید سوئیسی\n"
-#~ "داشته باشید. یا اگر شما انگلیسی صحبت کرده ولی در کوبک کانادا زندگی "
-#~ "می‌کنید،\n"
-#~ "ممکن است خود را در شرایطی بیابید که زبان بومی شما و صفحه‌کلیدتان مطابقت\n"
-#~ "نداشته باشند. در هر دو صورت، این مرحله نصب به شما اجازه‌ی انتخاب یک\n"
-#~ "صفحه‌کلید مناسب را از لیستی می‌دهد.\n"
-#~ "\n"
-#~ "برای عرضه‌ی لیست کامل صفحه‌کلید‌های حمایت شده بر دکمه‌ی \"%s\" کلیک کنید.\n"
-#~ "\n"
-#~ "اگر شما یک صفحه‌کلید بر اساس یک الفبای غیر لاتین را انتخاب کنید، گفتگوی \n"
-#~ "بعدی به شما اجازه‌ی ترکیب کلیدی که بتوانید بین طرح‌های صفحه‌کلید لاتین\n"
-#~ "و غیر لاتین تعویض کنید را خواهد داد."
-
-#~ msgid ""
-#~ "Your choice of preferred language will affect the language of the\n"
-#~ "documentation, the installer and the system in general. Select first the\n"
-#~ "region you are located in, and then the language you speak.\n"
-#~ "\n"
-#~ "Clicking on the \"%s\" button will allow you to select other languages "
-#~ "to\n"
-#~ "be installed on your workstation, thereby installing the language-"
-#~ "specific\n"
-#~ "files for system documentation and applications. For example, if you "
-#~ "will\n"
-#~ "host users from Spain on your machine, select English as the default\n"
-#~ "language in the tree view and \"%s\" in the Advanced section.\n"
-#~ "\n"
-#~ "Note that you're not limited to choosing a single additional language. "
-#~ "You\n"
-#~ "may choose several ones, or even install them all by selecting the \"%s"
-#~ "\"\n"
-#~ "box. Selecting support for a language means translations, fonts, spell\n"
-#~ "checkers, etc. for that language will be installed. Additionally, the\n"
-#~ "\"%s\" checkbox allows you to force the system to use unicode (UTF-8). "
-#~ "Note\n"
-#~ "however that this is an experimental feature. If you select different\n"
-#~ "languages requiring different encoding the unicode support will be\n"
-#~ "installed anyway.\n"
-#~ "\n"
-#~ "To switch between the various languages installed on the system, you can\n"
-#~ "launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
-#~ "language used by the entire system. Running the command as a regular "
-#~ "user\n"
-#~ "will only change the language settings for that particular user."
-#~ msgstr ""
-#~ "انتخاب زبان ترجیحی شما زبان نوشتارها، نصب‌گر و سیستم شما را در کل مورد\n"
-#~ "تاثیر قرار خواهد داد. در ابتدا منطقه‌ای را که در آن قرار دارید و سپس زبانی "
-#~ "را که\n"
-#~ "صحبت می‌کنید را انتخاب کنید.\n"
-#~ "\n"
-#~ "کلیک بر دکمه‌ی \"%s\" به شما اجازه می‌دهد تا زبان‌های دیگر را بر ایستگاه‌کار\n"
-#~ "خود انتخاب کرده، و بدین طریق پرونده‌های مخصوص-زبان را برای سیستم\n"
-#~ "نوشتارها و برنامه‌ها نصب کنید. برای نمونه، اگر شما کاربرانی از اسپانیا را "
-#~ "بر ماشین\n"
-#~ "خود میزبان هستید، انگلیسی را مانند زمان پیش‌فرض در درخت‌نما انتخاب نموده\n"
-#~ "و \"%s\" را در قسمت پیشرفته انتخاب کنید.\n"
-#~ "\n"
-#~ "توجه کنید که شما به انتخاب یک زبان اضافه‌ی تکی محدود نمی‌باشید. شما "
-#~ "می‌توانید\n"
-#~ "چندین زبان، حتی تمام آنها را بوسیله‌ی انتخاب جعبه‌ی \"%s\" انتخاب کنید.\n"
-#~ "انتخاب کردن حمایت برای یک زبان بمعنی ترجمه‌ها، قلم های نگارش، غلط‌یاب‌ها\n"
-#~ "وغیره برای آن زبان که نصب خواهد شد می‌باشد. بعلاوه، جعبه‌ی علامت \"%s\"\n"
-#~ "به شما اجازه می‌دهد تا سیستم را مجبور به استفاده از یونی‌کد (UTF-8) کنید.\n"
-#~ "توجه داشته باشید که این یک قابلیت تجربی می‌باشد. اگر شما زبان های مختلف\n"
-#~ "که لازم به رمزگذاری متفاوت دارند را انتخاب کرده‌اید، حمایت یونی‌کد بهر حال\n"
-#~ "نصب خواهد شد.\n"
-#~ "\n"
-#~ "برای تعویض بین زبان‌های گوناگون نصب شده بر سیستم، می‌توانید\n"
-#~ "فرمان \"/usr/sbin/localedrake\" را مانند \"root\" برای تغییر زبان مورد\n"
-#~ "استفاده بوسیله‌ی تمام سیستم اجرا کنید. اجرای این فرمان مانند یک کاربر\n"
-#~ "عادی تنظیم زبان را تنها برای آن کاربر عوض خواهد کرد."
-
-#~ msgid ""
-#~ "Usually, DrakX has no problems detecting the number of buttons on your\n"
-#~ "mouse. If it does, it assumes you have a two-button mouse and will\n"
-#~ "configure it for third-button emulation. The third-button mouse button of "
-#~ "a\n"
-#~ "two-button mouse can be ``pressed'' by simultaneously clicking the left "
-#~ "and\n"
-#~ "right mouse buttons. DrakX will automatically know whether your mouse "
-#~ "uses\n"
-#~ "a PS/2, serial or USB interface.\n"
-#~ "\n"
-#~ "If for some reason you wish to specify a different type of mouse, select "
-#~ "it\n"
-#~ "from the list provided.\n"
-#~ "\n"
-#~ "If you choose a mouse other than the default, a test screen will be\n"
-#~ "displayed. Use the buttons and wheel to verify that the settings are\n"
-#~ "correct and that the mouse is working correctly. If the mouse is not\n"
-#~ "working well, press the space bar or [Return] key to cancel the test and "
-#~ "to\n"
-#~ "go back to the list of choices.\n"
-#~ "\n"
-#~ "Wheel mice are occasionally not detected automatically, so you will need "
-#~ "to\n"
-#~ "select your mouse from a list. Be sure to select the one corresponding "
-#~ "to\n"
-#~ "the port that your mouse is attached to. After selecting a mouse and\n"
-#~ "pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
-#~ "the mouse wheel to ensure that it is activated correctly. Once you see "
-#~ "the\n"
-#~ "on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
-#~ "buttons and check that the mouse pointer moves on-screen as you move "
-#~ "your\n"
-#~ "mouse."
-#~ msgstr ""
-#~ "معمولا DrakX مشکلی برای شناسایی تعداد دکمه‌های موشی شما ندارد. \n"
-#~ "اگر اشکالی پیش آمد فرض بر آن می‌شود که شما موشی دودکمه‌ای دارید و \n"
-#~ "می‌خواهید آن را برای شبیه‌سازی دکمه‌ی سوم پیکربندی کنید. دکمه‌ی سوم موشی\n"
-#~ "یک موشی دودکمه‌ای با فشردن همزمان دکمه‌های چپ و راست می‌تواند استفاده \n"
-#~ "شود. DrakX بطور خودکار می‌داند که آیا موشی شما از واسط PS/2 ، \n"
-#~ "سریال یا USB استفاده می‌کند.\n"
-#~ "\n"
-#~ "اگر به هر دلیلی شما می‌خواهید یک نوع موشی دیگر را مشخص کنید، آن را از \n"
-#~ "لیست عرضه شده انتخاب کنید.\n"
-#~ "\n"
-#~ "اگر شما موشی غیر از پیش‌فرض انتخاب کنید، یک صفحه‌ی آزمایش نمایش داده \n"
-#~ "خواهد شد. از تکمه‌ها و چرخ برای امتحان صحت تنظیمات و اینکه موشی بدرستی \n"
-#~ "کار می‌کند استفاده کنید.اگر آن موشی بدرستی کار نمی‌کند، با فشار بر دکمه "
-#~ "فاصله \n"
-#~ "یا کلید [Return] برای لغو آزمایش و بازگشت به لیست انتخاب‌ها می‌توانید\n"
-#~ "این کار را انجام دهید.\n"
-#~ "\n"
-#~ "موشی‌های چرخی بعضی وقتها خودکار شناسایی نمی‌شوند، بنابرین باید موشی خود \n"
-#~ "را از لیستی انتخاب کنید. مطمئن شوید که آن را که به درگاه موشی شما وصل \n"
-#~ "است را انتخاب می‌کنید. بعد از انتخاب یک موشی و فشردن دکمه \"%s\" تصویر "
-#~ "یک \n"
-#~ "موشی بر صفحه نمایان می‌شود. چرخ موشی را بچرخانید تا آن را امتحان کرده "
-#~ "باشید.\n"
-#~ "با مشاهده‌ی چرخش موش همزمان با انجام آن توسط شما، می‌توانید دکمه‌ها را \n"
-#~ "آزمایش کرده و امتحان کنید که آیا وقتی شما موشی خود را حرکت می‌دهید "
-#~ "مکان‌نمای\n"
-#~ "موشی به همان طریق حرکت می‌کند."
-
-#~ msgid ""
-#~ "This is the most crucial decision point for the security of your GNU/"
-#~ "Linux\n"
-#~ "system: you have to enter the \"root\" password. \"Root\" is the system\n"
-#~ "administrator and is the only user authorized to make updates, add "
-#~ "users,\n"
-#~ "change the overall system configuration, and so on. In short, \"root\" "
-#~ "can\n"
-#~ "do everything! That is why you must choose a password that is difficult "
-#~ "to\n"
-#~ "guess - DrakX will tell you if the password that you chose too easy. As "
-#~ "you\n"
-#~ "can see, you are not forced to enter a password, but we strongly advise "
-#~ "you\n"
-#~ "against this. GNU/Linux is just as prone to operator error as any other\n"
-#~ "operating system. Since \"root\" can overcome all limitations and\n"
-#~ "unintentionally erase all data on partitions by carelessly accessing the\n"
-#~ "partitions themselves, it is important that it be difficult to become\n"
-#~ "\"root\".\n"
-#~ "\n"
-#~ "The password should be a mixture of alphanumeric characters and at least "
-#~ "8\n"
-#~ "characters long. Never write down the \"root\" password -- it makes it "
-#~ "far\n"
-#~ "too easy to compromise a system.\n"
-#~ "\n"
-#~ "One caveat -- do not make the password too long or complicated because "
-#~ "you\n"
-#~ "must be able to remember it!\n"
-#~ "\n"
-#~ "The password will not be displayed on screen as you type it in. To "
-#~ "reduce\n"
-#~ "the chance of a blind typing error you will need to enter the password\n"
-#~ "twice. If you do happen to make the same typing error twice, this\n"
-#~ "``incorrect'' password will be the one you will have use the first time "
-#~ "you\n"
-#~ "connect.\n"
-#~ "\n"
-#~ "If you wish access to this computer to be controlled by an "
-#~ "authentication\n"
-#~ "server, click the \"%s\" button.\n"
-#~ "\n"
-#~ "If your network uses either LDAP, NIS, or PDC Windows Domain "
-#~ "authentication\n"
-#~ "services, select the appropriate one for \"%s\". If you do not know "
-#~ "which\n"
-#~ "one to use, you should ask your network administrator.\n"
-#~ "\n"
-#~ "If you happen to have problems with remembering passwords, if your "
-#~ "computer\n"
-#~ "will never be connected to the internet or that you absolutely trust\n"
-#~ "everybody who uses your computer, you can choose to have \"%s\"."
-#~ msgstr ""
-#~ "این مهمترین مقطع تصمیم‌گیری برای امنیت سیستم لینوکس/گنوی شما است. شما\n"
-#~ "باید گذرواژه‌ی \"مدیر\" را وارد کنید. \"مدیر\" مدیر سیستم می‌باشد و تنها "
-#~ "کاربری\n"
-#~ "است که می‌تواند بروزسازی کرده، کاربران را اضافه کند، پیکربندی همگانی\n"
-#~ "سیستم را تغییر دهد، و همچنین بقیه‌ی کارهای از این قبیل را. بطور خلاصه، "
-#~ "\"مدیر\"\n"
-#~ "هر کاری می‌تواند انجام دهد! برای همین باید گذرواژه‌ای را انتخاب کنید که\n"
-#~ "حدس زدنش سخت باشد - اگر گذرواژه خیلی ساده باشد دراک‌ایکس به شما تذکر \n"
-#~ "خواهد داد. همانطور که مشاهده می‌کنید، مجبور به وارد کردن یک گذرواژه "
-#~ "نیستید،\n"
-#~ "ولی ما بشدت برعکس این را به شما نصیحت می‌کنیم. لینوکس/گنو مانند هر سیستم\n"
-#~ "عامل دیگری برای خطاهای کارکنان مستعد است. چون \"مدیر\" هیچ محدودیت\n"
-#~ "اجرایی ندارد و بطور غیرعمدی می‌تواند تمام داده‌های بر قسمت‌بندی‌ها را "
-#~ "بوسیله‌ی\n"
-#~ "دستیابی بی‌توجه خود به قسمت‌بندی‌ها پاک کند، این امر مهمی است که بسختی\n"
-#~ "بتوان \"مدیر\" شد.\n"
-#~ "گذرواژه بایستی ترکیبی از نویسه‌های الفبا و حداقل دارای ۸ نویسه باشد. "
-#~ "هرگز \n"
-#~ "گذرواژه \"مدیر\" یادداشت نشود-- آن به آسانی سیستم را تسلیم می‌کند.\n"
-#~ "\n"
-#~ "یک نصیحت -- گذرواژه را طولانی یا پیچیده نسازید برای اینکه شما باید "
-#~ "بتوانید\n"
-#~ "آنرا بخاطر بسپارید!\n"
-#~ "\n"
-#~ "گذرواژه هنگام نگارش آن برصفحه نشان داده نخواهد شد. برای کم کردن احتمال\n"
-#~ "خطای نگارش کورکورانه لازم است که گذرواژه را دوبار بنوسید. اگر شما اتفاقی\n"
-#~ "هر دوبار همان خطای نگارشی را انجام دهید، این گذرواژه‌ی نادرست همان می‌شود\n"
-#~ "که شما باید بار اول از آن استفاده کنید.\n"
-#~ "\n"
-#~ "اگر می‌خواهید دسترسی به این رایانه از طریق یک کارگزار تأیید هویت کنترل "
-#~ "گردد،\n"
-#~ "دکمه‌ی \"%s\" را کلیک کنید.\n"
-#~ "\n"
-#~ "اگر شبکه‌ی شما نه از LDAP ،NIS، یا سرویس‌های تأیید هویت دامنه‌ی ویندوز\n"
-#~ "استفاده می‌کند، یک سرویس مناسب را برای \"%s\" انتخاب کنید. اگر نمی‌دانید "
-#~ "از\n"
-#~ "کدام باید استفاده کنید، باید این را از مدیر شبکه‌اتان سؤال کنید.\n"
-#~ "\n"
-#~ "اگر شما در بخاطر سپردن گذرواژه مشکل دارید، اگر رایانه‌ی شما هرگز به "
-#~ "اینترنت \n"
-#~ "وصل نخواهد شد یا شما مطلقاً به همه‌ی کسانی که از رایانه‌ی شما استفاده "
-#~ "می‌کنند\n"
-#~ "اطمینان دارید، می‌توانید داشتن \"%s\" را انتخاب کنید."
-
-#~ msgid ""
-#~ "This dialog allows you to fine tune your bootloader:\n"
-#~ "\n"
-#~ " * \"%s\": there are three choices for your bootloader:\n"
-#~ "\n"
-#~ "    * \"%s\": if you prefer grub (text menu).\n"
-#~ "\n"
-#~ "    * \"%s\": if you prefer LILO with its text menu interface.\n"
-#~ "\n"
-#~ "    * \"%s\": if you prefer LILO with its graphical interface.\n"
-#~ "\n"
-#~ " * \"%s\": in most cases, you will not change the default (\"%s\"), but "
-#~ "if\n"
-#~ "you prefer, the bootloader can be installed on the second hard drive\n"
-#~ "(\"%s\"), or even on a floppy disk (\"%s\");\n"
-#~ "\n"
-#~ " * \"%s\": after a boot or a reboot of the computer, this is the delay\n"
-#~ "given to the user at the console to select a boot entry other than the\n"
-#~ "default.\n"
-#~ "\n"
-#~ "!! Beware 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"
-#~ "system! Be sure you know what you are doing before changing any of the\n"
-#~ "options. !!\n"
-#~ "\n"
-#~ "Clicking the \"%s\" button in this dialog will offer advanced options "
-#~ "which\n"
-#~ "are normally reserved for the expert user."
-#~ msgstr ""
-#~ "این گفتگو به شما اجازه‌ی میزان کردن بارگذار آغازگر را می‌دهد:\n"
-#~ "\n"
-#~ " * \"%s\": سه انتخاب برای بارگزار آغازگر شما وجود دارد:\n"
-#~ "\n"
-#~ "    * \"%s\": اگر گروب (فهرست متنی) را ترجیح می‌دهید.\n"
-#~ "\n"
-#~ "    * \"%s\": اگر لیلو را با واسط منوی متنی ترجیح می‌دهید.\n"
-#~ "\n"
-#~ "    * \"%s\": اگر لیلو را با واسط منوی گرافیکی ترجیح می‌دهید.\n"
-#~ "\n"
-#~ " * \"%s\": در بیشتر مواقع، شما پیش‌فرض  (\"%s\") را تغییر نخواهید داد, "
-#~ "اما\n"
-#~ "اگر ترجیح می‌دهید، بارگذار آغازگر می‌تواند بر دستگاه دوم دیسک \n"
-#~ "(\"%s\"), یا حتی بر دیسکچه‌ی (\"%s\") نصب گردد;\n"
-#~ "\n"
-#~ " * \"%s\": بعد از آغازگری و یا آغازگری مجدد رایانه، این درنگی است که به "
-#~ "کاربر برای\n"
-#~ "برای انتخاب یک ورودی آغازگری غیر از پیش‌فرض داده می‌شود. \n"
-#~ "\n"
-#~ "!! توجه داشته باشید که اگر شما هیچ بارگذار آغازگری را برای نصب انتخاب "
-#~ "نکنید \n"
-#~ "(با انتخاب \"%s\"), شما باید حتما روشی برای آغاز سیستم لینوکس ماندرایک "
-#~ "خود\n"
-#~ "داشته باشید! مطمئن شوید قبل از تغییر هر گزینه‌ای می‌دانید چکار دارید "
-#~ "می‌کنید!! \n"
-#~ "\n"
-#~ "با کلیک بر دکمه‌ی \"%s\" در این گفتگو ، گزینه‌های پیشرفته‌ای که معمولا برای\n"
-#~ " کاربران حرفه‌ای در نظر گرفته شده‌اند عرضه خواهد شد."
-
-#~ msgid ""
-#~ "LILO and grub are GNU/Linux bootloaders. Normally, this stage is totally\n"
-#~ "automated. DrakX will analyze the disk boot sector and act according to\n"
-#~ "what it finds there:\n"
-#~ "\n"
-#~ " * if a Windows boot sector is found, it will replace it with a grub/"
-#~ "LILO\n"
-#~ "boot sector. This way you will be able to load either GNU/Linux or "
-#~ "another\n"
-#~ "OS.\n"
-#~ "\n"
-#~ " * if a grub or LILO boot sector is found, it will replace it with a new\n"
-#~ "one.\n"
-#~ "\n"
-#~ "If it cannot make a determination, DrakX will ask you where to place the\n"
-#~ "bootloader."
-#~ msgstr ""
-#~ "لیلو و گروب بارگذاران گنو/لینوکس هستند. معمولا این مرحله کاملا\n"
-#~ "خودکار است. درایک‌ایکس بندهای آغازگری دیسک را بررسی کرده و بر اساس\n"
-#~ "آنچه در آنجا پیدا می‌کند عمل خواهد کرد:\n"
-#~ "\n"
-#~ " * اگر یک بند آغازگر ویندوز یافت شود، آن را بوسیله یک بند آغازگر گروب/"
-#~ "لیلو\n"
-#~ "جایگزین می‌کند. بدین ترتیب شما قادر خواهید بود یا لینوکس/گنو یا یک سیستم "
-#~ "عامل\n"
-#~ "دیگر را آغازگری کنید.\n"
-#~ "\n"
-#~ " * اگر یک بند آغازگری گروب یا لیلو یافت شود, آن را با یکی دیگر جایگزین\n"
-#~ "می‌کند.\n"
-#~ "\n"
-#~ "اگر نتواند چیزی پیدا کند، درایک‌ایکس از شما برای مکانی برای گذاشتن "
-#~ "بارگذار\n"
-#~ "آغازگر سؤال خواهد کرد."
-
-#~ 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 "
-#~ "system\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"
-#~ "if you have a direct connection to your printer, you want to be able to\n"
-#~ "panic out of printer jams, and you do not have networked printers. (\"%s"
-#~ "\"\n"
-#~ "will handle only very simple network cases and is somewhat slow when "
-#~ "used\n"
-#~ "with networks.) It's recommended that you use \"pdq\" if this is your "
-#~ "first\n"
-#~ "experience with GNU/Linux.\n"
-#~ "\n"
-#~ " * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
-#~ "printing to your local printer or to one halfway around the planet. It "
-#~ "is\n"
-#~ "simple to configure and can act as a server or a client for the ancient\n"
-#~ "\"lpd \" printing system, so it compatible with older operating systems\n"
-#~ "which may still need print services. While quite powerful, the basic "
-#~ "setup\n"
-#~ "is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, "
-#~ "make\n"
-#~ "sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
-#~ "front-ends for printing or choosing printer options and for managing the\n"
-#~ "printer.\n"
-#~ "\n"
-#~ "If you make a choice now, and later find that you don't like your "
-#~ "printing\n"
-#~ "system you may change it by running PrinterDrake from the Mandrake "
-#~ "Control\n"
-#~ "Center and clicking the expert button."
-#~ msgstr ""
-#~ "اکنون زمان آن رسیده که یک سیستم چاپ برای رایانه‌اتان انتخاب شود. سیستم‌های\n"
-#~ "عامل دیگر ممکن است یکی را به شما عرضه کنند، ولی لینوکس ماندرایک دو تا "
-#~ "عرضه\n"
-#~ "می‌دارد.هر یک از سیستم‌های چاپ برای پیکربندی نوع خاصی مناسب‌تر است.\n"
-#~ "\n"
-#~ "  * \"%s\" -- که مخفف ``چاپ, بدون صف'' است, انتخابی است برای آن دسته که\n"
-#~ "اتصال مستقیم به چاپگر خود دارند، شما که می‌خواهید از ترافیک چاپگر رهایی\n"
-#~ "یابید، و چاپگرهای شبکه‌ای ندارید. (\"%s\"موارد خیلی ساده‌ی شبکه را اداره\n"
-#~ "کرده و وقتی با شبکه استفاده شود قدری آهسته کار می‌کند.) پیشنهاد ما به شما\n"
-#~ "استفاده از \"pdq\"است اگر این اولین تجربه‌ی شما با گنو/لینوکس است.\n"
-#~ "\n"
-#~ " * \"%s\" - `` Common Unix Printing System'', یک انتخاب برتر برای چاپ به\n"
-#~ "چاپگر محلی شما یا به یک چاپگر در آن طرف کره‌ی زمین می‌باشد. تنظیم آن\n"
-#~ "آسان بوده و می‌تواند مانند یک کارگزار یا یک کارگیر برای سیستم چاپ عهد "
-#~ "عتیق\n"
-#~ "\"lpd \" عمل کند، بنابرین آن با سیستم‌های عامل قدیمی که ممکن است هنوز به\n"
-#~ "سرویس چاپ احتیاج داشته باشند همخوانی دارد. در حالی که بسیار قدرتمند است،\n"
-#~ "برپاسازی پایه‌ای آن تقریباً به سادگی  \"pdq\"می‌باشد. اگر شما احتیاج به شبیه "
-#~ "سازی\n"
-#~ "یک کارگزار \"lpd\"دارید، مطمئن شوید که شبح \"cups-lpd \" را روشن کرده "
-#~ "باشید.\n"
-#~ " \"%s\" شامل یک ظاهر گرافیکی برای چاپ یا انتخاب گزینه‌های چاپگر و برای \n"
-#~ "مدیریت چاپگر می‌باشد.\n"
-#~ "\n"
-#~ "اگر شما انتخاب خود را اکنون انجام دهید، و بعداً دریابید که سیستم چاپ خود "
-#~ "را\n"
-#~ "دوست ندارید می‌توانید آن را بوسیله‌ی برنامه چاپگردرایک در مرکز کنترل "
-#~ "ماندرایک\n"
-#~ "و کلیک بر دکمه‌ی کارشناس تغییر دهید."
-
-#~ msgid ""
-#~ "You can add additional entries in yaboot for other operating systems,\n"
-#~ "alternate kernels, or for an emergency boot image.\n"
-#~ "\n"
-#~ "For other OSs, the entry consists only of a label and the \"root\"\n"
-#~ "partition.\n"
-#~ "\n"
-#~ "For Linux, there are a few possible options:\n"
-#~ "\n"
-#~ " * Label: this is the name you will have to type at the yaboot prompt to\n"
-#~ "select this boot option.\n"
-#~ "\n"
-#~ " * Image: this is the name of the kernel to boot. Typically, vmlinux or "
-#~ "a\n"
-#~ "variation of vmlinux with an extension.\n"
-#~ "\n"
-#~ " * Root: the \"root\" device or ``/'' for your Linux installation.\n"
-#~ "\n"
-#~ " * Append: on Apple hardware, the kernel append option is often used to\n"
-#~ "assist in initializing video hardware, or to enable keyboard mouse "
-#~ "button\n"
-#~ "emulation for the missing 2nd and 3rd mouse buttons on a stock Apple "
-#~ "mouse.\n"
-#~ "The following are some examples:\n"
-#~ "\n"
-#~ "         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-#~ "hda=autotune\n"
-#~ "\n"
-#~ "         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-#~ "\n"
-#~ " * Initrd: this option can be used either to load initial modules before\n"
-#~ "the boot device is available, or to load a ramdisk image for an "
-#~ "emergency\n"
-#~ "boot situation.\n"
-#~ "\n"
-#~ " * Initrd-size: the default ramdisk size is generally 4096 Kbytes. If "
-#~ "you\n"
-#~ "need to allocate a large ramdisk, this option can be used to specify a\n"
-#~ "ramdisk larger than the default.\n"
-#~ "\n"
-#~ " * Read-write: normally the \"root\" partition is initially mounted as\n"
-#~ "read-only, to allow a file system check before the system becomes "
-#~ "``live''.\n"
-#~ "You can override the default with this option.\n"
-#~ "\n"
-#~ " * NoVideo: should the Apple video hardware prove to be exceptionally\n"
-#~ "problematic, you can select this option to boot in ``novideo'' mode, "
-#~ "with\n"
-#~ "native frame buffer support.\n"
-#~ "\n"
-#~ " * Default: selects this entry as being the default Linux selection,\n"
-#~ "selectable by pressing ENTER at the yaboot prompt. This entry will also "
-#~ "be\n"
-#~ "highlighted with a ``*'' if you press [Tab] to see the boot selections."
-#~ msgstr ""
-#~ "شما می‌توانید ورودی‌های دیگری برای سیستم‌های عامل دیگر، هسته‌های \n"
-#~ "جایگزین، یا یک تصویر آغازگری نجات را به yaboot اضافه کنید، \n"
-#~ "\n"
-#~ "برای سیستم‌های عامل دیگر، آن ورودی فقط شامل یک برچسب و قسمت‌بندی \n"
-#~ " \"root\"\n"
-#~ " می‌باشد. \n"
-#~ "برای لینوکس چند گزینه‌ی ممکنه وجود دارند:\n"
-#~ "\n"
-#~ "* برچسب: این نامی است که باید برای انتخاب این گزینه‌ی آغازگری\n"
-#~ "در اعلان یابوت تایپ کنید.\n"
-#~ "\n"
-#~ "* تصویر: این نام هسته‌ای است که آغازگر است. معمولا، vmlinux یا \n"
-#~ "یک نوع از vmlinux با یک دنباله.\n"
-#~ "\n"
-#~ "* ریشه: شاخه‌ی \"ریشه\" یا ``/'' برای نصب لینوکس شما.\n"
-#~ "\n"
-#~ "* پیوست: بر سخت‌افزار رایانه‌های Apple، گزینه‌ی \n"
-#~ "پیوست هسته برای یاری در مقداردهی سخت‌افزار ویدیو، یا بکاراندازی \n"
-#~ "صفحه‌کلید، شبیه‌ساز دکمه‌ی موشی برای دومین و سومین دکمه‌هایی که در بعضی\n"
-#~ "از موشی‌ها وجود ندارند استفاده می‌شود. \n"
-#~ "به چند مثال در زیر توجه کنید:\n"
-#~ "\n"
-#~ "         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-#~ "hda=autotune\n"
-#~ "\n"
-#~ "         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-#~ "\n"
-#~ "* Initrd: از این گزینه برای بارگذاری بخش‌های شروعی قبل از \n"
-#~ "دسترسی به دستگاه آغازگر، یا بارگذاری یک تصویر دیسک حافظه موقت یا "
-#~ "ramdisk \n"
-#~ "برای یک موقعیت اضطراری در آغازگری استفاده می‌شود. \n"
-#~ "\n"
-#~ "* Initrd-size: اندازه پیش‌فرض دیسک حافظه‌ی موقت \n"
-#~ "معمولا ۴۰۹۶ کیلوبایت است. اگر شما احتیاج به یک دیسک حافظه موقت بزرگتر\n"
-#~ "دارید، این گزینه برای تعیین اندازه‌ی بیشتر از پیش‌فرض می‌تواند استفاده "
-#~ "گردد.\n"
-#~ "\n"
-#~ "* خواندن-نوشتن: معمولا قسمت‌بندی \"ریشه\" در شروع مانند\n"
-#~ "فقط-خواندن سوار گردیده، تا بررسی سیستم پرونده را قبل از ``زنده'' شدن\n"
-#~ "سیستم میسر گردد. با این گزینه می‌توانید پیش‌فرض را نادیده بگیرید.\n"
-#~ "\n"
-#~ "* بدون-ویدیو: اگر سخت‌افزار ویدیوی اپل برای شما ایجاد \n"
-#~ "اشکالات فراوان کرد می‌توانید این گزینه را در آغازگری انتخاب کرده \n"
-#~ "تا بوسیله حالت ``بدون-ویدیو'' با حمایت از native frame buffer \n"
-#~ "رایانه را آغازگری کنید.\n"
-#~ "\n"
-#~ "* پیش‌فرض: این ورودی انتخاب پیش‌فرض لینوکس بوده که با \n"
-#~ "فشردن دکمه‌ی ورود انتخاب می‌شود.اگر شما تکمه [جهش] را برای دیدن \n"
-#~ "انتخاب آغازگری فشار دهید این ورودی با یک ستاره نمایان می‌گردد."
-
-#~ msgid ""
-#~ "Yaboot is a bootloader for NewWorld Macintosh hardware and can be used "
-#~ "to\n"
-#~ "boot GNU/Linux, MacOS or MacOSX. Normally, MacOS and MacOSX are "
-#~ "correctly\n"
-#~ "detected and installed in the bootloader menu. If this is not the case, "
-#~ "you\n"
-#~ "can add an entry by hand in this screen. Be careful to choose the "
-#~ "correct\n"
-#~ "parameters.\n"
-#~ "\n"
-#~ "Yaboot's main options are:\n"
-#~ "\n"
-#~ " * Init Message: a simple text message displayed before the boot prompt.\n"
-#~ "\n"
-#~ " * Boot Device: indicates where you want to place the information "
-#~ "required\n"
-#~ "to boot to GNU/Linux. Generally, you set up a bootstrap partition "
-#~ "earlier\n"
-#~ "to hold this information.\n"
-#~ "\n"
-#~ " * Open Firmware Delay: unlike LILO, there are two delays available with\n"
-#~ "yaboot. The first delay is measured in seconds and at this point, you "
-#~ "can\n"
-#~ "choose between CD, OF boot, MacOS or Linux;\n"
-#~ "\n"
-#~ " * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
-#~ "After selecting Linux, you will have this delay in 0.1 second increments\n"
-#~ "before your default kernel description is selected;\n"
-#~ "\n"
-#~ " * Enable CD Boot?: checking this option allows you to choose ``C'' for "
-#~ "CD\n"
-#~ "at the first boot prompt.\n"
-#~ "\n"
-#~ " * Enable OF Boot?: checking this option allows you to choose ``N'' for\n"
-#~ "Open Firmware at the first boot prompt.\n"
-#~ "\n"
-#~ " * Default OS: you can select which OS will boot by default when the "
-#~ "Open\n"
-#~ "Firmware Delay expires."
-#~ msgstr ""
-#~ "برنامه Yaboot یک بارگذار آغازگر برای سخت‌افزار مک‌اینتاش بوده و می‌تواند\n"
-#~ "GNU/Linux, MacOS یا MacOSX را آغازگری کند. معمولاً، MacOS و MacOSX\n"
-#~ "بدرستی شناسایی و در فهرست بارگذار آغازگر نصب می‌شوند. اگر این طور نشد،\n"
-#~ "می‌توانید یک ورودی را در این صحنه دستی اضافه کنید. دقت کنید که اجرای\n"
-#~ "درست را انتخاب می‌کنید.\n"
-#~ "\n"
-#~ " گزینه‌های اصلی Yaboot: \n"
-#~ "\n"
-#~ "  * پیغام شروع: یک متن ساده پیش از اعلان آغازگر نشان داده می‌شود.\n"
-#~ "\n"
-#~ " * دستگاه آغازگر: نشان دهنده‌ی جایی است که می‌خواهید اطلاعات لازم برای\n"
-#~ "آغازگری به لینوکس/گنو را قرار دهید. معمولاً، شما یک قسمت‌بندی تسمه‌آغازگری\n"
-#~ "را پیشتر برای نگهداری این اطلاعات برپاسازی می‌کنید.\n"
-#~ "\n"
-#~ " * تأخیر Firmware آزاد: برخلاف LILO، دو تأخیر با yaboot وجود دارد.\n"
-#~ "اولین تأخیر با ثانیه اندازه گیری شده و در این نقطه، شما می‌توانید بین CD, "
-#~ "OF \n"
-#~ "boot, MacOS یا Linux انتخاب کنید;\n"
-#~ "\n"
-#~ " * وقفه آغازگری هسته: این وقفه شبیه تأخیر آغازگری LILO می‌باشد.\n"
-#~ "بعد از انتخاب لینوکس، شما این تأخیر را در یکدهم ثانیه پیش از توضیح\n"
-#~ "هسته پیش‌فرض خود دارید;\n"
-#~ "\n"
-#~ " * فعال‌سازی آغازگری از CD؟: علامت زدن این گزینه به شما اجازه‌ی انتخاب "
-#~ "``C''را\n"
-#~ "برای CD را در اولین اعلان آغازگری میدهد.\n"
-#~ "\n"
-#~ " * فعال‌سازی OF Boot؟: علامت زدن این گزینه به شما اجازه‌ی انتخاب ``N'' را\n"
-#~ "برای ثابت‌افزار آزاد را در اولین اعلان آغازگری می‌دهد.\n"
-#~ "\n"
-#~ " * سیستم عامل پیش‌فرض: شما می‌توانید سیستم عامل آغازگر پیش‌فرض را وقتی \n"
-#~ "وقفه‌ی Firmware آزاد پایان می‌یابد انتخاب کنید."
-
-#~ msgid ""
-#~ "As a review, DrakX will present a summary of information it has about "
-#~ "your\n"
-#~ "system. Depending on your installed hardware, you may have some or all "
-#~ "of\n"
-#~ "the following entries. Each entry is made up of the configuration item "
-#~ "to\n"
-#~ "be configured, followed by a quick summary of the current configuration.\n"
-#~ "Click on the corresponding \"%s\" button to change that.\n"
-#~ "\n"
-#~ " * \"%s\": check the current keyboard map configuration and change that "
-#~ "if\n"
-#~ "necessary.\n"
-#~ "\n"
-#~ " * \"%s\": check the current country selection. If you are not in this\n"
-#~ "country, click on the \"%s\" button and choose another one. If your "
-#~ "country\n"
-#~ "is not in the first list shown, click the \"%s\" button to get the "
-#~ "complete\n"
-#~ "country list.\n"
-#~ "\n"
-#~ " * \"%s\": By default, DrakX deduces your time zone based on the country\n"
-#~ "you have chosen. You can click on the \"%s\" button here if this is not\n"
-#~ "correct.\n"
-#~ "\n"
-#~ " * \"%s\": check the current mouse configuration and click on the button "
-#~ "to\n"
-#~ "change it if necessary.\n"
-#~ "\n"
-#~ " * \"%s\": clicking on the \"%s\" button will open the printer\n"
-#~ "configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-#~ "Guide'' for more information on how to setup a new printer. The "
-#~ "interface\n"
-#~ "presented there is similar to the one used during installation.\n"
-#~ "\n"
-#~ " * \"%s\": if a sound card is detected on your system, it is displayed\n"
-#~ "here. If you notice the sound card displayed is not the one that is\n"
-#~ "actually present on your system, you can click on the button and choose\n"
-#~ "another driver.\n"
-#~ "\n"
-#~ " * \"%s\": by default, DrakX configures your graphical interface in\n"
-#~ "\"800x600\" or \"1024x768\" resolution. If that does not suit you, click "
-#~ "on\n"
-#~ "\"%s\" to reconfigure your graphical interface.\n"
-#~ "\n"
-#~ " * \"%s\": if a TV card is detected on your system, it is displayed "
-#~ "here.\n"
-#~ "If you have a TV card and it is not detected, click on \"%s\" to try to\n"
-#~ "configure it manually.\n"
-#~ "\n"
-#~ " * \"%s\": if an ISDN card is detected on your system, it will be "
-#~ "displayed\n"
-#~ "here. You can click on \"%s\" to change the parameters associated with "
-#~ "the\n"
-#~ "card.\n"
-#~ "\n"
-#~ " * \"%s\": If you want to configure your Internet or local network "
-#~ "access\n"
-#~ "now.\n"
-#~ "\n"
-#~ " * \"%s\": this entry allows you to redefine the security level as set in "
-#~ "a\n"
-#~ "previous step ().\n"
-#~ "\n"
-#~ " * \"%s\": if you plan to connect your machine to the Internet, it's a "
-#~ "good\n"
-#~ "idea to protect yourself from intrusions by setting up a firewall. "
-#~ "Consult\n"
-#~ "the corresponding section of the ``Starter Guide'' for details about\n"
-#~ "firewall settings.\n"
-#~ "\n"
-#~ " * \"%s\": if you wish to change your bootloader configuration, click "
-#~ "that\n"
-#~ "button. This should be reserved to advanced users.\n"
-#~ "\n"
-#~ " * \"%s\": here you'll be able to fine control which services will be "
-#~ "run\n"
-#~ "on your machine. If you plan to use this machine as a server it's a good\n"
-#~ "idea to review this setup."
-#~ msgstr ""
-#~ "مانند بازنگری، برنامه‌ی درایک‌ایکس خلاصه‌ای از اطلاعات خود را درباره‌ی\n"
-#~ "سیستم شما عرضه می‌دارد. بستگی به نرم‌افزارهای نصب شده، می‌توانید\n"
-#~ "بعضی یا همه‌ی ورودی‌های بدنبال آمده را دارا باشید. هر ورودی از آیتم "
-#~ "پیکربندی\n"
-#~ "و یک خلاصه‌ی کوتاه از پیکربندی کنونی بدنبال آمده‌ی آن ساخته شده است. بر "
-#~ "دکمه‌ی\n"
-#~ "مربوط \"%s\" برای تغییر آن کلیک کنید.\n"
-#~ "\n"
-#~ " * \"%s\": پیکربندی نقشه‌ی صفحه‌کلید کنونی را بررسی کرده و آن را اگر لازم "
-#~ "است\n"
-#~ "تغییر دهید.\n"
-#~ "\n"
-#~ " * \"%s\": گزینش کشور کنونی را بررسی کنید. اگر شما در این کشور نیستید، "
-#~ "بر\n"
-#~ "دکمه‌ی \"%s\" کلیک کرده و یکی دیگر را انتخاب کنید. اگر کشور شما در اولین "
-#~ "لیست\n"
-#~ "نشان داده شده نیست، بر دکمه‌ی \"%s\" برای دریافت لیست کامل کشورها کلیک "
-#~ "کنید.\n"
-#~ "\n"
-#~ " * \"%s\":  در پیش‌فرض، درایک‌ایکس منطقه‌ی زمانی شما را بر اساس کشوری که\n"
-#~ "انتخاب کرده‌اید استنتاج می‌کند. شما می‌توانید بر دکمه‌ی \"%s\" اگر این صحیح\n"
-#~ "نیست کلیک کنید.\n"
-#~ "\n"
-#~ " * \"%s\": پیکربندی موشی کنونی را بررسی کنید و اگر لازم است آن را با کلیک "
-#~ "بر \n"
-#~ "دکمه تغییر دهید.\n"
-#~ "\n"
-#~ " * \"%s\": با کلیک بر دکمه‌ی \"%s\" جادوگر پیکربندی چاپگر باز خواهد گردید\n"
-#~ "به فصل مربوط به ``راهنمای شروع'' برای اطلاعات بیشتر در چگونه یک چاپگر "
-#~ "جدید را\n"
-#~ "برپاسازی کنیم مراجعه کنید. ظاهر عرضه شده در آنجا شبیه به آن است که در\n"
-#~ "طول نصب استفاده شده است.\n"
-#~ "\n"
-#~ " * \"%s\": اگر کارت صوتی بر سیستم‌تان شناسایی شده است، در اینجا نمایش\n"
-#~ "داده می‌شود. اگر متوجه شدید که کارت صوتی نشان داده شده آن نیست که واقعاًً\n"
-#~ "بر سیستم‌تان وجود دارد می‌توانید بر آن دکمه برای انتخاب راه‌انداز دیگری "
-#~ "کلیک\n"
-#~ "کنید.\n"
-#~ "\n"
-#~ " * \"%s\": در پیش‌فرض, درایک‌ایکس تفکیک‌پذیری واسط گرافیکی‌تان را با\n"
-#~ "\"800x600\" یا \"1024x768\" پیکربندی میکند. اگر آن برایتان مناسب نیست، \n"
-#~ "برای پیکربندی واسط گرافیکی خود بر \"%s\" کلیک کنید.\n"
-#~ "\n"
-#~ " * \"%s\": اگر کارت تلویزیونی بر سیستم‌تان شناسایی شده باشد، در اینجا "
-#~ "نشان\n"
-#~ "داده می‌شود. اگر شما کارت تلویزیونی داشته ولی شناسایی نشده، بر \"%s\" "
-#~ "برای\n"
-#~ "تلاش به پیکربندی دستی آن کلیک کنید.\n"
-#~ "\n"
-#~ " * \"%s\": اگر یک کارت ISDN بر سیستم‌تان شناسایی شده باشد, در اینجا نشان \n"
-#~ "داده خواهد شد. با کلیک بر \"%s\" می‌توانید پارامترهای مرتبط با کارت را "
-#~ "تغییر دهید.\n"
-#~ "\n"
-#~ " * \"%s\": اگر می‌خواهید دستیابی به اینترنت یا به شبکه‌ی محلی خود را "
-#~ "اکنون \n"
-#~ "پیکربندی کنید\n"
-#~ " * \"%s\": این ورودی به شما اجازه‌ی مشخص کردن مجدد سطح امنیت را که\n"
-#~ "در مرحله‌ی پیش تعیین شده را می‌دهد.\n"
-#~ "\n"
-#~ " * \"%s\": اگر خیال دارید رایانه‌ی خود را به اینترنت وصل کنید, فکر خوبی\n"
-#~ "است که آن را از رسوخ دیگران با برپاسازی دیوارآتشی حفاظت کنید.\n"
-#~ "به فصل مربوط ``راهنمای شروع'' برای تشریحات درباره‌ی تنظیمات دیوارآتش\n"
-#~ "مراجعه کنید.\n"
-#~ "\n"
-#~ " * \"%s\": اگر می‌خواهید پیکربندی بارگذارآغازگر را تغییر دهید, آن دکمه "
-#~ "را \n"
-#~ "کلیک کنید این بایستی برای کاربران پیشرفته رزرو شود.\n"
-#~ "\n"
-#~ " * \"%s\": در اینجا شما قادر خواهید بود سرویس‌هایی را که بر ماشین شما "
-#~ "اجرا\n"
-#~ "خواهند شد را کنترل کنید. اگر می‌خواهید از این ماشین مانند یک کارگزار "
-#~ "استفاده کنید\n"
-#~ "فکر خوبی است که این برپاسازی را بازنگری کید."
-
-#~ msgid ""
-#~ "Choose the hard drive you want to erase in order to install your new\n"
-#~ "Mandrake Linux partition. Be careful, all data present on this partition\n"
-#~ "will be lost and will not be recoverable!"
-#~ msgstr ""
-#~ "دستگاه دیسک‌سختی را که می‌خواهید برای نصب قسمت‌بندی جدید لینوکس ماندرایک\n"
-#~ "پاک کنید انتخاب کنید. دقت کنید، همه‌ی داده‌های موجود بر این قسمت‌بندی از\n"
-#~ "دست خواهند رفت و دیگر نمی‌توان آنها را بازیابی کرد!"
-
-#~ msgid ""
-#~ "Click on \"%s\" if you want to delete all data and partitions present on\n"
-#~ "this hard drive. Be careful, after clicking on \"%s\", you will not be "
-#~ "able\n"
-#~ "to recover any data and partitions present on this hard drive, including\n"
-#~ "any Windows data.\n"
-#~ "\n"
-#~ "Click on \"%s\" to stop this operation without losing any data and\n"
-#~ "partitions present on this hard drive."
-#~ msgstr ""
-#~ "اگر می‌خواهید تمام داده‌ها و قسمت‌بندی‌های موجود بر این دیسک را حذف کنید \n"
-#~ "بر \"%s\" کلیک کنید. دقت کنید که بعد از کلیک بر \"%s\"، نمی‌توانید هیچ \n"
-#~ "داده و قسمت‌بندی موجود بر این دیسک، به اضافه‌ی هر داده ویندوز را بازیابی \n"
-#~ "کنید.\n"
-#~ "\n"
-#~ "برای توقف این عملیات بدون از دست دادن هیچ داده‌ای و قسمت‌بندی‌های موجود بر\n"
-#~ "این دیسک بر \"%s\" کلیک کنید."
-
-#~ msgid "http://www.mandrakelinux.com/en/92errata.php3"
-#~ msgstr "http://www.mandrakelinux.com/en/92errata.php3"
-
-#~ msgid "Serbia"
-#~ msgstr "صربستان"
-
-#~ msgid ""
-#~ "PCMCIA support no longer exists for 2.2 kernels. Please use a 2.4 kernel."
-#~ msgstr ""
-#~ "حمایت PCMCIA در هسته‌های ۲٬۲ دیگر وجود ندارد. لطفاً از هسته‌ی ۲٬۴ استفاده "
-#~ "کنید."
-
-#~ msgid "Firmware needed"
-#~ msgstr "Firmware لازم است"
-
-#~ msgid ""
-#~ "Welcome to The Network Configuration Wizard.\n"
-#~ "\n"
-#~ "We are about to configure your internet/network connection.\n"
-#~ "If you don't want to use the auto detection, deselect the checkbox.\n"
-#~ msgstr ""
-#~ "به جادوگر پیکربندی شبکه خوش آمدید.\n"
-#~ "\n"
-#~ "ما بزودی ارتباط اینترنت/شبکه شما را پیکربندی می‌کنیم.\n"
-#~ "اگر نمی‌خواهید از شناسایی خودکار استفاده کنید، جعبه‌ی‌کنترل را علامت نزنید.\n"
-
-#~ msgid "Network Configuration Wizard"
-#~ msgstr "جادوگر پیکربندی شبکه"
-
-#~ msgid "Normal modem connection"
-#~ msgstr "اتصال مودم عادی"
-
-#~ msgid "Winmodem connection"
-#~ msgstr "اتصال وین‌مودم"
-
-#~ msgid "Choose your country"
-#~ msgstr "کشور خود را انتخاب کنید"
-
-#~ msgid "Which dhcp client do you want to use ? (default is dhcp-client)"
-#~ msgstr ""
-#~ "از چه کارگیر dhcp می‌خواهید استفاده کنید؟ (پیش‌فرض dhcp-client می‌باشد)"
-
-#~ msgid "You don't have any winmodem"
-#~ msgstr "شما هیچ وین‌مودمی ندارید"
-
-#~ msgid "Title"
-#~ msgstr "عنوان"
-
-#~ msgid ""
-#~ "\"%s\" based winmodem detected, do you want to install needed software ?"
-#~ msgstr ""
-#~ "وین‌مودم بر اساس \"%s\" شناسایی شده است، آیا می‌خواهید نرم‌افزار لازم را نصب "
-#~ "کنید؟"
-
-#~ msgid "Install rpm"
-#~ msgstr "نصب rpm"
-
-#~ msgid "Do nothing"
-#~ msgstr "هیچ کاری نکن"
-
-#~ msgid "Dialup options"
-#~ msgstr "گزینه‌های شماره‌گیری"
-
-#~ msgid "Configuring network device %s"
-#~ msgstr "پیکربندی دستگاه شبکه‌ی %s"
-
-#~ msgid " (driver %s)"
-#~ msgstr " (راه‌انداز %s)"
-
-#~ msgid "Automatic IP"
-#~ msgstr "آی‌پی خودکار"
-
-#~ msgid "(bootp/dhcp/zeroconf)"
-#~ msgstr "(bootp/dhcp/zeroconf)"
-
-#~ msgid "Netwok name (ESSID)"
-#~ msgstr "نام شبکه (ESSID)"
-
-#~ msgid ""
-#~ "RTS/CTS adds a handshake before each packet transmission to make sure "
-#~ "that the\n"
-#~ "channel is clear. This adds overhead, but increase performance in case of "
-#~ "hidden\n"
-#~ "nodes or large number of active nodes. This parameters set the size of "
-#~ "the\n"
-#~ "smallest packet for which the node sends RTS, a value equal to the "
-#~ "maximum\n"
-#~ "packet size disable the scheme. You may also set this parameter to auto, "
-#~ "fixed\n"
-#~ "or off."
-#~ msgstr ""
-#~ "RTS/CTS دست‌دادنی را قبل از انتقال هر پاکت اضافه کرده تا مطمئن شود که\n"
-#~ "کانال آماده است. این سرآیند را می‌افزاید، ولی در موارد گره‌های پنهان یا "
-#~ "تعداد\n"
-#~ "زیاد گره‌های فعال قابلیت اجرایی را بالا می‌برد. این پارامترها اندازه‌ی "
-#~ "کوچکترین\n"
-#~ "پاکت را که گره RTS می‌فرستد تعیین می‌کند، مقداری برابر با حداکثر اندازه‌ی\n"
-#~ "پاکت این طرح را از کار می‌اندازد. می‌توانید این پارامتر را به خودکار، ثابت "
-#~ "یا\n"
-#~ "خاموش تعیین کنید."
-
-#~ msgid "DNS server"
-#~ msgstr "کارگزار DNS"
-
-#~ msgid ""
-#~ "\n"
-#~ "Congratulations, your printer is now installed and configured!\n"
-#~ "\n"
-#~ "You can print using the \"Print\" command of your application (usually in "
-#~ "the \"File\" menu).\n"
-#~ "\n"
-#~ "If you want to add, remove, or rename a printer, or if you want to change "
-#~ "the default option settings (paper input tray, printout quality, ...), "
-#~ "select \"Printer\" in the \"Hardware\" section of the Mandrake Control "
-#~ "Center."
-#~ msgstr ""
-#~ "\n"
-#~ "تبریک می گوییم، چاپگر شما اکنون نصب و پیکربندی شده است!\n"
-#~ "\n"
-#~ "شما می‌توانید با استفاده از فرمان \"Print\" برنامه‌ی خود (معمولاً در فهرست "
-#~ "\"پرونده\" ) چاپ کنید.\n"
-#~ "\n"
-#~ "اگر می‌خواهید یک چاپگر را اضافه، بردارید یا بازنامی کنید، یا اگر می خواهید "
-#~ "تنظیم‌های گزینه‌ی پیش‌فرض خود را تغییر دهید (سینی کاغذ، کیفیت چاپ، ...)، "
-#~ "\"چاپگر\" را در \"سخت‌افزار\" در قسمت مرکز کنترل ماندرایک انتخاب کنید."
-
-#~ msgid "Configuration of a remote printer"
-#~ msgstr "پیکربندی چاپگر از راه دوری"
-
-#~ msgid ""
-#~ "The network configuration done during the installation cannot be started "
-#~ "now. Please check whether the network is accessable after booting your "
-#~ "system and correct the configuration using the Mandrake Control Center, "
-#~ "section \"Network & Internet\"/\"Connection\", and afterwards set up the "
-#~ "printer, also using the Mandrake Control Center, section \"Hardware\"/"
-#~ "\"Printer\""
-#~ msgstr ""
-#~ "پیکربندی انجام شده‌ی شبکه در طول نصب نمی‌تواند اکنون شروع گردد. لطفا بررسی "
-#~ "کنید که آیا شبکه بعد از آغازگری سیستم قابل دستیابی می‌باشد و پیکربندی را "
-#~ "با استفاده از مرکز کنترل ماندرایک، قسمت \"شبکه & اینترنت\"/\"اتصال\", "
-#~ "تصحیح کنید، و بعد چاپگر رابا استفاده از مرکز کنترل ماندرایک، قسمت "
-#~ "\"سخت‌افزار\"/\"چاپگر\" برپاسازی کنید."
-
-#~ msgid ""
-#~ "The following printers are configured. Double-click on a printer to "
-#~ "change its settings; to make it the default printer; or to view "
-#~ "information about it."
-#~ msgstr ""
-#~ "چاپگرهای بدنبال آمده پیکربندی شده‌اند. برای تغییر تنظیمات یک چاپگر، ساختن "
-#~ "آن به پیش‌فرض یا نمایش اطلاعات درباره‌ی آن بر آن دوکلیکه کنید."
-
-#~ msgid "Thank you for choosing Mandrake Linux 9.2"
-#~ msgstr "برای انتخاب لینوکس ماندرایک ۹٬۲ از شما متشکریم"
-
-#~ msgid "Welcome to the Open Source world."
-#~ msgstr "به دنیای متن باز خوش آمدید."
-
-#~ msgid ""
-#~ "The success of MandrakeSoft is based upon the principle of Free Software. "
-#~ "Your new operating system is the result of collaborative work of the "
-#~ "worldwide Linux Community."
-#~ msgstr ""
-#~ "موفقیت MandrakeSoft بر پایه‌ی اصول نرم‌افزار آزاد قرار دارد. سیستم عامل "
-#~ "جدید شما نتیجه‌ی همکاری جامعه‌ی جهانی لینوکس می‌باشد."
-
-#~ msgid "Build the future of Linux!"
-#~ msgstr "آینده‌ی لینوکس را بسازید!"
-
-#~ msgid ""
-#~ "Want to know more and to contribute to the Open Source community? Get "
-#~ "involved in the Free Software world!"
-#~ msgstr ""
-#~ "می‌خواهید بیشتر بدانید و به مجمع منبع آزاد کمک کنید؟ عضو دنیای نرم‌افزار "
-#~ "آزاد شوید!"
-
-#~ msgid ""
-#~ "To share your own knowledge and help build Linux software, join our "
-#~ "discussion forums on our \"Community\" webpages."
-#~ msgstr ""
-#~ "برای به اشتراک گذاشتن دانستنی‌های خود و کمک در ساختن نرم‌افزار لینوکس، به "
-#~ "تالارهای بحث ما بر صفحات وب \"جامعه\" ما بپیوندید."
-
-#~ msgid "MandrakeSoft has selected the best software for you"
-#~ msgstr "MandrakeSoft بهترین نرم‌افزار را برای شما انتخاب کرده است"
-
-#~ msgid ""
-#~ "Surf the Web with Mozilla or Konqueror, read your mail with Evolution or "
-#~ "Kmail, create your documents with OpenOffice.org."
-#~ msgstr ""
-#~ "صفحه‌نوردی وب با موزیلا یا کانکرر، خواندن پست با تکامل یا Kmail، ایجاد "
-#~ "نوشتارهایتان با برنامه‌ی دفتر آزاد."
-
-#~ msgid ""
-#~ "And, of course, push multimedia to its limits with the very latest "
-#~ "software to play videos, audio files and to handle your images or photos."
-#~ msgstr ""
-#~ "و البته چندرسانه‌‌ای را به مرز خود با آخرین نرم‌افزار برای پخش ویدیو، "
-#~ "پرونده‌های صوتی و اداره‌ی تصاویر یا عکس‌ها برسانید."
-
-#~ msgid "Mandrake's multipurpose configuration tool"
-#~ msgstr "ابزار پیکربندی چندمنظوری ماندرایک"
-
-#~ msgid ""
-#~ "Mandrake Linux 9.2 provides you with the Mandrake Control Center, a "
-#~ "powerful tool to fully adapt your computer to the use you make of it. "
-#~ "Configure and customize elements such as the security level, the "
-#~ "peripherals (screen, mouse, keyboard...), the Internet connection and "
-#~ "much more!"
-#~ msgstr ""
-#~ "لینوکس ماندرایک ۹٬۲ مرکز کنترل ماندرایک، ابزار قدرتمندی را برای تطابق "
-#~ "رایانه شما برای آن استفاده‌ای که می‌خواهید از آن بکنید عرضه می‌دارد. "
-#~ "پیکربندی و اختصاصی کردن اجزایی مانند سطح امنیتی، وسایل حاشیه (صفحه، موشی، "
-#~ "صفحه‌کلید...)، اتصال اینترنت و غیرو!"
-
-#~ msgid "A customizable environment"
-#~ msgstr "محیطی اختصاصی‌سازی"
-
-#~ msgid ""
-#~ "Perfectly adapt your computer to your needs thanks to the 11 available "
-#~ "Mandrake Linux user interfaces which can be fully modified: KDE 3.1, "
-#~ "GNOME 2.2, Window Maker, ..."
-#~ msgstr ""
-#~ "رایانه‌ی خود را کاملاً به احتیاجات خود تطبیق دهید این با استفاده از ۱۱ واسط "
-#~ "کاربر لینوکس ماندرایک در دسترس است که می‌توانند کاملاً پیرایش شوند: KDE "
-#~ "3.1, GNOME 2.2, Window Maker, ..."
-
-#~ msgid "Mandrake Linux 9.2: the ultimate development platform"
-#~ msgstr "لینوکس ماندرایک ۹٬۲: بهترین پایگاه برنامه‌سازی"
-
-#~ msgid ""
-#~ "To modify and to create in different languages such as Perl, Python, C "
-#~ "and C++ has never been so easy thanks to GNU gcc 3 and the best Open "
-#~ "Source development environments."
-#~ msgstr ""
-#~ "پیرایش و برنامه‌نویسی در زبان‌های گوناگون مانند Perl, Python, C و C++ هرگز "
-#~ "به این سادگی نبوده است این بخاطر وجود gcc ۳ گنو و بهترین محیط‌های "
-#~ "برنامه‌نویسی منبع باز می‌باشد."
-
-#~ msgid "Turn your computer into a reliable server"
-#~ msgstr "رایانه خود را به یک کارگزار قابل اعتماد تبدیل کنید"
-
-#~ msgid ""
-#~ "Transform your computer into a powerful Linux server: Web server, mail, "
-#~ "firewall, router, file and print server (etc.) are just a few clicks away!"
-#~ msgstr ""
-#~ "رایانه خود را به یک کارگزار قدرتمند لینوکس تبدیل کنید: کارگزار وب، پست، "
-#~ "دیوارآتش، مسیریاب، پرونده و کارگزار چاپ (و غیره) فقط با چند کلیک از شما "
-#~ "فاصله دارند!"
-
-#~ msgid "The official MandrakeSoft Store"
-#~ msgstr "فروشگاه رسمی MandrakeSoft"
+#: ../../share/compssUsers:999
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"برنامه‌های دفتری: واژه پردازها ((kword, abiword), برگ‌های حساب (kspread, "
+"gnumeric), نماگرهای pdf و غیره"
 
-#~ msgid ""
-#~ "Our full range of Linux solutions, as well as special offers on products "
-#~ "and other \"goodies\", are available on our e-store:"
-#~ msgstr ""
-#~ "گستره‌ی کاملی از راه حل‌های لینوکس ما، همچنین پیشنهادات مخصوص محصولات و "
-#~ "\"شیرینی‌های\" دیگر، در فروشگاه الکترونیکی ما در دسترس هستند:"
+#: ../../share/compssUsers:999
+msgid "Game station"
+msgstr "ایستگاه بازی"
 
-#~ msgid "Get the best items with Mandrake Linux Strategic partners"
-#~ msgstr "بهترین‌ها را با شرکای تاکتیکی لینوکس مان‌درایک دریافت کنید"
+#: ../../share/compssUsers:999
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "برنامه‌های سرگرمی: آرکید، تخته‌ها، تاکتیکی، غیره"
 
-#~ msgid ""
-#~ "Enhance your computer performance with the help of a selection of "
-#~ "partners offering professional solutions compatible with Mandrake Linux"
-#~ msgstr ""
-#~ "توانایی اجرای رایانه‌ی خود را با کمک از مجموعه‌ای از راه حل‌های حرفه‌ای "
-#~ "همخوان با لینوکس ماندرایک بهینه کنید."
+#: ../../share/compssUsers:999
+msgid "Multimedia station"
+msgstr "ایستگاه چندرسانه‌ای"
 
-#~ msgid "Optimize your security by using Mandrake Linux"
-#~ msgstr "امنیت خود را با استفاده از لینوکس ماندرایک به حداکثر برسانید"
+#: ../../share/compssUsers:999
+msgid "Sound and video playing/editing programs"
+msgstr "برنامه‌های ویرایش/پخش ویدیو و صوت"
 
-#~ msgid ""
-#~ "MandrakeSoft has designed exclusive tools to create the most secured "
-#~ "Linux version ever: Draksec, a system security management tool, and a "
-#~ "strong firewall are teamed up together  in order to highly reduce hacking "
-#~ "risks."
-#~ msgstr ""
-#~ "نرم‌افزار ماندرایک برای ایجاد امن‌ترین نسخه‌ی لینوکس ابزارهای منحصر بفردی را "
-#~ "طراحی کرده است: Draksec, ابزار مدیریت امنیتی سیستم و دیوارآتشی قدرتمند به "
-#~ "هم پیوسته‌اند تا خطرات رسوخ به سیستم را بشدت کم کنند."
+#: ../../share/compssUsers:999
+msgid "Internet station"
+msgstr "ایستگاه اینترنت"
 
-#~ msgid "Secure your networks with the Multi Network Firewall"
-#~ msgstr "شبکه خود را با دیوارآتش چند شبکه‌ای امن کنید"
+#: ../../share/compssUsers:999
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr "مجموعه ابزار خواندن و ارسال پست و اخبار (mutt, tin..) و برای مرور وب"
 
-#~ msgid ""
-#~ "Complete your security setup with this very easy-to-use software which "
-#~ "combines high performance components such as a firewall, a virtual "
-#~ "private network (VPN) server and client, an intrusion detection system "
-#~ "and a traffic manager."
-#~ msgstr ""
-#~ "برپاسازی امنیتی خود را با این نرم‌افزار آسان-برای-استفاده که با ترکیب "
-#~ "عناصری با توانایی بالا مانند یک دیوارآتش، یک کارگزار و کارگیر شبکه‌ی مجازی "
-#~ "خصوصی، یک سیستم کشف رسوخ و یک مدیر ترافیک تکمیل کنید."
+#: ../../share/compssUsers:999
+msgid "Network Computer (client)"
+msgstr "رایانه‌ی شبکه (کارگیر)"
 
-#~ msgid "This product is available on the MandrakeStore Web site."
-#~ msgstr "این محصول در پایگاه اینترنتی MandrakeStore در دسترس قرار دارد."
+#: ../../share/compssUsers:999
+msgid "Clients for different protocols including ssh"
+msgstr "کارگیرها برای پایان‌نامه‌های گوناگون از جمله ssh"
 
-#~ msgid "Become a MandrakeExpert"
-#~ msgstr "کارشناس ماندرایک شوید"
+#: ../../share/compssUsers:999
+msgid "Configuration"
+msgstr "پیکربندی"
 
-#~ msgid ""
-#~ "Find the solutions of your problems via MandrakeSoft's online support "
-#~ "platform."
-#~ msgstr ""
-#~ "راه‌حل‌های مشکلات خود را از طریق پایگاه پشتیبانی بر روی خط MandrakeSoft "
-#~ "پیدا کنید."
+#: ../../share/compssUsers:999
+msgid "Tools to ease the configuration of your computer"
+msgstr "ابزارهای برای آسان‌ کردن پیکربندی رایانه‌اتان"
 
-#~ msgid ""
-#~ "Join the MandrakeSoft support teams and the Linux Community online to "
-#~ "share your knowledge and help others by becoming a recognized Expert on "
-#~ "the online technical support website:"
-#~ msgstr ""
-#~ "برای به اشتراک گذاشتن دانستنی‌های خود و کمک بدیگران به گروه حمایت "
-#~ "MandrakeSoft و جامعه لینوکس بپیوندید و یک کارشناس شناخته شده در وب‌گاه "
-#~ "حمایت تکنیکی بشوید:"
+#: ../../share/compssUsers:999
+msgid "Console Tools"
+msgstr "ابزارهای کنسول"
 
-#~ msgid "MandrakeExpert Corporate"
-#~ msgstr "MandrakeExpert Corporate"
+#: ../../share/compssUsers:999
+msgid "Editors, shells, file tools, terminals"
+msgstr "ویرایش‌گرها، پوسته‌ها، ابزار پرونده، پایانه‌ها"
 
-#~ msgid "An online platform to respond to enterprise support needs."
-#~ msgstr "پایگاهی اینترنتی برای جوابگویی به احتیاجات حمایتی شرکت‌ها."
+#: ../../share/compssUsers:999
+msgid "KDE Workstation"
+msgstr "ایستگاه‌کار KDE "
 
-#~ msgid ""
-#~ "All incidents will be followed up by a single qualified MandrakeSoft "
-#~ "technical expert."
-#~ msgstr ""
-#~ "تمام پیش‌آمدها توسط یک کارشناس با تجربه‌ی MandrakeSoft پیگیری خواهند شد."
+#: ../../share/compssUsers:999
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "محیط رومیزی K، محیط گرافیکی پایه با مجموعه‌ای از ابزارهای ضمیمه"
 
-#~ msgid ""
-#~ "Font Importation and monitoring "
-#~ "application                                     \n"
-#~ "--windows_import : import from all available windows partitions.\n"
-#~ "--xls_fonts      : show all fonts that already exist from xls\n"
-#~ "--strong         : strong verification of font.\n"
-#~ "--install        : accept any font file and any directry.\n"
-#~ "--uninstall      : uninstall any font or any directory of font.\n"
-#~ "--replace        : replace all font if already exist\n"
-#~ "--application    : 0 none application.\n"
-#~ "                 : 1 all application available supported.\n"
-#~ "                 : name_of_application like  so for staroffice \n"
-#~ "                 : and gs for ghostscript for only this one."
-#~ msgstr ""
-#~ "برنامه‌ی پایشگری و واردات قلم نگارش                                     \n"
-#~ "--واردات_ویندوز : واردات از تمام قسمت‌بندی‌های موجود ویندوز.\n"
-#~ "--قلم‌هاـxls       : نشان دادن همه‌ی قلم‌های از قبل موجود xls\n"
-#~ "--قوی              : تصدیق قوی قلم.\n"
-#~ "--نصب            : پذیرش هر پرونده‌ی قلم و هر شاخه.\n"
-#~ "--نصب‌برداری    : نصب‌برداری هر قلم یا شاخه قلم.\n"
-#~ "--جایگزینی        : جایگزینی همه‌ی قلم‌های از قبل موجود\n"
-#~ "--برنامه           : ۰ هیچ برنامه.\n"
-#~ "                     : ۱ همه‌ی برنامه‌ی موجود حمایت شده.\n"
-#~ "                     : نام_برنامه  مانند staroffice \n"
-#~ "                     : و gs برای ghostscript فقط برای این یکی."
-
-#~ msgid "Mandrake Terminal Server Configuration"
-#~ msgstr "پیکربندی کارگزار پایانه‌ی ماندرایک"
+#: ../../share/compssUsers:999
+msgid "GNOME Workstation"
+msgstr "ایستگاه‌کار گنوم"
 
-#~ msgid ""
-#~ "\n"
-#~ " Copyright (C) 2002 by MandrakeSoft \n"
-#~ "\tStew Benedict sbenedict@mandrakesoft.com\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ " Copyright (C) 2002 by MandrakeSoft \n"
-#~ "\tStew Benedict sbenedict@mandrakesoft.com\n"
-#~ "\n"
+#: ../../share/compssUsers:999
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "محیط گرافیکی کاربر-دوستانه با مجموعه‌ای از برنامه‌ها و ابزارهای رومیزی"
 
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ " Thanks:\n"
-#~ "\t- LTSP Project http://www.ltsp.org\n"
-#~ "\t- Michael Brown <mbrown@fensystems.co.uk>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ " Thanks:\n"
-#~ "\t- LTSP Project http://www.ltsp.org\n"
-#~ "\t- Michael Brown <mbrown@fensystems.co.uk>\n"
-#~ "\n"
+#: ../../share/compssUsers:999
+msgid "Other Graphical Desktops"
+msgstr "دیگر رومیزی‌های گرافیکی"
 
-#~ msgid ""
-#~ "This should be a comma-separated list of local users or email addresses "
-#~ "that you want the backup results sent to. You will need a functioning "
-#~ "mail transfer agent setup on your system."
-#~ msgstr ""
-#~ "این باید لیستی جداشونده با ویرگول از کاربرهای محلی یا نشانی‌های پست "
-#~ "الکترونیکی که می‌خواهید نتایج ذخیره‌های پشتیبان به آنها فرستاده شوند باشد. "
-#~ "شما به یک برپاسازی مأمور انتقال پست کارآمد بر روی سیستم خود احتیاج خواهید "
-#~ "داشت."
+#: ../../share/compssUsers:999
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
-#~ msgid "WARNING"
-#~ msgstr "هشدار"
+#: ../../share/compssUsers:999
+msgid "C and C++ development libraries, programs and include files"
+msgstr "کتابخانه‌های برنامه‌سازی C و C++، برنامه‌ها و پرونده‌های شامل"
 
-#~ msgid "FATAL"
-#~ msgstr "مهلک"
+#: ../../share/compssUsers:999
+msgid "Documentation"
+msgstr "نوشتار"
 
-#~ msgid "INFO"
-#~ msgstr "اطلاعات"
+#: ../../share/compssUsers:999
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "کتاب‌ها و چگونگی‌ها در لینوکس و نرم‌افزار آزاد"
 
-#~ msgid ""
-#~ "%s exists, delete?\n"
-#~ "\n"
-#~ "Warning: If you've already done this process you'll probably\n"
-#~ " need to purge the entry from authorized_keys on the server."
-#~ msgstr ""
-#~ "%s وجود دارد, حذف گردد?\n"
-#~ "\n"
-#~ "هشدار: اگر از قبل این پردازش را انجام داده‌اید احتمالا\n"
-#~ " احتیاج به پاک کردن ورودی از کلیدهای‌ـ‌هویت بر روی کارگزار دارید."
+#: ../../share/compssUsers:999
+msgid "LSB"
+msgstr "LSB"
 
-#~ msgid "ERROR: Cannot spawn %s."
-#~ msgstr "خطا: نمی‌توان %s را ریزش کرد."
+#: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "پایه‌ی استاندارد لینوکس. حمایت برنامه‌های شخص سوم"
 
-#~ msgid ""
-#~ "file list sent by FTP: %s\n"
-#~ " "
-#~ msgstr ""
-#~ "لیست پرونده فرستاده شده توسط FTP: %s\n"
-#~ " "
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
-#~ msgid "On Hard Drive"
-#~ msgstr "بر دیسک سخت"
+#: ../../share/compssUsers:999
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
 
-#~ msgid "Backup the system files before:"
-#~ msgstr "ذخیره پشتیبان پرونده‌های سیستم قبلاً: "
+#: ../../share/compssUsers:999
+msgid "Mail"
+msgstr "پست"
 
-#~ msgid "please choose the date to restore"
-#~ msgstr "لطفاً تاریخ را برای بازسازی انتخاب نمایید"
+#: ../../share/compssUsers:999
+msgid "Postfix mail server"
+msgstr "کارگزار پست Postfix "
 
-#~ msgid "Use Hard Disk to backup"
-#~ msgstr "استفاده از دیسک برای ذخیره پشتیبان"
+#: ../../share/compssUsers:999
+msgid "Database"
+msgstr "بانک ‌اطلاعات"
 
-#~ msgid "Enter the directory to save:"
-#~ msgstr "شاخه‌ای را برای ذخیره وارد نمایید:"
+#: ../../share/compssUsers:999
+msgid "PostgreSQL or MySQL database server"
+msgstr "کارگزار بانک اطلاعاتی PostgreSQL یا MySQL "
 
-#~ msgid ""
-#~ "Enter the maximum size\n"
-#~ " allowed for Drakbackup (MB)"
-#~ msgstr ""
-#~ "حداکثر اندازه مجاز\n"
-#~ "برای Drakbackup (مگابایت)"
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "دیوار‌آتش/مسیریاب"
 
-#~ msgid "Use quota for backup files."
-#~ msgstr "استفاده از سهمیه برای پرونده‌های ذخیره پشتیبان."
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "دروازه‌ی اینترنت"
 
-#~ msgid "Filename text to search for:"
-#~ msgstr "نام پرونده‌ی متن برای جستجو:"
+#: ../../share/compssUsers:999
+msgid "Network Computer server"
+msgstr "کارگزار شبکه‌ی رایانه"
 
-#~ msgid ""
-#~ "Error during sendmail.\n"
-#~ "  Your report mail was not sent.\n"
-#~ "  Please configure sendmail"
-#~ msgstr ""
-#~ "خطا هنگام فرستادن پست.\n"
-#~ "  گزارش پست شما فرستاده نشد.\n"
-#~ "  لطفا sendmail را پیکربندی کنید"
+#: ../../share/compssUsers:999
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "کارگزار NFS , کارگزار SMB , کارگزار Proxy , کارگزار ssh "
 
-#~ msgid ""
-#~ "Error during sending file via FTP.\n"
-#~ " Please correct your FTP configuration."
-#~ msgstr ""
-#~ "خطا هنگام فرستادن پرونده از طریق FTP.\n"
-#~ "لطفاً پیکربندی FTP خود را درست کنید."
+#: ../../share/compssUsers:999
+msgid "Set of tools to read and send mail and news and to browse the Web"
+msgstr "مجموعه‌ای از ابزارها برای خواندن و فرستادن پست و اخبار و برای مرور وب"
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ msgid "Provider dns 1 (optional)"
+#~ msgstr "عرضه کننده dns  ۱ (اختیاری)"
 
-#~ msgid ""
-#~ "\n"
-#~ "Theme"
-#~ msgstr ""
-#~ "\n"
-#~ "تم‌ها"
+#~ msgid "Provider dns 2 (optional)"
+#~ msgstr "عرضه کننده dns ۲ (اختیاری)"
 
-#~ msgid "Install List"
-#~ msgstr "نصب کردن لیست"
+#~ msgid "Ethernet Card"
+#~ msgstr "کارت ایثرنت"
 
-#~ msgid "Sorry, we support only 2.4 kernels."
-#~ msgstr "متأسفم، ما فقط هسته‌های ۲.۴را حمایت می‌کنیم."
+#~ msgid "DHCP Client"
+#~ msgstr "کارگیر DHCP"
 
-#~ msgid ""
-#~ "DHCP Server Configuration.\n"
-#~ "\n"
-#~ "Here you can select different options for the DHCP server configuration.\n"
-#~ "If you don't know the meaning of an option, simply leave it as it is.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "پیکربندی کارگزارDHCP .\n"
-#~ "\n"
-#~ "در اینجا می‌توانید گزینه‌های مختلفی برای پیکربندی کارگزار DHCP انتخاب "
-#~ "کنید.\n"
-#~ "اگر شما معنی گزینه‌ای را نمی‌دانید، آن را به حال خود بگذارید.\n"
-#~ "\n"
+#~ msgid "Display"
+#~ msgstr "نمایش"
 
-#~ msgid ""
-#~ "Everything has been configured.\n"
-#~ "You may now share Internet connection with other computers on your Local "
-#~ "Area Network, using automatic network configuration (DHCP)."
-#~ msgstr ""
-#~ "همه چیز پیکربندی شده است.\n"
-#~ "اکنون می‌توانید اتصال اینترنت خود را با رایانه‌های دیگر در شبکه‌ی محلی‌تان با "
-#~ "استفاده از پیکربندی خودکار شبکه ( DHCP) شریک شوید."
+#~ msgid "Display configuration"
+#~ msgstr "پیکربندی نمایش"
 
-#~ msgid ""
-#~ " drakhelp 0.1\n"
-#~ "Copyright (C) 2003 MandrakeSoft.\n"
-#~ "This is free software and may be redistributed under the terms of the GNU "
-#~ "GPL.\n"
-#~ "\n"
-#~ "Usage: \n"
-#~ msgstr ""
-#~ " drakhelp 0.1\n"
-#~ "Copyright (C) 2003 MandrakeSoft.\n"
-#~ "این یک نرم‌افزار آزاد بوده و ممکن است تحت شرایط GNU GPL انتشار مجدد گردد.\n"
-#~ "\n"
-#~ "طرز استفاده: \n"
+#~ msgid "European protocol"
+#~ msgstr "پایان‌نامه‌ی اروپایی"
 
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Note: if you've an ISA PnP sound card, you'll have to use the sndconfig "
-#~ "program.  Just type \"sndconfig\" in a console."
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "توجه: اگر کارت صوتی ISA PnP ندارید, باید از برنامه‌ی sndconfig استفاده "
-#~ "کنید.  فقط دستور \"sndconfig\" را در پایانه وارد کنید."
+#~ msgid "Found \"%s\" interface do you want to use it ?"
+#~ msgstr "واسط \"%s\" یافت شد، می‌خواهید از آن استفاده کنید؟"
 
-#~ msgid "Connected through a serial port or an usb cable"
-#~ msgstr "متصل شده از طریق درگاه موازی یا کابل usb"
+#~ msgid "Bewan USB modem"
+#~ msgstr "مودم Bewan USB"
 
-#~ msgid "Add an UPS device"
-#~ msgstr "افزودن دستگاه UPS"
+#~ msgid "What kind is your ISDN connection?"
+#~ msgstr "اتصال ISDN  شما از چه نوعی است؟"
 
-#~ msgid ""
-#~ "Welcome to the UPS configuration utility.\n"
-#~ "\n"
-#~ "Here, you'll be add a new UPS to your system.\n"
-#~ msgstr ""
-#~ "به ابزار پیکربندی UPS خوش آمدید.\n"
-#~ "\n"
-#~ "در اینجا می‌توانید UPS جدیدی را به سیستم‌تان اضافه کنید.\n"
+#~ msgid "Do you want to start a new configuration ?"
+#~ msgstr "آیا می‌خواهید یک پیکربندی جدید را شروع کنید؟"
 
 #~ msgid ""
-#~ "We're going to add an UPS device.\n"
-#~ "\n"
-#~ "Do you prefer autodetect UPS devices connected to this machine or  ?"
+#~ "I have detected an ISDN PCI card, but I don't know its type. Please "
+#~ "select a PCI card on the next screen."
 #~ msgstr ""
-#~ "ما دستگاه UPS را اضافه خواهیم کرد.\n"
-#~ "\n"
-#~ "آیا ترجیح می‌دهید دستگاه‌های UPS وصل شده‌ی به این رایانه شناسایی خودکار شوند "
-#~ "یا ؟"
-
-#~ msgid "Autodetection"
-#~ msgstr "شناسایی خودکار"
-
-#~ msgid "The wizard successfully added the following UPS devices:"
-#~ msgstr "جادوگر با موفقیت دستگاه‌های UPS بدنبال آمده را افزود:"
+#~ "من یک کارت PCI ISDN را شناسایی کرده‌ام، ولی نوع آن را نمی‌دانم. لطفاً کارت "
+#~ "PCI را در صفحه‌ی بعد انتخاب کنید."
 
-#~ msgid "No new UPS devices was found"
-#~ msgstr "هیچ دستگاه‌های UPS جدیدی یافت نشد"
-
-#~ msgid "UPS driver configuration"
-#~ msgstr "پیکربندی راه‌انداز UPS"
-
-#~ msgid "Please select your UPS model."
-#~ msgstr "لطفاً مدل UPS خود را انتخاب کنید."
-
-#~ msgid "Manufacturer / Model:"
-#~ msgstr "سازنده / مدل:"
-
-#~ msgid ""
-#~ "We are configuring the \"%s\" UPS from \"%s\".\n"
-#~ "Please fill in its name, its driver and its port."
+#~ msgid "No ISDN PCI card found. Please select one on the next screen."
 #~ msgstr ""
-#~ "ما در حال پیکربندی \"%s\" UPS از \"%s\" هستیم.\n"
-#~ "لطفاً نام، راه‌انداز و درگاه آن را پر کنید."
-
-#~ msgid "Name:"
-#~ msgstr "نام:"
-
-#~ msgid "The name of your ups"
-#~ msgstr "نام ups شما"
-
-#~ msgid "The driver that manage your ups"
-#~ msgstr "راه‌اندازیی که ups شما را اداره می‌کند"
-
-#~ msgid "Port:"
-#~ msgstr "درگاه:"
-
-#~ msgid "The port on which is connected your ups"
-#~ msgstr "درگاهی که ups شما به آن وصل شده است"
-
-#~ msgid "The wizard successfully configured the new \"%s\" UPS device."
-#~ msgstr "جادوگر با موفقیت دستگاه UPS \"%s\" جدید را پیکربندی کرد."
-
-#~ msgid "About DrakUPS"
-#~ msgstr "درباره‌ی DrakUPS"
-
-#~ msgid ""
-#~ "This is DrakUPS, a Mandrake configuration tool for UPS devices.\n"
-#~ "\n"
-#~ "Author:</span> Thierry Vignaud &lt;tvignaud@mandrakesoft.com&gt;\n"
-#~ "\n"
-#~ msgstr ""
-#~ "این DrakUPS است، ابزار پیکربندی ماندرایک برای دستگاه‌های UPS.\n"
-#~ "\n"
-#~ "نگارنده:</span> Thierry Vignaud &lt;tvignaud@mandrakesoft.com&gt;\n"
-#~ "\n"
-
-#~ msgid "UPS devices"
-#~ msgstr "سرویس‌های UPS"
-
-#~ msgid "UPS users"
-#~ msgstr "کاربران UPS"
-
-#~ msgid "Access Control Lists"
-#~ msgstr "دستیابی به لیست‌های کنترل"
-
-#~ msgid "IP mask"
-#~ msgstr "نقاب آی‌پی"
-
-#~ msgid "Rules"
-#~ msgstr "قواعد"
-
-#~ msgid "Action"
-#~ msgstr "کنش"
-
-#~ msgid "ACL name"
-#~ msgstr "نام ACL"
-
-#~ msgid "DrakUPS"
-#~ msgstr "DrakUPS"
-
-#~ msgid "Welcome to the UPS configuration tools"
-#~ msgstr "به ابزارهای پیکربندی UPS خوش آمدید"
-
-#~ msgid "Running \"%s\" ..."
-#~ msgstr "در حال اجرای \"%s\" ..."
-
-#~ msgid "logdrake"
-#~ msgstr "logdrake"
-
-#~ msgid "Messages"
-#~ msgstr "پیغام‌ها"
-
-#~ msgid "Syslog"
-#~ msgstr "Syslog"
-
-#~ msgid "Wrong email"
-#~ msgstr "پست اشتباه!"
-
-#~ msgid "Mandrake Linux Printer Management Tool"
-#~ msgstr "ابزار مدیریت چاپگر لینوکس ماندرایک"
-
-#~ msgid "The %s is not supported by this version of Mandrake Linux."
-#~ msgstr "این %s توسط این نسخه از‌ لینوکس ماندرایک حمایت نمی‌شود."
-
-#~ msgid ""
-#~ "The %s must be configured by printerdrake.\n"
-#~ "You can launch printerdrake from the Mandrake Control Center in Hardware "
-#~ "section."
-#~ msgstr ""
-#~ "این %s باید بوسیله printerdrake پیکربندی گردد.\n"
-#~ "شما می‌توانید printerdrake را از مرکز کنترل ماندرایک در قسمت سخت‌افزار اجرا "
+#~ "هیچ کارت PCI برای شبکه ISDN یافت نشد. لطفاً یکی را در صفحه‌ی بعدی انتخاب "
 #~ "کنید."
 
-#~ msgid "utopia 25"
-#~ msgstr "utopia 25"
-
-#~ msgid "Office Workstation"
-#~ msgstr "ایستگاه‌کار دفتری"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "برنامه‌های دفتری: واژه پردازها ((kword, abiword), برگ‌های حساب (kspread, "
-#~ "gnumeric), نماگرهای pdf و غیره"
-
-#~ msgid "Game station"
-#~ msgstr "ایستگاه بازی"
-
-#~ msgid "Amusement programs: arcade, boards, strategy, etc"
-#~ msgstr "برنامه‌های سرگرمی: آرکید، تخته‌ها، تاکتیکی، غیره"
-
-#~ msgid "Multimedia station"
-#~ msgstr "ایستگاه چندرسانه‌ای"
-
-#~ msgid "Sound and video playing/editing programs"
-#~ msgstr "برنامه‌های ویرایش/پخش ویدیو و صوت"
-
-#~ msgid "Internet station"
-#~ msgstr "ایستگاه اینترنت"
-
-#~ msgid ""
-#~ "Set of tools to read and send mail and news (mutt, tin..) and to browse "
-#~ "the Web"
-#~ msgstr ""
-#~ "مجموعه ابزار خواندن و ارسال پست و اخبار (mutt, tin..) و برای مرور وب"
-
-#~ msgid "Network Computer (client)"
-#~ msgstr "رایانه‌ی شبکه (کارگیر)"
-
-#~ msgid "Clients for different protocols including ssh"
-#~ msgstr "کارگیرها برای پایان‌نامه‌های گوناگون از جمله ssh"
-
-#~ msgid "Configuration"
-#~ msgstr "پیکربندی"
-
-#~ msgid "Tools to ease the configuration of your computer"
-#~ msgstr "ابزارهای برای آسان‌ کردن پیکربندی رایانه‌اتان"
-
-#~ msgid "Scientific Workstation"
-#~ msgstr "ایستگاه‌کار دانشی"
-
-#~ msgid "Scientific applications such as gnuplot"
-#~ msgstr "برنامه‌های دانشی مانند gnuplot"
-
-#~ msgid "Console Tools"
-#~ msgstr "ابزارهای کنسول"
-
-#~ msgid "Editors, shells, file tools, terminals"
-#~ msgstr "ویرایش‌گرها، پوسته‌ها، ابزار پرونده، پایانه‌ها"
-
-#~ msgid "KDE Workstation"
-#~ msgstr "ایستگاه‌کار KDE "
-
-#~ msgid ""
-#~ "The K Desktop Environment, the basic graphical environment with a "
-#~ "collection of accompanying tools"
-#~ msgstr "محیط رومیزی K، محیط گرافیکی پایه با مجموعه‌ای از ابزارهای ضمیمه"
-
-#~ msgid "Gnome Workstation"
-#~ msgstr "ایستگاه‌کار گنوم"
-
-#~ msgid ""
-#~ "A graphical environment with user-friendly set of applications and "
-#~ "desktop tools"
-#~ msgstr ""
-#~ "محیط گرافیکی کاربر-دوستانه با مجموعه‌ای از برنامه‌ها و ابزارهای رومیزی"
-
-#~ msgid "Other Graphical Desktops"
-#~ msgstr "دیگر رومیزی‌های گرافیکی"
-
-#~ msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-#~ msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-
-#~ msgid "C and C++ development libraries, programs and include files"
-#~ msgstr "کتابخانه‌های برنامه‌سازی C و C++، برنامه‌ها و پرونده‌های شامل"
-
-#~ msgid "Documentation"
-#~ msgstr "نوشتار"
-
-#~ msgid "Books and Howto's on Linux and Free Software"
-#~ msgstr "کتاب‌ها و چگونگی‌ها در لینوکس و نرم‌افزار آزاد"
-
-#~ msgid "LSB"
-#~ msgstr "LSB"
-
-#~ msgid "Linux Standard Base. Third party applications support"
-#~ msgstr "پایه‌ی استاندارد لینوکس. حمایت برنامه‌های شخص سوم"
-
-#~ msgid "Web/FTP"
-#~ msgstr "Web/FTP"
-
-#~ msgid "Apache, Pro-ftpd"
-#~ msgstr "Apache, Pro-ftpd"
-
-#~ msgid "Mail"
-#~ msgstr "پست"
-
-#~ msgid "Postfix mail server"
-#~ msgstr "کارگزار پست Postfix "
-
-#~ msgid "Database"
-#~ msgstr "بانک ‌اطلاعات"
-
-#~ msgid "PostgreSQL or MySQL database server"
-#~ msgstr "کارگزار بانک اطلاعاتی PostgreSQL یا MySQL "
-
-#~ msgid "Firewall/Router"
-#~ msgstr "دیوار‌آتش/مسیریاب"
-
-#~ msgid "Internet gateway"
-#~ msgstr "دروازه‌ی اینترنت"
-
-#~ msgid "DNS/NIS "
-#~ msgstr "DNS/NIS "
-
-#~ msgid "Domain Name and Network Information Server"
-#~ msgstr "کارگزار نام دامنه و اطلاعات شبکه"
-
-#~ msgid "Network Computer server"
-#~ msgstr "کارگزار شبکه‌ی رایانه"
-
-#~ msgid "NFS server, SMB server, Proxy server, ssh server"
-#~ msgstr "کارگزار NFS , کارگزار SMB , کارگزار Proxy , کارگزار ssh "
-
-#~ msgid "Set of tools to read and send mail and news and to browse the Web"
-#~ msgstr ""
-#~ "مجموعه‌ای از ابزارها برای خواندن و فرستادن پست و اخبار و برای مرور وب"
-
-#~ msgid "Lilo message not found"
-#~ msgstr "پیغام Lilo یافت نشد"
-
-#~ msgid "Can't write /etc/sysconfig/bootsplash."
-#~ msgstr "نمی‌توان /etc/sysconfig/bootsplash را نوشت."
-
 #~ msgid ""
-#~ "Can't write /etc/sysconfig/bootsplash\n"
-#~ "File not found."
+#~ "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"
 #~ msgstr ""
-#~ "نمی‌توان پرونده /etc/sysconfig/bootsplash را نوشت \n"
-#~ "پرونده یافت نشد."
-
-#~ msgid "Can't launch mkinitrd -f /boot/initrd-%s.img %s."
-#~ msgstr "نمی‌توان mkinitrd -f /boot/initrd-%s.img %s را اجرا کرد."
-
-#~ msgid ""
-#~ "Can't relaunch LiLo!\n"
-#~ "Launch \"lilo\" as root in command line to complete LiLo theme "
-#~ "installation."
-#~ msgstr ""
-#~ "نمی‌توان LiLo را مجدداً پرتاب نمود! \n"
-#~ "در خط فرمان \"lilo\" را مانند مدیر سیستم برای تکمیل نصب تم LiLo پرتاب "
-#~ "نمایید."
-
-#~ msgid "Theme installation failed!"
-#~ msgstr "نصب تم شکست خورد!"
+#~ "لطفاًً نام واسطی را که به اینترنت اتصال دارد وارد کنید.                \n"
+#~ "                   \n"
+#~ "نمونه‌ها:\n"
+#~ "                    ppp+ برای مودم یا اتصالات DSL, \n"
+#~ "                    eth0, یا eth1 برای اتصال با کابل, \n"
+#~ "                    ippp+ برای یک اتصال isdn.\n"
 
-#~ msgid "LiLo and Bootsplash themes installation successful"
-#~ msgstr "نصب LiLo و تم Bootsplash موفق بود"
-
-#~ msgid "Splash selection"
-#~ msgstr "انتخاب Splash"
-
-#~ msgid ""
-#~ "\n"
-#~ "Select the theme for\n"
-#~ "lilo and bootsplash,\n"
-#~ "you can choose\n"
-#~ "them separately"
-#~ msgstr ""
-#~ "\n"
-#~ "انتخاب طرح برای\n"
-#~ "lilo و bootsplash,\n"
-#~ "شما می‌توانید آنها را\n"
-#~ "جداگانه انتخاب نمایید"
-
-#~ msgid "Lilo screen"
-#~ msgstr "صفحه Lilo "
-
-#~ msgid "Bootsplash"
-#~ msgstr "تصویر آغازگری"
-
-#~ msgid "Build the disk"
-#~ msgstr "ساختن دیسک"
-
-#~ msgid "Get Windows Fonts"
-#~ msgstr "گرفتن قلم‌های نگارش ویندوز"
-
-#~ msgid "Uninstall Fonts"
-#~ msgstr "نصب‌برداری قلم‌های نگارش"
-
-#~ msgid "Advanced Options"
-#~ msgstr "گزینه‌های پیشرفته"
-
-#~ msgid ""
-#~ "\n"
-#~ " Copyright (C) 2001-2002 by MandrakeSoft \n"
-#~ "     DUPONT Sebastien (original version)\n"
-#~ "     CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
-#~ "\n"
-#~ " This program is free software; you can redistribute it and/or modify\n"
-#~ " it under the terms of the GNU General Public License as published by\n"
-#~ " the Free Software Foundation; either version 2, or (at your option)\n"
-#~ " any later version.\n"
-#~ "\n"
-#~ " This program is distributed in the hope that it will be useful,\n"
-#~ " but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-#~ " GNU General Public License for more details.\n"
-#~ "\n"
-#~ " You should have received a copy of the GNU General Public License\n"
-#~ " along with this program; if not, write to the Free Software\n"
-#~ " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, "
-#~ "USA.\n"
-#~ "\n"
-#~ " Thanks:\n"
-#~ "    -  pfm2afm:   \n"
-#~ "\t by Ken Borgendale:\n"
-#~ "\t    Convert a Windows .pfm  file to a .afm (Adobe Font Metrics)\n"
-#~ "    -  type1inst:\n"
-#~ "\t by James Macnicol: \n"
-#~ "\t    type1inst generates files fonts.dir fonts.scale & Fontmap.\n"
-#~ "    -  ttf2pt1:   \n"
-#~ "\t  by Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
-#~ "             Convert ttf font files to afm and pfb fonts\n"
-#~ msgstr ""
-#~ "\n"
-#~ " Copyright (C) 2001-2002 by MandrakeSoft \n"
-#~ "     DUPONT Sebastien (original version)\n"
-#~ "     CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
-#~ "\n"
-#~ " این برنامه یک نرم‌افزار آزاد می‌باشد؛ شما می‌توانید آن را پخش مجدد و یا آن "
-#~ "را تحت \n"
-#~ " شرایط گنو که توسط موسسه نرم‌افزار آزاد منتشر شده است؛ نسخه ۲ یا بالاتر "
-#~ "تغییر دهید\n"
-#~ "\n"
-#~ " این برنامه به امید آنکه مفید بوده ولی بدون هیچگونه ضمانت؛ بدون حتی ضمانت "
-#~ "کارآرایی\n"
-#~ " تجاری یا تناسب برای منظور خاصی می باشد. اجازه نامه گنو را برای تشریحات "
-#~ "بیشتر نگاه کنید\n"
-#~ "\n"
-#~ " شما بایستی یک کپی از این اجازه نامه‌ی گنو را با این برنامه دریافت کرده "
-#~ "باشید؛ اگر نه، به نشانی\n"
-#~ " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, "
-#~ "USA.\n"
-#~ "نامه‌ای برای دریافت آن بنویسید.\n"
-#~ " \n"
-#~ "با تشکر از:\n"
-#~ "    -  pfm2afm:   \n"
-#~ "\t by Ken Borgendale:\n"
-#~ "\t    Convert a Windows .pfm  file to a .afm (Adobe Font Metrics)\n"
-#~ "    -  type1inst:\n"
-#~ "\t by James Macnicol: \n"
-#~ "\t    type1inst generates files fonts.dir fonts.scale & Fontmap.\n"
-#~ "    -  ttf2pt1:   \n"
-#~ "\t  by Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
-#~ "             Convert ttf font files to afm and pfb fonts\n"
-
-#~ msgid ""
-#~ "A custom bootdisk provides a way of booting into your Linux system "
-#~ "without\n"
-#~ "depending on the normal bootloader. This is useful if you don't want to "
-#~ "install\n"
-#~ "LILO (or grub) on your system, or another operating system removes LILO, "
-#~ "or LILO doesn't\n"
-#~ "work with your hardware configuration. A custom bootdisk can also be used "
-#~ "with\n"
-#~ "the Mandrake rescue image, making it much easier to recover from severe "
-#~ "system\n"
-#~ "failures. Would you like to create a bootdisk for your system?\n"
-#~ "%s"
-#~ msgstr ""
-#~ "یک دیسکچه آغازگر اختصاصی، custom bootdisk، روشی از آغازگری بدرون \n"
-#~ "سیستم لینوکس را عرضه می‌دارد که شما به بارگزار آغازگر bootloader معمولی \n"
-#~ "وابسته نمی‌شوید. این روش اگر شما نمی‌خواهید آغازگر لینوکس، LILO (یا grub)،\n"
-#~ " را بر سیستم خود نصب کنید، یا سیستم عامل دیگری آغازگر لینوکس را پاک "
-#~ "کند، \n"
-#~ "یا آغازگر لینوکس با تنظیم سخت‌افزار شما کار نکند مفید می‌باشد. \n"
-#~ "یک دیسکچه آغازگر اختصاصی می‌تواند برای کار کردن با تصویر نجات مان‌درایک "
-#~ "استفاده \n"
-#~ "شود که بازسازی سیستم خراب شده را بسیار آسان می‌سازد. آیا مایل هستید یک "
-#~ "دیسکچه \n"
-#~ "آغازگر برای سیستم خود بسازید؟ \n"
-#~ "%s "
-
-#~ msgid "Unable to start live upgrade !!!\n"
-#~ msgstr "نمی‌توانم ارتقا را بطور زنده شروع کنم!!!\n"
-
-#~ msgid "Use the %c and %c keys for selecting which entry is highlighted."
-#~ msgstr "استفاده از کلیدهای %c و %c برای انتخاب یک کدام از ورودی‌ها."
-
-#~ msgid "The highlighted entry will be booted automatically in %d seconds."
-#~ msgstr "ورودی تایین شده در %d ثانیه بطور خودکار آغازگری خواهد شد."
-
-#~ msgid "Second floppy drive"
-#~ msgstr "دستگاه دیسکچه دوم"
-
-#~ msgid "Sorry, no floppy drive available"
-#~ msgstr "متاسفم، هیچ دستگاه دیسکچه موجود نمی‌باشد"
-
-#~ msgid ""
-#~ "Please insert the Installation Cd-Rom in your drive and press Ok when "
-#~ "done.\n"
-#~ "If you don't have it, press Cancel to avoid live upgrade."
-#~ msgstr ""
-#~ "لطفاً Cd-Rom نصب را در دستگاه خود وارد نموده و در پایان تایید را فشار "
-#~ "دهید. اگر شما آن را ندارید، لغو را برای جلوگیری از بروزسازی زنده فشار "
-#~ "دهید."
-
-#~ msgid "Change Cd-Rom"
-#~ msgstr "سی دی را عوض کنید"
-
-#~ msgid "commands before booting, or 'c' for a command-line."
-#~ msgstr "فرمان‌های قبل از آغازگری، یا 'c' برای خط فرمان."
-
-#~ msgid "Choose the floppy drive you want to use to make the bootdisk"
-#~ msgstr ""
-#~ "انتخاب دستگاه دیسکچه‌ای که می‌خواهید برای ساختن دیسک آغازگری استفاده نمایید"
-
-#~ msgid ""
-#~ "A custom bootdisk provides a way of booting into your Linux system "
-#~ "without\n"
-#~ "depending on the normal bootloader. This is useful if you don't want to "
-#~ "install\n"
-#~ "SILO on your system, or another operating system removes SILO, or SILO "
-#~ "doesn't\n"
-#~ "work with your hardware configuration. A custom bootdisk can also be used "
-#~ "with\n"
-#~ "the Mandrake rescue image, making it much easier to recover from severe "
-#~ "system\n"
-#~ "failures.\n"
-#~ "\n"
-#~ "If you want to create a bootdisk for your system, insert a floppy in the "
-#~ "first\n"
-#~ "drive and press \"Ok\"."
-#~ msgstr ""
-#~ "یک دیسک آغازگر اختصاصی روشی از آغازگری بدرون سیستم لینوکس را بدون\n"
-#~ "وابستگی به بارگزار آغازگر عادی را عرضه می‌دارد. اگر نخواهید SILO را بر "
-#~ "سیستم\n"
-#~ "خود نصب کنید، یا یک سیستم عامل دیگر SILO را بردارد، یا SILO با تنظیمات "
-#~ "سخت‌افزاری\n"
-#~ "شما کار نکند مفید می‌باشد. یک دیسک آغازگر اختصاصی می‌تواند همچنین با تصویر\n"
-#~ "نجات مان‌درایک استفاده شود، که بازآوری سیستم را از یک اشکال مهلک بسیار "
-#~ "آسان\n"
-#~ "می‌سازد.\n"
-#~ "\n"
-#~ "اگر می‌خواهید برای سیستم خود یک دیسک آغازگر بسازید، یک دیسکچه را به اولین\n"
-#~ "دستگاه داخل کرده و \"تایید\" را فشار دهید."
-
-#~ msgid "Press enter to boot the selected OS, 'e' to edit the"
-#~ msgstr ""
-#~ "تکمه ورود را برای آغازگری سیستم عامل انتخاب شده فشار دهید، برای ویرایش "
-#~ "'e' را"
-
-#~ msgid "Insert a floppy in %s"
-#~ msgstr "یک دیسکچه را به %s داخل نمایید"
-
-#~ msgid "First floppy drive"
-#~ msgstr "دستگاه دیسکچه اول"
-
-#~ msgid "Create a bootdisk"
-#~ msgstr "ایجاد یک دیسک آغازگر"
-
-#~ msgid "Welcome to GRUB the operating system chooser!"
-#~ msgstr "به GRUB انتخاب کننده‌ی سیستم عامل خوش آمدید!"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "(WARNING! You're using XFS for your root partition,\n"
-#~ "creating a bootdisk on a 1.44 Mb floppy will probably fail,\n"
-#~ "because XFS needs a very large driver)."
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "(اخطار! شما از XFS برای قسمت‌بندی ریشه‌ی خود استفاده می‌کنید،\n"
-#~ "ایجاد یک دیسک آغازگر بر روی یک ۱.۴۴مگابایت دیسکچه احتمالاً شکست \n"
-#~ "خواهد خورد، برای اینکه XFS احتیاج به یک راه‌انداز بسیار بزرگ دارد)."
-
-#~ msgid "DVD-R device"
-#~ msgstr "دستگاه DVDR"
-
-#~ msgid "Creating bootdisk..."
-#~ msgstr "در حال ایجاد دیسک آغازگر"
-
-#~ msgid "Lilo/grub mode"
-#~ msgstr "حالت Lilo/grub "
-
-#~ msgid ""
-#~ "You are currently using %s as your boot manager.\n"
-#~ "Click on Configure to launch the setup wizard."
-#~ msgstr ""
-#~ "شما در حال حاضر از %s مانند مدیر آغازگری خود استفاده می‌کنید. \n"
-#~ "بر روی تنظیم برای شروع جادوگر برپاسازی کلیک نمایید."
-
-#~ msgid "Yaboot mode"
-#~ msgstr "حالت Yaboot "
-
-#~ msgid "Choose the profile to configure"
-#~ msgstr "نمایه‌ای را برای تنظیم انتخاب نمایید "
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Enter a Zeroconf host name without any dot if you don't\n"
-#~ "want to use the default host name."
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "یک نام میزبان  Zeroconf را بدون هیچ نقطه‌ای وارد نمایید \n"
-#~ "البته اگر نمی‌خواهید از نام میزبان پیش‌فرض استفاده کنید."
-
-#~ msgid "Internet configuration"
-#~ msgstr "تنظیم اینترنت"
-
-#~ msgid " isdn"
-#~ msgstr " isdn"
-
-#~ msgid "Configuring network"
-#~ msgstr "در حال تنظیم شبکه"
-
-#~ msgid "modem"
-#~ msgstr " مودم"
-
-#~ msgid "cable connection detected"
-#~ msgstr "ارتباط کابلی شناسایی شد"
-
-#~ msgid "Network configuration"
-#~ msgstr "تنظیمات شبکه"
-
-#~ msgid "ethernet card(s) detected"
-#~ msgstr "کارت ایترنت شناسایی شد"
-
-#~ msgid " adsl"
-#~ msgstr " adsl"
-
-#~ msgid " local network"
-#~ msgstr " شبکه محلی"
-
-#~ msgid " cable"
-#~ msgstr " کابل"
-
-#~ msgid "\"%s\" is not a valid email!"
-#~ msgstr "\"%s\" یک پست الکترونیکی معتبر نمی‌باشد!"
-
-#~ msgid "Configure Internet Access..."
-#~ msgstr "تنظیم دسترسی به اینترنت..."
-
-#~ msgid "Delete profile"
-#~ msgstr "حذف نمایه"
-
-#~ msgid "Type:"
-#~ msgstr "نوع:"
-
-#~ msgid "Del profile..."
-#~ msgstr "حذف نمایه..."
-
-#~ msgid "Launch the wizard"
-#~ msgstr "شروع جادوگر "
-
-#~ msgid "Profile to delete:"
-#~ msgstr "نمایه برای حذف"
-
-#~ msgid ""
-#~ "Name of the profile to create (the new profile is created as a copy of "
-#~ "the current one) :"
-#~ msgstr ""
-#~ "نام نمایه برای ایجاد (نمایه جدید مثل یک کپی از نمایه کنونی ایجاد شده است)"
-
-#~ msgid "Profile: "
-#~ msgstr "نمایه:"
-
-#~ msgid "New profile..."
-#~ msgstr "نمایه‌ی جدید..."
-
-#, fuzzy
-#~ msgid "Busy files"
-#~ msgstr "ذخیره پشتیبان پرونده‌های سیستم"
-
-#~ msgid "The setup has already been done, and it's currently enabled."
-#~ msgstr "پیکربندی قبلا انجام شده است و اکنون فعال می‌باشد. "
-
-#~ msgid "Logs"
-#~ msgstr "ثبت‌ها"
-
-#~ msgid "The setup has already been done, but it's currently disabled."
-#~ msgstr "این تنظیم قبلا انجام شده ولی در حال حاضر فعال نمی‌باشد."
-
-#~ msgid "Profile "
-#~ msgstr "نمایه"
-
-#~ msgid ""
-#~ "Welcome to the Internet Connection Sharing utility!\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Click on Configure to launch the setup wizard."
-#~ msgstr ""
-#~ "به ابزار اشتراک ارتباط اینترنت خوش آمدید! \n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "بر روی تنظیم برای پرتاب جادوگر برپاسازی کلیک نمایید."
+#~ msgid "DrakTermServ"
+#~ msgstr "DrakTermServ"
 
-#~ msgid "Internet Connection Sharing configuration"
-#~ msgstr "تنظیم اشتراک ارتباط اینترنت"
+#~ msgid "Under Devel ... please wait."
+#~ msgstr "تحت تهیه ... لطفاً صبر کنید."
 
-#~ msgid "No Internet Connection Sharing has ever been configured."
-#~ msgstr "هیچ اشتراک ارتباط اینترنت تاکنون تنظیم نشده است."
+#~ msgid "Windows (FAT32)"
+#~ msgstr "ویندوز (فات ۳۲)"
 
-#~ msgid "when checked, owner and group won't be changed"
-#~ msgstr "اگر انتخاب شود، مالک و گروه تغییر نخواهند کرد"
+#~ msgid "Use tar and bzip2 (rather than tar and gzip)"
+#~ msgstr "استفاده از tar و bzip2 (بجای tar و gzip)"
 
 #~ msgid ""
-#~ "XawTV isn't installed!\n"
-#~ "\n"
-#~ "\n"
-#~ "If you do have a TV card but DrakX has neither detected it (no bttv nor "
-#~ "saa7134\n"
-#~ "module in \"/etc/modules\") nor installed xawtv, please send the\n"
-#~ "results of \"lspcidrake -v -f\" to \"install@mandrakesoft.com\"\n"
-#~ "with subject \"undetected TV card\".\n"
-#~ "\n"
-#~ "\n"
-#~ "You can install it by typing \"urpmi xawtv\" as root, in a console."
+#~ "Change\n"
+#~ "Restore Path"
 #~ msgstr ""
-#~ "XawTV نصب نشده است!\n"
-#~ "\n"
-#~ "\n"
-#~ "اگر شما یک کارت TV دارید ولی نه DrakX توانسته آن را شناسایی (نه بخش bttv "
-#~ "نه saa7134\n"
-#~ "در \"/etc/modules\") نه xawtv نصب شده, لطفا نتیجه \n"
-#~ " \"lspcidrake -v -f\" را به \"install@mandrakesoft.com\" با موضوع\n"
-#~ " \"undetected TV card\" گزارش دهید.\n"
-#~ "\n"
-#~ "\n"
-#~ "شما می‌توانتد آن را بوسیله نوشتن \"urpmi xawtv\" در حالت مدیریت سیستم، در "
-#~ "یک پایانه نصب نمایید."
-
-#~ msgid "http://www.mandrakelinux.com/en/91errata.php3"
-#~ msgstr "http://www.mandrakelinux.com/en/91errata.php3"
-
-#~ msgid "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"
-
-#~ msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
-
-#~ msgid "Error while parsing \"MODULES\" line from %s"
-#~ msgstr "خطا هنگام تجزیه خط \"MODULES\" از %s"
+#~ "تغییر\n"
+#~ "بازسازی مسیر"
diff --git a/perl-install/share/po/is.po b/perl-install/share/po/is.po
index 016859289..189b1d9d5 100644
--- a/perl-install/share/po/is.po
+++ b/perl-install/share/po/is.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2004-02-19 18:02+0100\n"
+"POT-Creation-Date: 2004-03-19 14:32+0100\n"
 "PO-Revision-Date: 2003-09-18 10:44GMT\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -83,7 +83,7 @@ msgid ""
 "plug the key again, and launch Mandrake Move again."
 msgstr ""
 
-#: ../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 "Endurræsa"
@@ -132,44 +132,51 @@ msgstr "Augnablik, stilli öryggisþrep..."
 #: 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"
@@ -397,15 +404,16 @@ msgstr ""
 msgid "Xpmac (installation display driver)"
 msgstr "Xpmac (installation display driver)"
 
-#: 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 "Sérsniðið"
 
 #: 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 "Hætta"
@@ -432,11 +440,11 @@ msgstr "Prófa"
 
 #: 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 "Valkostir"
@@ -469,7 +477,7 @@ msgstr "Plug'n Play"
 msgid "Generic"
 msgstr "Almenn"
 
-#: 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"
@@ -552,52 +560,51 @@ msgid "Graphics card: %s"
 msgstr "Skjákort: %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 "Í lagi"
 
-#: 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 "Hætta við"
 
 #: 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 "Hjálp"
@@ -731,19 +738,20 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "Hvaða staðal notar sjónvarpið þitt?"
 
-#: 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 "Augnablik..."
 
-#: any.pm:98
+#: any.pm:103
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "Er að setja upp ræsistjóra"
 
-#: any.pm:137
+#: any.pm:142
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -758,270 +766,270 @@ msgstr ""
 "\n"
 "Af hvaða disk ræsir þú?"
 
-#: 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 "Í ræsifærsluna (MBR)"
 
-#: any.pm:161
+#: any.pm:166
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Á fyrsta geira ræsidisksneiðar"
 
-#: any.pm:163
+#: any.pm:168
 #, c-format
 msgid "On Floppy"
 msgstr "Á diskling"
 
-#: 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 "Sleppa"
 
-#: any.pm:170
+#: any.pm:175
 #, c-format
 msgid "SILO Installation"
 msgstr "SILO uppsetning"
 
-#: any.pm:170
+#: any.pm:175
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "LILO/grub uppsetning"
 
-#: any.pm:171
+#: any.pm:176
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "Hvert viltu setja ræsistjórann?"
 
-#: any.pm:192
+#: any.pm:197
 #, c-format
 msgid "First sector of boot partition"
 msgstr "Á fyrsta geira ræsidisksneiðar"
 
-#: any.pm:204 any.pm:239
-#, c-format
-msgid "Bootloader main options"
-msgstr "Aðalvalmöguleikar ræsiforrits"
-
-#: any.pm:205
+#: any.pm:208
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Uppsetning ræsistíls"
 
-#: any.pm:209
+#: any.pm:210 any.pm:244
+#, c-format
+msgid "Bootloader main options"
+msgstr "Aðalvalmöguleikar ræsiforrits"
+
+#: any.pm:214
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "Sláðu inn vinnsluminni í MB"
 
-#: any.pm:211
+#: any.pm:216
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Valkosturinn ``Takmarka alla rofa á skipanalínu'' gerir ekkert án lykilorðs"
 
-#: 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 "Mismunandi lykilorð"
 
-#: 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 "Reyndu aftur"
 
-#: 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 "Ræsiforrit sem á að nota"
 
-#: any.pm:219
+#: any.pm:224
 #, c-format
 msgid "Bootloader installation"
 msgstr "Uppsetning ræsistjóra"
 
-#: any.pm:221 any.pm:244 help.pm:768
+#: any.pm:226 any.pm:249 help.pm:768
 #, c-format
 msgid "Boot device"
 msgstr "Ræsitæki"
 
-#: any.pm:223
+#: any.pm:228
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Töf áður en sjálfgefin ræsing byrjar"
 
-#: any.pm:224 help.pm:768
+#: any.pm:229 help.pm:768
 #, c-format
 msgid "Enable ACPI"
 msgstr "Virkja ACPI"
 
-#: any.pm:225
+#: any.pm:230
 #, c-format
 msgid "Force No APIC"
 msgstr "Þvinga engan APIC"
 
-#: 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 "Lykilorð"
 
-#: 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 "Lykilorð (aftur)"
 
-#: any.pm:229
+#: any.pm:234
 #, c-format
 msgid "Restrict command line options"
 msgstr "Takmarka alla rofa á skipanlínu"
 
-#: any.pm:229
+#: any.pm:234
 #, c-format
 msgid "restrict"
 msgstr "takmarka"
 
-#: any.pm:231
+#: any.pm:236
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "Hreinsa /tmp við hverja ræsingu"
 
-#: any.pm:232
+#: any.pm:237
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Nákvæm stærð vinnsluminnis (fann %d MB)"
 
-#: any.pm:234
+#: any.pm:239
 #, c-format
 msgid "Enable multiple profiles"
 msgstr "Virkja mörg snið"
 
-#: any.pm:243
+#: any.pm:248
 #, c-format
 msgid "Init Message"
 msgstr "Init skilaboð"
 
-#: any.pm:245
+#: any.pm:250
 #, c-format
 msgid "Open Firmware Delay"
 msgstr ""
 
-#: any.pm:246
+#: any.pm:251
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Kjarna ræsibið:"
 
-#: any.pm:247
+#: any.pm:252
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "Virkja CD ræsingu?"
 
-#: any.pm:248
+#: any.pm:253
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "Virkja OF ræsingu?"
 
-#: any.pm:249
+#: any.pm:254
 #, c-format
 msgid "Default OS?"
 msgstr "Sjálfgefið stýrikerfi?"
 
-#: any.pm:290
+#: any.pm:295
 #, c-format
 msgid "Image"
 msgstr "Ræsikjarna"
 
-#: any.pm:291 any.pm:300
+#: any.pm:296 any.pm:305
 #, c-format
 msgid "Root"
 msgstr "Rót"
 
-#: any.pm:292 any.pm:313
+#: any.pm:297 any.pm:318
 #, c-format
 msgid "Append"
 msgstr "Bæta aftan við"
 
-#: any.pm:294
+#: any.pm:299
 #, c-format
 msgid "Video mode"
 msgstr "Skjáhamur"
 
-#: 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 "Nafn"
 
-#: 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 "Sjálfgefið"
 
-#: any.pm:314
+#: any.pm:319
 #, c-format
 msgid "Initrd-size"
 msgstr "Initrd-stærð"
 
-#: 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 "Autt er ekki leyft"
 
-#: any.pm:328
+#: any.pm:333
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Þú verður að skilgreina ræsikjarna"
 
-#: any.pm:328
+#: any.pm:333
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Þú verður að hafa disksneið fyrir rótina"
 
-#: any.pm:329
+#: any.pm:334
 #, c-format
 msgid "This label is already used"
 msgstr "Þetta nafn er nú þegar í notkun."
 
-#: any.pm:342
+#: any.pm:347
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Hverju viltu bæta við?"
 
-#: 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 "Öðru stýrikerfi (SunOS...)"
 
-#: any.pm:344
+#: any.pm:349
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "Öðru stýrikerfi (MacOS...)"
 
-#: any.pm:344
+#: any.pm:349
 #, c-format
 msgid "Other OS (windows...)"
 msgstr "Öðru stýrikerfi (Windows...)"
 
-#: any.pm:372
+#: any.pm:377
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1030,73 +1038,73 @@ msgstr ""
 "Hérna eru núverandi stillingar á ræsivalmynd .\n"
 "Þú getur bætt við fleirum eða breytt þessum."
 
-#: any.pm:504
+#: any.pm:509
 #, c-format
 msgid "access to X programs"
 msgstr "aðgengi að X forritum"
 
-#: any.pm:505
+#: any.pm:510
 #, c-format
 msgid "access to rpm tools"
 msgstr "aðgengi að rpm tólum"
 
-#: any.pm:506
+#: any.pm:511
 #, c-format
 msgid "allow \"su\""
 msgstr "leyfa \"su\""
 
-#: any.pm:507
+#: any.pm:512
 #, c-format
 msgid "access to administrative files"
 msgstr "aðgengi að stýrikerfisskrám"
 
-#: any.pm:508
+#: any.pm:513
 #, c-format
 msgid "access to network tools"
 msgstr "aðgengi að nettólum"
 
-#: any.pm:509
+#: any.pm:514
 #, c-format
 msgid "access to compilation tools"
 msgstr "aðgengi að þróunartólum"
 
-#: any.pm:515
+#: any.pm:520
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s er nú þegar til)"
 
-#: any.pm:520
+#: any.pm:525
 #, c-format
 msgid "This password is too simple"
 msgstr "Þetta lykilorð er of einfalt"
 
-#: any.pm:521
+#: any.pm:526
 #, c-format
 msgid "Please give a user name"
 msgstr "Vinsamlega sláðu inn notandanafn"
 
-#: any.pm:522
+#: any.pm:527
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Notandanafnið má bara innihalda litla stafi, tölustafi, `-' og `_'"
 
-#: any.pm:523
+#: any.pm:528
 #, c-format
 msgid "The user name is too long"
 msgstr "Þetta notandanafn er of langt"
 
-#: any.pm:524
+#: any.pm:529
 #, c-format
 msgid "This user name has already been added"
 msgstr "Þetta notandanafn er nú þegar til"
 
-#: any.pm:528
+#: any.pm:533
 #, c-format
 msgid "Add user"
 msgstr "Bæta við notanda"
 
-#: any.pm:529
+#: any.pm:534
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1105,125 +1113,125 @@ msgstr ""
 "Sláðu inn notanda\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 "Búið"
 
-#: any.pm:533 help.pm:52
+#: any.pm:538 help.pm:52
 #, c-format
 msgid "Accept user"
 msgstr "Samþykkja notanda"
 
-#: any.pm:544
+#: any.pm:549
 #, c-format
 msgid "Real name"
 msgstr "Nafn notanda"
 
-#: 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 "Notandanafn"
 
-#: any.pm:548
+#: any.pm:553
 #, c-format
 msgid "Shell"
 msgstr "Skel"
 
-#: any.pm:550
+#: any.pm:555
 #, c-format
 msgid "Icon"
 msgstr "Táknmynd"
 
-#: any.pm:591 security/l10n.pm:14
+#: any.pm:596 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Autologin"
 
-#: any.pm:592
+#: any.pm:597
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "Ég get stillt tölvuna þína til að stimpla sjálfkrafa inn einn notanda."
 
-#: any.pm:593 help.pm:52
+#: any.pm:598 help.pm:52
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Viltu nota þennan eiginleika?"
 
-#: any.pm:594
+#: any.pm:599
 #, c-format
 msgid "Choose the default user:"
 msgstr "Veldu sjálfgefinn notanda:"
 
-#: any.pm:595
+#: any.pm:600
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Veldu gluggastjórann sem þú vilt nota:"
 
-#: any.pm:607
+#: any.pm:612
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Vinsamlega veldu tungumál sem á að nota."
 
-#: 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 getur stutt mörg tungumál.  Veldu tungumál\n"
+"Mandrakelinux getur stutt mörg tungumál.  Veldu tungumál\n"
 "sem þú vilt setja upp stuðning fyrir.  Þau verða tiltæk þegar\n"
 "uppsetningu er lokið. og þú endurræsir kerfið."
 
-#: any.pm:646 help.pm:660
+#: any.pm:651 help.pm:660
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Sjálfgefið að nota Unicode"
 
-#: any.pm:647 help.pm:660
+#: any.pm:652 help.pm:660
 #, c-format
 msgid "All languages"
 msgstr "Öll tungumál"
 
-#: 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 "Land / Svæði"
 
-#: any.pm:684
+#: any.pm:689
 #, c-format
 msgid "Please choose your country."
 msgstr "Veldu þér land,"
 
-#: any.pm:686
+#: any.pm:691
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Hér er listi af tiltækum löndum"
 
-#: 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 "Meira"
 
-#: any.pm:818
+#: any.pm:823
 #, c-format
 msgid "No sharing"
 msgstr "Engin miðlun"
 
-#: any.pm:818
+#: any.pm:823
 #, c-format
 msgid "Allow all users"
 msgstr "Leyfa öllum notendum"
 
-#: any.pm:822
+#: any.pm:827
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1238,23 +1246,23 @@ msgstr ""
 "\n"
 "\"Sérsniðið\" leyfir að stilla fyrir hvern notanda.\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 "Þú getur miðlað með NFS eða Samba. Veldu hvort þú vilt nota."
 
-#: any.pm:846
+#: any.pm:851
 #, fuzzy, c-format
 msgid "The package %s is going to be removed."
 msgstr "Eftirfarandi pakkar verða fjarlægðir"
 
-#: any.pm:858
+#: any.pm:863
 #, c-format
 msgid "Launch userdrake"
 msgstr "Ræsa userdrake"
 
-#: any.pm:860
+#: any.pm:865
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1355,7 +1363,7 @@ msgstr "Get ekki notað útsendingu án NIS léns"
 # so use only 7bit for this message (and do transliteration or
 # leave it in English, as it is the best for your language)
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:542
+#: bootloader.pm:533
 #, fuzzy, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1372,56 +1380,56 @@ msgstr ""
 "eda biddu i %d sekundur thar til sjalfgefin raesing hefst.\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 með grafískri valmynd"
 
-#: bootloader.pm:677 help.pm:768
+#: bootloader.pm:670 help.pm:768
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO með textavalmynd"
 
-#: 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 "ekki nægilegt pláss í /boot"
 
-#: bootloader.pm:1178
+#: bootloader.pm:1175
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "Þú getur ekki sett ræsistjórann á %s disksneiðina\n"
 
-#: bootloader.pm:1218
+#: bootloader.pm:1219
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr ""
 
-#: 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 ""
 
-#: bootloader.pm:1226
+#: bootloader.pm:1227
 #, fuzzy, c-format
 msgid "Re-install Boot Loader"
 msgstr "Setja inn ræsistjóra"
@@ -1461,90 +1469,91 @@ msgstr "1 mínútu"
 msgid "%d seconds"
 msgstr "%d sekúndur"
 
-#: common.pm:196
+#: common.pm:197
 #, c-format
 msgid "Can't make screenshots before partitioning"
 msgstr "Get ekki tekið skjámyndir fyrr en disksneiðar hafa verið skilgreindar"
 
-#: common.pm:203
+#: common.pm:204
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skjámyndir verða tiltækar eftir uppsetningu í %s"
 
-#: common.pm:268
+#: common.pm:269
 #, c-format
 msgid "kdesu missing"
 msgstr "kdesu vantar"
 
-#: common.pm:271
+#: common.pm:272
 #, c-format
 msgid "consolehelper missing"
 msgstr "consolehelper vantar"
 
-#: 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 "Frakkland"
 
-#: crypto.pm:15 lang.pm:207
+#: crypto.pm:15 lang.pm:212
 #, c-format
 msgid "Costa Rica"
 msgstr "Kosta Ríka"
 
-#: 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 "Belgía"
 
-#: 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ékkland"
 
-#: 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 "Þýskaland"
 
-#: crypto.pm:19 crypto.pm:32 lang.pm:244
+#: crypto.pm:19 crypto.pm:32 lang.pm:249
 #, c-format
 msgid "Greece"
 msgstr "Grikkland"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:317
+#: crypto.pm:20 crypto.pm:33 lang.pm:322
 #, c-format
 msgid "Norway"
 msgstr "Noregur"
 
-#: 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 "Svíþjóð"
 
-#: 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 "Ítalía"
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:172
+#: crypto.pm:24 crypto.pm:38 lang.pm:177
 #, c-format
 msgid "Austria"
 msgstr "Austurríki"
 
-#: 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 "Bandaríkin"
@@ -1625,7 +1634,7 @@ msgstr "Vinsamlega taktu fyrst afrit af öllum gögnum"
 #: 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 ""
@@ -1658,6 +1667,7 @@ msgid "Please click on a partition"
 msgstr "Smelltu á disksneið"
 
 #: 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 "Ítarlegar"
@@ -1698,7 +1708,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 "Annað"
@@ -1820,7 +1830,7 @@ msgstr "Allar aðal-skráarsneiðar eru í notkun"
 
 #: diskdrake/interactive.pm:330
 #, c-format
-msgid "I can't add any more partition"
+msgid "I can't add any more partitions"
 msgstr "Get ekki bætt við disksneiðum"
 
 #: diskdrake/interactive.pm:331
@@ -1872,13 +1882,19 @@ msgstr ""
 "Disksneiðin sem var tekin sem afrit er ekki af sömu stærð\n"
 "Halda áfram?"
 
-#: 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 "Aðvörun"
@@ -2425,8 +2441,8 @@ msgstr "Þetta lykilorð er of einfalt (verður að vera minnst %d stafa langt)"
 msgid "The encryption keys do not match"
 msgstr "Dulritunarlyklarnir eru mismunandi"
 
-#: 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 "Dulritunarlykill"
@@ -2469,7 +2485,7 @@ msgstr ""
 "Vinsamlega gefðu upp notandanafn, lykilorð og nafn léns til að fá aðgang að "
 "þessum miðlara"
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3874
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3591
 #, c-format
 msgid "Username"
 msgstr "Notandanafn"
@@ -2499,36 +2515,36 @@ msgstr "Pakkinn %s þarfnast innsetningar, viltu setja hann inn?"
 msgid "Mandatory package %s is missing"
 msgstr "Vantar nauðsynlegan pakka %s"
 
-#: do_pkgs.pm:136
+#: do_pkgs.pm:143
 #, c-format
 msgid "Installing packages..."
 msgstr "Set inn pakka..."
 
-#: do_pkgs.pm:210
+#: do_pkgs.pm:217
 #, fuzzy, c-format
 msgid "Removing packages..."
 msgstr "Fjarlægi %s..."
 
-#: fs.pm:399
+#: fs.pm:409
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
 "(e.g, for faster access on the news spool to speed up news servers)."
 msgstr ""
 
-#: fs.pm:402
+#: fs.pm:412
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
 "the -a option will not cause the file system to be mounted)."
 msgstr ""
 
-#: fs.pm:405
+#: fs.pm:415
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 
-#: fs.pm:407
+#: fs.pm:417
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2536,7 +2552,7 @@ msgid ""
 "containing binaries for architectures other than its own."
 msgstr ""
 
-#: fs.pm:411
+#: fs.pm:421
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2544,17 +2560,17 @@ msgid ""
 "have suidperl(1) installed.)"
 msgstr ""
 
-#: fs.pm:415
+#: fs.pm:425
 #, c-format
 msgid "Mount the file system read-only."
 msgstr ""
 
-#: fs.pm:417
+#: fs.pm:427
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr ""
 
-#: fs.pm:421
+#: fs.pm:431
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2565,52 +2581,57 @@ msgid ""
 "user,exec,dev,suid )."
 msgstr ""
 
-#: fs.pm:429
+#: fs.pm:439
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "Veita skrifleyfi til venjulegra notenda"
 
-#: fs.pm:565 fs.pm:575 fs.pm:579 fs.pm:583 fs.pm:587 fs.pm:591 swap.pm:12
+#: fs.pm:441
+#, fuzzy, c-format
+msgid "Give read-only access to ordinary users"
+msgstr "Veita skrifleyfi til venjulegra notenda"
+
+#: 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 forsniðið á %s mistókst"
 
-#: fs.pm:628
+#: fs.pm:647
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "kann ekki að forsníða %s af tegundinni %s"
 
-#: fs.pm:635 fs.pm:642
+#: fs.pm:654 fs.pm:661
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Forsníð disksneið %s"
 
-#: fs.pm:639
+#: fs.pm:658
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "bý til og forsníð skrá %s"
 
-#: fs.pm:705 fs.pm:758
+#: fs.pm:718 fs.pm:771
 #, c-format
 msgid "Mounting partition %s"
 msgstr "Tengi disksneið %s"
 
-#: fs.pm:706 fs.pm:759
+#: fs.pm:719 fs.pm:772
 #, c-format
 msgid "mounting partition %s in directory %s failed"
 msgstr "tenging disksneiðar %s í möppu %s mistókst"
 
-#: fs.pm:726 fs.pm:734
+#: fs.pm:739 fs.pm:747
 #, c-format
 msgid "Checking %s"
 msgstr "Athuga %s"
 
-#: fs.pm:775 partition_table.pm:636
+#: fs.pm:788 partition_table.pm:638
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "villa við að aftengja %s: %s"
 
-#: fs.pm:807
+#: fs.pm:820
 #, c-format
 msgid "Enabling swap partition %s"
 msgstr "Virkja diskminni á disksneið %s"
@@ -2649,32 +2670,32 @@ msgstr ""
 "\n"
 "Viltu eyða öllum þessum disksneiðum?\n"
 
-#: fsedit.pm:514
+#: fsedit.pm:513
 #, c-format
 msgid "You can't use JFS for partitions smaller than 16MB"
 msgstr "Þú getur ekki notað JFS á disksneiðar minni en 16MB"
 
-#: fsedit.pm:515
+#: fsedit.pm:514
 #, c-format
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr "Þú getur ekki notað ReiserFs á disksneiðar minni en 32MB"
 
-#: fsedit.pm:534
+#: fsedit.pm:533
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Heiti tengipunkta verða að byrja á /."
 
-#: fsedit.pm:535
+#: fsedit.pm:534
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "Heiti tengipunkta eiga aðeins að innihalda bókstafi og tölur"
 
-#: fsedit.pm:536
+#: fsedit.pm:535
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Það er þegar disksneið með tengipunktinn %s\n"
 
-#: fsedit.pm:538
+#: fsedit.pm:537
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2685,24 +2706,35 @@ msgstr ""
 "ræsistjóri ræður við þetta án sérstakrar /boot sneiðar.\n"
 "Vinsamlega passaðu uppá að bæta við sneið fyrir /boot"
 
-#: fsedit.pm:541
+#: fsedit.pm:540
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "Þú gtur ekki notað LVM sýndardisk fyrir tengipunkt %s"
 
-#: fsedit.pm:543
+#: fsedit.pm:542
+#, fuzzy, 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 ""
+"Þú hefur valið að nota RAID hugbúnað til að stjórna rótarsneið (/).\\ Enginn "
+"ræsistjóri ræður við þetta án sérstakrar /boot sneiðar.\n"
+"Vinsamlega passaðu uppá að bæta við sneið fyrir /boot"
+
+#: fsedit.pm:545
 #, c-format
 msgid ""
 "You may not be able to install lilo (since lilo doesn't handle a LV on "
 "multiple PVs)"
 msgstr ""
 
-#: fsedit.pm:546 fsedit.pm:548
+#: fsedit.pm:548 fsedit.pm:550
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "Þessi mappa ætti að vera í rótarskráarkerfinu"
 
-#: fsedit.pm:550
+#: fsedit.pm:552
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
@@ -2711,22 +2743,22 @@ msgstr ""
 "Þú þarft raunverulegt skráarkerfi (ext2/ext3, reiserfs, xfs, eða jfs) fyrir "
 "þennan tengipunkt\n"
 
-#: fsedit.pm:552
+#: fsedit.pm:554
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr "Þú getur ekki notað dulritað skráarkerfi á tengipunkt %s"
 
-#: fsedit.pm:613
+#: fsedit.pm:615
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "Ekki nægilegt pláss til sjálfvirkrar úthlutunar"
 
-#: fsedit.pm:615
+#: fsedit.pm:617
 #, c-format
 msgid "Nothing to do"
 msgstr "Ekkert að gera"
 
-#: fsedit.pm:711
+#: fsedit.pm:713
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Villa við að opna %s til skriftar: %s"
@@ -2761,7 +2793,7 @@ msgstr "CD/DVD skrifarar"
 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 "Segulband"
@@ -2801,36 +2833,41 @@ msgstr "Örgjörvar"
 msgid "ISDN adapters"
 msgstr "ISDN spjald"
 
-#: harddrake/data.pm:71
+#: harddrake/data.pm:70
 #, c-format
 msgid "Ethernetcard"
 msgstr "Netkort"
 
-#: 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 "Módald"
 
-#: harddrake/data.pm:80
+#: harddrake/data.pm:79
 #, c-format
 msgid "ADSL adapters"
 msgstr ""
 
+#: harddrake/data.pm:81
+#, fuzzy, c-format
+msgid "AGP controllers"
+msgstr "USB stýringar"
+
 #: harddrake/data.pm:82
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "Brýr og kerfisstýringar"
 
 #: 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 "Prentari"
 
-#: 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 "Mús"
@@ -2845,52 +2882,52 @@ msgstr "Gleðigandur"
 msgid "(E)IDE/ATA controllers"
 msgstr "(E)IDE/ATA stýringar"
 
-#: harddrake/data.pm:93
+#: harddrake/data.pm:94
 #, c-format
 msgid "Firewire controllers"
 msgstr "Firewire stýringar"
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:95
 #, c-format
 msgid "SCSI controllers"
 msgstr "SCSI stýringar"
 
-#: harddrake/data.pm:95
+#: harddrake/data.pm:96
 #, c-format
 msgid "USB controllers"
 msgstr "USB stýringar"
 
-#: harddrake/data.pm:96
+#: harddrake/data.pm:97
 #, c-format
 msgid "SMBus controllers"
 msgstr "SMBus stýringar"
 
-#: harddrake/data.pm:97
+#: harddrake/data.pm:98
 #, c-format
 msgid "Scanner"
 msgstr "Myndskanni"
 
-#: harddrake/data.pm:99 standalone/harddrake2:315
+#: harddrake/data.pm:100 standalone/harddrake2:319
 #, c-format
 msgid "Unknown/Others"
 msgstr "Óþekkt/annað"
 
-#: 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 "Augnablik... Framkvæmi stillingar"
 
-#: harddrake/sound.pm:182
+#: harddrake/sound.pm:186
 #, c-format
 msgid "No alternative driver"
 msgstr "Enginn aukarekill"
 
-#: 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 "
@@ -2899,12 +2936,12 @@ msgstr ""
 "Það er enginn þekktur OSS/ALSA aukarekill fyrir hljóðkortið þitt (%s) sem nú "
 "notar \"%s\""
 
-#: harddrake/sound.pm:189
+#: harddrake/sound.pm:193
 #, c-format
 msgid "Sound configuration"
 msgstr "Hljóðuppsetning"
 
-#: harddrake/sound.pm:191
+#: harddrake/sound.pm:195
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -2913,7 +2950,7 @@ msgstr ""
 "Hér getur þú valið annan rekil (annað hvort OSS eða ALSA) fyrir hljóðkortið "
 "þitt (%s)"
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:197
 #, c-format
 msgid ""
 "\n"
@@ -2925,7 +2962,7 @@ msgstr ""
 "\n"
 "Kortið þitt notar rekilinn %s\"%s\" (sjálfgefið fyrir kortið þitt er \"%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 "
@@ -2945,17 +2982,17 @@ msgid ""
 "the ALSA library.\n"
 msgstr ""
 
-#: harddrake/sound.pm:209 harddrake/sound.pm:289
+#: harddrake/sound.pm:213 harddrake/sound.pm:293 standalone/drakups:134
 #, c-format
 msgid "Driver:"
 msgstr "Rekill:"
 
-#: harddrake/sound.pm:214
+#: harddrake/sound.pm:218
 #, c-format
 msgid "Trouble shooting"
 msgstr "Vandamálaleit"
 
-#: harddrake/sound.pm:222
+#: harddrake/sound.pm:226
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
@@ -2965,12 +3002,12 @@ msgid ""
 "The new \"%s\" driver'll only be used on next bootstrap."
 msgstr ""
 
-#: harddrake/sound.pm:230
+#: harddrake/sound.pm:234
 #, c-format
 msgid "No open source driver"
 msgstr "Enginn \"frjáls hugbúnaðar\" rekill"
 
-#: 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 "
@@ -2979,32 +3016,32 @@ msgstr ""
 "Það er enginn \"frjáls\" rekill fyrir hljóðkortið þitt (%s) en það er til "
 "rekill framleiðanda á \"%s\"."
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:238
 #, c-format
 msgid "No known driver"
 msgstr "Enginn þekktur rekill"
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:239
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "Það er enginn þekktur rekill fyrir hljóðkortið þitt (%s)"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:243
 #, c-format
 msgid "Unknown driver"
 msgstr "Óþekktur rekill"
 
-#: harddrake/sound.pm:240
+#: harddrake/sound.pm:244
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "Villa: rekillinn \"%s\" er ekki á listanum"
 
-#: harddrake/sound.pm:253
+#: harddrake/sound.pm:257
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Vandamálaleit hljóðkorta"
 
-#: harddrake/sound.pm:254
+#: harddrake/sound.pm:258
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3028,17 +3065,17 @@ msgid ""
 "- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound card.\n"
 msgstr ""
 
-#: harddrake/sound.pm:280
+#: harddrake/sound.pm:284
 #, c-format
 msgid "Let me pick any driver"
 msgstr "Lyfðu mér að velja rekil"
 
-#: harddrake/sound.pm:283
+#: harddrake/sound.pm:287
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "Velja einhvern rekil"
 
-#: 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 "
@@ -3124,13 +3161,13 @@ msgstr "virkja útvarps stuðning"
 #, 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 ""
 
 #: 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 "Samþykkja"
@@ -3178,10 +3215,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 "Næsta"
@@ -3229,7 +3265,7 @@ 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 ""
@@ -3238,12 +3274,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"
@@ -3340,10 +3376,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"
@@ -3364,17 +3400,17 @@ msgid ""
 "create such a floppy."
 msgstr ""
 
-#: 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 "Nei"
 
-#: 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 "Já"
@@ -3389,7 +3425,7 @@ msgstr ""
 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"
@@ -3404,7 +3440,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"
@@ -3427,8 +3463,8 @@ msgid ""
 msgstr ""
 
 #: 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 "Stilla"
@@ -3471,7 +3507,7 @@ msgid ""
 "other machines on your local network as well."
 msgstr ""
 
-#: 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 "Tölvuklukkan stillt á GMT"
@@ -3500,7 +3536,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"
@@ -3601,7 +3637,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"
@@ -3628,7 +3664,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"
@@ -3637,7 +3673,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"
@@ -3723,17 +3759,17 @@ msgstr ""
 msgid "Generate auto-install floppy"
 msgstr "Búa til diskling fyrir sjálfvirka uppsetningu"
 
-#: help.pm:418 install_steps_interactive.pm:1320
+#: help.pm:418 install_steps_interactive.pm:1329
 #, c-format
 msgid "Replay"
 msgstr "Spila aftur"
 
-#: help.pm:418 install_steps_interactive.pm:1320
+#: help.pm:418 install_steps_interactive.pm:1329
 #, c-format
 msgid "Automated"
 msgstr "Sjálfvirkt"
 
-#: help.pm:418 install_steps_interactive.pm:1323
+#: help.pm:418 install_steps_interactive.pm:1332
 #, c-format
 msgid "Save packages selection"
 msgstr "Vista val á pakkahóp"
@@ -3761,27 +3797,27 @@ 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."
 msgstr ""
 
 #: 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 "Fyrri"
+msgstr "Fyrra"
 
 #: 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"
@@ -3795,7 +3831,7 @@ msgid ""
 msgstr ""
 
 #: 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 "Innsetning"
@@ -3827,7 +3863,7 @@ msgstr "Öryggisfulltrúi:"
 #, 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"
@@ -3914,7 +3950,7 @@ msgstr "Víxla milli venjulegs/sérfræðings-hams"
 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"
@@ -3959,7 +3995,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"
@@ -3967,13 +4003,13 @@ 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 ""
 
 #: help.pm:605
@@ -4013,7 +4049,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"
@@ -4140,7 +4176,7 @@ msgid "authentication"
 msgstr "auðkenning"
 
 #. -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 "Ekkert lykilorð"
@@ -4175,7 +4211,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"
@@ -4233,8 +4269,9 @@ msgid ""
 msgstr ""
 
 #: 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 "Bæta við"
@@ -4245,7 +4282,8 @@ msgid "Modify"
 msgstr "Breyta"
 
 #: 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 "Fjarlægja"
@@ -4273,7 +4311,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"
@@ -4303,7 +4341,7 @@ msgstr ""
 msgid "pdq"
 msgstr ""
 
-#: 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"
@@ -4423,8 +4461,8 @@ msgid ""
 "driver."
 msgstr ""
 
-#: 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 "Hljóðkort"
@@ -4554,12 +4592,12 @@ msgstr ""
 "hugmynd að fara vel yfir þessa uppsetningu."
 
 #: 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 "Lyklaborð"
 
-#: help.pm:991 install_steps_interactive.pm:921
+#: help.pm:991 install_steps_interactive.pm:926
 #, c-format
 msgid "Timezone"
 msgstr "Tímabelti"
@@ -4569,7 +4607,7 @@ msgstr "Tímabelti"
 msgid "Graphical Interface"
 msgstr "Grafískt viðmót"
 
-#: help.pm:991 install_steps_interactive.pm:995
+#: help.pm:991 install_steps_interactive.pm:1000
 #, c-format
 msgid "TV card"
 msgstr "Sjónvarpskort"
@@ -4579,27 +4617,27 @@ msgstr "Sjónvarpskort"
 msgid "ISDN card"
 msgstr "ISDN spjald"
 
-#: 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 "Net"
 
-#: help.pm:991 install_steps_interactive.pm:1039
+#: help.pm:991 install_steps_interactive.pm:1044
 #, c-format
 msgid "Security Level"
 msgstr "Öryggisþrep"
 
-#: help.pm:991 install_steps_interactive.pm:1053
+#: help.pm:991 install_steps_interactive.pm:1058
 #, c-format
 msgid "Firewall"
 msgstr "Eldveggur"
 
-#: help.pm:991 install_steps_interactive.pm:1067
+#: help.pm:991 install_steps_interactive.pm:1072
 #, c-format
 msgid "Bootloader"
 msgstr "Ræsistjóri"
 
-#: 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 "Þjónustur"
@@ -4608,11 +4646,11 @@ msgstr "Þjónustur"
 #, fuzzy, 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 ""
 "Veldu harða diskinn sem þú vilt hreinsa allt af til að setja upp nýja\n"
-"Mandrake Linux disksneið.  Varúð, öllum gögnum á disknum verður\n"
+"Mandrakelinux disksneið.  Varúð, öllum gögnum á disknum verður\n"
 "eytt, og það er ekki hægt að sækja þau aftur!"
 
 #: help.pm:999
@@ -4647,7 +4685,7 @@ msgstr ""
 msgid "You must also format %s"
 msgstr "Þú verður einnig að forsníða %s"
 
-#: install_any.pm:413
+#: install_any.pm:411
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -4661,7 +4699,7 @@ msgid ""
 "Do you really want to install these servers?\n"
 msgstr ""
 
-#: install_any.pm:434
+#: install_any.pm:432
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -4674,29 +4712,29 @@ msgstr ""
 "\n"
 "Viltu í alvöru fjarlægja þessa pakka?\n"
 
-#: install_any.pm:812
+#: install_any.pm:827
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Settu tóman FAT forsniðinn diskling í drif %s"
 
-#: install_any.pm:816
+#: install_any.pm:831
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "Þessi disklingur er ekki FAT forsniðinn"
 
-#: install_any.pm:828
+#: install_any.pm:843
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 msgstr ""
 
-#: install_any.pm:856 partition_table.pm:845
+#: install_any.pm:871 partition_table.pm:847
 #, c-format
 msgid "Error reading file %s"
 msgstr "Villa við lestur úr skránni %s"
 
-#: install_any.pm:973
+#: install_any.pm:995
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -4815,7 +4853,7 @@ msgstr "Reikna stærð Windows disksneiðar"
 #, 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 ""
 
@@ -4931,13 +4969,13 @@ msgstr "Keyri niður netið"
 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"
@@ -4991,7 +5029,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"
@@ -5028,7 +5066,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"
@@ -5094,14 +5132,14 @@ msgid ""
 msgstr ""
 
 #: install_messages.pm:128
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of Mandrake "
-"Linux,\n"
+"For information on fixes which are available for this release of "
+"Mandrakelinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5109,20 +5147,20 @@ 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 ""
 "Til hamingju! Innsetningu er lokið.\n"
 "Taktu disklinginn eða geisladiskinn úr drifinu og sláðu á ENTER.\n"
 "\n"
 "\n"
 "viðbætur og/eða lagfæringar á göllum sem gætu verið til\n"
-"staðar í þessari útgáfu af Mandrake Linux má finna á \n"
+"staðar í þessari útgáfu af Mandrakelinux má finna á \n"
 "\n"
 "\n"
 "%s \n"
 "\n"
 "Frekari upplýsingar um hvernig á að stilla vélina eftir innsetninguna er að\n"
-"finna í viðeigandi kafla í Official Mandrake Linux User's Guide bókinni."
+"finna í viðeigandi kafla í Official Mandrakelinux User's Guide bókinni."
 
 #: install_messages.pm:141
 #, c-format
@@ -5134,7 +5172,7 @@ msgstr "http://www.mandrakelinux.com/en/100errata.php3"
 msgid "Duplicate mount point %s"
 msgstr "%s tengipunktur er nú þegar til"
 
-#: install_steps.pm:410
+#: install_steps.pm:406
 #, c-format
 msgid ""
 "Some important packages didn't get installed properly.\n"
@@ -5147,7 +5185,7 @@ msgstr ""
 "Athugaðu geisladiskinn á uppsettri vél með skipuninni\n"
 "\"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
 
-#: install_steps.pm:541
+#: install_steps.pm:535
 #, c-format
 msgid "No floppy drive available"
 msgstr "Ekkert disklingadrif aðgengilegt"
@@ -5161,7 +5199,7 @@ msgstr "Hef skref `%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 ""
@@ -5358,8 +5396,8 @@ msgstr "Viltu samt halda áfram?"
 msgid "There was an error installing packages:"
 msgstr "Það kom upp villa við innsetningu pakka:"
 
-#: 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 "Ekki stillt"
@@ -5454,7 +5492,7 @@ msgstr "IDE"
 msgid "Configuring IDE"
 msgstr "Uppsetning IDE"
 
-#: 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 "Engin tiltæk disksneið"
@@ -5670,177 +5708,176 @@ 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 ""
-"Hef samband við Mandrake Linux vefinn til að sækja lista yfir fáanlega "
+"Hef samband við Mandrakelinux vefinn til að sækja lista yfir fáanlega "
 "spegla..."
 
-#: install_steps_interactive.pm:786
+#: install_steps_interactive.pm:787
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Veldu spegilvélina þaðan sem á að sækja pakkanna"
 
-#: install_steps_interactive.pm:800
+#: install_steps_interactive.pm:801
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "Hef samband við vélina til að sækja lista yfir fáanlega pakka"
 
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:805
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Get ekki tengst spegilvél %s"
 
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:805
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Viltu reyna aftur?"
 
-#: install_steps_interactive.pm:830 standalone/drakclock:42
+#: install_steps_interactive.pm:831 standalone/drakclock:42
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Hvert er þitt tímabelti?"
 
-#: install_steps_interactive.pm:835
+#: install_steps_interactive.pm:836
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Sjálfvirk tímastilling (með NTP)"
 
-#: install_steps_interactive.pm:843
+#: install_steps_interactive.pm:844
 #, c-format
 msgid "NTP Server"
 msgstr "NTP þjónn"
 
-#: install_steps_interactive.pm:885 steps.pm:30
+#: install_steps_interactive.pm:886 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Yfirlit"
 
-#: 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 "Kerfi"
 
-#: 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 "Vélbúnaður"
 
-#: 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 "Fjarlægur CUPS þjónn"
 
-#: install_steps_interactive.pm:940
+#: install_steps_interactive.pm:945
 #, c-format
 msgid "No printer"
 msgstr "Enginn prentari"
 
-#: install_steps_interactive.pm:982
+#: install_steps_interactive.pm:987
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Er kannski ISA hhljóðkort í vélinni?"
 
-#: install_steps_interactive.pm:984
+#: install_steps_interactive.pm:989
 #, c-format
 msgid "Run \"sndconfig\" after installation to configure your sound card"
 msgstr "Keyrðu \"sndconfig\" eftir uppsetningu til að stilla hljóðkortið þitt"
 
-#: install_steps_interactive.pm:986
+#: install_steps_interactive.pm:991
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Ekkert hljóðkort fannst reyndu að keyra \"harddrake\" eftir uppsetningu"
 
-#: install_steps_interactive.pm:1006
+#: install_steps_interactive.pm:1011
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafískt viðmót"
 
-#: 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 "Staðarnet og Internet"
 
-#: install_steps_interactive.pm:1028
+#: install_steps_interactive.pm:1033
 #, fuzzy, c-format
 msgid "Proxies"
 msgstr "Snið "
 
-#: install_steps_interactive.pm:1029
+#: install_steps_interactive.pm:1034
 #, fuzzy, c-format
 msgid "configured"
 msgstr "endurstilla"
 
-#: 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 "Öryggi"
 
-#: install_steps_interactive.pm:1057
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "activated"
 msgstr "Virk"
 
-#: install_steps_interactive.pm:1057
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "disabled"
 msgstr "óvirkt"
 
-#: install_steps_interactive.pm:1066
+#: install_steps_interactive.pm:1071
 #, c-format
 msgid "Boot"
 msgstr "Ræsing"
 
 #. -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 á %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 "Þjónustur: %d ræstar af %d skráðum"
 
-#: 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 "Þú hefur ekki sett upp X, ertu viss um að þú viljir þetta?"
 
-#: install_steps_interactive.pm:1149
+#: install_steps_interactive.pm:1154
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr ""
 
-#: install_steps_interactive.pm:1150
+#: install_steps_interactive.pm:1155
 #, c-format
 msgid "Set root password"
 msgstr "Ákveða rótarlykilorð"
 
-#: 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 "Þetta lykilorð er of einfalt (verður að vera minnst %d stafa langt)"
 
-#: 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 "Auðkenning"
 
-#: install_steps_interactive.pm:1196
+#: install_steps_interactive.pm:1201
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Set upp ræsistjórann..."
 
-#: install_steps_interactive.pm:1206
+#: install_steps_interactive.pm:1211
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -5849,29 +5886,29 @@ msgid ""
 " need to use BootX or some other means to boot your machine"
 msgstr ""
 
-#: install_steps_interactive.pm:1212
+#: install_steps_interactive.pm:1217
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "Viltu nota aboot?"
 
-#: install_steps_interactive.pm:1215
+#: install_steps_interactive.pm:1220
 #, c-format
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: install_steps_interactive.pm:1226
+#: install_steps_interactive.pm:1231
 #, c-format
 msgid "Installing bootloader"
 msgstr "Setja inn ræsistjórann"
 
-#: install_steps_interactive.pm:1233
+#: install_steps_interactive.pm:1238
 #, c-format
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Innsetning ræsiforrits brást sökum eftirfarandi villu:"
 
-#: 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"
@@ -5882,24 +5919,29 @@ msgid ""
 "At your next boot you should see the bootloader prompt."
 msgstr ""
 
-#: 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 ""
 
-#: 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 "Settu tóman diskling í drif %s"
 
-#: install_steps_interactive.pm:1287
+#: install_steps_interactive.pm:1293
+#, fuzzy, c-format
+msgid "Please insert another floppy for drivers disk"
+msgstr "Settu ræsidiskling í drif %s"
+
+#: install_steps_interactive.pm:1295
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Bý til diskling fyrir sjálfvirka uppsetningu..."
 
-#: install_steps_interactive.pm:1298
+#: install_steps_interactive.pm:1307
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -5910,12 +5952,12 @@ msgstr ""
 "\n"
 "Viltu virkilega hætta núna?"
 
-#: install_steps_interactive.pm:1313
+#: install_steps_interactive.pm:1322
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Búa til diskling fyrir sjálfvirka uppsetningu"
 
-#: install_steps_interactive.pm:1315
+#: install_steps_interactive.pm:1324
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -5927,8 +5969,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrake Linux Installation %s"
-msgstr "Mandrake Linux innsetning %s"
+msgid "Mandrakelinux Installation %s"
+msgstr "Mandrakelinux innsetning %s"
 
 #: install_steps_newt.pm:33
 #, c-format
@@ -5947,7 +5989,7 @@ msgstr "Veldu skrá"
 msgid "Basic"
 msgstr "Einfalt"
 
-#: 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 "Ljúka"
@@ -6056,7 +6098,7 @@ msgstr "Finnskt"
 msgid "French"
 msgstr "Franskt"
 
-#: keyboard.pm:143 keyboard.pm:217
+#: keyboard.pm:143 keyboard.pm:220
 #, c-format
 msgid "Norwegian"
 msgstr "Norskt"
@@ -6066,22 +6108,22 @@ msgstr "Norskt"
 msgid "Polish"
 msgstr "Pólskt"
 
-#: keyboard.pm:145 keyboard.pm:226
+#: keyboard.pm:145 keyboard.pm:229
 #, c-format
 msgid "Russian"
 msgstr "Rússneskt"
 
-#: keyboard.pm:147 keyboard.pm:230
+#: keyboard.pm:147 keyboard.pm:233
 #, c-format
 msgid "Swedish"
 msgstr "Sænskt"
 
-#: keyboard.pm:148 keyboard.pm:249
+#: keyboard.pm:148 keyboard.pm:252
 #, c-format
 msgid "UK keyboard"
 msgstr "Breskt lyklaborð"
 
-#: keyboard.pm:149 keyboard.pm:250
+#: keyboard.pm:149 keyboard.pm:253
 #, c-format
 msgid "US keyboard"
 msgstr "Bandarískt lyklaborð"
@@ -6276,312 +6318,312 @@ msgstr "Ítalskt"
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: keyboard.pm:197
+#: keyboard.pm:200
 #, c-format
 msgid "Japanese 106 keys"
 msgstr "Japanskt 106 lykla"
 
-#: keyboard.pm:198
+#: keyboard.pm:201
 #, c-format
 msgid "Kannada"
 msgstr "Kanada"
 
-#: keyboard.pm:201
+#: keyboard.pm:204
 #, c-format
 msgid "Korean keyboard"
 msgstr "Kóreskt lyklaborð"
 
-#: keyboard.pm:202
+#: keyboard.pm:205
 #, c-format
 msgid "Latin American"
 msgstr "Suður amerískt"
 
-#: keyboard.pm:203
+#: keyboard.pm:206
 #, c-format
 msgid "Laotian"
 msgstr "Laotian"
 
-#: keyboard.pm:204
+#: keyboard.pm:207
 #, c-format
 msgid "Lithuanian AZERTY (old)"
 msgstr "Litháenískt AZERTY (gamalt)"
 
-#: keyboard.pm:206
+#: keyboard.pm:209
 #, c-format
 msgid "Lithuanian AZERTY (new)"
 msgstr "Litháenískt AZERTY (nýtt)"
 
-#: keyboard.pm:207
+#: keyboard.pm:210
 #, c-format
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Litháenískt \"töluröð\" QWERTY"
 
-#: keyboard.pm:208
+#: keyboard.pm:211
 #, c-format
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Litháenískt \"hljóðfræðilegt\" QWERTY"
 
-#: keyboard.pm:209
+#: keyboard.pm:212
 #, c-format
 msgid "Latvian"
 msgstr "Lettneska"
 
-#: keyboard.pm:210
+#: keyboard.pm:213
 #, c-format
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: keyboard.pm:211
+#: keyboard.pm:214
 #, c-format
 msgid "Macedonian"
 msgstr "Makedónískt"
 
-#: keyboard.pm:212
+#: keyboard.pm:215
 #, c-format
 msgid "Myanmar (Burmese)"
 msgstr "Myanmar (Búrmenskt)"
 
-#: keyboard.pm:213
+#: keyboard.pm:216
 #, c-format
 msgid "Mongolian (cyrillic)"
 msgstr "Mongólskt (kýrílskt)"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
 msgid "Maltese (UK)"
 msgstr "Maltneskt (UK)"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
 msgid "Maltese (US)"
 msgstr "Maltneskt (US)"
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
 msgid "Dutch"
 msgstr "Hollenskt"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
 msgid "Oriya"
 msgstr "Oriya"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
 msgid "Polish (qwerty layout)"
 msgstr "Pólskt (qwerty)"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
 msgid "Polish (qwertz layout)"
 msgstr "Pólskt (qwertz)"
 
-#: keyboard.pm:221
+#: keyboard.pm:224
 #, c-format
 msgid "Portuguese"
 msgstr "Portúgalskt"
 
-#: keyboard.pm:222
+#: keyboard.pm:225
 #, c-format
 msgid "Canadian (Quebec)"
 msgstr "Kanadískt (Quebec)"
 
-#: keyboard.pm:224
+#: keyboard.pm:227
 #, c-format
 msgid "Romanian (qwertz)"
 msgstr "Rúmenskt (qwertz)"
 
-#: keyboard.pm:225
+#: keyboard.pm:228
 #, c-format
 msgid "Romanian (qwerty)"
 msgstr "Rúmenskt (qwerty)"
 
-#: keyboard.pm:227
+#: keyboard.pm:230
 #, c-format
 msgid "Russian (Phonetic)"
 msgstr "Rússneskt (hljóðfræðilegt)"
 
-#: keyboard.pm:228
+#: keyboard.pm:231
 #, c-format
 msgid "Saami (norwegian)"
 msgstr "Saami (Norskt)"
 
-#: keyboard.pm:229
+#: keyboard.pm:232
 #, c-format
 msgid "Saami (swedish/finnish)"
 msgstr ""
 
-#: keyboard.pm:231
+#: keyboard.pm:234
 #, c-format
 msgid "Slovenian"
 msgstr "Slóvenskt"
 
-#: keyboard.pm:232
+#: keyboard.pm:235
 #, c-format
 msgid "Slovakian (QWERTZ)"
 msgstr "Slóvakískt (QWERTZ)"
 
-#: keyboard.pm:233
+#: keyboard.pm:236
 #, c-format
 msgid "Slovakian (QWERTY)"
 msgstr "Slóvakískt (QWERTY)"
 
-#: keyboard.pm:235
+#: keyboard.pm:238
 #, c-format
 msgid "Serbian (cyrillic)"
 msgstr "Serbneskt (kýrílskt)"
 
-#: keyboard.pm:236
+#: keyboard.pm:239
 #, c-format
 msgid "Syriac"
 msgstr "Sýrland"
 
-#: keyboard.pm:237
+#: keyboard.pm:240
 #, c-format
 msgid "Syriac (phonetic)"
 msgstr "Sýrlenskt (hljóðfræðilegt)"
 
-#: 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 "Tamílskt (ISCII uppsetning)"
 
-#: keyboard.pm:241
+#: keyboard.pm:244
 #, c-format
 msgid "Tamil (Typewriter-layout)"
 msgstr "Tamílskt (ritvélaruppsetning)"
 
-#: keyboard.pm:242
+#: keyboard.pm:245
 #, c-format
 msgid "Thai keyboard"
 msgstr "Tælenskt lyklaborð"
 
-#: keyboard.pm:244
+#: keyboard.pm:247
 #, c-format
 msgid "Tajik keyboard"
 msgstr "Tajik lyklaborð"
 
-#: keyboard.pm:245
+#: keyboard.pm:248
 #, c-format
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Tyrkneskt (hefðbundið \"F\" módel)"
 
-#: keyboard.pm:246
+#: keyboard.pm:249
 #, c-format
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Tyrkneskt (nútíma \"Q\" módel)"
 
-#: keyboard.pm:248
+#: keyboard.pm:251
 #, c-format
 msgid "Ukrainian"
 msgstr "Úkraínskt"
 
-#: keyboard.pm:251
+#: keyboard.pm:254
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Bandarískt (alþjóðlegt)"
 
-#: keyboard.pm:252
+#: keyboard.pm:255
 #, c-format
 msgid "Uzbek (cyrillic)"
 msgstr "Úsbeskt (kýrílskt)"
 
-#: keyboard.pm:253
+#: keyboard.pm:256
 #, c-format
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Víetnamskt \"töluröð\" QWERTY"
 
-#: keyboard.pm:254
+#: keyboard.pm:257
 #, c-format
 msgid "Yugoslavian (latin)"
 msgstr "Júgoslavneskt (Latínu upps.)"
 
-#: keyboard.pm:261
+#: keyboard.pm:264
 #, c-format
 msgid "Right Alt key"
 msgstr "Hægri Alt lykill"
 
-#: keyboard.pm:262
+#: keyboard.pm:265
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Báðir Shift lyklar samtímis"
 
-#: keyboard.pm:263
+#: keyboard.pm:266
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Ctrl og Shift lyklar samtímis"
 
-#: keyboard.pm:264
+#: keyboard.pm:267
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock lykill"
 
-#: keyboard.pm:265
+#: keyboard.pm:268
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl og Alt lyklar samtímis"
 
-#: keyboard.pm:266
+#: keyboard.pm:269
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt og Shift lyklar samtímis"
 
-#: keyboard.pm:267
+#: keyboard.pm:270
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menu\" lykill"
 
-#: keyboard.pm:268
+#: keyboard.pm:271
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Vinstri \"Windows\" lykill"
 
-#: keyboard.pm:269
+#: keyboard.pm:272
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Hægri \"Windows\" lykill"
 
-#: keyboard.pm:270
+#: keyboard.pm:273
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Báðir Ctrl lyklar samtímis"
 
-#: keyboard.pm:271
+#: keyboard.pm:274
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Báðir Alt lyklar samtímis"
 
-#: keyboard.pm:272
+#: keyboard.pm:275
 #, c-format
 msgid "Left Shift key"
 msgstr "Vinstri Shift lykill"
 
-#: keyboard.pm:273
+#: keyboard.pm:276
 #, c-format
 msgid "Right Shift key"
 msgstr "Hægri Shift lykill"
 
-#: keyboard.pm:274
+#: keyboard.pm:277
 #, c-format
 msgid "Left Alt key"
 msgstr "Vinstri Alt lykill"
 
-#: keyboard.pm:275
+#: keyboard.pm:278
 #, c-format
 msgid "Left Control key"
 msgstr "Vinstri Ctrl lykill"
 
-#: keyboard.pm:276
+#: keyboard.pm:279
 #, c-format
 msgid "Right Control key"
 msgstr "Hægri Ctrl lykill"
 
-#: keyboard.pm:307
+#: keyboard.pm:310
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -6591,7 +6633,7 @@ msgstr ""
 "Hér getur þú valið lykla eða lyklasamsetningar sem skipta \n"
 "milli mismunandi lykilboðsuppsetninga (t.d íslenskt/enskt)"
 
-#: keyboard.pm:312
+#: keyboard.pm:315
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -6599,1144 +6641,1144 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: lang.pm:144
+#: lang.pm:149
 #, c-format
 msgid "default:LTR"
-msgstr "Sjálfgefið: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 "Sameinuðu Arabísku Furstadæmin"
 
-#: lang.pm:163
+#: lang.pm:168
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Antigua og Barbuda"
 
-#: lang.pm:164
+#: lang.pm:169
 #, c-format
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: lang.pm:165
+#: lang.pm:170
 #, c-format
 msgid "Albania"
 msgstr "Albanía"
 
-#: lang.pm:166
+#: lang.pm:171
 #, c-format
 msgid "Armenia"
 msgstr "Armenía"
 
-#: lang.pm:167
+#: lang.pm:172
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "Holland, Antilleyjar"
 
-#: lang.pm:168
+#: lang.pm:173
 #, c-format
 msgid "Angola"
 msgstr "Angóla"
 
-#: lang.pm:169
+#: lang.pm:174
 #, c-format
 msgid "Antarctica"
 msgstr "Suðurskautslandið"
 
-#: lang.pm:170 standalone/drakxtv:51
+#: lang.pm:175 standalone/drakxtv:51
 #, c-format
 msgid "Argentina"
 msgstr "Argentína"
 
-#: lang.pm:171
+#: lang.pm:176
 #, c-format
 msgid "American Samoa"
 msgstr "Ameríku Samóeyjar"
 
-#: lang.pm:173 standalone/drakxtv:49
+#: lang.pm:178 network/adsl_consts.pm:20 standalone/drakxtv:49
 #, c-format
 msgid "Australia"
 msgstr "Ástralía"
 
-#: lang.pm:174
+#: lang.pm:179
 #, c-format
 msgid "Aruba"
 msgstr "Aruba"
 
-#: lang.pm:175
+#: lang.pm:180
 #, c-format
 msgid "Azerbaijan"
 msgstr "Asjerbæjan"
 
-#: lang.pm:176
+#: lang.pm:181
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnía og Herzegónía"
 
-#: 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 "Búlgaría"
 
-#: lang.pm:182
+#: lang.pm:187
 #, c-format
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: lang.pm:183
+#: lang.pm:188
 #, c-format
 msgid "Burundi"
 msgstr "Búrúndi"
 
-#: lang.pm:184
+#: lang.pm:189
 #, c-format
 msgid "Benin"
 msgstr "Benín"
 
-#: lang.pm:185
+#: lang.pm:190
 #, c-format
 msgid "Bermuda"
 msgstr "Bermúda"
 
-#: lang.pm:186
+#: lang.pm:191
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: lang.pm:187
+#: lang.pm:192
 #, c-format
 msgid "Bolivia"
 msgstr "Bólivía"
 
-#: lang.pm:188
+#: lang.pm:193
 #, c-format
 msgid "Brazil"
 msgstr "Brasilía"
 
-#: lang.pm:189
+#: lang.pm:194
 #, c-format
 msgid "Bahamas"
 msgstr "Bahamaeyjar"
 
-#: lang.pm:190
+#: lang.pm:195
 #, c-format
 msgid "Bhutan"
 msgstr "Bútan"
 
-#: lang.pm:191
+#: lang.pm:196
 #, c-format
 msgid "Bouvet Island"
 msgstr "Bouvet eyja"
 
-#: lang.pm:192
+#: lang.pm:197
 #, c-format
 msgid "Botswana"
 msgstr "Botswana"
 
-#: lang.pm:193
+#: lang.pm:198
 #, c-format
 msgid "Belarus"
 msgstr "Hvítarússland"
 
-#: lang.pm:194
+#: lang.pm:199
 #, c-format
 msgid "Belize"
 msgstr "Belís"
 
-#: 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 "Kókos (Keeling) eyjar"
 
-#: lang.pm:197
+#: lang.pm:202
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "Kongó (Kinshasa)"
 
-#: lang.pm:198
+#: lang.pm:203
 #, c-format
 msgid "Central African Republic"
 msgstr "Miðafríkulýðveldið"
 
-#: lang.pm:199
+#: lang.pm:204
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "Kongó (brassaville)"
 
-#: lang.pm:200
+#: lang.pm:205
 #, c-format
 msgid "Switzerland"
 msgstr "Sviss"
 
-#: 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 "Cook eyjar"
 
-#: lang.pm:203
+#: lang.pm:208
 #, c-format
 msgid "Chile"
 msgstr "Chíle"
 
-#: lang.pm:204
+#: lang.pm:209
 #, c-format
 msgid "Cameroon"
 msgstr "Kamerún"
 
-#: lang.pm:205
+#: lang.pm:210
 #, c-format
 msgid "China"
 msgstr "Kína"
 
-#: lang.pm:206
+#: lang.pm:211
 #, c-format
 msgid "Colombia"
 msgstr "Kólumbía"
 
-#: lang.pm:208
+#: lang.pm:213
 #, c-format
 msgid "Cuba"
 msgstr "Kúba"
 
-#: lang.pm:209
+#: lang.pm:214
 #, c-format
 msgid "Cape Verde"
 msgstr "Grænhöfðaeyjar"
 
-#: lang.pm:210
+#: lang.pm:215
 #, c-format
 msgid "Christmas Island"
 msgstr "Jólaeyjar"
 
-#: lang.pm:211
+#: lang.pm:216
 #, c-format
 msgid "Cyprus"
 msgstr "Kýpur"
 
-#: lang.pm:214
+#: lang.pm:219
 #, c-format
 msgid "Djibouti"
 msgstr "Djibútí"
 
-#: lang.pm:215
+#: lang.pm:220
 #, c-format
 msgid "Denmark"
 msgstr "Danmörk"
 
-#: lang.pm:216
+#: lang.pm:221
 #, c-format
 msgid "Dominica"
 msgstr "Dominiká"
 
-#: lang.pm:217
+#: lang.pm:222
 #, c-format
 msgid "Dominican Republic"
 msgstr "Dóminíska lýðveldið"
 
-#: lang.pm:218
+#: lang.pm:223
 #, c-format
 msgid "Algeria"
 msgstr "Algería"
 
-#: lang.pm:219
+#: lang.pm:224
 #, c-format
 msgid "Ecuador"
 msgstr "Ekvador"
 
-#: lang.pm:220
+#: lang.pm:225
 #, c-format
 msgid "Estonia"
 msgstr "Eistland"
 
-#: lang.pm:221
+#: lang.pm:226
 #, c-format
 msgid "Egypt"
 msgstr "Egyptaland"
 
-#: lang.pm:222
+#: lang.pm:227
 #, c-format
 msgid "Western Sahara"
 msgstr "Vestur Sahara"
 
-#: lang.pm:223
+#: lang.pm:228
 #, c-format
 msgid "Eritrea"
 msgstr "Erítrea"
 
-#: 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 "Spánn"
 
-#: lang.pm:225
+#: lang.pm:230
 #, c-format
 msgid "Ethiopia"
 msgstr "Eþíópía"
 
-#: lang.pm:226 network/adsl_consts.pm:119
+#: lang.pm:231 network/adsl_consts.pm:127
 #, c-format
 msgid "Finland"
 msgstr "Finnland"
 
-#: lang.pm:227
+#: lang.pm:232
 #, c-format
 msgid "Fiji"
 msgstr "Fíjí"
 
-#: lang.pm:228
+#: lang.pm:233
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "Falklandseyjar (Malvinas)"
 
-#: lang.pm:229
+#: lang.pm:234
 #, c-format
 msgid "Micronesia"
 msgstr "Míkrónesía"
 
-#: lang.pm:230
+#: lang.pm:235
 #, c-format
 msgid "Faroe Islands"
 msgstr "Færeyjar"
 
-#: 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 "Stóra Bretland"
 
-#: lang.pm:234
+#: lang.pm:239
 #, c-format
 msgid "Grenada"
 msgstr "Grenada"
 
-#: lang.pm:235
+#: lang.pm:240
 #, c-format
 msgid "Georgia"
 msgstr "Georgía"
 
-#: lang.pm:236
+#: lang.pm:241
 #, c-format
 msgid "French Guiana"
 msgstr "Franska Gínea"
 
-#: lang.pm:237
+#: lang.pm:242
 #, c-format
 msgid "Ghana"
 msgstr "Gana"
 
-#: lang.pm:238
+#: lang.pm:243
 #, c-format
 msgid "Gibraltar"
 msgstr "Gíbraltar"
 
-#: lang.pm:239
+#: lang.pm:244
 #, c-format
 msgid "Greenland"
 msgstr "Grænland"
 
-#: lang.pm:240
+#: lang.pm:245
 #, c-format
 msgid "Gambia"
 msgstr "Gambía"
 
-#: lang.pm:241
+#: lang.pm:246
 #, c-format
 msgid "Guinea"
 msgstr "Gínea"
 
-#: lang.pm:242
+#: lang.pm:247
 #, c-format
 msgid "Guadeloupe"
 msgstr "Gvadalúp"
 
-#: lang.pm:243
+#: lang.pm:248
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Miðbaugs Gínea"
 
-#: lang.pm:245
+#: lang.pm:250
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Suður Georgía og suður samlokueyjar"
 
-#: lang.pm:246
+#: lang.pm:251
 #, c-format
 msgid "Guatemala"
 msgstr "Gvatemala"
 
-#: lang.pm:247
+#: lang.pm:252
 #, c-format
 msgid "Guam"
 msgstr "Guam"
 
-#: lang.pm:248
+#: lang.pm:253
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "Gínea-Bissáu"
 
-#: lang.pm:249
+#: lang.pm:254
 #, c-format
 msgid "Guyana"
 msgstr "Gvíana"
 
-#: lang.pm:250
+#: lang.pm:255
 #, fuzzy, c-format
 msgid "China (Hong Kong)"
 msgstr "Hong Kong"
 
-#: lang.pm:251
+#: lang.pm:256
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Heard og McDonald eyjar"
 
-#: lang.pm:252
+#: lang.pm:257
 #, c-format
 msgid "Honduras"
 msgstr "Hondúras"
 
-#: lang.pm:253
+#: lang.pm:258
 #, c-format
 msgid "Croatia"
 msgstr "Króvatía"
 
-#: lang.pm:254
+#: lang.pm:259
 #, c-format
 msgid "Haiti"
 msgstr "Haíti"
 
-#: lang.pm:255 network/adsl_consts.pm:144
+#: lang.pm:260 network/adsl_consts.pm:152
 #, c-format
 msgid "Hungary"
 msgstr "Ungverjaland"
 
-#: lang.pm:256
+#: lang.pm:261
 #, c-format
 msgid "Indonesia"
 msgstr "Indónesía"
 
-#: lang.pm:257 standalone/drakxtv:48
+#: lang.pm:262 standalone/drakxtv:48
 #, c-format
 msgid "Ireland"
 msgstr "Írland"
 
-#: lang.pm:258
+#: lang.pm:263
 #, c-format
 msgid "Israel"
 msgstr "Ísrael"
 
-#: lang.pm:259
+#: lang.pm:264
 #, c-format
 msgid "India"
 msgstr "Indland"
 
-#: lang.pm:260
+#: lang.pm:265
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "Bresku indíueyjar"
 
-#: lang.pm:261
+#: lang.pm:266
 #, c-format
 msgid "Iraq"
 msgstr "Írak"
 
-#: lang.pm:262
+#: lang.pm:267
 #, c-format
 msgid "Iran"
 msgstr "Íran"
 
-#: lang.pm:263
+#: lang.pm:268
 #, c-format
 msgid "Iceland"
 msgstr "Ísland"
 
-#: lang.pm:265
+#: lang.pm:270
 #, c-format
 msgid "Jamaica"
 msgstr "Jamaíka"
 
-#: lang.pm:266
+#: lang.pm:271
 #, c-format
 msgid "Jordan"
 msgstr "Jórdanía"
 
-#: lang.pm:267
+#: lang.pm:272
 #, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: lang.pm:268
+#: lang.pm:273
 #, c-format
 msgid "Kenya"
 msgstr "Kenía"
 
-#: lang.pm:269
+#: lang.pm:274
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Kirgistan"
 
-#: lang.pm:270
+#: lang.pm:275
 #, c-format
 msgid "Cambodia"
 msgstr "Kambódía"
 
-#: lang.pm:271
+#: lang.pm:276
 #, c-format
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: lang.pm:272
+#: lang.pm:277
 #, c-format
 msgid "Comoros"
 msgstr "Kómoros"
 
-#: lang.pm:273
+#: lang.pm:278
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "Saint Kitts og Nevis"
 
-#: lang.pm:274
+#: lang.pm:279
 #, c-format
 msgid "Korea (North)"
 msgstr "Kórea (norður)"
 
-#: lang.pm:275
+#: lang.pm:280
 #, c-format
 msgid "Korea"
 msgstr "Kórea"
 
-#: lang.pm:276
+#: lang.pm:281
 #, c-format
 msgid "Kuwait"
 msgstr "Kúvæt"
 
-#: lang.pm:277
+#: lang.pm:282
 #, c-format
 msgid "Cayman Islands"
 msgstr "Keyman eyjar"
 
-#: lang.pm:278
+#: lang.pm:283
 #, c-format
 msgid "Kazakhstan"
 msgstr "Kasakstan"
 
-#: lang.pm:279
+#: lang.pm:284
 #, c-format
 msgid "Laos"
 msgstr "Laos"
 
-#: lang.pm:280
+#: lang.pm:285
 #, c-format
 msgid "Lebanon"
 msgstr "Líbanon"
 
-#: lang.pm:281
+#: lang.pm:286
 #, c-format
 msgid "Saint Lucia"
 msgstr "Sankti Lúsía"
 
-#: 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 "Líbería"
 
-#: lang.pm:285
+#: lang.pm:290
 #, c-format
 msgid "Lesotho"
 msgstr "Lesótó"
 
-#: lang.pm:286
+#: lang.pm:291
 #, c-format
 msgid "Lithuania"
 msgstr "Litháen"
 
-#: lang.pm:287
+#: lang.pm:292
 #, c-format
 msgid "Luxembourg"
 msgstr "Lúxemborg"
 
-#: lang.pm:288
+#: lang.pm:293
 #, c-format
 msgid "Latvia"
 msgstr "Lettland"
 
-#: lang.pm:289
+#: lang.pm:294
 #, c-format
 msgid "Libya"
 msgstr "Líbía"
 
-#: lang.pm:290
+#: lang.pm:295
 #, c-format
 msgid "Morocco"
 msgstr "Marokkó"
 
-#: lang.pm:291
+#: lang.pm:296
 #, c-format
 msgid "Monaco"
 msgstr "Mónakó"
 
-#: lang.pm:292
+#: lang.pm:297
 #, c-format
 msgid "Moldova"
 msgstr "Moldóvía"
 
-#: lang.pm:293
+#: lang.pm:298
 #, c-format
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: lang.pm:294
+#: lang.pm:299
 #, c-format
 msgid "Marshall Islands"
 msgstr "Marshall eyjar"
 
-#: lang.pm:295
+#: lang.pm:300
 #, c-format
 msgid "Macedonia"
 msgstr "Makedónía"
 
-#: lang.pm:296
+#: lang.pm:301
 #, c-format
 msgid "Mali"
 msgstr "Malí"
 
-#: lang.pm:297
+#: lang.pm:302
 #, c-format
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: lang.pm:298
+#: lang.pm:303
 #, c-format
 msgid "Mongolia"
 msgstr "Mongólía"
 
-#: lang.pm:299
+#: lang.pm:304
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "Norður Maríanaeyjar"
 
-#: lang.pm:300
+#: lang.pm:305
 #, c-format
 msgid "Martinique"
 msgstr "Martiník"
 
-#: lang.pm:301
+#: lang.pm:306
 #, c-format
 msgid "Mauritania"
 msgstr "Máritanía"
 
-#: 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 "Máritus"
 
-#: lang.pm:305
+#: lang.pm:310
 #, c-format
 msgid "Maldives"
 msgstr "Maldíví"
 
-#: lang.pm:306
+#: lang.pm:311
 #, c-format
 msgid "Malawi"
 msgstr "Malaví"
 
-#: lang.pm:307
+#: lang.pm:312
 #, c-format
 msgid "Mexico"
 msgstr "Mexíkó"
 
-#: lang.pm:308
+#: lang.pm:313
 #, c-format
 msgid "Malaysia"
 msgstr "Malasía"
 
-#: lang.pm:309
+#: lang.pm:314
 #, c-format
 msgid "Mozambique"
 msgstr "Mósabmbík"
 
-#: lang.pm:310
+#: lang.pm:315
 #, c-format
 msgid "Namibia"
 msgstr "Namibía"
 
-#: lang.pm:311
+#: lang.pm:316
 #, c-format
 msgid "New Caledonia"
 msgstr "Nýja Kaledónía"
 
-#: lang.pm:312
+#: lang.pm:317
 #, c-format
 msgid "Niger"
 msgstr "Níger"
 
-#: lang.pm:313
+#: lang.pm:318
 #, c-format
 msgid "Norfolk Island"
 msgstr "Norfolk eyjar"
 
-#: lang.pm:314
+#: lang.pm:319
 #, c-format
 msgid "Nigeria"
 msgstr "Nígería"
 
-#: lang.pm:315
+#: lang.pm:320
 #, c-format
 msgid "Nicaragua"
 msgstr "Nígarakúa"
 
-#: lang.pm:318
+#: lang.pm:323
 #, c-format
 msgid "Nepal"
 msgstr "Nepal"
 
-#: lang.pm:319
+#: lang.pm:324
 #, c-format
 msgid "Nauru"
 msgstr "Nárú"
 
-#: lang.pm:320
+#: lang.pm:325
 #, c-format
 msgid "Niue"
 msgstr "Niue"
 
-#: lang.pm:321
+#: lang.pm:326
 #, c-format
 msgid "New Zealand"
 msgstr "Nýja Sjáland"
 
-#: lang.pm:322
+#: lang.pm:327
 #, c-format
 msgid "Oman"
 msgstr "Óman"
 
-#: lang.pm:323
+#: lang.pm:328
 #, c-format
 msgid "Panama"
 msgstr "Panama"
 
-#: lang.pm:324
+#: lang.pm:329
 #, c-format
 msgid "Peru"
 msgstr "Perú"
 
-#: lang.pm:325
+#: lang.pm:330
 #, c-format
 msgid "French Polynesia"
 msgstr "Franska Pólínesía"
 
-#: lang.pm:326
+#: lang.pm:331
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Papúa Nýja-Gínea"
 
-#: lang.pm:327
+#: lang.pm:332
 #, c-format
 msgid "Philippines"
 msgstr "Filippseyjar"
 
-#: 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 "Pólland"
 
-#: lang.pm:330
+#: lang.pm:335
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint Pierre og 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 Ríko"
 
-#: lang.pm:333
+#: lang.pm:338
 #, c-format
 msgid "Palestine"
 msgstr "Palestína"
 
-#: lang.pm:334 network/adsl_consts.pm:187
+#: lang.pm:339 network/adsl_consts.pm:196
 #, c-format
 msgid "Portugal"
 msgstr "Portúgal"
 
-#: lang.pm:335
+#: lang.pm:340
 #, c-format
 msgid "Paraguay"
 msgstr "Paragvæ"
 
-#: lang.pm:336
+#: lang.pm:341
 #, c-format
 msgid "Palau"
 msgstr "Palá"
 
-#: lang.pm:337
+#: lang.pm:342
 #, c-format
 msgid "Qatar"
 msgstr "Kvatar"
 
-#: lang.pm:338
+#: lang.pm:343
 #, c-format
 msgid "Reunion"
 msgstr "Reunion"
 
-#: lang.pm:339
+#: lang.pm:344
 #, c-format
 msgid "Romania"
 msgstr "Rúmenía"
 
-#: lang.pm:340
+#: lang.pm:345
 #, c-format
 msgid "Russia"
 msgstr "Rússland"
 
-#: lang.pm:341
+#: lang.pm:346
 #, c-format
 msgid "Rwanda"
 msgstr "Rúanda"
 
-#: lang.pm:342
+#: lang.pm:347
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Sádiarabía"
 
-#: lang.pm:343
+#: lang.pm:348
 #, c-format
 msgid "Solomon Islands"
 msgstr "Salómon eyjar"
 
-#: lang.pm:344
+#: lang.pm:349
 #, c-format
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: lang.pm:345
+#: lang.pm:350
 #, c-format
 msgid "Sudan"
 msgstr "Súdan"
 
-#: lang.pm:347
+#: lang.pm:352
 #, c-format
 msgid "Singapore"
 msgstr "Singapúr"
 
-#: 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 "Slóvenía"
 
-#: lang.pm:350
+#: lang.pm:355
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Svalbarði og Jan Mayen"
 
-#: lang.pm:351
+#: lang.pm:356
 #, c-format
 msgid "Slovakia"
 msgstr "Slóvakía"
 
-#: lang.pm:352
+#: lang.pm:357
 #, c-format
 msgid "Sierra Leone"
 msgstr "Síera Leóne"
 
-#: lang.pm:353
+#: lang.pm:358
 #, c-format
 msgid "San Marino"
 msgstr "San Marínó"
 
-#: lang.pm:354
+#: lang.pm:359
 #, c-format
 msgid "Senegal"
 msgstr "Senegal"
 
-#: lang.pm:355
+#: lang.pm:360
 #, c-format
 msgid "Somalia"
 msgstr "Sómalía"
 
-#: lang.pm:356
+#: lang.pm:361
 #, c-format
 msgid "Suriname"
 msgstr "Súrinam"
 
-#: lang.pm:357
+#: lang.pm:362
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "Sao Tome og Prinsípe"
 
-#: 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ýrland"
 
-#: lang.pm:360
+#: lang.pm:365
 #, c-format
 msgid "Swaziland"
 msgstr "Svasiland"
 
-#: lang.pm:361
+#: lang.pm:366
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Turks og Kaikós eyjar"
 
-#: lang.pm:362
+#: lang.pm:367
 #, c-format
 msgid "Chad"
 msgstr "Chad"
 
-#: lang.pm:363
+#: lang.pm:368
 #, c-format
 msgid "French Southern Territories"
 msgstr "Frönsku suðureyjar"
 
-#: lang.pm:364
+#: lang.pm:369
 #, c-format
 msgid "Togo"
 msgstr "Tógó"
 
-#: lang.pm:365
+#: lang.pm:370
 #, c-format
 msgid "Thailand"
 msgstr "Taíland"
 
-#: lang.pm:366
+#: lang.pm:371
 #, c-format
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: lang.pm:367
+#: lang.pm:372
 #, c-format
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: lang.pm:368
+#: lang.pm:373
 #, c-format
 msgid "East Timor"
 msgstr "Austur Tímor"
 
-#: lang.pm:369
+#: lang.pm:374
 #, c-format
 msgid "Turkmenistan"
 msgstr "Túrkmenistan"
 
-#: lang.pm:370
+#: lang.pm:375
 #, c-format
 msgid "Tunisia"
 msgstr "Túnis"
 
-#: lang.pm:371
+#: lang.pm:376
 #, c-format
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:372
+#: lang.pm:377
 #, c-format
 msgid "Turkey"
 msgstr "Tyrkland"
 
-#: lang.pm:373
+#: lang.pm:378
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Trínidad og Tóbagó"
 
-#: lang.pm:374
+#: lang.pm:379
 #, c-format
 msgid "Tuvalu"
 msgstr "Túvaú"
 
-#: lang.pm:375
+#: lang.pm:380
 #, c-format
 msgid "Taiwan"
 msgstr "Tævan"
 
-#: lang.pm:376
+#: lang.pm:381
 #, c-format
 msgid "Tanzania"
 msgstr "Tansanía"
 
-#: lang.pm:377
+#: lang.pm:382
 #, c-format
 msgid "Ukraine"
 msgstr "Úkraína"
 
-#: lang.pm:378
+#: lang.pm:383
 #, c-format
 msgid "Uganda"
 msgstr "Úganda"
 
-#: lang.pm:379
+#: lang.pm:384
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr "Bandaríkin, smærri eyjar"
 
-#: lang.pm:381
+#: lang.pm:386
 #, c-format
 msgid "Uruguay"
 msgstr "Úrúgvæ"
 
-#: lang.pm:382
+#: lang.pm:387
 #, c-format
 msgid "Uzbekistan"
 msgstr "Úsbekistan"
 
-#: lang.pm:383
+#: lang.pm:388
 #, c-format
 msgid "Vatican"
 msgstr "Vatikanið"
 
-#: lang.pm:384
+#: lang.pm:389
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "Saint Vincent og Grenadín"
 
-#: lang.pm:385
+#: lang.pm:390
 #, c-format
 msgid "Venezuela"
 msgstr "Venesúela"
 
-#: lang.pm:386
+#: lang.pm:391
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Jómfrúreyjar (Breskt)"
 
-#: lang.pm:387
+#: lang.pm:392
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Jómfrúreyjar (US)"
 
-#: lang.pm:388
+#: lang.pm:393
 #, c-format
 msgid "Vietnam"
 msgstr "Víetnam"
 
-#: lang.pm:389
+#: lang.pm:394
 #, c-format
 msgid "Vanuatu"
 msgstr "Vanuatú"
 
-#: lang.pm:390
+#: lang.pm:395
 #, c-format
 msgid "Wallis and Futuna"
 msgstr "Wallis og Futuna"
 
-#: lang.pm:391
+#: lang.pm:396
 #, c-format
 msgid "Samoa"
 msgstr "Samóa"
 
-#: lang.pm:392
+#: lang.pm:397
 #, c-format
 msgid "Yemen"
 msgstr "Jemen"
 
-#: lang.pm:393
+#: lang.pm:398
 #, c-format
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:394
+#: lang.pm:399
 #, c-format
 msgid "Serbia & Montenegro"
 msgstr ""
 
-#: lang.pm:395 standalone/drakxtv:50
+#: lang.pm:400 standalone/drakxtv:50
 #, c-format
 msgid "South Africa"
 msgstr "Suður Afríka"
 
-#: lang.pm:396
+#: lang.pm:401
 #, c-format
 msgid "Zambia"
 msgstr "Sambía"
 
-#: lang.pm:397
+#: lang.pm:402
 #, c-format
 msgid "Zimbabwe"
 msgstr "Simbave"
 
-#: lang.pm:966
+#: lang.pm:983
 #, c-format
 msgid "Welcome to %s"
 msgstr "Velkomin(n) að %s"
@@ -7751,7 +7793,7 @@ msgstr "Hringtenging %s\n"
 msgid "Remove the logical volumes first\n"
 msgstr "Fjarlægðu sýndardrifin fyrst\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:962
+#: modules/interactive.pm:21 standalone/drakconnect:959
 #, c-format
 msgid "Parameters"
 msgstr "Viðföng"
@@ -7921,12 +7963,11 @@ msgstr "Almenn PS2 hjól-mús"
 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
 #, fuzzy, c-format
 msgid "Automatic"
 msgstr "Sjálfvirkt IP"
@@ -8071,7 +8112,7 @@ msgstr "Eftirvinnsla"
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: mouse.pm:92
+#: mouse.pm:92 standalone/drakvpn:1138
 #, c-format
 msgid "none"
 msgstr "ekkert"
@@ -8131,12 +8172,12 @@ msgstr "Sagem (notar pppoa) usb"
 msgid "Sagem (using dhcp) usb"
 msgstr "Sagem (notar dhcp) 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 "Tengast Internetinu"
 
-#: 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"
@@ -8147,7 +8188,7 @@ msgstr ""
 "sumir nota pptp (Ísland), nokkrir nota dhcp.\n"
 "Ef þú veist ekki, veldu þá 'nota pptp' (Ísland)"
 
-#: network/adsl.pm:41 network/netconnect.pm:684
+#: network/adsl.pm:41 network/netconnect.pm:759
 #, fuzzy, c-format
 msgid "ADSL connection type :"
 msgstr "ADSL tenging"
@@ -8212,13 +8253,13 @@ msgstr "Ekkert netkort fannst"
 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 ""
 "drakfirewall stillingar\n"
 "\n"
-"Þessi eining stillir prívat eldvegg fyrir þessa Mandrake Linux vél\n"
+"Þessi eining stillir prívat eldvegg fyrir þessa Mandrakelinux vél\n"
 "Fyrir öruggan og aflmikinn eldvegg líttu á hina sértæku\n"
 "Mandrake eldveggs útgáfu."
 
@@ -8244,11 +8285,11 @@ msgstr "Að hvaða þjónustum viltu leyfa Internetaðgang?"
 #, 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 ""
 "Þú getur gefið upp ýmsar gáttir. \n"
-"gild dæmi eru 139/tcp 139/udp.\n"
+"gild dæmi eru 139/tcp 139/udp 600:610/tcp 600:610/udp.\n"
 "Nánari upplýsingar eru t.d. í /etc/services"
 
 #: network/drakfirewall.pm:176
@@ -8274,319 +8315,270 @@ msgstr "Allt (enginn eldveggur)"
 msgid "Other ports"
 msgstr "aðrar gáttir"
 
-#: 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
+#: network/isdn.pm:113 network/netconnect.pm:424
 #, c-format
-msgid "ISDN Configuration"
-msgstr "ISDN uppsetning"
-
-#: network/isdn.pm:127
-#, c-format
-msgid ""
-"Select your provider.\n"
-"If it isn't listed, choose Unlisted."
+msgid "Unlisted - edit manually"
 msgstr ""
-"Veldu þjónustuaðila.\n"
-"Ef hann er ekki á lista, veldu 'Ekki á lista'"
 
-#: network/isdn.pm:140 standalone/drakconnect:503
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Evrópskan samskiptastaðal (EDSSI)"
-
-#: network/isdn.pm:140
-#, c-format
-msgid "European protocol"
-msgstr "Evrópskan samskiptastaðal"
-
-#: network/isdn.pm:142 standalone/drakconnect:504
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr "Samskiptaregla til tengingar við umheiminn"
-
-#: network/isdn.pm:142
-#, c-format
-msgid "Protocol for the rest of the world"
-msgstr "Samskiptaregla til tengingar við umheiminn"
-
-#: network/isdn.pm:146
-#, c-format
-msgid "Which protocol do you want to use?"
-msgstr "Hvaða samskiptareglu viltu nota?"
-
-#: network/isdn.pm:157
-#, c-format
-msgid "Found \"%s\" interface do you want to use it ?"
-msgstr "Fann \"%s\" kort vilu nota það ?"
-
-#: network/isdn.pm:164
-#, c-format
-msgid "What kind of card do you have?"
-msgstr "Hvernig kort ertu með?"
-
-#: 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 "Ég veit ekki"
+
+#: 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
 #, fuzzy, c-format
 msgid "USB"
 msgstr "LSB"
 
-#: network/isdn.pm:165
-#, c-format
-msgid "I don't know"
-msgstr "Ég veit ekki"
-
-#: 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"
-"Ef þú ert með ISA kort þá ættu gildin á næsta skjá að vera rétt.\n"
-"\n"
-"Ef þú hefur PCMCIA kort, þá þarft þú að vita \"irq\" og \"io\" kortsins.\n"
-
-#: network/isdn.pm:178
-#, c-format
-msgid "Continue"
-msgstr "Áfram"
+#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
+#: network/netconnect.pm:579 network/netconnect.pm:596
+#: network/netconnect.pm:612
+#, fuzzy, c-format
+msgid "Manual"
+msgstr "handvirkt"
 
-#: network/isdn.pm:178
-#, c-format
-msgid "Abort"
-msgstr "Hætta við"
+#: network/netconnect.pm:88 network/netconnect.pm:453
+#: network/netconnect.pm:463 network/netconnect.pm:822
+#: network/netconnect.pm:827
+#, fuzzy, c-format
+msgid "Manual choice"
+msgstr "handvirkt"
 
-#: network/isdn.pm:184
+#: network/netconnect.pm:88
 #, c-format
-msgid "Which of the following is your ISDN card?"
-msgstr "Hvert af eftirfarandi er þitt ISDN kort?"
+msgid "Internal ISDN card"
+msgstr "Innvært ISDN mótald"
 
-#: network/netconnect.pm:95
+#: network/netconnect.pm:97
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: network/netconnect.pm:96
+#: network/netconnect.pm:98
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "Veldu tungumál"
 
-#: network/netconnect.pm:97
+#: network/netconnect.pm:99
 #, fuzzy, c-format
 msgid "Master"
 msgstr "Mayotte"
 
-#: network/netconnect.pm:98
+#: network/netconnect.pm:100
 #, fuzzy, c-format
 msgid "Repeater"
 msgstr "Endurheimta"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:101
 #, fuzzy, c-format
 msgid "Secondary"
 msgstr "auka"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:102
 #, fuzzy, c-format
 msgid "Auto"
 msgstr "Um forrit"
 
-#: 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 "Handvikr uppsetning"
 
-#: network/netconnect.pm:104
+#: network/netconnect.pm:106
 #, fuzzy, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "Sjálfvirkt IP"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:108
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr ""
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:111
+#, c-format
+msgid "Protocol for the rest of the world"
+msgstr "Samskiptaregla til tengingar við umheiminn"
+
+#: network/netconnect.pm:113 standalone/drakconnect:528
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Evrópskan samskiptastaðal (EDSSI)"
+
+#: network/netconnect.pm:114 standalone/drakconnect:529
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr "Samskiptaregla til tengingar við umheiminn"
+
+#: network/netconnect.pm:146
 #, fuzzy, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Alcatel speedtouch usb"
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:147
 #, c-format
 msgid "Sagem USB modem"
 msgstr ""
 
-#: network/netconnect.pm:158
-#, c-format
-msgid "Bewan USB modem"
-msgstr ""
-
-#: network/netconnect.pm:159
+#: network/netconnect.pm:148
 #, c-format
-msgid "Bewan PCI modem"
+msgid "Bewan modem"
 msgstr ""
 
-#: network/netconnect.pm:160
+#: network/netconnect.pm:149
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr ""
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:153
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr ""
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:154
 #, fuzzy, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "Handvikr uppsetning"
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:155
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr ""
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:156
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr ""
 
-#: network/netconnect.pm:168
+#: network/netconnect.pm:157
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr ""
 
-#: network/netconnect.pm:172
+#: network/netconnect.pm:161
 #, fuzzy, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Ethernet-kort"
 
-#: network/netconnect.pm:173
+#: network/netconnect.pm:162
 #, fuzzy, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Ethernet-kort"
 
-#: network/netconnect.pm:174
+#: network/netconnect.pm:163
 #, c-format
 msgid "Routed IP LLC"
 msgstr ""
 
-#: network/netconnect.pm:175
+#: network/netconnect.pm:164
 #, c-format
 msgid "Routed IP VC"
 msgstr ""
 
-#: network/netconnect.pm:176
+#: network/netconnect.pm:165
 #, c-format
 msgid "PPPOA LLC"
 msgstr ""
 
-#: network/netconnect.pm:177
+#: network/netconnect.pm:166
 #, c-format
 msgid "PPPOA VC"
 msgstr ""
 
-#: network/netconnect.pm:181 standalone/drakconnect:443
-#: standalone/drakconnect:917
+#: network/netconnect.pm:170 standalone/drakconnect:466
 #, c-format
 msgid "Script-based"
 msgstr "Með skriftu"
 
-#: 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 "Með skjáhermi"
 
-#: 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
 #, fuzzy, c-format
 msgid "PAP/CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:199 standalone/drakconnect:54
+#: network/netconnect.pm:219 standalone/drakconnect:55
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "Staðarnets og Internet stillingar"
 
-#: network/netconnect.pm:205
+#: network/netconnect.pm:225
 #, fuzzy, c-format
 msgid "(detected on port %s)"
 msgstr "fundin á tengi %s"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:207
+#: network/netconnect.pm:227
 #, fuzzy, c-format
 msgid "(detected %s)"
 msgstr "skynjuð %s"
 
-#: network/netconnect.pm:207
+#: network/netconnect.pm:227
 #, fuzzy, c-format
 msgid "(detected)"
 msgstr "skynjuð"
 
-#: network/netconnect.pm:209
+#: network/netconnect.pm:229
 #, fuzzy, c-format
 msgid "Modem connection"
 msgstr "Winmodem tenging"
 
-#: network/netconnect.pm:210
+#: network/netconnect.pm:230
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN tenging"
 
-#: network/netconnect.pm:211
+#: network/netconnect.pm:231
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL tenging"
 
-#: network/netconnect.pm:212
+#: network/netconnect.pm:232
 #, c-format
 msgid "Cable connection"
 msgstr "Breiðbandstenging"
 
-#: network/netconnect.pm:213
+#: network/netconnect.pm:233
 #, c-format
 msgid "LAN connection"
 msgstr "Staðarnetstenging"
 
-#: network/netconnect.pm:214 network/netconnect.pm:228
+#: network/netconnect.pm:234 network/netconnect.pm:248
 #, fuzzy, c-format
 msgid "Wireless connection"
 msgstr "Breiðbandstenging"
 
-#: network/netconnect.pm:224
+#: network/netconnect.pm:244
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Veldu tenginguna sem þú vilt stilla"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:261
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -8599,138 +8591,191 @@ msgstr ""
 "\n"
 "Ýttu á \"%s\" til að halda áfram."
 
-#: network/netconnect.pm:249 network/netconnect.pm:710
+#: network/netconnect.pm:269 network/netconnect.pm:781
 #, c-format
 msgid "Connection Configuration"
 msgstr "Tengi-stillingar"
 
-#: 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 ""
 
-#: network/netconnect.pm:256 standalone/drakconnect:494
-#: standalone/drakconnect:899
+#: network/netconnect.pm:277 standalone/drakconnect:519
 #, c-format
 msgid "Card IRQ"
 msgstr "Kort 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 "Kortminni (DMA)"
 
-#: network/netconnect.pm:258 standalone/drakconnect:496
-#: standalone/drakconnect:901
+#: network/netconnect.pm:279 standalone/drakconnect:521
 #, c-format
 msgid "Card IO"
 msgstr "Kort 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 "Kort IO_0"
 
-#: network/netconnect.pm:260 standalone/drakconnect:903
+#: network/netconnect.pm:281
 #, c-format
 msgid "Card IO_1"
 msgstr "Kort IO_1"
 
-#: network/netconnect.pm:261 standalone/drakconnect:904
+#: network/netconnect.pm:282
 #, c-format
 msgid "Your personal phone number"
 msgstr "Þitt símanúmer"
 
-#: 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 "Nafn þjónustuaðila (t.d. simnet.is)"
 
-#: network/netconnect.pm:263 standalone/drakconnect:440
-#: standalone/drakconnect:906
+#: network/netconnect.pm:284 standalone/drakconnect:463
 #, c-format
 msgid "Provider phone number"
 msgstr "Símanúmer netþjónustu"
 
-#: network/netconnect.pm:264
+#: network/netconnect.pm:285
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "Nafnamiðlari 1 (ekki krafist)"
 
-#: network/netconnect.pm:265
+#: network/netconnect.pm:286
 #, fuzzy, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "Nafnamiðlari 2 (ekki krafist)"
 
-#: 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 "Hringihamur"
 
-#: 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 "Tengihraði"
 
-#: 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 "Tenging fellur á tíma eftir (í sek)"
 
-#: 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 "Netþjónustu-notandanafn"
 
-#: 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 "Netþjónustu-lykilorð"
 
-#: network/netconnect.pm:300
+#: network/netconnect.pm:323 network/netconnect.pm:637
+#: network/netconnect.pm:820
+#, fuzzy, c-format
+msgid "Select the network interface to configure:"
+msgstr "Veldu netkort"
+
+#: network/netconnect.pm:323 network/netconnect.pm:457
+#: network/netconnect.pm:641 standalone/drakgw:113 standalone/drakvpn:49
 #, c-format
-msgid "What kind is your ISDN connection?"
-msgstr "Hvaða gerðar er ISDN tengingin þín?"
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr ""
 
-#: 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 "Internal ISDN card"
-msgstr "Innvært ISDN mótald"
+msgid "Net Device"
+msgstr "Nettæki"
 
-#: network/netconnect.pm:301
+#: network/netconnect.pm:326 network/netconnect.pm:334
 #, c-format
 msgid "External ISDN modem"
 msgstr "Útvært ISDN mótald"
 
-#: network/netconnect.pm:332
+#: network/netconnect.pm:365 standalone/harddrake2:115
 #, c-format
-msgid "Do you want to start a new configuration ?"
-msgstr "Viltu prófa stillingarnar?"
+msgid "Select a device !"
+msgstr "Veldu tæki !"
+
+#: 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 uppsetning"
+
+#: network/netconnect.pm:375
+#, c-format
+msgid "What kind of card do you have?"
+msgstr "Hvernig kort ertu með?"
 
-#: network/netconnect.pm:335
+#: network/netconnect.pm:385
 #, 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."
+"\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 ""
-"Ég hef fundið ISDN PCI kort, en ég veit ekki hvaða tegund. Vinsamlega veldu "
-"tegund á næsta skjá."
+"\n"
+"Ef þú ert með ISA kort þá ættu gildin á næsta skjá að vera rétt.\n"
+"\n"
+"Ef þú hefur PCMCIA kort, þá þarft þú að vita \"irq\" og \"io\" kortsins.\n"
+
+#: network/netconnect.pm:389
+#, c-format
+msgid "Continue"
+msgstr "Áfram"
+
+#: network/netconnect.pm:389
+#, c-format
+msgid "Abort"
+msgstr "Hætta við"
 
-#: network/netconnect.pm:344
+#: network/netconnect.pm:395
 #, c-format
-msgid "No ISDN PCI card found. Please select one on the next screen."
-msgstr "Ekkert ISDN-PCI kort fannst. Vinsamlega veldu eitt á næsta skjá."
+msgid "Which of the following is your ISDN card?"
+msgstr "Hvert af eftirfarandi er þitt ISDN kort?"
+
+#: network/netconnect.pm:410
+#, c-format
+msgid "Which protocol do you want to use?"
+msgstr "Hvaða samskiptareglu viltu nota?"
 
-#: network/netconnect.pm:353
+#: network/netconnect.pm:412 standalone/drakconnect:116
+#: standalone/drakconnect:527 standalone/drakvpn:1140
+#, c-format
+msgid "Protocol"
+msgstr "Samskiptaregla"
+
+#: network/netconnect.pm:421
+#, c-format
+msgid ""
+"Select your provider.\n"
+"If it isn't listed, choose Unlisted."
+msgstr ""
+"Veldu þjónustuaðila.\n"
+"Ef hann er ekki á lista, veldu 'Ekki á lista'"
+
+#: network/netconnect.pm:423 network/netconnect.pm:529
+#: network/netconnect.pm:675
+#, fuzzy, c-format
+msgid "Provider:"
+msgstr "Snið: "
+
+#: network/netconnect.pm:438
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -8739,140 +8784,117 @@ msgstr ""
 "Mótaldið þitt er ekki stutt af kerfinu.\n"
 "Líttu á http://www.linmodems.org"
 
-#: network/netconnect.pm:364
+#: network/netconnect.pm:450
 #, fuzzy, c-format
 msgid "Select the modem to configure:"
 msgstr "Veldu netkort"
 
-#: network/netconnect.pm:403
+#: network/netconnect.pm:498
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Hvaða raðtengi er mótaldið tengt við"
 
-#: network/netconnect.pm:427
+#: network/netconnect.pm:527
 #, fuzzy, c-format
 msgid "Select your provider:"
 msgstr "Veldu biðraðastjóra"
 
-#: network/netconnect.pm:429 network/netconnect.pm:599
-#, fuzzy, c-format
-msgid "Provider:"
-msgstr "Snið: "
-
-#: network/netconnect.pm:481 network/netconnect.pm:482
-#: network/netconnect.pm:483 network/netconnect.pm:508
-#: network/netconnect.pm:525 network/netconnect.pm:541
-#, fuzzy, c-format
-msgid "Manual"
-msgstr "handvirkt"
-
-#: network/netconnect.pm:485
+#: network/netconnect.pm:556
 #, fuzzy, c-format
 msgid "Dialup: account options"
 msgstr "Innhringistillingar"
 
-#: network/netconnect.pm:488 standalone/drakconnect:913
+#: network/netconnect.pm:559
 #, c-format
 msgid "Connection name"
 msgstr "Nafn tengingar"
 
-#: network/netconnect.pm:489 standalone/drakconnect:914
+#: network/netconnect.pm:560
 #, c-format
 msgid "Phone number"
 msgstr "Símanúmer"
 
-#: network/netconnect.pm:490 standalone/drakconnect:915
+#: network/netconnect.pm:561
 #, c-format
 msgid "Login ID"
 msgstr "Notendanafn"
 
-#: network/netconnect.pm:505 network/netconnect.pm:538
+#: network/netconnect.pm:576 network/netconnect.pm:609
 #, fuzzy, c-format
 msgid "Dialup: IP parameters"
 msgstr "Viðföng"
 
-#: network/netconnect.pm:508
+#: network/netconnect.pm:579
 #, fuzzy, c-format
 msgid "IP parameters"
 msgstr "Viðföng"
 
-#: 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 vistfang:"
 
-#: network/netconnect.pm:510
+#: network/netconnect.pm:581
 #, fuzzy, c-format
 msgid "Subnet mask"
 msgstr "Staðarnetsía:"
 
-#: network/netconnect.pm:522
+#: network/netconnect.pm:593
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr ""
 
-#: network/netconnect.pm:525
+#: network/netconnect.pm:596
 #, fuzzy, c-format
 msgid "DNS"
 msgstr "NIS"
 
-#: network/netconnect.pm:526 standalone/drakconnect:918
+#: network/netconnect.pm:597
 #, c-format
 msgid "Domain name"
 msgstr "Nafn léns"
 
-#: 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 "Aðal nafnamiðlari (ekki krafist)"
 
-#: 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 "Vara nafnamiðlari (ekki krafist)"
 
-#: network/netconnect.pm:529
+#: network/netconnect.pm:600
 #, fuzzy, c-format
 msgid "Set hostname from IP"
 msgstr "Nafn á prentara-vél eða IP"
 
-#: network/netconnect.pm:541 standalone/drakconnect:317
-#: standalone/drakconnect:912
+#: network/netconnect.pm:612 standalone/drakconnect:336
 #, c-format
 msgid "Gateway"
 msgstr "Gátt"
 
-#: network/netconnect.pm:542
+#: network/netconnect.pm:613
 #, fuzzy, c-format
 msgid "Gateway IP address"
 msgstr "IP vistfang:"
 
-#: network/netconnect.pm:567
+#: network/netconnect.pm:637
 #, fuzzy, c-format
 msgid "ADSL configuration"
 msgstr "Staðarnets-uppsetning"
 
-#: network/netconnect.pm:567 network/netconnect.pm:746
-#, fuzzy, c-format
-msgid "Select the network interface to configure:"
-msgstr "Veldu netkort"
-
-#: 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 "Nettæki"
-
-#: network/netconnect.pm:597
+#: network/netconnect.pm:673
 #, fuzzy, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Veldu þér land,"
 
-#: network/netconnect.pm:616
+#: network/netconnect.pm:691
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -8880,32 +8902,32 @@ msgid ""
 "or skip and do it later."
 msgstr ""
 
-#: network/netconnect.pm:620 network/netconnect.pm:625
+#: network/netconnect.pm:695 network/netconnect.pm:700
 #, c-format
 msgid "Use a floppy"
 msgstr "Nota diskling"
 
-#: network/netconnect.pm:620 network/netconnect.pm:629
+#: network/netconnect.pm:695 network/netconnect.pm:704
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Nota Windows disksneið"
 
-#: network/netconnect.pm:620 network/netconnect.pm:633
+#: network/netconnect.pm:695 network/netconnect.pm:708
 #, c-format
 msgid "Do it later"
 msgstr ""
 
-#: network/netconnect.pm:640
+#: network/netconnect.pm:715
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr ""
 
-#: network/netconnect.pm:647
+#: network/netconnect.pm:722
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr ""
 
-#: network/netconnect.pm:662
+#: network/netconnect.pm:737
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -8918,22 +8940,22 @@ msgstr ""
 "%s\n"
 "og afritaðu mgmt.o á /usr/share/speedtouch"
 
-#: network/netconnect.pm:719
+#: network/netconnect.pm:790
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr ""
 
-#: network/netconnect.pm:720
+#: network/netconnect.pm:791
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr ""
 
-#: network/netconnect.pm:721
+#: network/netconnect.pm:793
 #, fuzzy, c-format
 msgid "Encapsulation :"
 msgstr "Dulritunarlykill"
 
-#: network/netconnect.pm:736
+#: network/netconnect.pm:810
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -8942,17 +8964,7 @@ msgid ""
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
 
-#: network/netconnect.pm:753
-#, fuzzy, c-format
-msgid "No wireless network adapter on your system!"
-msgstr "Ekkert nettengi á vélinni þinni!"
-
-#: network/netconnect.pm:754 standalone/drakgw:240 standalone/drakpxe:137
-#, c-format
-msgid "No network adapter on your system!"
-msgstr "Ekkert nettengi á vélinni þinni!"
-
-#: network/netconnect.pm:766
+#: network/netconnect.pm:837
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
@@ -8961,24 +8973,33 @@ msgid ""
 "Modifying the fields below will override this configuration."
 msgstr ""
 
-#: 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 ""
+"Til hamingju, staðarnets og Internets uppsetningu er lokið.\n"
+"\n"
+
+#: network/netconnect.pm:864
 #, fuzzy, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconf Heiti vélar"
 
-#: network/netconnect.pm:785 network/netconnect.pm:816
+#: network/netconnect.pm:865 network/netconnect.pm:899
 #, fuzzy, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "Stilli nettæki %s"
 
-#: network/netconnect.pm:786
+#: network/netconnect.pm:866
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
 "Please choose the one you want to use"
 msgstr ""
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:900
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -8989,108 +9010,108 @@ msgstr ""
 "á að vera IP tala rituð með punkt á milli.\n"
 "(dæmi 1.2.3.4)"
 
-#: network/netconnect.pm:824
+#: network/netconnect.pm:907
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Skilgreina nafn vélar frá DHCP vistfangi"
 
-#: network/netconnect.pm:825
+#: network/netconnect.pm:908
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP vélarheiti:"
 
-#: 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 "Netsía"
 
-#: 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 ""
 
-#: network/netconnect.pm:833 standalone/drakconnect:390
+#: network/netconnect.pm:916 standalone/drakconnect:413
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Netstillingar útskifanlegra tækja"
 
-#: network/netconnect.pm:834 standalone/drakconnect:384
+#: network/netconnect.pm:917 standalone/drakconnect:407
 #, c-format
 msgid "Start at boot"
 msgstr "Ræsa við kerfisræsingu"
 
-#: network/netconnect.pm:836 standalone/drakconnect:768
+#: network/netconnect.pm:919 standalone/drakconnect:810
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP biðlari"
 
-#: 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 vistfang á að vera á sniðinu 1.2.3.4"
 
-#: network/netconnect.pm:849
+#: network/netconnect.pm:932
 #, c-format
 msgid "Warning : IP address %s is usually reserved !"
 msgstr ""
 
-#: network/netconnect.pm:879 network/netconnect.pm:908
+#: network/netconnect.pm:962 network/netconnect.pm:991
 #, fuzzy, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "Sláðu inn nafn vélar eða IP."
 
-#: network/netconnect.pm:882 standalone/drakconnect:355
+#: network/netconnect.pm:965 standalone/drakconnect:378
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "F. sérfræðinga"
 
-#: network/netconnect.pm:884 standalone/drakconnect:356
+#: network/netconnect.pm:967 standalone/drakconnect:379
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: network/netconnect.pm:885 standalone/drakconnect:357
+#: network/netconnect.pm:968 standalone/drakconnect:380
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Net"
 
-#: network/netconnect.pm:886 standalone/drakconnect:358
+#: network/netconnect.pm:969 standalone/drakconnect:381
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: network/netconnect.pm:887 standalone/drakconnect:359
+#: network/netconnect.pm:970 standalone/drakconnect:382
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: network/netconnect.pm:888 standalone/drakconnect:360
+#: network/netconnect.pm:971 standalone/drakconnect:383
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: 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 "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: 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 "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: network/netconnect.pm:911 standalone/drakconnect:371
+#: network/netconnect.pm:994 standalone/drakconnect:394
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: network/netconnect.pm:912
+#: network/netconnect.pm:995
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -9104,17 +9125,17 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:919 standalone/drakconnect:372
+#: network/netconnect.pm:1002 standalone/drakconnect:395
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Leikja-(vinnu)stöð"
 
-#: network/netconnect.pm:920 standalone/drakconnect:373
+#: network/netconnect.pm:1003 standalone/drakconnect:396
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:921
+#: network/netconnect.pm:1004
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -9125,12 +9146,12 @@ msgid ""
 msgstr ""
 
 #. -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 ""
 
-#: 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"
@@ -9142,12 +9163,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:937 standalone/drakconnect:375
+#: network/netconnect.pm:1020 standalone/drakconnect:398
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:938
+#: network/netconnect.pm:1021
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -9165,7 +9186,7 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:965
+#: network/netconnect.pm:1048
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system.\n"
@@ -9174,18 +9195,18 @@ msgstr ""
 "Ekkert netkort hefur fundist á tölvunni þinni, Ég get ekki\n"
 "sett upp þessa tengingu."
 
-#: 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 "Veldu netkort"
 
-#: 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 "Veldu hvaða netkort þú notar til að tengjast Internetinu."
 
-#: network/netconnect.pm:991
+#: network/netconnect.pm:1074
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -9198,84 +9219,84 @@ msgstr ""
 "vistfang gáttarinnar ef þú veist hvað það vistfang er.\n"
 "Gáttin gefur þér aðgang út úr staðarnetinu (t.d. á Internetið)."
 
-#: 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 ""
 
-#: network/netconnect.pm:997
+#: network/netconnect.pm:1080 standalone/drakconnect:923
 #, fuzzy, c-format
 msgid "Host name (optional)"
 msgstr "Stilla nafn á vél"
 
-#: network/netconnect.pm:997
+#: network/netconnect.pm:1080
 #, c-format
 msgid "Host name"
 msgstr "Heiti vélar"
 
-#: network/netconnect.pm:998
+#: network/netconnect.pm:1082
 #, fuzzy, c-format
 msgid "DNS server 1"
 msgstr "Nafnamiðlari"
 
-#: network/netconnect.pm:999
+#: network/netconnect.pm:1083
 #, fuzzy, c-format
 msgid "DNS server 2"
 msgstr "Nafnamiðlari"
 
-#: network/netconnect.pm:1000
+#: network/netconnect.pm:1084
 #, fuzzy, c-format
 msgid "DNS server 3"
 msgstr "Nafnamiðlari"
 
-#: network/netconnect.pm:1001
+#: network/netconnect.pm:1085
 #, fuzzy, c-format
 msgid "Search domain"
 msgstr "NIS lén"
 
-#: 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 ""
 
-#: network/netconnect.pm:1003
+#: network/netconnect.pm:1087
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Gátt (þ.e. %s)"
 
-#: network/netconnect.pm:1005
+#: network/netconnect.pm:1089
 #, c-format
 msgid "Gateway device"
 msgstr "Gátt (tækið)"
 
-#: network/netconnect.pm:1014
+#: network/netconnect.pm:1098
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Vistfang DNS-þjóns á að vera á sniðinu 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 "Vistfang Gáttar á að vera á sniðinu 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 "
 "back to other machines on the network:"
 msgstr ""
 
-#: network/netconnect.pm:1031
+#: network/netconnect.pm:1115
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf Heiti vélar"
 
-#: network/netconnect.pm:1034
+#: network/netconnect.pm:1118
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zerocont vélarheiti má ekki innihalda ."
 
-#: network/netconnect.pm:1044
+#: network/netconnect.pm:1128
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -9286,32 +9307,32 @@ msgstr ""
 "Veldi þá sem þú vilt nota.\n"
 "\n"
 
-#: network/netconnect.pm:1046
+#: network/netconnect.pm:1130
 #, c-format
 msgid "Internet connection"
 msgstr "Internettenging"
 
-#: network/netconnect.pm:1054
+#: network/netconnect.pm:1144
 #, c-format
 msgid "Configuration is complete, do you want to apply settings ?"
 msgstr "Uppsetningu lokið, viltu virkja stillingar?"
 
-#: network/netconnect.pm:1070
+#: network/netconnect.pm:1154
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "Viltu ræsa nettengingarnar þegar kerfi ræsir?"
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1166
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it ?"
 msgstr "Það þarf að endurræsa netið, viltu endurræsa það núna?"
 
-#: network/netconnect.pm:1100 network/netconnect.pm:1165
+#: network/netconnect.pm:1173 network/netconnect.pm:1238
 #, c-format
 msgid "Network Configuration"
 msgstr "Netstillingar"
 
-#: network/netconnect.pm:1101
+#: network/netconnect.pm:1174
 #, c-format
 msgid ""
 "A problem occured while restarting the network: \n"
@@ -9322,27 +9343,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 "Viltu reyna að tengjast Internetinu núna?"
 
-#: network/netconnect.pm:1118 standalone/drakconnect:958
+#: network/netconnect.pm:1190 standalone/drakconnect:955
 #, c-format
 msgid "Testing your connection..."
 msgstr "Prófa tenginguna þína..."
 
-#: network/netconnect.pm:1134
+#: network/netconnect.pm:1206
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "Kerfið er nú tengt Internetinu"
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1207
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "Af öryggisástæðum verður aftengt núna."
 
-#: network/netconnect.pm:1136
+#: network/netconnect.pm:1208
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -9351,16 +9372,7 @@ msgstr ""
 "Kerfið virðist ekki vera tengt við Internetið.\n"
 "reyndu að endurstilla tenginguna."
 
-#: network/netconnect.pm:1150
-#, c-format
-msgid ""
-"Congratulations, the network and Internet configuration is finished.\n"
-"\n"
-msgstr ""
-"Til hamingju, staðarnets og Internets uppsetningu er lokið.\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 "
@@ -9369,7 +9381,7 @@ msgstr ""
 "Eftir að þessu er lokið mælum við með að þú  endurræsir X umhverfið til að "
 "koma í veg fyrir nafna-tengd vandamál."
 
-#: network/netconnect.pm:1154
+#: network/netconnect.pm:1226
 #, c-format
 msgid ""
 "Problems occured during configuration.\n"
@@ -9377,7 +9389,7 @@ msgid ""
 "work, you might want to relaunch the configuration."
 msgstr ""
 
-#: network/netconnect.pm:1166
+#: network/netconnect.pm:1239
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -9386,61 +9398,67 @@ msgid ""
 "Internet & Network connection.\n"
 msgstr ""
 
-#: network/network.pm:314
+#: network/netconnect.pm:1327
+#, c-format
+msgid ""
+"An unexpected error has happened:\n"
+"%s"
+msgstr ""
+
+#: network/network.pm:315
 #, c-format
 msgid "Proxies configuration"
 msgstr "Seluppsetning"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP sel:"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP Sel:"
 
-#: network/network.pm:319
+#: network/network.pm:320
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "Sel ætti að vera http://..."
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "Slóð ætti að byrja á 'ftp' eða 'http'"
 
-#: network/shorewall.pm:26
+#: network/shorewall.pm:28
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "Fann eldveggsuppsetningu!"
 
-#: network/shorewall.pm:27
+#: network/shorewall.pm:29
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fixes after installation."
 msgstr ""
 
-#: 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 ""
 
-#: network/tools.pm:207
+#: network/tools.pm:205
 #, c-format
 msgid "Insert floppy"
 msgstr "Settu diskling í drif"
 
-#: 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 "
@@ -9448,22 +9466,22 @@ msgid ""
 msgstr ""
 "Settu FAT forsniðinn diskling í drif %s með %s í rótarmöppu og ýttu á %s"
 
-#: network/tools.pm:209
+#: network/tools.pm:207
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "Diskettuvilla, get ekki tengt %s"
 
-#: partition_table.pm:642
+#: partition_table.pm:644
 #, c-format
 msgid "mount failed: "
 msgstr "tókst ekki að tengja: "
 
-#: partition_table.pm:747
+#: partition_table.pm:749
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr ""
 
-#: 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"
@@ -9474,22 +9492,22 @@ msgstr ""
 "Eina lausnins er að færa aðalsneiðar svo að gatið verði við hliðina á "
 "viðbótasneið"
 
-#: partition_table.pm:852
+#: partition_table.pm:854
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Villa við lestur úr skránni %s: %s"
 
-#: partition_table.pm:854
+#: partition_table.pm:856
 #, c-format
 msgid "Bad backup file"
 msgstr "Skemmd afritsskrá"
 
-#: partition_table.pm:874
+#: partition_table.pm:876
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Villa við að skrifa í skrána %s"
 
-#: partition_table/raw.pm:181
+#: partition_table/raw.pm:187
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -9528,70 +9546,70 @@ msgstr "þægilegt"
 msgid "maybe"
 msgstr "kannski"
 
-#: printer/cups.pm:87
+#: printer/cups.pm:103
 #, c-format
 msgid "(on %s)"
 msgstr "(á %s)"
 
-#: printer/cups.pm:87
+#: printer/cups.pm:103
 #, c-format
 msgid "(on this machine)"
 msgstr "(á þessarri vél)"
 
-#: printer/cups.pm:99 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:197
 #, c-format
 msgid "Configured on other machines"
 msgstr "Stillt á öðrum vélum"
 
-#: printer/cups.pm:101
+#: printer/cups.pm:117
 #, c-format
 msgid "On CUPS server \"%s\""
 msgstr "Á CUPS þjóni \"%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 " (Sjálfgefið)"
 
-#: printer/data.pm:21
+#: printer/data.pm:22
 #, c-format
 msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - Print, Don't Queue"
 
-#: 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 "LPD - Line Printer Daemon"
 
-#: 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 New Generation"
 
-#: 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 - Common Unix Printing System"
 
 #: 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 "Óþekkt tegund"
@@ -9611,7 +9629,7 @@ msgstr "Fjartengdur prentari"
 msgid "Printer on remote CUPS server"
 msgstr "Prentari fjartengdur á CUPS þjóni"
 
-#: 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 "Prentari fjartengdur á lpd þjóni"
@@ -9631,7 +9649,7 @@ msgstr "Prentari á SMB/Windows 95/98/NT miðlara"
 msgid "Printer on NetWare server"
 msgstr "Prentari á NetWare miðlara"
 
-#: 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 "Gefðu upp slóð að prentara (URI)"
@@ -9642,8 +9660,8 @@ msgid "Pipe job into a command"
 msgstr "Senda prentverk á skipun"
 
 #: 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 "Óþekkt tegund"
@@ -9653,12 +9671,12 @@ msgstr "Óþekkt tegund"
 msgid "Configured on this machine"
 msgstr "Uppsettur á þessarri vél"
 
-#: printer/main.pm:337 printer/printerdrake.pm:948
+#: printer/main.pm:337 printer/printerdrake.pm:963
 #, c-format
 msgid " on parallel port #%s"
 msgstr " á raðtengi - port #%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 prentari #%s"
@@ -9728,8 +9746,8 @@ msgstr ", nota skipun %s"
 msgid "Parallel port #%s"
 msgstr "Raðtengi - port #%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 prentari #%s"
@@ -9799,8 +9817,8 @@ msgstr "Notar skipun %s"
 msgid "URI: %s"
 msgstr ""
 
-#: 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 "Hrár prentari (enginn rekill)"
@@ -9852,7 +9870,7 @@ msgstr "CUPS prentarastillingar"
 #, 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 ""
 
 #: printer/printerdrake.pm:64
@@ -9882,8 +9900,8 @@ msgstr "Samnýting prentara á vél/neti: "
 msgid "Custom configuration"
 msgstr "Sérsniðin uppsetning"
 
-#: 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 "Engar fjarlægar vélar"
@@ -10059,7 +10077,7 @@ msgstr "IP-vistfang miðlara vantar!"
 msgid "The entered IP is not correct.\n"
 msgstr "Uppgefið IP-vistfang er ekki rétt.\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 ""
@@ -10069,36 +10087,37 @@ msgstr ""
 msgid "This server is already in the list, it cannot be added again.\n"
 msgstr ""
 
-#: 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"
@@ -10126,7 +10145,7 @@ msgid ""
 "printers will be automatically detected."
 msgstr ""
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:3807
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
 #, c-format
 msgid ""
 "\n"
@@ -10136,7 +10155,8 @@ msgstr ""
 
 #: printer/printerdrake.pm:515
 #, c-format
-msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
+msgid ""
+"Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
 msgstr ""
 
 #: printer/printerdrake.pm:545
@@ -10144,17 +10164,17 @@ msgstr ""
 msgid "Checking your system..."
 msgstr "Athuga tölvuna þína..."
 
-#: printer/printerdrake.pm:560
+#: printer/printerdrake.pm:561
 #, c-format
 msgid "and one unknown printer"
 msgstr "og einn óþekktur prentari"
 
-#: printer/printerdrake.pm:562
+#: printer/printerdrake.pm:563
 #, c-format
 msgid "and %d unknown printers"
 msgstr "og %d óþekktir prentarar"
 
-#: printer/printerdrake.pm:566
+#: printer/printerdrake.pm:567
 #, c-format
 msgid ""
 "The following printers\n"
@@ -10167,7 +10187,7 @@ msgstr ""
 "%s%s\n"
 "eru tengdir beint við tölvuna þína"
 
-#: printer/printerdrake.pm:568
+#: printer/printerdrake.pm:569
 #, c-format
 msgid ""
 "The following printer\n"
@@ -10180,7 +10200,7 @@ msgstr ""
 "%s%s\n"
 "eru tengdir beint við tölvuna þína"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:570
 #, c-format
 msgid ""
 "The following printer\n"
@@ -10193,103 +10213,103 @@ msgstr ""
 "%s%s\n"
 "er tengdur beint við tölvuna þína"
 
-#: printer/printerdrake.pm:573
+#: printer/printerdrake.pm:574
 #, c-format
 msgid ""
 "\n"
 "There is one unknown printer directly connected to your system"
 msgstr ""
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:575
 #, c-format
 msgid ""
 "\n"
 "There are %d unknown printers directly connected to your system"
 msgstr ""
 
-#: printer/printerdrake.pm:577
+#: printer/printerdrake.pm:578
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr ""
 
-#: printer/printerdrake.pm:580
+#: printer/printerdrake.pm:581
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr ""
 " (vertu viss um að allir þínir prentarar séu tengdir og kveikt á þeim).\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 "
 "printers in the local network?\n"
 msgstr ""
 
-#: 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 "Viltu virkja prentun á prenturum á staðarnetinu?\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 "Viltu virkja prentun á ofangreindum prenturum?\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 ""
 
-#: 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 "
 "additional software will be installed."
 msgstr ""
 
-#: printer/printerdrake.pm:622
+#: printer/printerdrake.pm:629
 #, c-format
 msgid "Searching for new printers..."
 msgstr "Leita að nýjum prenturum..."
 
-#: printer/printerdrake.pm:706
+#: printer/printerdrake.pm:713
 #, c-format
 msgid "Configuring printer ..."
 msgstr "Setja upp prentara..."
 
-#: 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 "Stilla prentara \"%s\"..."
 
-#: 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 ""
 
-#: 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 "Veldu prentarategund"
 
-#: 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 "Hvaða prentarategund ertu með?"
 
-#: printer/printerdrake.pm:736
+#: printer/printerdrake.pm:743
 #, c-format
 msgid ""
 "\n"
@@ -10298,28 +10318,28 @@ msgid ""
 "choose the correct model from the list."
 msgstr ""
 
-#: 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 "
 "similar one."
 msgstr ""
 
-#: 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 "Set upp forrit..."
 
-#: 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 "Bæta við prentara"
 
-#: printer/printerdrake.pm:825
+#: printer/printerdrake.pm:832
 #, c-format
 msgid ""
 "\n"
@@ -10333,7 +10353,7 @@ msgid ""
 "connection types."
 msgstr ""
 
-#: printer/printerdrake.pm:838
+#: printer/printerdrake.pm:845
 #, c-format
 msgid ""
 "\n"
@@ -10355,7 +10375,7 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:847
+#: printer/printerdrake.pm:854
 #, c-format
 msgid ""
 "\n"
@@ -10371,7 +10391,7 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:855
+#: printer/printerdrake.pm:862
 #, c-format
 msgid ""
 "\n"
@@ -10392,7 +10412,7 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:864
+#: printer/printerdrake.pm:871
 #, c-format
 msgid ""
 "\n"
@@ -10408,22 +10428,22 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:873
+#: printer/printerdrake.pm:880
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "Finna sjálfkrafa staðværa prentara"
 
-#: printer/printerdrake.pm:876
+#: printer/printerdrake.pm:883
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr ""
 
-#: printer/printerdrake.pm:879
+#: printer/printerdrake.pm:886
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 
-#: printer/printerdrake.pm:895
+#: printer/printerdrake.pm:902
 #, c-format
 msgid ""
 "\n"
@@ -10437,54 +10457,70 @@ msgid ""
 "select \"Printer\" in the \"Hardware\" section of the %s Control Center."
 msgstr ""
 
-#: 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
+#, fuzzy, c-format
+msgid "Could not install the %s packages!"
+msgstr "Set inn pakka %s"
+
+#: printer/printerdrake.pm:939
+#, c-format
+msgid "Skipping Windows/SMB server auto-detection"
+msgstr ""
+
+#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
 #, c-format
 msgid "Printer auto-detection"
 msgstr "Finna prentara sjálfkrafa"
 
-#: printer/printerdrake.pm:930
+#: printer/printerdrake.pm:945
 #, c-format
 msgid "Detecting devices..."
 msgstr "Leita að tækjum..."
 
-#: printer/printerdrake.pm:952
+#: printer/printerdrake.pm:967
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", netprentari \"%s\", gátt %s"
 
-#: printer/printerdrake.pm:954
+#: printer/printerdrake.pm:969
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", prentari á \"%s\" SMB/Windows 95/98/NT \"%s\""
 
-#: printer/printerdrake.pm:958
+#: printer/printerdrake.pm:973
 #, c-format
 msgid "Detected %s"
 msgstr "Skyjnaði %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 "Prentari á raðtengi - port \\#%s"
 
-#: printer/printerdrake.pm:966
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Netprentari \"%s\", gátt %s"
 
-#: printer/printerdrake.pm:968
+#: printer/printerdrake.pm:983
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "Prentari á \"%s\" SMB/Windows 95/98/NT \"%s\""
 
-#: printer/printerdrake.pm:1047
+#: printer/printerdrake.pm:1062
 #, c-format
 msgid "Local Printer"
 msgstr "Staðbundinn prentari"
 
-#: printer/printerdrake.pm:1048
+#: printer/printerdrake.pm:1063
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -10493,64 +10529,64 @@ msgid ""
 "printer: /dev/usb/lp1, ...)."
 msgstr ""
 
-#: printer/printerdrake.pm:1052
+#: printer/printerdrake.pm:1067
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr ""
 
-#: printer/printerdrake.pm:1061
+#: printer/printerdrake.pm:1076
 #, c-format
 msgid "No printer found!"
 msgstr "Enginn prentari fannst!"
 
-#: printer/printerdrake.pm:1069
+#: printer/printerdrake.pm:1084
 #, c-format
 msgid "Local Printers"
 msgstr "Staðbundnir prentarar"
 
-#: printer/printerdrake.pm:1070
+#: printer/printerdrake.pm:1085
 #, c-format
 msgid "Available printers"
 msgstr "Tiltækir prentarar"
 
-#: 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 "Eftirfarandi prentari fannst. "
 
-#: 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 "
 "the input line"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "
 "name in the input line"
 msgstr ""
 
-#: 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 "
 "device name/file name in the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1100
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -10558,12 +10594,12 @@ msgid ""
 "configuration, turn on \"Manual configuration\"."
 msgstr ""
 
-#: printer/printerdrake.pm:1086
+#: printer/printerdrake.pm:1101
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr ""
 
-#: printer/printerdrake.pm:1089
+#: printer/printerdrake.pm:1104
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -10572,24 +10608,24 @@ msgid ""
 "\"Manual configuration\"."
 msgstr ""
 
-#: printer/printerdrake.pm:1090
+#: printer/printerdrake.pm:1105
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "Veldu prentara sém á að fá send prentverkin"
 
-#: 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 "
 "name/file name in the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1093
+#: printer/printerdrake.pm:1108
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "Veldu hvaða tengi er prentarinn er tengdur við"
 
-#: printer/printerdrake.pm:1095
+#: printer/printerdrake.pm:1110
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -10598,17 +10634,26 @@ msgstr ""
 " (hliðtengd port: /dev/lp0, /dev/lp1, ..., samsvarar LPT1:, LPT2:, ..., 1. "
 "USB prentari: /dev/usb/lp0, 2.USB prentari: /dev/usb/lp1, ...)."
 
-#: printer/printerdrake.pm:1099
+#: printer/printerdrake.pm:1114
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "Þú verður að velja/gefa upp prentara/prenttæki!"
 
-#: 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
+#, fuzzy, c-format
+msgid "Aborting"
+msgstr "Hætta við"
+
+#: printer/printerdrake.pm:1189
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "Viðföng fyrir fjartengda lpd prentara"
 
-#: 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 "
@@ -10618,66 +10663,65 @@ msgstr ""
 "upp vélarheiti prentþjónsins og prentröðina á þeim sem\n"
 "þú vilt senda prentverkin í."
 
-#: printer/printerdrake.pm:1170
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "Remote host name"
 msgstr "Vélarnafn þjóns"
 
-#: printer/printerdrake.pm:1171
+#: printer/printerdrake.pm:1192
 #, c-format
 msgid "Remote printer name"
 msgstr "Vélarnafn fjartengds prentara"
 
-#: printer/printerdrake.pm:1174
+#: printer/printerdrake.pm:1195
 #, c-format
 msgid "Remote host name missing!"
 msgstr "Vélarnafn vantar á prentþjón!"
 
-#: printer/printerdrake.pm:1178
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "Nafn vantar á fjartengdan prentara!"
 
-#: 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 "Upplýsingar"
 
-#: printer/printerdrake.pm:1200 printer/printerdrake.pm:1714
+#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Fann tegund: %s %s"
 
-#: printer/printerdrake.pm:1276 printer/printerdrake.pm:1516
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
 #, c-format
 msgid "Scanning network..."
 msgstr "Leita á neti..."
 
-#: 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 ", prentari \"%s\" á miðlara \"%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 "Prentari \"%s\" á miðlara \"%s\""
 
-#: printer/printerdrake.pm:1332
+#: printer/printerdrake.pm:1366
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB/Windows 9x/NT prentviðföng"
 
-#: 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 "
@@ -10691,54 +10735,54 @@ msgstr ""
 "ásamt samnýtingarheiti prentarans, notandaheiti, lykilorði og\n"
 "vinnuhópsupplýsingum fyrir prentarann."
 
-#: printer/printerdrake.pm:1334
+#: printer/printerdrake.pm:1368
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
 "and then add user name, password, and/or workgroup if needed."
 msgstr ""
 
-#: printer/printerdrake.pm:1336
+#: printer/printerdrake.pm:1370
 #, c-format
 msgid "SMB server host"
 msgstr "Heiti SMB þjóns"
 
-#: printer/printerdrake.pm:1337
+#: printer/printerdrake.pm:1371
 #, c-format
 msgid "SMB server IP"
 msgstr "Vistfang SMB þjóns"
 
-#: printer/printerdrake.pm:1338
+#: printer/printerdrake.pm:1372
 #, c-format
 msgid "Share name"
 msgstr "Sameignarheiti"
 
-#: printer/printerdrake.pm:1341
+#: printer/printerdrake.pm:1375
 #, c-format
 msgid "Workgroup"
 msgstr "Vinnuhópur"
 
-#: printer/printerdrake.pm:1343
+#: printer/printerdrake.pm:1377
 #, c-format
 msgid "Auto-detected"
 msgstr "Fundinn sjálfkrafa"
 
-#: printer/printerdrake.pm:1353
+#: printer/printerdrake.pm:1387
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr ""
 
-#: printer/printerdrake.pm:1357
+#: printer/printerdrake.pm:1391
 #, c-format
 msgid "Samba share name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1363
+#: printer/printerdrake.pm:1397
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "ÖRYGGISAÐVÖRUN!"
 
-#: 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 "
@@ -10762,7 +10806,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:1374
+#: printer/printerdrake.pm:1408
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -10771,7 +10815,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1411
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -10785,12 +10829,12 @@ msgstr ""
 "Viltu í alvöru halda áfram að setja upp þennan prentara eins og þú ert að "
 "gera núna?"
 
-#: printer/printerdrake.pm:1449
+#: printer/printerdrake.pm:1489
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "Viðföng NetWare prentara"
 
-#: 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 "
@@ -10803,49 +10847,49 @@ msgstr ""
 "ásamt heiti prentaraðar, notandaheiti og lykilorði fyrir\n"
 "prentarann."
 
-#: printer/printerdrake.pm:1451
+#: printer/printerdrake.pm:1491
 #, c-format
 msgid "Printer Server"
 msgstr "Prentþjónn"
 
-#: printer/printerdrake.pm:1452
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Print Queue Name"
 msgstr "Heiti prentraðar"
 
-#: printer/printerdrake.pm:1457
+#: printer/printerdrake.pm:1497
 #, c-format
 msgid "NCP server name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1461
+#: printer/printerdrake.pm:1501
 #, c-format
 msgid "NCP queue name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1527 printer/printerdrake.pm:1547
+#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", vél \"%s\", gátt %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 "Vél \"%s\", gátt %s"
 
-#: printer/printerdrake.pm:1571
+#: printer/printerdrake.pm:1618
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "TCP/Sökkul prentara-valkostir"
 
-#: 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 "
 "or IP and the optional port number (default is 9100) in the input fields."
 msgstr ""
 
-#: 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 "
@@ -10854,22 +10898,27 @@ msgid ""
 "vary. See the manual of your hardware."
 msgstr ""
 
-#: printer/printerdrake.pm:1578
+#: printer/printerdrake.pm:1625
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "vélarnafn prentara-vélar eða IP vantar!"
 
-#: printer/printerdrake.pm:1601
+#: printer/printerdrake.pm:1648
 #, c-format
 msgid "Printer host name or IP"
 msgstr "Nafn á prentara-vél eða IP"
 
-#: printer/printerdrake.pm:1649 printer/printerdrake.pm:1651
+#: printer/printerdrake.pm:1704
+#, fuzzy, c-format
+msgid "Refreshing Device URI list..."
+msgstr "Endurles prentara upplýsingar..."
+
+#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
 #, c-format
 msgid "Printer Device URI"
 msgstr "Slóð að prentara (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 "
@@ -10877,34 +10926,34 @@ msgid ""
 "are supported by all the spoolers."
 msgstr ""
 
-#: printer/printerdrake.pm:1668
+#: printer/printerdrake.pm:1731
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr ""
 
-#: printer/printerdrake.pm:1749
+#: printer/printerdrake.pm:1834
 #, c-format
 msgid "Pipe into command"
 msgstr "Pípaa inn í skipun"
 
-#: 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 ""
 
-#: printer/printerdrake.pm:1751
+#: printer/printerdrake.pm:1836
 #, c-format
 msgid "Command line"
 msgstr "Skipanalína"
 
-#: printer/printerdrake.pm:1755
+#: printer/printerdrake.pm:1840
 #, c-format
 msgid "A command line must be entered!"
 msgstr "Skipanalína verður að vera!"
 
-#: printer/printerdrake.pm:1788
+#: printer/printerdrake.pm:1873
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -10912,100 +10961,115 @@ msgid ""
 "an HP PhotoSmart or an HP LaserJet 2200?"
 msgstr ""
 
-#: printer/printerdrake.pm:1801
+#: printer/printerdrake.pm:1887
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "Set inn HPOJ pakka..."
 
-#: printer/printerdrake.pm:1809 printer/printerdrake.pm:1893
+#: printer/printerdrake.pm:1894
+#, c-format
+msgid "Only printing will be possible on the %s."
+msgstr ""
+
+#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
 #, c-format
 msgid "Checking device and configuring HPOJ..."
 msgstr ""
 
-#: printer/printerdrake.pm:1831
+#: printer/printerdrake.pm:1946
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "Set inn SANE pakka..."
 
-#: printer/printerdrake.pm:1858
+#: printer/printerdrake.pm:1956
+#, c-format
+msgid "Scanning on the %s will not be possible."
+msgstr ""
+
+#: printer/printerdrake.pm:1983
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "Set inn mtools pakka..."
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1990
+#, c-format
+msgid "Photo memory card access on the %s will not be possible."
+msgstr ""
+
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr ""
 
-#: printer/printerdrake.pm:1881
+#: printer/printerdrake.pm:2013
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr ""
 
-#: printer/printerdrake.pm:1930
+#: printer/printerdrake.pm:2062
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr ""
 
-#: 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 "Les prentara-gagnagrunn..."
 
-#: printer/printerdrake.pm:2149
+#: printer/printerdrake.pm:2281
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "Gefðu upp nafn prentara og lýsingu"
 
-#: 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 ""
 
-#: 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"
 "do you really want to overwrite its configuration?"
 msgstr ""
 
-#: printer/printerdrake.pm:2168
+#: printer/printerdrake.pm:2300
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
 "Location fields do not need to be filled in. They are comments for the users."
 msgstr ""
 
-#: printer/printerdrake.pm:2169
+#: printer/printerdrake.pm:2301
 #, c-format
 msgid "Name of printer"
 msgstr "Nafn prentara"
 
-#: 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 "Lýsing"
 
-#: printer/printerdrake.pm:2171 standalone/printerdrake:212
+#: printer/printerdrake.pm:2303 standalone/printerdrake:212
 #: standalone/printerdrake:219
 #, c-format
 msgid "Location"
 msgstr "Staðsetning"
 
-#: printer/printerdrake.pm:2188
+#: printer/printerdrake.pm:2320
 #, c-format
 msgid "Preparing printer database..."
 msgstr "Undirbý prentara-gagnagrunn..."
 
-#: printer/printerdrake.pm:2306
+#: printer/printerdrake.pm:2438
 #, c-format
 msgid "Your printer model"
 msgstr "Þín tegund prentara"
 
-#: printer/printerdrake.pm:2307
+#: printer/printerdrake.pm:2439
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -11020,18 +11084,18 @@ msgid ""
 "%s"
 msgstr ""
 
-#: printer/printerdrake.pm:2312 printer/printerdrake.pm:2315
+#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
 #, c-format
 msgid "The model is correct"
 msgstr "Tegundin er rétt"
 
-#: 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 "Velja tegund handvirkt"
 
-#: printer/printerdrake.pm:2340
+#: printer/printerdrake.pm:2472
 #, c-format
 msgid ""
 "\n"
@@ -11041,38 +11105,38 @@ msgid ""
 "\"Raw printer\" is highlighted."
 msgstr ""
 
-#: printer/printerdrake.pm:2359
+#: printer/printerdrake.pm:2491
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr ""
 
-#: printer/printerdrake.pm:2390
+#: printer/printerdrake.pm:2522
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
 "printer's options and features."
 msgstr ""
 
-#: 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 "
 "delivered with the printer."
 msgstr ""
 
-#: 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 ""
 
-#: 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 "
 "your Windows partition, too."
 msgstr ""
 
-#: 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 "
@@ -11080,65 +11144,65 @@ msgid ""
 "printer's hardware"
 msgstr ""
 
-#: 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 "
 "then be used for the setup of your printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2397
+#: printer/printerdrake.pm:2529
 #, fuzzy, c-format
 msgid "Install PPD file from"
 msgstr "Setja inn rpm"
 
-#: 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
 #, fuzzy, c-format
 msgid "CD-ROM"
 msgstr "CDROM"
 
-#: 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
 #, fuzzy, c-format
 msgid "Floppy Disk"
 msgstr "Disklingadrif"
 
-#: 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
 #, fuzzy, c-format
 msgid "Other place"
 msgstr "aðrar gáttir"
 
-#: printer/printerdrake.pm:2416
+#: printer/printerdrake.pm:2548
 #, fuzzy, c-format
 msgid "Select PPD file"
 msgstr "Veljið skrá"
 
-#: printer/printerdrake.pm:2420
+#: printer/printerdrake.pm:2552
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr ""
 
-#: printer/printerdrake.pm:2426
+#: printer/printerdrake.pm:2558
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr ""
 
-#: printer/printerdrake.pm:2437
+#: printer/printerdrake.pm:2569
 #, fuzzy, c-format
 msgid "Installing PPD file..."
 msgstr "Set inn %s..."
 
-#: printer/printerdrake.pm:2539
+#: printer/printerdrake.pm:2682
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "OKI winprinter stillingar"
 
-#: printer/printerdrake.pm:2540
+#: printer/printerdrake.pm:2683
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -11149,12 +11213,12 @@ msgid ""
 "not work. Your connection type setting will be ignored by the driver."
 msgstr ""
 
-#: printer/printerdrake.pm:2564 printer/printerdrake.pm:2593
+#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Lexmark bleksprautu stillingar"
 
-#: printer/printerdrake.pm:2565
+#: printer/printerdrake.pm:2708
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -11163,7 +11227,7 @@ msgid ""
 "to."
 msgstr ""
 
-#: printer/printerdrake.pm:2594
+#: printer/printerdrake.pm:2737
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -11176,12 +11240,26 @@ msgid ""
 "adjust the head alignment settings with this program."
 msgstr ""
 
-#: printer/printerdrake.pm:2597
+#: printer/printerdrake.pm:2746
+#, fuzzy, c-format
+msgid "Lexmark X125 configuration"
+msgstr "Lexmark bleksprautu stillingar"
+
+#: 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 ""
+
+#: printer/printerdrake.pm:2765
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr ""
 
-#: printer/printerdrake.pm:2710
+#: printer/printerdrake.pm:2878
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -11192,27 +11270,27 @@ msgid ""
 "printout quality/resolution printing can get substantially slower."
 msgstr ""
 
-#: printer/printerdrake.pm:2835
+#: printer/printerdrake.pm:3003
 #, c-format
 msgid "Printer default settings"
 msgstr "Sjálfgefin stilling prentara"
 
-#: printer/printerdrake.pm:2842
+#: printer/printerdrake.pm:3010
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "Valkostur %s verður að vera heiltala!"
 
-#: printer/printerdrake.pm:2846
+#: printer/printerdrake.pm:3014
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "Valkostur %s verður að vera tala!"
 
-#: printer/printerdrake.pm:2850
+#: printer/printerdrake.pm:3018
 #, c-format
 msgid "Option %s out of range!"
 msgstr ""
 
-#: printer/printerdrake.pm:2901
+#: printer/printerdrake.pm:3069
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -11221,12 +11299,12 @@ msgstr ""
 "Viltu setja þennan prentara (\"%s\")\n"
 "sem sjálfgefinn prentara?"
 
-#: printer/printerdrake.pm:2916
+#: printer/printerdrake.pm:3084
 #, c-format
 msgid "Test pages"
 msgstr "Prufusíður"
 
-#: printer/printerdrake.pm:2917
+#: printer/printerdrake.pm:3085
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -11235,47 +11313,57 @@ msgid ""
 "it is enough to print the standard test page."
 msgstr ""
 
-#: printer/printerdrake.pm:2921
+#: printer/printerdrake.pm:3089
 #, c-format
 msgid "No test pages"
 msgstr "Engar prufusíður"
 
-#: printer/printerdrake.pm:2922
+#: printer/printerdrake.pm:3090
 #, c-format
 msgid "Print"
 msgstr "Prenta"
 
-#: printer/printerdrake.pm:2947
+#: printer/printerdrake.pm:3115
 #, c-format
 msgid "Standard test page"
 msgstr "Stöðluð prufusíða"
 
-#: printer/printerdrake.pm:2950
+#: printer/printerdrake.pm:3118
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Önnur prufublaðsíða (Letter)"
 
-#: printer/printerdrake.pm:2953
+#: printer/printerdrake.pm:3121
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Önnur prufublaðsíða (A4)"
 
-#: printer/printerdrake.pm:2955
+#: printer/printerdrake.pm:3123
 #, c-format
 msgid "Photo test page"
 msgstr "Myndprófunarsíðu(r)"
 
-#: printer/printerdrake.pm:2959
+#: printer/printerdrake.pm:3127
 #, c-format
 msgid "Do not print any test page"
 msgstr "Prenta ekki út prufublaðsíðu(r)"
 
-#: printer/printerdrake.pm:2967 printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "Prenta út prufublaðsíðu(r)..."
 
-#: printer/printerdrake.pm:2992
+#: printer/printerdrake.pm:3150
+#, fuzzy, c-format
+msgid "Could not install the %s package!"
+msgstr "Set inn pakka %s"
+
+#: printer/printerdrake.pm:3152
+#, fuzzy, c-format
+msgid "Skipping photo test page."
+msgstr "Myndprófunarsíðu(r)"
+
+#: printer/printerdrake.pm:3169
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -11285,24 +11373,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:2996
+#: printer/printerdrake.pm:3173
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
 "It may take some time before the printer starts.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3180
 #, c-format
 msgid "Did it work properly?"
 msgstr ""
 
-#: printer/printerdrake.pm:3024 printer/printerdrake.pm:4192
+#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
 #, c-format
 msgid "Raw printer"
 msgstr "Hrár prentari"
 
-#: 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 "
@@ -11311,7 +11399,7 @@ msgid ""
 "to modify the option settings easily.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3056
+#: printer/printerdrake.pm:3233
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -11319,8 +11407,8 @@ msgid ""
 "because the file to print is provided by the application.\n"
 msgstr ""
 
-#: 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"
@@ -11329,7 +11417,7 @@ msgid ""
 "line, e. g. \"%s <file>\". "
 msgstr ""
 
-#: 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 "
@@ -11337,14 +11425,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: 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"
 "\n"
 msgstr ""
 
-#: 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 "
@@ -11353,8 +11441,8 @@ msgstr ""
 "Til að prenta skrá frá skipanalínunni (skjáglugga) notaðu skipunina \"%s "
 "<skrá>\".\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 "
@@ -11362,21 +11450,21 @@ msgid ""
 "because the file to print is provided by the application.\n"
 msgstr ""
 
-#: 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 "
 "\"Print option list\" button."
 msgstr ""
 
-#: 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 "
 "<file>\" or \"%s <file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3095
+#: printer/printerdrake.pm:3272
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -11387,7 +11475,7 @@ msgid ""
 "jams.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3099
+#: printer/printerdrake.pm:3276
 #, c-format
 msgid ""
 "\n"
@@ -11396,42 +11484,42 @@ msgid ""
 "line, e. g. \"%s <file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3109
+#: printer/printerdrake.pm:3286
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "Prenta/skanna/Mynd á \"%s\""
 
-#: printer/printerdrake.pm:3110
+#: printer/printerdrake.pm:3287
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "Prenta/skanna á \"%s\""
 
-#: printer/printerdrake.pm:3112
+#: printer/printerdrake.pm:3289
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Prentun/Mynda-korts aðgangur á \"%s\""
 
-#: printer/printerdrake.pm:3113
+#: printer/printerdrake.pm:3290
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "Prenta á prentara \"%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 "Loka"
 
-#: printer/printerdrake.pm:3119
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Print option list"
 msgstr "Valkostir á prentara"
 
-#: printer/printerdrake.pm:3140
+#: printer/printerdrake.pm:3317
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -11445,7 +11533,7 @@ msgid ""
 "Do not use \"scannerdrake\" for this device!"
 msgstr ""
 
-#: printer/printerdrake.pm:3163
+#: printer/printerdrake.pm:3343
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -11459,18 +11547,18 @@ msgid ""
 "of the file lists."
 msgstr ""
 
-#: printer/printerdrake.pm:3185 printer/printerdrake.pm:3575
+#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
 #, c-format
 msgid "Reading printer data..."
 msgstr "Les prentara-upplýsingar..."
 
-#: 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 "Flytja prentarastillingar"
 
-#: printer/printerdrake.pm:3206
+#: printer/printerdrake.pm:3386
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -11480,33 +11568,33 @@ msgid ""
 "Not all queues can be transferred due to the following reasons:\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3209
+#: printer/printerdrake.pm:3389
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
 "data into a free-formed command.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3211
+#: printer/printerdrake.pm:3391
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
 "printers.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3213
+#: printer/printerdrake.pm:3393
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3215
+#: printer/printerdrake.pm:3395
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
 msgstr ""
 
-#: printer/printerdrake.pm:3216
+#: printer/printerdrake.pm:3396
 #, c-format
 msgid ""
 "\n"
@@ -11517,7 +11605,7 @@ msgstr ""
 "Einnig er ekki hægt að flytja prentara sem eru skilgreindir með PPD skrám "
 "frá framleiðanda eða prentara með eigin CUPS reklum."
 
-#: printer/printerdrake.pm:3217
+#: printer/printerdrake.pm:3397
 #, c-format
 msgid ""
 "\n"
@@ -11525,17 +11613,17 @@ msgid ""
 "\"Transfer\"."
 msgstr ""
 
-#: printer/printerdrake.pm:3220
+#: printer/printerdrake.pm:3400
 #, c-format
 msgid "Do not transfer printers"
 msgstr "Ekki flytja prentara"
 
-#: printer/printerdrake.pm:3221 printer/printerdrake.pm:3237
+#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
 #, c-format
 msgid "Transfer"
 msgstr "Flutningur"
 
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3413
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -11543,45 +11631,45 @@ msgid ""
 "You can also type a new name or skip this printer."
 msgstr ""
 
-#: printer/printerdrake.pm:3254
+#: printer/printerdrake.pm:3434
 #, c-format
 msgid "New printer name"
 msgstr "Nýtt prentaranafn"
 
-#: printer/printerdrake.pm:3257
+#: printer/printerdrake.pm:3437
 #, c-format
 msgid "Transferring %s..."
 msgstr "Flyt %s..."
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3448
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
 "the default printer under the new printing system %s?"
 msgstr ""
 
-#: printer/printerdrake.pm:3278
+#: printer/printerdrake.pm:3458
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "Endurles prentara upplýsingar..."
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3467
 #, c-format
 msgid "Starting network..."
 msgstr "Ræsi net..."
 
-#: 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 "Stilla nettengingu núna"
 
-#: printer/printerdrake.pm:3329
+#: printer/printerdrake.pm:3509
 #, c-format
 msgid "Network functionality not configured"
 msgstr "Netmöguleikar ekki skilreindir"
 
-#: printer/printerdrake.pm:3330
+#: printer/printerdrake.pm:3510
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -11590,22 +11678,22 @@ msgid ""
 "configuring now. How do you want to proceed?"
 msgstr ""
 
-#: printer/printerdrake.pm:3333
+#: printer/printerdrake.pm:3513
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Halda áfram án þess að stilla nettengingu"
 
-#: 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\""
 msgstr ""
 
-#: printer/printerdrake.pm:3368
+#: printer/printerdrake.pm:3548
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -11613,34 +11701,34 @@ msgid ""
 "printer again."
 msgstr ""
 
-#: printer/printerdrake.pm:3378
+#: printer/printerdrake.pm:3558
 #, c-format
 msgid "Restarting printing system..."
 msgstr "Endurræsi prentkerfi..."
 
-#: printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3597
 #, c-format
 msgid "high"
 msgstr "Hátt"
 
-#: printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3597
 #, c-format
 msgid "paranoid"
 msgstr "Taugaveiklað"
 
-#: printer/printerdrake.pm:3418
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr ""
 
-#: 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"
@@ -11648,12 +11736,12 @@ msgid ""
 "Do you really want to configure printing on this machine?"
 msgstr ""
 
-#: printer/printerdrake.pm:3453
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "Ræsa prentkerfi við kerfisræsingu"
 
-#: printer/printerdrake.pm:3454
+#: printer/printerdrake.pm:3634
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -11667,47 +11755,67 @@ msgid ""
 "again?"
 msgstr ""
 
-#: printer/printerdrake.pm:3475 printer/printerdrake.pm:3690
+#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
 #, c-format
 msgid "Checking installed software..."
 msgstr "Athuga uppsettann hugbúnað..."
 
-#: printer/printerdrake.pm:3481
+#: printer/printerdrake.pm:3661
 #, c-format
 msgid "Removing %s ..."
 msgstr "Fjarlægi %s..."
 
-#: printer/printerdrake.pm:3488
+#: printer/printerdrake.pm:3665
+#, fuzzy, c-format
+msgid "Could not remove the %s printing system!"
+msgstr "Breyta prentkerfinu"
+
+#: printer/printerdrake.pm:3674
 #, c-format
 msgid "Installing %s ..."
 msgstr "Set inn %s..."
 
-#: printer/printerdrake.pm:3535
+#: printer/printerdrake.pm:3678
+#, fuzzy, c-format
+msgid "Could not install the %s printing system!"
+msgstr "Breyta prentkerfinu"
+
+#: printer/printerdrake.pm:3727
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "Set sjálfgefinn prentara..."
 
-#: printer/printerdrake.pm:3555
+#: printer/printerdrake.pm:3747
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "Veldu biðraðastjóra"
 
-#: printer/printerdrake.pm:3556
+#: printer/printerdrake.pm:3748
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Hvaða prentkerfi (biðraðastjóra) viltu nota?"
 
-#: printer/printerdrake.pm:3607
+#: printer/printerdrake.pm:3799
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "Gat ekki stillt prentara \"%s\"!"
 
-#: printer/printerdrake.pm:3620
+#: printer/printerdrake.pm:3812
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Set inn Foomatic..."
 
-#: printer/printerdrake.pm:3806
+#: printer/printerdrake.pm:3818
+#, c-format
+msgid "Could not install %s packages, %s cannot be started!"
+msgstr ""
+
+#: printer/printerdrake.pm:3910
+#, c-format
+msgid "Could not install necessary packages, %s cannot be started!"
+msgstr ""
+
+#: printer/printerdrake.pm:4011
 #, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -11715,48 +11823,48 @@ msgid ""
 "it. "
 msgstr ""
 
-#: printer/printerdrake.pm:3834
+#: printer/printerdrake.pm:4039
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr ""
 
-#: printer/printerdrake.pm:3835
+#: printer/printerdrake.pm:4040
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
 
-#: printer/printerdrake.pm:3845
+#: printer/printerdrake.pm:4050
 #, c-format
 msgid "CUPS configuration"
 msgstr "CUPS uppsetning"
 
-#: printer/printerdrake.pm:3857
+#: printer/printerdrake.pm:4062
 #, c-format
 msgid "Change the printing system"
 msgstr "Breyta prentkerfinu"
 
-#: printer/printerdrake.pm:3866
+#: printer/printerdrake.pm:4071
 #, c-format
 msgid "Normal Mode"
 msgstr "Venjulegur hamur"
 
-#: printer/printerdrake.pm:3867
+#: printer/printerdrake.pm:4072
 #, c-format
 msgid "Expert Mode"
 msgstr "F. sérfræðinga"
 
-#: 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 "Stillingar á prentara"
 
-#: printer/printerdrake.pm:4174
+#: printer/printerdrake.pm:4379
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Breyta prentarastillingum"
 
-#: printer/printerdrake.pm:4176
+#: printer/printerdrake.pm:4381
 #, c-format
 msgid ""
 "Printer %s\n"
@@ -11765,116 +11873,116 @@ msgstr ""
 "Prentari %s\n"
 "Hverju viltu breyta á þessum prentara"
 
-#: printer/printerdrake.pm:4180
+#: printer/printerdrake.pm:4385
 #, c-format
 msgid "Do it!"
 msgstr "Áfram!"
 
-#: printer/printerdrake.pm:4185 printer/printerdrake.pm:4243
+#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
 #, c-format
 msgid "Printer connection type"
 msgstr "Tegund prenttengingar"
 
-#: printer/printerdrake.pm:4186 printer/printerdrake.pm:4247
+#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
 #, c-format
 msgid "Printer name, description, location"
 msgstr "Prentaranafn, lýsing, staðsetning"
 
-#: printer/printerdrake.pm:4188 printer/printerdrake.pm:4266
+#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr ""
 
-#: printer/printerdrake.pm:4189 printer/printerdrake.pm:4267
+#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr ""
 
-#: 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 "Setja þennan prentara sjálfgefinn"
 
-#: 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 ""
 
-#: 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 "Fjarlægja þennan prentara frá Star Office/OpenOffice.org/GIMP"
 
-#: printer/printerdrake.pm:4199 printer/printerdrake.pm:4295
+#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
 #, c-format
 msgid "Print test pages"
 msgstr "Prenta út prufublaðsíðu(r)"
 
-#: 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 "Læra hvernig á að nota þennann prentara"
 
-#: printer/printerdrake.pm:4201 printer/printerdrake.pm:4299
+#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
 #, c-format
 msgid "Remove printer"
 msgstr "Fjarlægja prentara"
 
-#: printer/printerdrake.pm:4255
+#: printer/printerdrake.pm:4460
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Fjarlægi gamlan prentara \"%s\"..."
 
-#: printer/printerdrake.pm:4286
+#: printer/printerdrake.pm:4491
 #, c-format
 msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
 msgstr "Bæta prentara við Star Office/OpenOffice.org/GIMP"
 
-#: 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/printerdrake.pm:4289
+#: printer/printerdrake.pm:4494
 #, c-format
 msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
 msgstr ""
 
-#: printer/printerdrake.pm:4291
+#: printer/printerdrake.pm:4496
 #, c-format
 msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
 msgstr ""
 
-#: 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/printerdrake.pm:4294
+#: printer/printerdrake.pm:4499
 #, c-format
 msgid ""
 "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
 msgstr ""
 
-#: printer/printerdrake.pm:4338
+#: printer/printerdrake.pm:4543
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Vitlu í alvöru fjarlægja prentarann \"%s\"?"
 
-#: printer/printerdrake.pm:4342
+#: printer/printerdrake.pm:4547
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Fjarlægi prentara \"%s\"..."
 
-#: printer/printerdrake.pm:4366
+#: printer/printerdrake.pm:4571
 #, c-format
 msgid "Default printer"
 msgstr "Sjálfgefinn prentari"
 
-#: printer/printerdrake.pm:4367
+#: printer/printerdrake.pm:4572
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr ""
@@ -11904,31 +12012,36 @@ msgstr "Ekki nógu margar disksneiðar fyrir RAID %d\n"
 msgid "Could not create directory /usr/share/sane/firmware!"
 msgstr ""
 
-#: scanner.pm:102
+#: scanner.pm:107
+#, c-format
+msgid "Could not create link /usr/share/sane/%s!"
+msgstr ""
+
+#: scanner.pm:114
 #, c-format
 msgid "Could not copy firmware file %s to /usr/share/sane/firmware!"
 msgstr ""
 
-#: scanner.pm:109
+#: scanner.pm:121
 #, c-format
 msgid "Could not set permissions of firmware file %s!"
 msgstr ""
 
-#: 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 ""
 
-#: scanner.pm:190
+#: scanner.pm:202
 #, c-format
 msgid "Your scanner(s) will not be available for non-root users."
 msgstr ""
@@ -12965,7 +13078,7 @@ msgstr ""
 "Engar aukalegar upplýsingar\n"
 "um þetta tæki, því miður."
 
-#: services.pm:226 ugtk2.pm:1139
+#: services.pm:226 ugtk2.pm:1167
 #, c-format
 msgid "Info"
 msgstr "Upplýsingar"
@@ -12993,8 +13106,8 @@ msgstr "Stöðva"
 #: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13
 #: share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
 #, fuzzy, c-format
-msgid "<b>Congratulations for choosing Mandrake Linux!</b>"
-msgstr "Þakka þér fyrir að velja Mandrake Linux 9.2"
+msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
+msgstr "Þakka þér fyrir að velja Mandrakelinux 9.2"
 
 #: share/advertising/dis-01.pl:15 share/advertising/dwd-01.pl:15
 #: share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15
@@ -13005,9 +13118,9 @@ msgstr "Velkomin í heim opins hugbúnaðar"
 #: 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 ""
 
 #: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
@@ -13222,8 +13335,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
 #, fuzzy, c-format
-msgid "\t- Voting for software to put in Mandrake Linux"
-msgstr "Þakka þér fyrir að velja Mandrake Linux 9.2"
+msgid "\t- Voting for software to put in Mandrakelinux"
+msgstr "Þakka þér fyrir að velja Mandrakelinux 9.2"
 
 #: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
 #: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
@@ -13267,15 +13380,15 @@ 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 ""
 
 #: share/advertising/dwd-02.pl:13
 #, c-format
-msgid "<b>Join the Mandrake Linux community!</b>"
+msgid "<b>Join the Mandrakelinux community!</b>"
 msgstr ""
 
 #: share/advertising/dwd-02.pl:15
@@ -13294,28 +13407,28 @@ msgstr ""
 
 #: share/advertising/dwd-03.pl:13
 #, c-format
-msgid "<b>What is Mandrake Linux?</b>"
+msgid "<b>What is Mandrakelinux?</b>"
 msgstr ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
@@ -13326,7 +13439,7 @@ msgstr ""
 
 #: share/advertising/dwd-04.pl:16
 #, c-format
-msgid "\t- Find out Mandrake Linux on a bootable CD with <b>MandrakeMove</b>"
+msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
 msgstr ""
 
 #: share/advertising/dwd-04.pl:17
@@ -13375,7 +13488,7 @@ 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 ""
 
@@ -13419,7 +13532,7 @@ msgstr ""
 
 #: 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 ""
 
 #: share/advertising/dwd-09.pl:20
@@ -13433,9 +13546,9 @@ 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 ""
 
 #: share/advertising/ppp-02.pl:13
@@ -13454,7 +13567,7 @@ 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 ""
 
 #: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
@@ -13465,7 +13578,7 @@ msgstr "Veldu dulritunarlykil fyrir skráarkerfið"
 #: 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 ""
@@ -13473,7 +13586,7 @@ msgstr ""
 #: 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 ""
 
@@ -13620,8 +13733,8 @@ msgstr ""
 #: 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 ""
 
@@ -13649,7 +13762,7 @@ msgstr ""
 #: 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 ""
 
@@ -13892,17 +14005,17 @@ msgstr "Stimplaðu þig út og sláðu á Ctrl-Alt-Backspace"
 msgid "You need to log out and back in again for changes to take effect"
 msgstr ""
 
-#: standalone/drakTermServ:71
+#: standalone/drakTermServ:77
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr ""
 
-#: standalone/drakTermServ:101 standalone/drakTermServ:108
+#: standalone/drakTermServ:114 standalone/drakTermServ:121
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr ""
 
-#: standalone/drakTermServ:121
+#: standalone/drakTermServ:134
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -13911,78 +14024,78 @@ msgstr ""
 "%s: %s þarfnast vélarnafns, MAC addressu, IP, nbi-image, 0/1 fyrir "
 "THIN_CLIENT, 0/1 fyirr Local Config...\n"
 
-#: standalone/drakTermServ:128
+#: standalone/drakTermServ:141
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr ""
 
-#: standalone/drakTermServ:140
+#: standalone/drakTermServ:153
 #, c-format
 msgid "You must be root to read configuration file. \n"
 msgstr "Þú verður að vera kerfisstjóri til að lesa stillingaskrá. \n"
 
-#: standalone/drakTermServ:219 standalone/drakTermServ:488
-#: standalone/drakfont:572
+#: standalone/drakTermServ:238 standalone/drakTermServ:511
+#: standalone/drakfont:575
 #, c-format
 msgid "OK"
 msgstr "Í lagi"
 
-#: standalone/drakTermServ:235
+#: standalone/drakTermServ:249 standalone/drakTermServ:252
 #, fuzzy, c-format
 msgid "Terminal Server Configuration"
 msgstr "Uppsetning Mandrake skjámiðlara"
 
-#: standalone/drakTermServ:240
-#, c-format
-msgid "DrakTermServ"
-msgstr ""
-
-#: standalone/drakTermServ:264
+#: standalone/drakTermServ:267
 #, c-format
 msgid "Enable Server"
 msgstr "Virkja þjón"
 
-#: standalone/drakTermServ:270
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Disable Server"
 msgstr "Aftengja þjón"
 
-#: standalone/drakTermServ:278
+#: standalone/drakTermServ:281
 #, c-format
 msgid "Start Server"
 msgstr "Ræsa þjón"
 
-#: standalone/drakTermServ:284
+#: standalone/drakTermServ:287
 #, c-format
 msgid "Stop Server"
 msgstr "Stöðva þjón"
 
-#: standalone/drakTermServ:292
+#: standalone/drakTermServ:295
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Netræsi- disklingur/ISO"
 
-#: standalone/drakTermServ:296
+#: standalone/drakTermServ:299
 #, c-format
 msgid "Net Boot Images"
 msgstr ""
 
-#: standalone/drakTermServ:302
+#: standalone/drakTermServ:305
 #, c-format
 msgid "Add/Del Users"
 msgstr "Bæta við/eyða notanda"
 
-#: standalone/drakTermServ:306
+#: standalone/drakTermServ:309
 #, c-format
 msgid "Add/Del Clients"
 msgstr ""
 
-#: standalone/drakTermServ:317 standalone/drakbug:54
+#: standalone/drakTermServ:320 standalone/drakbug:54
 #, c-format
 msgid "First Time Wizard"
+msgstr "Fyrsti leiðarvísir"
+
+#: standalone/drakTermServ:351 standalone/drakTermServ:352
+#, c-format
+msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
 msgstr ""
 
-#: standalone/drakTermServ:342
+#: standalone/drakTermServ:358
 #, c-format
 msgid ""
 "\n"
@@ -14005,64 +14118,69 @@ msgid ""
 "    f) If it's thin clients, ask if you want to restart KDM.\n"
 msgstr ""
 
-#: standalone/drakTermServ:387
+#: standalone/drakTermServ:403
 #, fuzzy, c-format
 msgid "Cancel Wizard"
 msgstr "Ræsa leiðbeinandann"
 
-#: standalone/drakTermServ:399
+#: standalone/drakTermServ:415
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr ""
 
-#: standalone/drakTermServ:427
+#: standalone/drakTermServ:443
+#, c-format
+msgid "Use thin clients."
+msgstr ""
+
+#: 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."
 msgstr ""
 
-#: standalone/drakTermServ:433
+#: standalone/drakTermServ:457 standalone/drakTermServ:1071
 #, c-format
-msgid "Allow thin clients."
+msgid "Sync client X keyboard settings with server."
 msgstr ""
 
-#: standalone/drakTermServ:441
+#: standalone/drakTermServ:464
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr ""
 
-#: 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 "Þetta tekur nokkrar mínútur."
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:466
+#: standalone/drakTermServ:469 standalone/drakTermServ:489
 #, fuzzy, c-format
 msgid "Done!"
 msgstr "Búið"
 
-#: standalone/drakTermServ:452
+#: standalone/drakTermServ:475
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 
-#: standalone/drakTermServ:472
+#: standalone/drakTermServ:495
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
 "be restarted. Restart now?"
 msgstr ""
 
-#: standalone/drakTermServ:507
-#, c-format
-msgid "drakTermServ Overview"
-msgstr ""
+#: standalone/drakTermServ:530
+#, fuzzy, c-format
+msgid "Terminal Server Overview"
+msgstr "Uppsetning Mandrake skjámiðlara"
 
-#: standalone/drakTermServ:508
+#: standalone/drakTermServ:531
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -14078,7 +14196,7 @@ msgid ""
 "one full kernel."
 msgstr ""
 
-#: standalone/drakTermServ:514
+#: standalone/drakTermServ:537
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -14098,7 +14216,7 @@ msgid ""
 "like:"
 msgstr ""
 
-#: standalone/drakTermServ:532
+#: standalone/drakTermServ:555
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -14137,7 +14255,7 @@ msgid ""
 "clients."
 msgstr ""
 
-#: standalone/drakTermServ:552
+#: standalone/drakTermServ:575
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -14155,7 +14273,7 @@ msgid ""
 "        \tWith SUBNET/MASK being defined for your network."
 msgstr ""
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:587
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -14166,7 +14284,7 @@ msgid ""
 "file."
 msgstr ""
 
-#: standalone/drakTermServ:568
+#: standalone/drakTermServ:591
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -14177,7 +14295,7 @@ msgid ""
 "        \tdrakTermServ will help create these files."
 msgstr ""
 
-#: standalone/drakTermServ:573
+#: standalone/drakTermServ:596
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -14197,7 +14315,7 @@ msgid ""
 "machine is configured."
 msgstr ""
 
-#: standalone/drakTermServ:582
+#: standalone/drakTermServ:605
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -14227,7 +14345,7 @@ msgid ""
 "        \tputs its images."
 msgstr ""
 
-#: standalone/drakTermServ:603
+#: standalone/drakTermServ:626
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
@@ -14245,57 +14363,62 @@ msgid ""
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 msgstr ""
 
-#: standalone/drakTermServ:638
+#: standalone/drakTermServ:661
 #, c-format
 msgid "Boot Floppy"
-msgstr ""
+msgstr "Ræsidisklingur"
 
-#: standalone/drakTermServ:640
+#: standalone/drakTermServ:663
 #, c-format
 msgid "Boot ISO"
 msgstr ""
 
-#: standalone/drakTermServ:642
+#: standalone/drakTermServ:665
 #, fuzzy, c-format
 msgid "PXE Image"
 msgstr "Ræsikjarna"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:734
+#, fuzzy, c-format
+msgid "Default kernel version"
+msgstr "Senda kjarnaútgáfu"
+
+#: standalone/drakTermServ:761
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr ""
 
-#: standalone/drakTermServ:730
+#: standalone/drakTermServ:768
 #, c-format
 msgid "No kernel selected!"
 msgstr ""
 
-#: standalone/drakTermServ:733
+#: standalone/drakTermServ:771
 #, c-format
 msgid "Build Single NIC -->"
 msgstr ""
 
-#: standalone/drakTermServ:737
+#: standalone/drakTermServ:775
 #, c-format
 msgid "No NIC selected!"
 msgstr "Ekkert NIC valið!"
 
-#: standalone/drakTermServ:740
+#: standalone/drakTermServ:778
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "Byggja alla kjarna -->"
 
-#: standalone/drakTermServ:747
+#: standalone/drakTermServ:786
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Eyða"
 
-#: standalone/drakTermServ:754
+#: standalone/drakTermServ:793
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Eyða öllum NBI"
 
-#: standalone/drakTermServ:841
+#: standalone/drakTermServ:880
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -14303,27 +14426,27 @@ msgid ""
 "Delete/re-add the user to the Terminal Server to enable login."
 msgstr ""
 
-#: standalone/drakTermServ:846
+#: standalone/drakTermServ:885
 #, c-format
 msgid "Add User -->"
 msgstr "Bæta við notanda -->"
 
-#: standalone/drakTermServ:852
+#: standalone/drakTermServ:891
 #, c-format
 msgid "<-- Del User"
 msgstr ""
 
-#: standalone/drakTermServ:888
+#: standalone/drakTermServ:927
 #, c-format
 msgid "type: %s"
 msgstr "tegund: %s"
 
-#: standalone/drakTermServ:892
+#: standalone/drakTermServ:931
 #, c-format
 msgid "local config: %s"
 msgstr ""
 
-#: standalone/drakTermServ:922
+#: standalone/drakTermServ:961
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -14332,124 +14455,134 @@ msgstr ""
 "Leyfa uppsetningu á\n"
 "þessum vélbúnaði"
 
-#: standalone/drakTermServ:931
+#: standalone/drakTermServ:970
 #, c-format
 msgid "No net boot images created!"
 msgstr ""
 
-#: standalone/drakTermServ:949
+#: standalone/drakTermServ:988
 #, c-format
 msgid "Thin Client"
 msgstr ""
 
-#: standalone/drakTermServ:953
+#: standalone/drakTermServ:992
 #, c-format
 msgid "Allow Thin Clients"
 msgstr ""
 
-#: standalone/drakTermServ:954
+#: standalone/drakTermServ:993
 #, c-format
 msgid "Add Client -->"
 msgstr "Bæta við biðlara -->"
 
-#: standalone/drakTermServ:968
+#: standalone/drakTermServ:1007
 #, c-format
 msgid "type: fat"
 msgstr "tegund: fat"
 
-#: standalone/drakTermServ:969
+#: standalone/drakTermServ:1008
 #, c-format
 msgid "type: thin"
 msgstr "tegund: þunn"
 
-#: standalone/drakTermServ:976
+#: standalone/drakTermServ:1015
 #, c-format
 msgid "local config: false"
 msgstr "Staðbundin uppsetning: nei"
 
-#: standalone/drakTermServ:977
+#: standalone/drakTermServ:1016
 #, c-format
 msgid "local config: true"
 msgstr "Staðbundin uppsetning: já"
 
-#: standalone/drakTermServ:985
+#: standalone/drakTermServ:1024
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Breyta biðlara"
 
-#: standalone/drakTermServ:1011
+#: standalone/drakTermServ:1050
 #, c-format
 msgid "Disable Local Config"
 msgstr ""
 
-#: standalone/drakTermServ:1018
+#: standalone/drakTermServ:1057
 #, c-format
 msgid "Delete Client"
 msgstr "Eyða biðlara"
 
-#: standalone/drakTermServ:1027
+#: standalone/drakTermServ:1066
 #, c-format
 msgid "dhcpd Config..."
 msgstr "dhcpd uppsetning..."
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1082
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
 "(service dm restart - at the console)"
 msgstr ""
 
-#: standalone/drakTermServ:1084
+#: standalone/drakTermServ:1122
+#, c-format
+msgid "Thin clients won't work with autologin. Disable autologin?"
+msgstr ""
+
+#: standalone/drakTermServ:1138
+#, c-format
+msgid "All clients will use %s"
+msgstr ""
+
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Subnet:"
 msgstr "Staðarnet:"
 
-#: standalone/drakTermServ:1091
+#: standalone/drakTermServ:1175
 #, c-format
 msgid "Netmask:"
 msgstr "Netsía:"
 
-#: standalone/drakTermServ:1098
+#: standalone/drakTermServ:1182
 #, c-format
 msgid "Routers:"
 msgstr "Beinar:"
 
-#: standalone/drakTermServ:1105
+#: standalone/drakTermServ:1189
 #, c-format
 msgid "Subnet Mask:"
 msgstr "Staðarnetsía:"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1196
 #, c-format
 msgid "Broadcast Address:"
 msgstr "Útvörpunarvistfang:"
 
-#: standalone/drakTermServ:1119
+#: standalone/drakTermServ:1203
 #, c-format
 msgid "Domain Name:"
 msgstr "Nafn léns:"
 
-#: standalone/drakTermServ:1127
+#: standalone/drakTermServ:1211
 #, c-format
 msgid "Name Servers:"
 msgstr "Nafnaþjónar:"
 
-#: standalone/drakTermServ:1138
+#: standalone/drakTermServ:1222
 #, c-format
 msgid "IP Range Start:"
 msgstr ""
 
-#: standalone/drakTermServ:1139
+#: standalone/drakTermServ:1223
 #, c-format
 msgid "IP Range End:"
 msgstr ""
 
-#: standalone/drakTermServ:1191
+#: standalone/drakTermServ:1275
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "dhcpd miðlara uppsetning"
 
-#: standalone/drakTermServ:1192
+#: standalone/drakTermServ:1276
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -14457,133 +14590,133 @@ msgid ""
 "You can modify as needed."
 msgstr ""
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1279
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr ""
 
-#: standalone/drakTermServ:1208
+#: standalone/drakTermServ:1292
 #, c-format
 msgid "Write Config"
 msgstr "Skrifa stillingar"
 
-#: standalone/drakTermServ:1326
+#: standalone/drakTermServ:1411
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Settu diskling í drif:"
 
-#: standalone/drakTermServ:1330
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr "Enginn aðgangur að disklingadrifi"
 
-#: standalone/drakTermServ:1332
+#: standalone/drakTermServ:1417
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "Það má fjarlægja diskling núna"
 
-#: standalone/drakTermServ:1335
+#: standalone/drakTermServ:1420
 #, c-format
 msgid "No floppy drive available!"
 msgstr "Ekkert disklingadrif aðgengilegt!"
 
-#: standalone/drakTermServ:1340
+#: standalone/drakTermServ:1425
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr ""
 
-#: standalone/drakTermServ:1342
+#: standalone/drakTermServ:1427
 #, fuzzy, c-format
 msgid "Error writing %s/%s"
 msgstr "Villa við að skrifa í skrána %s"
 
-#: standalone/drakTermServ:1351
+#: standalone/drakTermServ:1436
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr ""
 
-#: standalone/drakTermServ:1353
+#: standalone/drakTermServ:1438
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr ""
 
-#: standalone/drakTermServ:1372
+#: standalone/drakTermServ:1458
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr ""
 
-#: standalone/drakTermServ:1533
+#: standalone/drakTermServ:1619
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr ""
 
-#: standalone/drakTermServ:1551
+#: standalone/drakTermServ:1637
 #, fuzzy, c-format
 msgid "%s is not a user..\n"
 msgstr "%s fannst ekki...\n"
 
-#: standalone/drakTermServ:1552
+#: standalone/drakTermServ:1638
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr ""
 
-#: standalone/drakTermServ:1554
+#: standalone/drakTermServ:1640
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr ""
 
-#: standalone/drakTermServ:1556
+#: standalone/drakTermServ:1642
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr ""
 
-#: standalone/drakTermServ:1608
+#: standalone/drakTermServ:1694
 #, fuzzy, c-format
 msgid "Deleted %s...\n"
 msgstr "Skyjnaði %s"
 
-#: standalone/drakTermServ:1610 standalone/drakTermServ:1687
+#: standalone/drakTermServ:1696 standalone/drakTermServ:1773
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s fannst ekki...\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 ""
 
-#: standalone/drakTermServ:1658
+#: standalone/drakTermServ:1744
 #, c-format
 msgid "Can't open %s!"
 msgstr "Get ekki opnað %s!"
 
-#: standalone/drakTermServ:1715
+#: standalone/drakTermServ:1801
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr ""
 
-#: standalone/drakTermServ:1872
+#: standalone/drakTermServ:1958
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "Stillingum breytt - endurræsa clusternfs/dhcpd?"
 
-#: standalone/drakautoinst:37
+#: standalone/drakautoinst:38
 #, c-format
 msgid "Error!"
 msgstr "Villa!"
 
-#: standalone/drakautoinst:38
+#: standalone/drakautoinst:39
 #, c-format
 msgid "I can't find needed image file `%s'."
 msgstr ""
 
-#: standalone/drakautoinst:40
+#: standalone/drakautoinst:41
 #, c-format
 msgid "Auto Install Configurator"
 msgstr "Uppsetning sjáfvirkrar innsetningar"
 
-#: standalone/drakautoinst:41
+#: standalone/drakautoinst:42
 #, c-format
 msgid ""
 "You are about to configure an Auto Install floppy. This feature is somewhat "
@@ -14599,34 +14732,45 @@ msgid ""
 "Press ok to continue."
 msgstr ""
 
-#: standalone/drakautoinst:59
+#: standalone/drakautoinst:60
 #, c-format
 msgid "replay"
 msgstr "endurspila"
 
-#: standalone/drakautoinst:59 standalone/drakautoinst:68
+#: standalone/drakautoinst:60 standalone/drakautoinst:69
 #, c-format
 msgid "manual"
 msgstr "handvirkt"
 
-#: standalone/drakautoinst:63
+#: standalone/drakautoinst:64
 #, c-format
 msgid "Automatic Steps Configuration"
 msgstr "Stillingar sjálfvirkra þrepa"
 
-#: standalone/drakautoinst:64
+#: standalone/drakautoinst:65
 #, c-format
 msgid ""
 "Please choose for each step whether it will replay like your install, or it "
 "will be manual"
 msgstr ""
 
-#: standalone/drakautoinst:76 standalone/drakautoinst:77
+#: standalone/drakautoinst:77 standalone/drakautoinst:78
+#: standalone/drakautoinst:92
 #, c-format
 msgid "Creating auto install floppy"
 msgstr "Bý til sjálfvirkan uppsetningar-diskling"
 
-#: standalone/drakautoinst:141
+#: standalone/drakautoinst:90
+#, fuzzy, c-format
+msgid "Insert another blank floppy in drive %s (for drivers disk)"
+msgstr "Settu tóman diskling í drif %s"
+
+#: standalone/drakautoinst:91
+#, fuzzy, c-format
+msgid "Creating auto install floppy (drivers disk)"
+msgstr "Bý til sjálfvirkan uppsetningar-diskling"
+
+#: standalone/drakautoinst:158
 #, c-format
 msgid ""
 "\n"
@@ -14635,90 +14779,83 @@ msgid ""
 "The parameters of the auto-install are available in the sections on the left"
 msgstr ""
 
-#: 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 "Til hamingju!"
 
-#: standalone/drakautoinst:236
+#: standalone/drakautoinst:253
 #, c-format
 msgid ""
 "The floppy has been successfully generated.\n"
 "You may now replay your installation."
 msgstr ""
 
-#: standalone/drakautoinst:272
+#: standalone/drakautoinst:289
 #, c-format
 msgid "Auto Install"
 msgstr "Sjáfvirk innsetning"
 
-#: standalone/drakautoinst:341
+#: standalone/drakautoinst:358
 #, c-format
 msgid "Add an item"
 msgstr "Bæta við hlut"
 
-#: standalone/drakautoinst:348
+#: standalone/drakautoinst:365
 #, c-format
 msgid "Remove the last item"
 msgstr "Fjarlægja síðasta hlut"
 
-#: standalone/drakbackup:87
+#: standalone/drakbackup:88
 #, c-format
 msgid "hd"
 msgstr "hd"
 
-#: standalone/drakbackup:87
+#: standalone/drakbackup:88
 #, c-format
 msgid "tape"
 msgstr "segulband"
 
-#: standalone/drakbackup:158
+#: standalone/drakbackup:112
 #, c-format
 msgid "No devices found"
 msgstr "Fann enginn tæki"
 
-#: standalone/drakbackup:196
+#: standalone/drakbackup:154
 #, c-format
 msgid ""
 "Expect is an extension to the Tcl scripting language that allows interactive "
 "sessions without user intervention."
 msgstr ""
 
-#: standalone/drakbackup:197
+#: standalone/drakbackup:155
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr ""
 
-#: standalone/drakbackup:198
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
 "the cdrw is erased before each backup."
 msgstr ""
 
-#: 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 ""
-
-#: standalone/drakbackup:200
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
 "whether incremental or differential mode is used."
 msgstr ""
 
-#: standalone/drakbackup:201
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
 "last backup."
 msgstr ""
 
-#: standalone/drakbackup:202
+#: standalone/drakbackup:159
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
@@ -14727,21 +14864,21 @@ msgstr ""
 "Mismuna-afrit geymir aðeins skrár sem hafa breytst eða eru nýjar frá "
 "upprunalegu 'grunn' afriti."
 
-#: standalone/drakbackup:203
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "This should be a local user or email addresse that you want the backup "
 "results sent to. You will need to define a functioning mail server."
 msgstr ""
 
-#: standalone/drakbackup:204
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
 "tree will not be backed up."
 msgstr ""
 
-#: standalone/drakbackup:205
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -14749,7 +14886,7 @@ msgid ""
 "tar files after the backup."
 msgstr ""
 
-#: standalone/drakbackup:206
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -14757,60 +14894,70 @@ msgid ""
 "path."
 msgstr ""
 
-#: standalone/drakbackup:207
+#: standalone/drakbackup:164
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
 "run-parts in /etc/crontab."
 msgstr ""
 
-#: standalone/drakbackup:604
+#: standalone/drakbackup:396
+#, c-format
+msgid "No media selected for cron operation."
+msgstr ""
+
+#: standalone/drakbackup:400
+#, c-format
+msgid "No interval selected for cron operation."
+msgstr ""
+
+#: standalone/drakbackup:447
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr ""
 
-#: 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 ""
 
-#: 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 "
 "a complete email address!"
 msgstr ""
 
-#: standalone/drakbackup:728
+#: standalone/drakbackup:545
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr ""
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:547
 #, c-format
 msgid "Old user list:\n"
 msgstr ""
 
-#: standalone/drakbackup:732
+#: standalone/drakbackup:549
 #, c-format
 msgid "New user list:\n"
 msgstr ""
 
-#: standalone/drakbackup:779
+#: standalone/drakbackup:594
 #, c-format
 msgid ""
 "\n"
 "                      DrakBackup Report \n"
 msgstr ""
 
-#: standalone/drakbackup:780
+#: standalone/drakbackup:595
 #, c-format
 msgid ""
 "\n"
 "                      DrakBackup Daemon Report\n"
 msgstr ""
 
-#: standalone/drakbackup:786
+#: standalone/drakbackup:601
 #, c-format
 msgid ""
 "\n"
@@ -14819,13 +14966,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:810 standalone/drakbackup:883
-#: standalone/drakbackup:939
+#: standalone/drakbackup:625 standalone/drakbackup:696
+#: standalone/drakbackup:752
 #, c-format
 msgid "Total progress"
 msgstr "Heildarframvinda"
 
-#: standalone/drakbackup:865
+#: standalone/drakbackup:678
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -14834,42 +14981,42 @@ msgid ""
 " need to purge the entry from authorized_keys on the server."
 msgstr ""
 
-#: standalone/drakbackup:874
+#: standalone/drakbackup:687
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr ""
 
-#: standalone/drakbackup:881
+#: standalone/drakbackup:694
 #, fuzzy, c-format
 msgid "Cannot spawn %s."
 msgstr "Get ekki opnað %s!"
 
-#: standalone/drakbackup:898
+#: standalone/drakbackup:711
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr ""
 
-#: standalone/drakbackup:899
+#: standalone/drakbackup:712
 #, c-format
 msgid "Bad password on %s"
 msgstr "Rangt lykilorð á %s"
 
-#: standalone/drakbackup:900
+#: standalone/drakbackup:713
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr ""
 
-#: standalone/drakbackup:901
+#: standalone/drakbackup:714
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "Finn ekki %s á %s"
 
-#: standalone/drakbackup:904
+#: standalone/drakbackup:718
 #, c-format
 msgid "%s not responding"
 msgstr ""
 
-#: standalone/drakbackup:908
+#: standalone/drakbackup:722
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -14880,84 +15027,84 @@ msgid ""
 "without being prompted for a password."
 msgstr ""
 
-#: standalone/drakbackup:953
+#: standalone/drakbackup:766
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr ""
 
-#: standalone/drakbackup:957
+#: standalone/drakbackup:770
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr ""
 
-#: standalone/drakbackup:978
+#: standalone/drakbackup:791
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr ""
 
-#: standalone/drakbackup:982
+#: standalone/drakbackup:795
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr ""
 
-#: standalone/drakbackup:986
+#: standalone/drakbackup:799
 #, c-format
 msgid "Not erasable media!"
 msgstr ""
 
-#: standalone/drakbackup:1027
+#: standalone/drakbackup:840
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr ""
 
-#: standalone/drakbackup:1103
+#: standalone/drakbackup:898
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr ""
 
-#: standalone/drakbackup:1130
+#: standalone/drakbackup:925
 #, c-format
 msgid "No tape in %s!"
 msgstr "Ekkert segulband í %s!"
 
-#: standalone/drakbackup:1232
+#: standalone/drakbackup:1025
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
 "%d MB used vs %d MB allocated."
 msgstr ""
 
-#: standalone/drakbackup:1251 standalone/drakbackup:1305
+#: standalone/drakbackup:1044 standalone/drakbackup:1077
 #, c-format
 msgid "Backup system files..."
 msgstr "Afrita kerfisskrár..."
 
-#: standalone/drakbackup:1306 standalone/drakbackup:1368
+#: standalone/drakbackup:1078 standalone/drakbackup:1119
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "Afritaskrár á hörðum diski..."
 
-#: standalone/drakbackup:1367
+#: standalone/drakbackup:1118
 #, c-format
 msgid "Backup User files..."
 msgstr "Afrita skrár notanda..."
 
-#: standalone/drakbackup:1421
+#: standalone/drakbackup:1153
 #, c-format
 msgid "Backup Other files..."
 msgstr "Afrita aðrar skrár..."
 
-#: standalone/drakbackup:1422
+#: standalone/drakbackup:1154
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr ""
 
-#: standalone/drakbackup:1427
+#: standalone/drakbackup:1159
 #, c-format
 msgid "No changes to backup!"
 msgstr ""
 
-#: standalone/drakbackup:1445 standalone/drakbackup:1469
+#: standalone/drakbackup:1177 standalone/drakbackup:1201
 #, c-format
 msgid ""
 "\n"
@@ -14968,7 +15115,7 @@ msgstr ""
 "Drakbackup aðgerðir um %s:\n"
 "\n"
 
-#: standalone/drakbackup:1454
+#: standalone/drakbackup:1186
 #, c-format
 msgid ""
 "\n"
@@ -14976,18 +15123,18 @@ msgid ""
 "FTP.\n"
 msgstr ""
 
-#: standalone/drakbackup:1455
+#: standalone/drakbackup:1187
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
 msgstr ""
 
-#: standalone/drakbackup:1457
+#: standalone/drakbackup:1189
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr ""
 
-#: standalone/drakbackup:1474
+#: standalone/drakbackup:1206
 #, c-format
 msgid ""
 "\n"
@@ -14995,7 +15142,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:1479
+#: standalone/drakbackup:1211
 #, c-format
 msgid ""
 "\n"
@@ -15003,79 +15150,68 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:1488
+#: standalone/drakbackup:1220
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr ""
 
-#: standalone/drakbackup:1489
+#: standalone/drakbackup:1221
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " Villa við sendingu pósts. \n"
 
-#: standalone/drakbackup:1518
+#: standalone/drakbackup:1249
 #, c-format
 msgid "Can't create catalog!"
 msgstr ""
 
-#: standalone/drakbackup:1639
-#, c-format
-msgid "Can't create log file!"
-msgstr "Get ekki búið til annál!"
-
-#: standalone/drakbackup:1656 standalone/drakbackup:1667
-#: standalone/drakfont:584
-#, c-format
-msgid "File Selection"
-msgstr "Skráaval"
-
-#: standalone/drakbackup:1695
+#: standalone/drakbackup:1455
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr ""
 
-#: standalone/drakbackup:1723
+#: standalone/drakbackup:1484
 #, c-format
 msgid ""
 "\n"
 "Please check all options that you need.\n"
 msgstr ""
 
-#: standalone/drakbackup:1724
+#: standalone/drakbackup:1485
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 msgstr ""
 
-#: standalone/drakbackup:1725
+#: standalone/drakbackup:1486
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: standalone/drakbackup:1730
+#: standalone/drakbackup:1491
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr ""
 
-#: standalone/drakbackup:1731
+#: standalone/drakbackup:1492
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -15084,601 +15220,584 @@ msgstr ""
 "Með þessum valkosti munt þú geta endurheimt allar útgáfur\n"
 " af /etc möppunni þinni."
 
-#: standalone/drakbackup:1762
+#: standalone/drakbackup:1523
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr ""
 
-#: standalone/drakbackup:1789
+#: standalone/drakbackup:1550
 #, c-format
 msgid "Do not include the browser cache"
 msgstr ""
 
-#: standalone/drakbackup:1844 standalone/drakfont:650
+#: standalone/drakbackup:1605 standalone/drakfont:656
 #, c-format
 msgid "Remove Selected"
 msgstr "Fjarlægja valið"
 
-#: standalone/drakbackup:1891 standalone/drakbackup:1895
-#, c-format
-msgid "Under Devel ... please wait."
-msgstr "Í þróun... Bíðið."
-
-#: standalone/drakbackup:1909
-#, c-format
-msgid "Windows (FAT32)"
-msgstr "Windows (FAT32)"
-
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1668
 #, c-format
 msgid "Users"
 msgstr "Notendur"
 
-#: standalone/drakbackup:1961
+#: standalone/drakbackup:1688
 #, c-format
 msgid "Use network connection to backup"
 msgstr "Nota nettengingu til afritunar"
 
-#: standalone/drakbackup:1963
+#: standalone/drakbackup:1690
 #, c-format
 msgid "Net Method:"
 msgstr "Net aðferð:"
 
-#: standalone/drakbackup:1967
+#: standalone/drakbackup:1694
 #, c-format
 msgid "Use Expect for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1968
+#: standalone/drakbackup:1695
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1970
+#: standalone/drakbackup:1697
 #, c-format
 msgid "Transfer Now"
 msgstr "Flytja núna"
 
-#: standalone/drakbackup:1972
+#: standalone/drakbackup:1699
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr ""
 
-#: standalone/drakbackup:1975
+#: standalone/drakbackup:1702
 #, c-format
 msgid "Host name or IP."
 msgstr "Heiti vélar eða IP."
 
-#: standalone/drakbackup:1980
+#: standalone/drakbackup:1707
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr ""
 
-#: standalone/drakbackup:1985
+#: standalone/drakbackup:1712
 #, c-format
 msgid "Login name"
 msgstr "Notandanafn"
 
-#: standalone/drakbackup:1992
+#: standalone/drakbackup:1719
 #, c-format
 msgid "Remember this password"
 msgstr "Muna þetta lykilorð"
 
-#: standalone/drakbackup:2004
+#: standalone/drakbackup:1735
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr ""
 
-#: standalone/drakbackup:2106
+#: standalone/drakbackup:1833
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "Nota CD-R/DVD-R til afritatöku"
 
-#: standalone/drakbackup:2109
+#: standalone/drakbackup:1836
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "Veldu CD/DVD tæki"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:1841
 #, fuzzy, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "Gefðu upp stærð CD/DVD diska (Mb)"
 
-#: standalone/drakbackup:2121
+#: standalone/drakbackup:1848
 #, c-format
 msgid "Multisession CD"
 msgstr "Viðbætanleg CD-lota"
 
-#: standalone/drakbackup:2123
+#: standalone/drakbackup:1850
 #, c-format
 msgid "CDRW media"
 msgstr ""
 
-#: standalone/drakbackup:2128
+#: standalone/drakbackup:1856
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "Eyða gögnum á RW miðli (1. sinn)"
 
-#: standalone/drakbackup:2129
+#: standalone/drakbackup:1857
 #, c-format
 msgid " Erase Now "
 msgstr " Eyða núna "
 
-#: standalone/drakbackup:2136
+#: standalone/drakbackup:1863
 #, c-format
 msgid "DVD+RW media"
 msgstr ""
 
-#: standalone/drakbackup:2138
+#: standalone/drakbackup:1865
 #, fuzzy, c-format
 msgid "DVD-R media"
 msgstr "DVD-R tæki"
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:1867
 #, c-format
 msgid "DVDRAM device"
 msgstr "DVDRAM tæki"
 
-#: standalone/drakbackup:2145
-#, c-format
-msgid ""
-"Enter your CD Writer device name\n"
-" ex: 0,1,0"
-msgstr ""
-
-#: standalone/drakbackup:2177
+#: standalone/drakbackup:1898
 #, c-format
 msgid "No CD device defined!"
 msgstr "Ekkert CD tæki valið!"
 
-#: standalone/drakbackup:2227
+#: standalone/drakbackup:1945
 #, c-format
 msgid "Use tape to backup"
 msgstr "Nota segulband til afritatöku"
 
-#: standalone/drakbackup:2230
+#: standalone/drakbackup:1948
 #, c-format
 msgid "Device name to use for backup"
 msgstr ""
 
-#: standalone/drakbackup:2237
+#: standalone/drakbackup:1954
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr "Ekki spóla segulband til baka eftir afritun"
 
-#: standalone/drakbackup:2243
+#: standalone/drakbackup:1960
 #, c-format
 msgid "Erase tape before backup"
 msgstr "Þurka út af segulbandi fyrir afritun"
 
-#: standalone/drakbackup:2249
+#: standalone/drakbackup:1966
 #, c-format
 msgid "Eject tape after the backup"
 msgstr ""
 
-#: standalone/drakbackup:2317
+#: standalone/drakbackup:2033
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "Gefðu upp möppu til vistunar:"
 
-#: standalone/drakbackup:2326
+#: standalone/drakbackup:2037
+#, fuzzy, c-format
+msgid "Directory to save to"
+msgstr "Gefðu upp möppu til vistunar:"
+
+#: standalone/drakbackup:2042
 #, c-format
 msgid ""
 "Maximum size\n"
 " allowed for Drakbackup (MB)"
 msgstr ""
 
-#: standalone/drakbackup:2399
+#: standalone/drakbackup:2106
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CDROM / DVDROM"
 
-#: standalone/drakbackup:2404
+#: standalone/drakbackup:2111
 #, c-format
 msgid "HardDrive / NFS"
 msgstr ""
 
-#: standalone/drakbackup:2420 standalone/drakbackup:2425
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2127 standalone/drakbackup:2132
+#: standalone/drakbackup:2137
 #, c-format
 msgid "hourly"
 msgstr "hverri klst"
 
-#: standalone/drakbackup:2421 standalone/drakbackup:2426
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2128 standalone/drakbackup:2133
+#: standalone/drakbackup:2137
 #, c-format
 msgid "daily"
 msgstr "daglega"
 
-#: standalone/drakbackup:2422 standalone/drakbackup:2427
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2129 standalone/drakbackup:2134
+#: standalone/drakbackup:2137
 #, c-format
 msgid "weekly"
 msgstr "vikulega"
 
-#: standalone/drakbackup:2423 standalone/drakbackup:2428
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2130 standalone/drakbackup:2135
+#: standalone/drakbackup:2137
 #, c-format
 msgid "monthly"
 msgstr "mánaðarlega"
 
-#: standalone/drakbackup:2424 standalone/drakbackup:2429
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2131 standalone/drakbackup:2136
+#: standalone/drakbackup:2137
 #, c-format
 msgid "custom"
 msgstr "sérsniðið"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "January"
 msgstr "janúar"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "February"
 msgstr "Febrúar"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "March"
 msgstr "Mars"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "April"
 msgstr "Apríl"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "May"
 msgstr "maí"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "June"
 msgstr "Júní"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "July"
 msgstr "Júlí"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "August"
 msgstr "Ágúst"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "September"
 msgstr "September"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "October"
 msgstr "Október"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "November"
 msgstr "Nóvember"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "December"
 msgstr "Desember"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Sunday"
 msgstr "sunnudagur"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Monday"
 msgstr "mánudagur"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Tuesday"
 msgstr "þriðjudagur"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Wednesday"
 msgstr "Miðvikudagur"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Thursday"
 msgstr "Fimmtudagur"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Friday"
 msgstr "föstudagur"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Saturday"
 msgstr "laugardagur"
 
-#: standalone/drakbackup:2478
+#: standalone/drakbackup:2185
 #, c-format
 msgid "Use daemon"
 msgstr "Nota þjón"
 
-#: standalone/drakbackup:2483
+#: standalone/drakbackup:2190
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "Vinsamlega veldu tímabil milli afrita."
 
-#: standalone/drakbackup:2489
+#: standalone/drakbackup:2196
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr ""
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2201
 #, c-format
 msgid "Minute"
 msgstr "Mínúta"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Hour"
 msgstr "Klukkustund:"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2209
 #, c-format
 msgid "Day"
 msgstr "Dagur"
 
-#: standalone/drakbackup:2506
+#: standalone/drakbackup:2213
 #, c-format
 msgid "Month"
 msgstr "Mánuður"
 
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2217
 #, c-format
 msgid "Weekday"
 msgstr "Vikudag"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2223
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "Veldu miðil fyrir afrit."
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2230
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr ""
 
-#: standalone/drakbackup:2524
+#: standalone/drakbackup:2231
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr ""
 
-#: standalone/drakbackup:2571
-#, c-format
-msgid "Use tar and bzip2 (rather than tar and gzip)"
-msgstr ""
+#: standalone/drakbackup:2281
+#, fuzzy, c-format
+msgid "Please choose the compression type"
+msgstr "Gefðu upp dagsetningu sem á að endurheimta"
 
-#: standalone/drakbackup:2572
+#: standalone/drakbackup:2285
 #, c-format
 msgid "Use .backupignore files"
 msgstr "Nota .backupignore skrár"
 
-#: standalone/drakbackup:2574
+#: standalone/drakbackup:2287
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr ""
 
-#: standalone/drakbackup:2580
+#: standalone/drakbackup:2293
 #, fuzzy, c-format
 msgid "SMTP server for mail:"
 msgstr "Heiti SMB þjóns"
 
-#: standalone/drakbackup:2585
+#: standalone/drakbackup:2298
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr ""
 
-#: standalone/drakbackup:2624
+#: standalone/drakbackup:2338
 #, c-format
 msgid "What"
 msgstr "Hvað"
 
-#: standalone/drakbackup:2629
+#: standalone/drakbackup:2343
 #, c-format
 msgid "Where"
 msgstr "Hvar"
 
-#: standalone/drakbackup:2634
+#: standalone/drakbackup:2348
 #, c-format
 msgid "When"
 msgstr "Hvenær"
 
-#: standalone/drakbackup:2639
+#: standalone/drakbackup:2353
 #, c-format
 msgid "More Options"
 msgstr "Fleiri valkostir"
 
-#: standalone/drakbackup:2651
+#: standalone/drakbackup:2366
 #, fuzzy, c-format
 msgid "Backup destination not configured..."
 msgstr "Netmöguleikar ekki skilreindir"
 
-#: standalone/drakbackup:2667 standalone/drakbackup:4731
+#: standalone/drakbackup:2385 standalone/drakbackup:4413
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Drakbackup uppsetning"
 
-#: standalone/drakbackup:2684
+#: standalone/drakbackup:2402
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "Veldu hvert þú vilt taka afrit"
 
-#: standalone/drakbackup:2686
+#: standalone/drakbackup:2404
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr ""
 
-#: standalone/drakbackup:2694
+#: standalone/drakbackup:2412
 #, c-format
 msgid "Across Network"
 msgstr "yfir net"
 
-#: standalone/drakbackup:2702
+#: standalone/drakbackup:2420
 #, c-format
 msgid "On CD-R"
 msgstr "Á geisladisk"
 
-#: standalone/drakbackup:2710
+#: standalone/drakbackup:2428
 #, c-format
 msgid "On Tape Device"
 msgstr "Áá segulband"
 
-#: standalone/drakbackup:2738
-#, c-format
-msgid "Please select media for backup..."
-msgstr ""
-
-#: standalone/drakbackup:2760
+#: standalone/drakbackup:2468
 #, c-format
 msgid "Backup Users"
 msgstr ""
 
-#: standalone/drakbackup:2761
+#: standalone/drakbackup:2469
 #, c-format
 msgid " (Default is all users)"
 msgstr " (Sjálfgefið er allir notendur)"
 
-#: standalone/drakbackup:2773
+#: standalone/drakbackup:2481
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "Veldu hvað þú vilt afrita"
 
-#: standalone/drakbackup:2774
+#: standalone/drakbackup:2482
 #, c-format
 msgid "Backup System"
 msgstr "Afrita kerfi"
 
-#: standalone/drakbackup:2776
+#: standalone/drakbackup:2484
 #, c-format
 msgid "Select user manually"
 msgstr ""
 
-#: standalone/drakbackup:2805
+#: standalone/drakbackup:2513
 #, c-format
 msgid "Please select data to backup..."
 msgstr "Veldu gögn sem skal afrita..."
 
-#: standalone/drakbackup:2879
+#: standalone/drakbackup:2585
 #, c-format
 msgid ""
 "\n"
 "Backup Sources: \n"
 msgstr ""
 
-#: standalone/drakbackup:2880
+#: standalone/drakbackup:2586
 #, c-format
 msgid ""
 "\n"
 "- System Files:\n"
 msgstr ""
 
-#: standalone/drakbackup:2882
+#: standalone/drakbackup:2588
 #, c-format
 msgid ""
 "\n"
 "- User Files:\n"
 msgstr ""
 
-#: standalone/drakbackup:2884
+#: standalone/drakbackup:2590
 #, c-format
 msgid ""
 "\n"
 "- Other Files:\n"
 msgstr ""
 
-#: standalone/drakbackup:2886
+#: standalone/drakbackup:2592
 #, c-format
 msgid ""
 "\n"
 "- Save on Hard drive on path: %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2887
+#: standalone/drakbackup:2593
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr ""
 
-#: standalone/drakbackup:2890
+#: standalone/drakbackup:2596
 #, c-format
 msgid ""
 "\n"
 "- Delete hard drive tar files after backup.\n"
 msgstr ""
 
-#: standalone/drakbackup:2894
+#: standalone/drakbackup:2600
 #, c-format
 msgid "NO"
 msgstr "NEI"
 
-#: standalone/drakbackup:2895
+#: standalone/drakbackup:2601
 #, c-format
 msgid "YES"
 msgstr ""
 
-#: standalone/drakbackup:2896
+#: standalone/drakbackup:2602
 #, c-format
 msgid ""
 "\n"
 "- Burn to CD"
 msgstr ""
 
-#: 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 " á tæki: %s"
 
-#: standalone/drakbackup:2899
+#: standalone/drakbackup:2605
 #, c-format
 msgid " (multi-session)"
 msgstr ""
 
-#: standalone/drakbackup:2900
+#: standalone/drakbackup:2606
 #, c-format
 msgid ""
 "\n"
 "- Save to Tape on device: %s"
 msgstr ""
 
-#: standalone/drakbackup:2901
+#: standalone/drakbackup:2607
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tEyða=%s"
 
-#: standalone/drakbackup:2904
+#: standalone/drakbackup:2610
 #, c-format
 msgid ""
 "\n"
 "- Save via %s on host: %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2905
+#: standalone/drakbackup:2611
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
 "\t\t on path: %s \n"
 msgstr ""
 
-#: standalone/drakbackup:2906
+#: standalone/drakbackup:2612
 #, c-format
 msgid ""
 "\n"
@@ -15687,113 +15806,118 @@ msgstr ""
 "\n"
 "- Valkostir:\n"
 
-#: standalone/drakbackup:2907
+#: standalone/drakbackup:2613
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr ""
 
-#: standalone/drakbackup:2910
+#: standalone/drakbackup:2615
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr ""
 
-#: standalone/drakbackup:2912
+#: standalone/drakbackup:2616
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr ""
 
-#: standalone/drakbackup:2915
+#: standalone/drakbackup:2617
+#, fuzzy, c-format
+msgid "\tBackups use tar only\n"
+msgstr "Afrita skrár notanda"
+
+#: standalone/drakbackup:2619
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\tNota .backupignore skrár\n"
 
-#: standalone/drakbackup:2916
+#: standalone/drakbackup:2620
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2621
 #, fuzzy, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "Á CUPS þjóni \"%s\""
 
-#: standalone/drakbackup:2919
+#: standalone/drakbackup:2623
 #, c-format
 msgid ""
 "\n"
 "- Daemon, %s via:\n"
 msgstr ""
 
-#: standalone/drakbackup:2920
+#: standalone/drakbackup:2624
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr ""
 
-#: standalone/drakbackup:2921
+#: standalone/drakbackup:2625
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr ""
 
-#: standalone/drakbackup:2922
+#: standalone/drakbackup:2626
 #, c-format
 msgid "\t-Tape \n"
 msgstr ""
 
-#: standalone/drakbackup:2923
+#: standalone/drakbackup:2627
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr ""
 
-#: standalone/drakbackup:2924
+#: standalone/drakbackup:2628
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr ""
 
-#: standalone/drakbackup:2925
+#: standalone/drakbackup:2629
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr ""
 
-#: standalone/drakbackup:2926
+#: standalone/drakbackup:2630
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr ""
 
-#: standalone/drakbackup:2928
+#: standalone/drakbackup:2632
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr ""
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2637
 #, c-format
 msgid ""
 "List of data to restore:\n"
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:2935
+#: standalone/drakbackup:2639
 #, fuzzy, c-format
 msgid "- Restore System Files.\n"
 msgstr ""
 "Endurheimta valdar\n"
 "Skrár"
 
-#: standalone/drakbackup:2937 standalone/drakbackup:2947
+#: standalone/drakbackup:2641 standalone/drakbackup:2651
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2940
+#: standalone/drakbackup:2644
 #, fuzzy, c-format
 msgid "- Restore User Files: \n"
 msgstr "Endurheimta notendur"
 
-#: standalone/drakbackup:2945
+#: standalone/drakbackup:2649
 #, fuzzy, c-format
 msgid "- Restore Other Files: \n"
 msgstr "Endurheimta annað"
 
-#: standalone/drakbackup:3121
+#: standalone/drakbackup:2830
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -15802,131 +15926,141 @@ msgstr ""
 "Listi af skemmdum gögnum:\n"
 "\n"
 
-#: standalone/drakbackup:3123
+#: standalone/drakbackup:2832
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "Vinsamlega afveldu eða fjarlægðu næst"
 
-#: standalone/drakbackup:3133
+#: standalone/drakbackup:2842
 #, c-format
 msgid "Backup files are corrupted"
 msgstr ""
 
-#: standalone/drakbackup:3154
+#: standalone/drakbackup:2863
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr ""
 
-#: standalone/drakbackup:3155
+#: standalone/drakbackup:2864
 #, c-format
 msgid "          Successfuly Restored on %s       "
 msgstr ""
 
-#: standalone/drakbackup:3270
+#: standalone/drakbackup:2987
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         Endurheimta uppsetningu       "
 
-#: standalone/drakbackup:3298
+#: standalone/drakbackup:3015
 #, c-format
 msgid "OK to restore the other files."
 msgstr ""
 
-#: standalone/drakbackup:3316
+#: standalone/drakbackup:3031
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
 
-#: standalone/drakbackup:3382
+#: standalone/drakbackup:3098
 #, fuzzy, c-format
 msgid "Please choose the date to restore:"
 msgstr "Gefðu upp dagsetningu sem á að endurheimta"
 
-#: standalone/drakbackup:3420
+#: standalone/drakbackup:3135
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "Endurheimta frá hörðum disk"
 
-#: standalone/drakbackup:3422
+#: standalone/drakbackup:3137
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "Gefðu upp möppu þar sem afrit eru vistuð"
 
-#: standalone/drakbackup:3478
+#: standalone/drakbackup:3141
+#, fuzzy, c-format
+msgid "Directory with backups"
+msgstr "Endurheimta öll afrit"
+
+#: standalone/drakbackup:3194
 #, c-format
 msgid "Select another media to restore from"
 msgstr ""
 
-#: standalone/drakbackup:3480
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Other Media"
 msgstr "Annar miðill"
 
-#: standalone/drakbackup:3485
+#: standalone/drakbackup:3201
 #, c-format
 msgid "Restore system"
 msgstr "Endurheimta kerfið"
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3202
 #, c-format
 msgid "Restore Users"
 msgstr "Endurheimta notendur"
 
-#: standalone/drakbackup:3487
+#: standalone/drakbackup:3203
 #, c-format
 msgid "Restore Other"
 msgstr "Endurheimta annað"
 
-#: standalone/drakbackup:3489
+#: standalone/drakbackup:3205
 #, c-format
-msgid "select path to restore (instead of /)"
+msgid "Select path to restore (instead of /)"
 msgstr ""
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3209 standalone/drakbackup:3490
+#, fuzzy, c-format
+msgid "Path To Restore To"
+msgstr "Sérsniðin endurheimt"
+
+#: standalone/drakbackup:3212
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr ""
 
-#: standalone/drakbackup:3495
+#: standalone/drakbackup:3214
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Fjarlægja heimsvæði notanda áður en endurheimt hefst."
 
-#: standalone/drakbackup:3575
+#: standalone/drakbackup:3298
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr ""
 
-#: standalone/drakbackup:3578
+#: standalone/drakbackup:3301
 #, c-format
 msgid "Search Backups"
 msgstr ""
 
-#: standalone/drakbackup:3597
+#: standalone/drakbackup:3320
 #, fuzzy, c-format
 msgid "No matches found..."
 msgstr "fann engan ræsikjarna"
 
-#: standalone/drakbackup:3601
+#: standalone/drakbackup:3324
 #, c-format
 msgid "Restore Selected"
 msgstr "Endurheimta val"
 
-#: standalone/drakbackup:3735
+#: standalone/drakbackup:3458
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
 "Ctrl-Click files to select multiple files."
 msgstr ""
 
-#: standalone/drakbackup:3741
+#: standalone/drakbackup:3464
 #, c-format
 msgid ""
 "Restore Selected\n"
 "Catalog Entry"
 msgstr ""
 
-#: standalone/drakbackup:3750
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -15935,355 +16069,351 @@ msgstr ""
 "Endurheimta valdar\n"
 "Skrár"
 
-#: standalone/drakbackup:3766
-#, c-format
-msgid ""
-"Change\n"
-"Restore Path"
-msgstr ""
-"Breyta\n"
-"Slóð endurheimtu"
-
-#: standalone/drakbackup:3833
+#: standalone/drakbackup:3550
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "Afrita skrár fundust ekki á %s."
 
-#: standalone/drakbackup:3846
+#: standalone/drakbackup:3563
 #, c-format
 msgid "Restore From CD"
 msgstr "Endurheimta frá CD"
 
-#: standalone/drakbackup:3846
+#: standalone/drakbackup:3563
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
 " in the CD drive under mount point /mnt/cdrom"
 msgstr ""
 
-#: standalone/drakbackup:3848
+#: standalone/drakbackup:3565
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3858
+#: standalone/drakbackup:3575
 #, c-format
 msgid "Restore From Tape"
 msgstr "Endurheimta frá segulbandi"
 
-#: standalone/drakbackup:3858
+#: standalone/drakbackup:3575
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
 " in the tape drive device %s"
 msgstr ""
 
-#: standalone/drakbackup:3860
+#: standalone/drakbackup:3577
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3871
+#: standalone/drakbackup:3588
 #, c-format
 msgid "Restore Via Network"
 msgstr "Endurheimta um net"
 
-#: standalone/drakbackup:3871
+#: standalone/drakbackup:3588
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr ""
 
-#: standalone/drakbackup:3872
+#: standalone/drakbackup:3589
 #, c-format
 msgid "Host Name"
 msgstr "Vélarheiti:"
 
-#: standalone/drakbackup:3873
+#: standalone/drakbackup:3590
 #, c-format
 msgid "Host Path or Module"
 msgstr ""
 
-#: standalone/drakbackup:3880
+#: standalone/drakbackup:3597
 #, c-format
 msgid "Password required"
 msgstr "Lykilorðs er þörf"
 
-#: standalone/drakbackup:3886
+#: standalone/drakbackup:3603
 #, c-format
 msgid "Username required"
 msgstr "Notandanafns er þörf"
 
-#: standalone/drakbackup:3889
+#: standalone/drakbackup:3606
 #, c-format
 msgid "Hostname required"
 msgstr "Þörf er á vélarheiti"
 
-#: standalone/drakbackup:3894
+#: standalone/drakbackup:3611
 #, c-format
 msgid "Path or Module required"
 msgstr ""
 
-#: standalone/drakbackup:3907
+#: standalone/drakbackup:3624
 #, c-format
 msgid "Files Restored..."
 msgstr "Skrár endurheimtar..."
 
-#: standalone/drakbackup:3910
+#: standalone/drakbackup:3627
 #, c-format
 msgid "Restore Failed..."
 msgstr "Endurheimting mistókst..."
 
-#: standalone/drakbackup:4015 standalone/drakbackup:4031
+#: standalone/drakbackup:3737 standalone/drakbackup:3754
 #, fuzzy, c-format
 msgid "%s not retrieved..."
 msgstr "%s fannst ekki...\n"
 
-#: standalone/drakbackup:4155 standalone/drakbackup:4228
+#: standalone/drakbackup:3880 standalone/drakbackup:3953
 #, c-format
 msgid "Search for files to restore"
 msgstr "Leita að skrám til að endurheimta"
 
-#: standalone/drakbackup:4160
+#: standalone/drakbackup:3885
 #, c-format
 msgid "Restore all backups"
 msgstr "Endurheimta öll afrit"
 
-#: standalone/drakbackup:4169
+#: standalone/drakbackup:3894
 #, c-format
 msgid "Custom Restore"
 msgstr "Sérsniðin endurheimt"
 
-#: standalone/drakbackup:4174 standalone/drakbackup:4224
+#: standalone/drakbackup:3899 standalone/drakbackup:3949
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Endurheimta frá lista"
 
-#: standalone/drakbackup:4196
+#: standalone/drakbackup:3921
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr ""
 
-#: standalone/drakbackup:4197
+#: standalone/drakbackup:3922
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "Staðfestið að %s sé rétt slóð"
 
-#: standalone/drakbackup:4198
+#: standalone/drakbackup:3923
 #, c-format
 msgid " and the CD is in the drive"
 msgstr ""
 
-#: standalone/drakbackup:4200
+#: standalone/drakbackup:3925
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 
-#: standalone/drakbackup:4216
+#: standalone/drakbackup:3941
 #, c-format
 msgid "CD in place - continue."
 msgstr "CD á réttum stað - áfram."
 
-#: standalone/drakbackup:4221
+#: standalone/drakbackup:3946
 #, c-format
 msgid "Browse to new restore repository."
 msgstr ""
 
-#: standalone/drakbackup:4258
+#: standalone/drakbackup:3947
+#, fuzzy, c-format
+msgid "Directory To Restore From"
+msgstr "Endurheimta frá CD"
+
+#: standalone/drakbackup:3986
 #, c-format
 msgid "Restore Progress"
 msgstr "Framvinda endurheimtu"
 
-#: standalone/drakbackup:4292 standalone/drakbackup:4404
-#: standalone/logdrake:175
+#: standalone/drakbackup:4016 standalone/drakbackup:4123
+#: standalone/logdrake:174
 #, c-format
 msgid "Save"
 msgstr "Vista"
 
-#: standalone/drakbackup:4378
+#: standalone/drakbackup:4099
 #, c-format
 msgid "Build Backup"
 msgstr "Byggja afrit"
 
-#: standalone/drakbackup:4430 standalone/drakbackup:4829
+#: standalone/drakbackup:4147 standalone/drakbackup:4512
 #, c-format
 msgid "Restore"
 msgstr "Endurheimta"
 
-#: standalone/drakbackup:4600
+#: standalone/drakbackup:4277
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "Eftirfarandi pakka þarf að setja inn:\n"
 
-#: standalone/drakbackup:4622
+#: standalone/drakbackup:4304
 #, c-format
 msgid "Please select data to restore..."
 msgstr ""
 
-#: standalone/drakbackup:4662
+#: standalone/drakbackup:4344
 #, c-format
 msgid "Backup system files"
 msgstr "Afrita kerfisskrár"
 
-#: standalone/drakbackup:4665
+#: standalone/drakbackup:4347
 #, c-format
 msgid "Backup user files"
 msgstr "Afrita skrár notanda"
 
-#: standalone/drakbackup:4668
+#: standalone/drakbackup:4350
 #, c-format
 msgid "Backup other files"
 msgstr "Afrita aðrar skrár"
 
-#: standalone/drakbackup:4671 standalone/drakbackup:4707
+#: standalone/drakbackup:4353 standalone/drakbackup:4389
 #, c-format
 msgid "Total Progress"
 msgstr "Heildarframvinda"
 
-#: standalone/drakbackup:4699
+#: standalone/drakbackup:4381
 #, c-format
 msgid "Sending files by FTP"
 msgstr "Sendi skrár með FTP"
 
-#: standalone/drakbackup:4702
+#: standalone/drakbackup:4384
 #, c-format
 msgid "Sending files..."
 msgstr "Sendi skrár..."
 
-#: standalone/drakbackup:4772
+#: standalone/drakbackup:4455
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "Afrita nú frá stillingaskrá"
 
-#: standalone/drakbackup:4777
+#: standalone/drakbackup:4460
 #, c-format
 msgid "View Backup Configuration."
 msgstr "Skoða vistaða stillingu"
 
-#: standalone/drakbackup:4803
+#: standalone/drakbackup:4486
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Álfa- uppsetning"
 
-#: standalone/drakbackup:4808
+#: standalone/drakbackup:4491
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Ítarlegri uppsetning"
 
-#: standalone/drakbackup:4813
+#: standalone/drakbackup:4496
 #, c-format
 msgid "View Configuration"
 msgstr "Skoða stillingar"
 
-#: standalone/drakbackup:4817
+#: standalone/drakbackup:4500
 #, c-format
 msgid "View Last Log"
 msgstr ""
 
-#: standalone/drakbackup:4822
+#: standalone/drakbackup:4505
 #, c-format
 msgid "Backup Now"
 msgstr ""
 
-#: standalone/drakbackup:4826
+#: standalone/drakbackup:4509
 #, c-format
 msgid ""
 "No configuration file found \n"
 "please click Wizard or Advanced."
 msgstr ""
 
-#: standalone/drakbackup:4858 standalone/drakbackup:4865
+#: standalone/drakbackup:4530 standalone/drakbackup:4533
 #, c-format
 msgid "Drakbackup"
 msgstr ""
 
-#: standalone/drakboot:56
+#: standalone/drakboot:57
 #, fuzzy, c-format
 msgid "Graphical boot theme selection"
 msgstr "Veldu prentarategund"
 
-#: standalone/drakboot:56
+#: standalone/drakboot:57
 #, c-format
 msgid "System mode"
 msgstr ""
 
-#: 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 "/_Skrá"
 
-#: standalone/drakboot:67 standalone/drakfloppy:47 standalone/logdrake:76
+#: standalone/drakboot:68 standalone/drakfloppy:47 standalone/logdrake:77
 #, c-format
 msgid "/File/_Quit"
 msgstr "/Skrá/_Hætta"
 
-#: 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 "<Ctrl>Q"
 
-#: standalone/drakboot:118
+#: standalone/drakboot:119
 #, c-format
 msgid "Install themes"
 msgstr "Setja inn þema"
 
-#: standalone/drakboot:119
+#: standalone/drakboot:120
 #, c-format
 msgid "Create new theme"
 msgstr "Búa til nýtt þema"
 
-#: standalone/drakboot:133
+#: standalone/drakboot:134
 #, c-format
 msgid "Use graphical boot"
 msgstr ""
 
-#: standalone/drakboot:138
+#: 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."
 msgstr ""
 
-#: standalone/drakboot:145
+#: standalone/drakboot:146
 #, fuzzy, c-format
 msgid "Theme"
 msgstr "Þemu"
 
-#: standalone/drakboot:147
+#: standalone/drakboot:149
 #, c-format
 msgid ""
 "Display theme\n"
 "under console"
 msgstr ""
 
-#: standalone/drakboot:156
+#: standalone/drakboot:158
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr ""
 
-#: standalone/drakboot:164
+#: standalone/drakboot:166
 #, c-format
-msgid "Yes, I want autologin with this (user, desktop)"
+msgid "No, I don't want autologin"
 msgstr ""
 
-#: standalone/drakboot:165
+#: standalone/drakboot:167
 #, c-format
-msgid "No, I don't want autologin"
+msgid "Yes, I want autologin with this (user, desktop)"
 msgstr ""
 
-#: standalone/drakboot:171
+#: standalone/drakboot:173
 #, c-format
 msgid "Default user"
 msgstr "Sjálfgefinn notandi"
 
-#: standalone/drakboot:172
+#: standalone/drakboot:174
 #, c-format
 msgid "Default desktop"
 msgstr "Sjálfgefið skjáborð"
 
-#: standalone/drakboot:236
+#: standalone/drakboot:238
 #, c-format
 msgid "Installation of %s failed. The following error occured:"
 msgstr "Innsetning %s brást sökum eftirfarandi villu:"
@@ -16483,7 +16613,7 @@ msgstr "Sláðu inn stutta lýsingu."
 #: standalone/drakclock:29
 #, c-format
 msgid "DrakClock"
-msgstr ""
+msgstr "DrakClock"
 
 #: standalone/drakclock:36
 #, fuzzy, c-format
@@ -16493,12 +16623,12 @@ msgstr "Tímabelti"
 #: standalone/drakclock:42
 #, c-format
 msgid "Timezone - DrakClock"
-msgstr ""
+msgstr "Tímabelti - DrakClock"
 
 #: standalone/drakclock:44
 #, c-format
 msgid "GMT - DrakClock"
-msgstr ""
+msgstr "GMT - DrakClock"
 
 #: standalone/drakclock:44
 #, fuzzy, c-format
@@ -16527,12 +16657,12 @@ msgstr ""
 msgid "Server:"
 msgstr "Þjónn: "
 
-#: standalone/drakclock:125 standalone/drakclock:137
+#: standalone/drakclock:129 standalone/drakclock:141
 #, fuzzy, c-format
 msgid "Reset"
 msgstr "Neita"
 
-#: standalone/drakclock:200
+#: standalone/drakclock:204
 #, c-format
 msgid ""
 "We need to install ntp package\n"
@@ -16541,212 +16671,201 @@ msgid ""
 "Do you want to install ntp ?"
 msgstr ""
 
-#: standalone/drakconnect:78
+#: standalone/drakconnect:81
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Netstillingar (%d tengi)"
 
-#: standalone/drakconnect:89 standalone/drakconnect:686
+#: standalone/drakconnect:92 standalone/drakconnect:728
 #, c-format
 msgid "Gateway:"
 msgstr "Gátt:"
 
-#: standalone/drakconnect:89 standalone/drakconnect:686
+#: standalone/drakconnect:92 standalone/drakconnect:728
 #, c-format
 msgid "Interface:"
 msgstr "Tengi:"
 
-#: standalone/drakconnect:93 standalone/net_monitor:105
+#: standalone/drakconnect:96 standalone/net_monitor:105
 #, c-format
 msgid "Wait please"
 msgstr "Augnablik"
 
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116
 #, c-format
 msgid "Interface"
 msgstr "Tengi"
 
-#: standalone/drakconnect:113 standalone/drakconnect:502
-#: standalone/drakvpn:1136
-#, c-format
-msgid "Protocol"
-msgstr "Samskiptaregla"
-
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116 standalone/drakups:233
 #, c-format
 msgid "Driver"
 msgstr "Rekill"
 
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116
 #, c-format
 msgid "State"
 msgstr "Staða"
 
-#: standalone/drakconnect:130
+#: standalone/drakconnect:133
 #, c-format
 msgid "Hostname: "
 msgstr "Vélarnafn: "
 
-#: standalone/drakconnect:132
+#: standalone/drakconnect:135
 #, c-format
 msgid "Configure hostname..."
 msgstr "Stilla vélarnafn..."
 
-#: standalone/drakconnect:146 standalone/drakconnect:727
+#: standalone/drakconnect:149 standalone/drakconnect:769
 #, c-format
 msgid "LAN configuration"
 msgstr "Staðarnets-uppsetning"
 
-#: standalone/drakconnect:151
+#: standalone/drakconnect:154
 #, c-format
 msgid "Configure Local Area Network..."
 msgstr "Stilla staðarnetstengingu..."
 
-#: standalone/drakconnect:159 standalone/drakconnect:228
-#: standalone/drakconnect:232
+#: standalone/drakconnect:162 standalone/drakconnect:237
+#: standalone/drakconnect:241
 #, c-format
 msgid "Apply"
 msgstr "Virkja"
 
-#: standalone/drakconnect:254 standalone/drakconnect:263
-#: standalone/drakconnect:277 standalone/drakconnect:283
-#: standalone/drakconnect:293 standalone/drakconnect:294
-#: standalone/drakconnect:540
+#: standalone/drakconnect:197
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Breiðbandstenging"
+
+#: 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 ""
 
-#: 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
 #, fuzzy, c-format
 msgid "Account"
 msgstr "Um forrit"
 
-#: 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 ""
 
-#: standalone/drakconnect:325
+#: standalone/drakconnect:344
 #, fuzzy, c-format
 msgid "DNS servers"
 msgstr "Nafnamiðlari"
 
-#: standalone/drakconnect:332
+#: standalone/drakconnect:351
 #, fuzzy, c-format
 msgid "Search Domain"
 msgstr "NIS lén"
 
-#: standalone/drakconnect:338
+#: standalone/drakconnect:359
 #, fuzzy, c-format
 msgid "static"
 msgstr "Sjálfvirkt IP"
 
-#: standalone/drakconnect:338
-#, fuzzy, c-format
-msgid "dhcp"
-msgstr "nota dhcp"
+#: standalone/drakconnect:359
+#, c-format
+msgid "DHCP"
+msgstr ""
 
-#: standalone/drakconnect:457
+#: standalone/drakconnect:482
 #, fuzzy, c-format
 msgid "Flow control"
 msgstr "<control>S"
 
-#: standalone/drakconnect:458
+#: standalone/drakconnect:483
 #, fuzzy, c-format
 msgid "Line termination"
 msgstr "Internet-vinnustöð"
 
-#: standalone/drakconnect:463
-#, c-format
-msgid "Tone dialing"
-msgstr ""
-
-#: standalone/drakconnect:463
-#, c-format
-msgid "Pulse dialing"
-msgstr ""
-
-#: standalone/drakconnect:468
+#: standalone/drakconnect:493
 #, fuzzy, c-format
 msgid "Use lock file"
 msgstr "Veljið skrá"
 
-#: standalone/drakconnect:471
+#: standalone/drakconnect:496
 #, fuzzy, c-format
 msgid "Modem timeout"
 msgstr "Tímamörk skeljar"
 
-#: standalone/drakconnect:475
+#: standalone/drakconnect:500
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr ""
 
-#: standalone/drakconnect:478
+#: standalone/drakconnect:503
 #, fuzzy, c-format
 msgid "Busy wait"
 msgstr "Kúvæt"
 
-#: standalone/drakconnect:482
+#: standalone/drakconnect:507
 #, fuzzy, c-format
 msgid "Modem sound"
 msgstr "Módald"
 
-#: standalone/drakconnect:483
+#: standalone/drakconnect:508
 #, fuzzy, c-format
 msgid "Enable"
 msgstr "virkja"
 
-#: standalone/drakconnect:483
+#: standalone/drakconnect:508
 #, fuzzy, c-format
 msgid "Disable"
 msgstr "aftengja"
 
-#: standalone/drakconnect:522 standalone/harddrake2:58
+#: standalone/drakconnect:558 standalone/harddrake2:58
 #, c-format
 msgid "Media class"
 msgstr ""
 
-#: standalone/drakconnect:523 standalone/drakfloppy:140
+#: standalone/drakconnect:559 standalone/drakfloppy:140
 #, c-format
 msgid "Module name"
 msgstr "Kjarnaeining"
 
-#: standalone/drakconnect:524
+#: standalone/drakconnect:560
 #, fuzzy, c-format
 msgid "Mac Address"
 msgstr "Útvörpunarvistfang:"
 
-#: standalone/drakconnect:525 standalone/harddrake2:21
+#: standalone/drakconnect:561 standalone/harddrake2:21
 #, c-format
 msgid "Bus"
 msgstr "Braut"
 
-#: standalone/drakconnect:526 standalone/harddrake2:29
+#: standalone/drakconnect:562 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr "Staðsetning á braut"
 
-#: 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 ""
 
-#: standalone/drakconnect:597
+#: standalone/drakconnect:638
 #, fuzzy, c-format
 msgid "Remove a network interface"
 msgstr "Veldu netkort"
 
-#: standalone/drakconnect:601
+#: standalone/drakconnect:642
 #, fuzzy, c-format
 msgid "Select the network interface to remove:"
 msgstr "Veldu netkort"
 
-#: standalone/drakconnect:617
+#: standalone/drakconnect:656
 #, fuzzy, c-format
 msgid ""
 "An error occured while deleting the \"%s\" network interface:\n"
@@ -16757,97 +16876,97 @@ msgstr ""
 "\n"
 "%s"
 
-#: standalone/drakconnect:619
+#: standalone/drakconnect:658
 #, c-format
 msgid ""
 "Congratulations, the \"%s\" network interface has been succesfully deleted"
 msgstr ""
 
-#: standalone/drakconnect:636
+#: standalone/drakconnect:675
 #, c-format
 msgid "No Ip"
 msgstr ""
 
-#: standalone/drakconnect:637
+#: standalone/drakconnect:676
 #, c-format
 msgid "No Mask"
 msgstr "Engin sía"
 
-#: standalone/drakconnect:638 standalone/drakconnect:798
+#: standalone/drakconnect:677 standalone/drakconnect:840
 #, c-format
 msgid "up"
 msgstr ""
 
-#: standalone/drakconnect:638 standalone/drakconnect:798
+#: standalone/drakconnect:677 standalone/drakconnect:840
 #, fuzzy, c-format
 msgid "down"
 msgstr "lokið"
 
-#: standalone/drakconnect:677 standalone/net_monitor:415
+#: standalone/drakconnect:718 standalone/net_monitor:415
 #, c-format
 msgid "Connected"
 msgstr "Tengdur"
 
-#: standalone/drakconnect:677 standalone/net_monitor:415
+#: standalone/drakconnect:718 standalone/net_monitor:415
 #, c-format
 msgid "Not connected"
 msgstr "Ótengdur"
 
-#: standalone/drakconnect:678
+#: standalone/drakconnect:720
 #, c-format
 msgid "Disconnect..."
 msgstr "Aftengjast.."
 
-#: standalone/drakconnect:678
+#: standalone/drakconnect:720
 #, c-format
 msgid "Connect..."
 msgstr "Tengjast..."
 
-#: standalone/drakconnect:707
+#: standalone/drakconnect:749
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
 "network"
 msgstr ""
 
-#: standalone/drakconnect:723
+#: standalone/drakconnect:765
 #, c-format
 msgid "Deactivate now"
 msgstr "Aftengja núna"
 
-#: standalone/drakconnect:723
+#: standalone/drakconnect:765
 #, c-format
 msgid "Activate now"
 msgstr "Virkja núna"
 
-#: standalone/drakconnect:731
+#: standalone/drakconnect:773
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 
-#: standalone/drakconnect:745
+#: standalone/drakconnect:787
 #, c-format
 msgid "LAN Configuration"
 msgstr "Staðarnets-uppsetning"
 
-#: standalone/drakconnect:757
+#: standalone/drakconnect:799
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Kort %s: %s"
 
-#: standalone/drakconnect:766
+#: standalone/drakconnect:808
 #, c-format
 msgid "Boot Protocol"
 msgstr ""
 
-#: standalone/drakconnect:767
+#: standalone/drakconnect:809
 #, c-format
 msgid "Started on boot"
 msgstr "Virkjað við ræsingu"
 
-#: standalone/drakconnect:803
+#: standalone/drakconnect:845
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
@@ -16857,54 +16976,39 @@ msgstr ""
 "Þú getur ræst printerdrake frá Mandrake stjórnborðinu í vélbúnaðar- "
 "uppsetningahluta"
 
-#: standalone/drakconnect:858
+#: standalone/drakconnect:900
 #, c-format
 msgid ""
 "You don't have any configured Internet connection.\n"
 "Please run \"Internet access\" in control center."
 msgstr ""
 
-#: standalone/drakconnect:866
+#: standalone/drakconnect:908
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Internet uppsetning"
 
-#: standalone/drakconnect:907
-#, c-format
-msgid "Provider dns 1 (optional)"
-msgstr "Nafnamiðlari 1 (ekki krafist)"
-
-#: standalone/drakconnect:908
-#, c-format
-msgid "Provider dns 2 (optional)"
-msgstr "Nafnamiðlari 2 (ekki krafist)"
-
-#: standalone/drakconnect:921
-#, c-format
-msgid "Ethernet Card"
-msgstr "Ethernet-kort"
-
-#: standalone/drakconnect:922
-#, c-format
-msgid "DHCP Client"
-msgstr "DHCP biðlari"
+#: standalone/drakconnect:926
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Aðal nafnamiðlari (ekki krafist)"
 
-#: standalone/drakconnect:951
+#: standalone/drakconnect:948
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Internet uppsetning"
 
-#: standalone/drakconnect:952
+#: standalone/drakconnect:949
 #, c-format
 msgid "Internet access"
 msgstr "Internet aðgengi"
 
-#: standalone/drakconnect:954 standalone/net_monitor:87
+#: standalone/drakconnect:951 standalone/net_monitor:87
 #, c-format
 msgid "Connection type: "
 msgstr "Tegund tengingar: "
 
-#: standalone/drakconnect:957
+#: standalone/drakconnect:954
 #, c-format
 msgid "Status:"
 msgstr "Staða:"
@@ -17038,109 +17142,109 @@ msgid ""
 "<span foreground=\"Red\"><tt>%s</tt></span>"
 msgstr ""
 
-#: standalone/drakfont:181
+#: standalone/drakfont:183
 #, c-format
 msgid "Search installed fonts"
 msgstr ""
 
-#: standalone/drakfont:183
+#: standalone/drakfont:185
 #, c-format
 msgid "Unselect fonts installed"
 msgstr ""
 
-#: standalone/drakfont:206
+#: standalone/drakfont:208
 #, c-format
 msgid "parse all fonts"
 msgstr ""
 
-#: standalone/drakfont:208
+#: standalone/drakfont:210
 #, fuzzy, c-format
 msgid "No fonts found"
 msgstr "Engin letur fundust"
 
-#: 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 "lokið"
 
-#: standalone/drakfont:221
+#: standalone/drakfont:223
 #, c-format
 msgid "Could not find any font in your mounted partitions"
 msgstr ""
 
-#: standalone/drakfont:254
+#: standalone/drakfont:256
 #, c-format
 msgid "Reselect correct fonts"
 msgstr ""
 
-#: standalone/drakfont:257
+#: standalone/drakfont:259
 #, fuzzy, c-format
 msgid "Could not find any font.\n"
 msgstr "Þú hefur ekki valið neitt letur"
 
-#: standalone/drakfont:267
+#: standalone/drakfont:269
 #, c-format
 msgid "Search for fonts in installed list"
 msgstr ""
 
-#: standalone/drakfont:292
+#: standalone/drakfont:294
 #, c-format
 msgid "%s fonts conversion"
 msgstr ""
 
-#: standalone/drakfont:321
+#: standalone/drakfont:323
 #, c-format
 msgid "Fonts copy"
 msgstr "Afrita letur"
 
-#: standalone/drakfont:324
+#: standalone/drakfont:326
 #, c-format
 msgid "True Type fonts installation"
 msgstr "Innsetning True Type leturs"
 
-#: standalone/drakfont:331
+#: standalone/drakfont:333
 #, c-format
 msgid "please wait during ttmkfdir..."
 msgstr ""
 
-#: standalone/drakfont:332
+#: standalone/drakfont:334
 #, c-format
 msgid "True Type install done"
 msgstr ""
 
-#: standalone/drakfont:338 standalone/drakfont:353
+#: standalone/drakfont:340 standalone/drakfont:355
 #, c-format
 msgid "type1inst building"
 msgstr ""
 
-#: standalone/drakfont:347
+#: standalone/drakfont:349
 #, c-format
 msgid "Ghostscript referencing"
 msgstr ""
 
-#: standalone/drakfont:357
+#: standalone/drakfont:359
 #, c-format
 msgid "Suppress Temporary Files"
 msgstr ""
 
-#: standalone/drakfont:360
+#: standalone/drakfont:362
 #, c-format
 msgid "Restart XFS"
 msgstr ""
 
-#: standalone/drakfont:406 standalone/drakfont:416
+#: standalone/drakfont:408 standalone/drakfont:418
 #, c-format
 msgid "Suppress Fonts Files"
 msgstr ""
 
-#: standalone/drakfont:418
+#: standalone/drakfont:420
 #, c-format
 msgid "xfs restart"
 msgstr "enduræsi xfs"
 
-#: standalone/drakfont:426
+#: standalone/drakfont:428
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -17150,32 +17254,32 @@ msgid ""
 "hang up your X Server."
 msgstr ""
 
-#: standalone/drakfont:474 standalone/drakfont:483
+#: standalone/drakfont:477 standalone/drakfont:486
 #, c-format
 msgid "DrakFont"
 msgstr ""
 
-#: standalone/drakfont:484
+#: standalone/drakfont:487
 #, c-format
 msgid "Font List"
 msgstr "Leturlisti"
 
-#: standalone/drakfont:490
+#: standalone/drakfont:493
 #, c-format
 msgid "About"
 msgstr "Um forrit"
 
-#: standalone/drakfont:492 standalone/drakfont:681 standalone/drakfont:719
+#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
 #, fuzzy, c-format
 msgid "Uninstall"
 msgstr "Eftirvinnsla"
 
-#: standalone/drakfont:493
+#: standalone/drakfont:496
 #, fuzzy, c-format
 msgid "Import"
 msgstr "Flytja inn letur"
 
-#: standalone/drakfont:509
+#: standalone/drakfont:512
 #, c-format
 msgid ""
 "Copyright (C) 2001-2002 by MandrakeSoft \n"
@@ -17188,7 +17292,7 @@ msgid ""
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
 
-#: standalone/drakfont:518
+#: standalone/drakfont:521
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -17208,7 +17312,7 @@ msgid ""
 " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: standalone/drakfont:534
+#: standalone/drakfont:537
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -17226,12 +17330,12 @@ msgid ""
 "             Convert ttf font files to afm and pfb fonts\n"
 msgstr ""
 
-#: standalone/drakfont:553
+#: standalone/drakfont:556
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "Veldu þau forrit sem eiga að styðja við letrin:"
 
-#: standalone/drakfont:554
+#: standalone/drakfont:557
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -17241,187 +17345,187 @@ msgid ""
 "hang up your X Server."
 msgstr ""
 
-#: 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 "Almennir prentarar"
 
-#: standalone/drakfont:583
+#: standalone/drakfont:586
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr ""
 
-#: standalone/drakfont:597
+#: standalone/drakfont:587
+#, c-format
+msgid "File Selection"
+msgstr "Skráaval"
+
+#: standalone/drakfont:600
 #, c-format
 msgid "You've not selected any font"
 msgstr "Þú hefur ekki valið neitt letur"
 
-#: standalone/drakfont:646
+#: standalone/drakfont:652
 #, fuzzy, c-format
 msgid "Import fonts"
 msgstr "Flytja inn letur"
 
-#: standalone/drakfont:651
+#: standalone/drakfont:657
 #, fuzzy, c-format
 msgid "Install fonts"
 msgstr "Fjarlægji letur"
 
-#: standalone/drakfont:686
+#: standalone/drakfont:692
 #, c-format
 msgid "click here if you are sure."
 msgstr ""
 
-#: standalone/drakfont:688
+#: standalone/drakfont:694
 #, c-format
 msgid "here if no."
 msgstr ""
 
-#: standalone/drakfont:727
+#: standalone/drakfont:733
 #, c-format
 msgid "Unselected All"
 msgstr ""
 
-#: standalone/drakfont:730
+#: standalone/drakfont:736
 #, c-format
 msgid "Selected All"
 msgstr "Allt valið"
 
-#: standalone/drakfont:733
+#: standalone/drakfont:739
 #, c-format
 msgid "Remove List"
 msgstr "Fjarlægja lista"
 
-#: standalone/drakfont:744 standalone/drakfont:763
+#: standalone/drakfont:750 standalone/drakfont:769
 #, fuzzy, c-format
 msgid "Importing fonts"
 msgstr "Flytja inn letur"
 
-#: standalone/drakfont:748 standalone/drakfont:768
+#: standalone/drakfont:754 standalone/drakfont:774
 #, c-format
 msgid "Initial tests"
 msgstr ""
 
-#: standalone/drakfont:749
+#: standalone/drakfont:755
 #, c-format
 msgid "Copy fonts on your system"
 msgstr ""
 
-#: standalone/drakfont:750
+#: standalone/drakfont:756
 #, c-format
 msgid "Install & convert Fonts"
 msgstr ""
 
-#: standalone/drakfont:751
+#: standalone/drakfont:757
 #, c-format
 msgid "Post Install"
 msgstr "Eftir innsetningu"
 
-#: standalone/drakfont:769
+#: standalone/drakfont:775
 #, c-format
 msgid "Remove fonts on your system"
 msgstr ""
 
-#: standalone/drakfont:770
+#: standalone/drakfont:776
 #, c-format
 msgid "Post Uninstall"
 msgstr "Eftirvinnsla"
 
-#: standalone/drakgw:59 standalone/drakgw:190
+#: standalone/drakgw:58 standalone/drakgw:193
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "Samnýting Internets tengingar"
 
-#: standalone/drakgw:117 standalone/drakvpn:49
-#, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr ""
-
-#: standalone/drakgw:128
+#: standalone/drakgw:124
 #, c-format
-msgid "Internet Connection Sharing currently enabled"
+msgid "Internet Connection Sharing currently disabled"
 msgstr ""
 
-#: 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 ""
 
-#: standalone/drakgw:133 standalone/drakvpn:99
+#: standalone/drakgw:129 standalone/drakvpn:125
 #, c-format
-msgid "disable"
-msgstr "aftengja"
+msgid "enable"
+msgstr "virkja"
 
-#: 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 "endurstilla"
 
-#: 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 "hætta við"
 
 #: standalone/drakgw:136
 #, c-format
-msgid "Disabling servers..."
-msgstr "Aftengi miðlara..."
+msgid "Enabling servers..."
+msgstr "Virkja miðlara..."
 
-#: standalone/drakgw:150
+#: standalone/drakgw:148
 #, c-format
-msgid "Internet Connection Sharing is now disabled."
-msgstr "Samnýting Internets tengingar er nú aftengd"
+msgid "Internet Connection Sharing is now enabled."
+msgstr "Samnýting Internetstengingar er nú virk."
 
-#: standalone/drakgw:157
+#: standalone/drakgw:151
 #, c-format
-msgid "Internet Connection Sharing currently disabled"
+msgid "Internet Connection Sharing currently enabled"
 msgstr ""
 
-#: 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 ""
 
-#: standalone/drakgw:162 standalone/drakvpn:125
+#: standalone/drakgw:156 standalone/drakvpn:99
 #, c-format
-msgid "enable"
-msgstr "virkja"
+msgid "disable"
+msgstr "aftengja"
 
-#: standalone/drakgw:169
+#: standalone/drakgw:159
 #, c-format
-msgid "Enabling servers..."
-msgstr "Virkja miðlara..."
+msgid "Disabling servers..."
+msgstr "Aftengi miðlara..."
 
-#: standalone/drakgw:175
+#: standalone/drakgw:174
 #, c-format
-msgid "Internet Connection Sharing is now enabled."
-msgstr "Samnýting Internetstengingar er nú virk."
+msgid "Internet Connection Sharing is now disabled."
+msgstr "Samnýting Internets tengingar er nú aftengd"
 
-#: standalone/drakgw:191
+#: standalone/drakgw:194
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -17435,40 +17539,27 @@ msgid ""
 "(LAN)."
 msgstr ""
 
-#: 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 ""
-
-#: standalone/drakgw:230
+#: standalone/drakgw:237
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Tengi %s (nota einingu %s)"
 
-#: standalone/drakgw:231
+#: standalone/drakgw:238
 #, c-format
 msgid "Interface %s"
 msgstr "Tengi %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 ""
+msgid "No network adapter on your system!"
+msgstr "Ekkert nettengi á vélinni þinni!"
 
-#: standalone/drakgw:247
+#: standalone/drakgw:254
 #, c-format
 msgid "Network interface"
 msgstr "Nettengi"
 
-#: standalone/drakgw:248
+#: standalone/drakgw:255
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -17478,19 +17569,19 @@ msgid ""
 "I am about to setup your Local Area Network with that adapter."
 msgstr ""
 
-#: standalone/drakgw:255
+#: standalone/drakgw:262
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr ""
 
-#: standalone/drakgw:283
+#: standalone/drakgw:291
 #, c-format
 msgid "Network interface already configured"
 msgstr "Nettenging þegar uppsett"
 
-#: standalone/drakgw:284
+#: standalone/drakgw:292
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -17500,27 +17591,27 @@ msgid ""
 "You can do it manually but you need to know what you're doing."
 msgstr ""
 
-#: standalone/drakgw:289
+#: standalone/drakgw:297
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Sjálfvirk enduruppsetning"
 
-#: standalone/drakgw:289
+#: standalone/drakgw:297
 #, c-format
 msgid "No (experts only)"
 msgstr "Nei (aðeins f. sérfræðinga)"
 
-#: standalone/drakgw:290
+#: standalone/drakgw:298
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Sýna núverandi uppsetningar tengis"
 
-#: standalone/drakgw:291
+#: standalone/drakgw:299
 #, c-format
 msgid "Current interface configuration"
 msgstr "Núverandi uppsetningar tengis"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:300
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -17531,7 +17622,7 @@ msgid ""
 "Driver: %s"
 msgstr ""
 
-#: standalone/drakgw:305
+#: standalone/drakgw:313
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -17547,12 +17638,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakgw:312
+#: standalone/drakgw:320
 #, c-format
 msgid "Local Network adress"
 msgstr "Staðbundið IP-vistfang"
 
-#: standalone/drakgw:316
+#: standalone/drakgw:324
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -17561,72 +17652,72 @@ msgid ""
 "If you don't know the meaning of an option, simply leave it as it is."
 msgstr ""
 
-#: standalone/drakgw:320
+#: standalone/drakgw:328
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "Vistfang (þessa) DHCP miðlara"
 
-#: standalone/drakgw:321
+#: standalone/drakgw:329
 #, c-format
 msgid "The DNS Server IP"
 msgstr "Vistfang DNS þjóns"
 
-#: standalone/drakgw:322
+#: standalone/drakgw:330
 #, c-format
 msgid "The internal domain name"
 msgstr "Nafn staðbundins léns"
 
-#: standalone/drakgw:323
+#: standalone/drakgw:331
 #, c-format
 msgid "The DHCP start range"
 msgstr ""
 
-#: standalone/drakgw:324
+#: standalone/drakgw:332
 #, c-format
 msgid "The DHCP end range"
 msgstr ""
 
-#: standalone/drakgw:325
+#: standalone/drakgw:333
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:326
+#: standalone/drakgw:334
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:327
+#: standalone/drakgw:335
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr ""
 
-#: standalone/drakgw:334
+#: standalone/drakgw:342
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr ""
 
-#: standalone/drakgw:344
+#: standalone/drakgw:352
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 
-#: standalone/drakgw:354
+#: standalone/drakgw:362
 #, c-format
 msgid "Configuring..."
 msgstr "Uppsetning..."
 
-#: standalone/drakgw:355
+#: standalone/drakgw:363
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 
-#: 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 "Vandræði við að setja inn pakka %s"
 
-#: standalone/drakgw:584
+#: standalone/drakgw:595
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -17698,7 +17789,7 @@ msgstr "Sérsniðin kerfisuppsetning"
 msgid "Editable"
 msgstr "Breytanlegt"
 
-#: standalone/drakperm:48 standalone/drakperm:315
+#: standalone/drakperm:48 standalone/drakperm:314
 #, c-format
 msgid "Path"
 msgstr "Slóð"
@@ -17713,7 +17804,7 @@ msgstr "Notandi"
 msgid "Group"
 msgstr "Hópur"
 
-#: standalone/drakperm:48 standalone/drakperm:327
+#: standalone/drakperm:48 standalone/drakperm:326
 #, c-format
 msgid "Permissions"
 msgstr "Aðgangsheimildir"
@@ -17770,7 +17861,8 @@ msgstr "Bæta við reglu aftast"
 msgid "Delete selected rule"
 msgstr "Eyða valinni reglu"
 
-#: 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"
@@ -17868,12 +17960,12 @@ msgstr "Núverandi notandi"
 msgid "When checked, owner and group won't be changed"
 msgstr ""
 
-#: standalone/drakperm:301
+#: standalone/drakperm:300
 #, c-format
 msgid "Path selection"
 msgstr "Val á slóð"
 
-#: standalone/drakperm:321
+#: standalone/drakperm:320
 #, c-format
 msgid "Property"
 msgstr "Eiginleiki"
@@ -17984,7 +18076,7 @@ msgstr ""
 msgid "LOCAL"
 msgstr ""
 
-#: standalone/draksec:44
+#: standalone/draksec:44 standalone/drakvpn:1144
 #, c-format
 msgid "default"
 msgstr "sjálfgefið"
@@ -18004,7 +18096,7 @@ msgstr "nei"
 msgid "yes"
 msgstr "Já"
 
-#: standalone/draksec:70
+#: standalone/draksec:81
 #, c-format
 msgid ""
 "Here, you can setup the security level and administrator of your machine.\n"
@@ -18054,32 +18146,32 @@ msgid ""
 "maximum"
 msgstr ""
 
-#: standalone/draksec:118
+#: standalone/draksec:129
 #, c-format
 msgid "(default value: %s)"
 msgstr "(sjálfgefið gildi: %s)"
 
-#: standalone/draksec:159
+#: standalone/draksec:170
 #, c-format
 msgid "Security Level:"
 msgstr "Öryggisþrep:"
 
-#: standalone/draksec:162
+#: standalone/draksec:173
 #, c-format
 msgid "Security Alerts:"
 msgstr "Öryggisviðvaranir:"
 
-#: standalone/draksec:166
+#: standalone/draksec:177
 #, c-format
 msgid "Security Administrator:"
 msgstr "Öryggisfulltrúi:"
 
-#: standalone/draksec:168
+#: standalone/draksec:179
 #, c-format
 msgid "Basic options"
 msgstr "Grunnvalkostir"
 
-#: standalone/draksec:181
+#: standalone/draksec:192
 #, c-format
 msgid ""
 "The following options can be set to customize your\n"
@@ -18088,27 +18180,27 @@ msgstr ""
 "Eftirfarandi aðgerðir er hægt að stilla til að sérsníða\n"
 "öryggiskerfi þitt.. Ef þú þarfnast aðstoðar, líttu á vísbendingarnar.\n"
 
-#: standalone/draksec:183
+#: standalone/draksec:194
 #, c-format
 msgid "Network Options"
 msgstr "Netvalkostir"
 
-#: standalone/draksec:183
+#: standalone/draksec:194
 #, c-format
 msgid "System Options"
 msgstr "Kerfisvalkostir"
 
-#: standalone/draksec:229
+#: standalone/draksec:240
 #, c-format
 msgid "Periodic Checks"
 msgstr ""
 
-#: standalone/draksec:247
+#: standalone/draksec:258
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "Augnablik, stilli öryggisþrep..."
 
-#: standalone/draksec:253
+#: standalone/draksec:264
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "Augnablik stilli öryggisvalkosti..."
@@ -18163,37 +18255,37 @@ msgstr ""
 "smelltu á \"Í lagi\" til að setja inn 'ImageMagick' eða 'Hætta' til að "
 "stöðva."
 
-#: standalone/draksplash:67
+#: standalone/draksplash:68
 #, c-format
 msgid "first step creation"
 msgstr "fyrsta skref"
 
-#: standalone/draksplash:70
+#: standalone/draksplash:71
 #, c-format
 msgid "final resolution"
 msgstr "endanleg upplausn"
 
-#: standalone/draksplash:71 standalone/draksplash:165
+#: standalone/draksplash:72
 #, c-format
 msgid "choose image file"
 msgstr "Veldu myndskrá"
 
-#: standalone/draksplash:72
+#: standalone/draksplash:73
 #, c-format
 msgid "Theme name"
 msgstr "Þema nafn"
 
-#: standalone/draksplash:77
+#: standalone/draksplash:78
 #, c-format
 msgid "Browse"
 msgstr "Flakka"
 
-#: standalone/draksplash:87 standalone/draksplash:153
+#: standalone/draksplash:93 standalone/draksplash:158
 #, c-format
 msgid "Configure bootsplash picture"
 msgstr "Stilla upphafs-smellimynd"
 
-#: standalone/draksplash:90
+#: standalone/draksplash:96
 #, c-format
 msgid ""
 "x coordinate of text box\n"
@@ -18202,7 +18294,7 @@ msgstr ""
 "x hnit textaglugga\n"
 "í fjölda stafa"
 
-#: standalone/draksplash:91
+#: standalone/draksplash:97
 #, c-format
 msgid ""
 "y coordinate of text box\n"
@@ -18211,17 +18303,17 @@ msgstr ""
 "y hnit textaglugga\n"
 "í fjölda stafa"
 
-#: standalone/draksplash:92
+#: standalone/draksplash:98
 #, c-format
 msgid "text width"
 msgstr "Textabreidd"
 
-#: standalone/draksplash:93
+#: standalone/draksplash:99
 #, c-format
 msgid "text box height"
 msgstr "hæð textaglugga"
 
-#: standalone/draksplash:94
+#: standalone/draksplash:100
 #, c-format
 msgid ""
 "the progress bar x coordinate\n"
@@ -18230,7 +18322,7 @@ msgstr ""
 "x hnit framvindusúlu\n"
 "á efra vinstra horni"
 
-#: standalone/draksplash:95
+#: standalone/draksplash:101
 #, c-format
 msgid ""
 "the progress bar y coordinate\n"
@@ -18239,87 +18331,250 @@ msgstr ""
 "y hnit framvindusúlu\n"
 "á efra vinstra horni"
 
-#: standalone/draksplash:96
+#: standalone/draksplash:102
 #, c-format
 msgid "the width of the progress bar"
 msgstr "breidd framvindusúlu"
 
-#: standalone/draksplash:97
+#: standalone/draksplash:103
 #, c-format
 msgid "the height of the progress bar"
 msgstr "hæð framvindusúlu"
 
-#: standalone/draksplash:98
+#: standalone/draksplash:104
 #, c-format
 msgid "the color of the progress bar"
 msgstr "litur framvindusúlu"
 
-#: standalone/draksplash:113
+#: standalone/draksplash:119
 #, c-format
 msgid "Preview"
 msgstr "Forsýn"
 
-#: standalone/draksplash:115
+#: standalone/draksplash:121
 #, c-format
 msgid "Save theme"
 msgstr "Vista þema"
 
-#: standalone/draksplash:116
+#: standalone/draksplash:122
 #, c-format
 msgid "Choose color"
 msgstr "Veldu lit"
 
-#: standalone/draksplash:119
+#: standalone/draksplash:125
 #, c-format
 msgid "Display logo on Console"
 msgstr "Birta merki á stjórnskjá"
 
-#: standalone/draksplash:120
+#: standalone/draksplash:126
 #, c-format
 msgid "Make kernel message quiet by default"
 msgstr "Skilaboð frá kjarna eru sjálfgefið ekki sýnileg"
 
-#: standalone/draksplash:156 standalone/draksplash:320
-#: standalone/draksplash:448
+#: standalone/draksplash:161 standalone/draksplash:319
+#: standalone/draksplash:462
 #, c-format
 msgid "Notice"
 msgstr "Tilkynning"
 
-#: 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 "Þemað hefur ekki enn smellimynd í %s !"
 
-#: standalone/draksplash:162
+#: standalone/draksplash:167
 #, c-format
 msgid "choose image"
 msgstr "Veldu myndskrá"
 
-#: standalone/draksplash:204
+#: standalone/draksplash:209
 #, c-format
 msgid "saving Bootsplash theme..."
 msgstr "vista smellimynda-þema..."
 
-#: standalone/draksplash:428
+#: standalone/draksplash:443
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "Litaval framvindusúlu"
 
-#: standalone/draksplash:448
+#: standalone/draksplash:462
 #, c-format
 msgid "You must choose an image file first!"
 msgstr "Þú verður að velja mynd fyrst!"
 
-#: standalone/draksplash:453
+#: standalone/draksplash:467
 #, c-format
 msgid "Generating preview ..."
 msgstr "Bý til forsýn..."
 
-#: standalone/draksplash:499
+#: standalone/draksplash:512
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr "%s Smellimerki (%s) forsýn"
 
+#: standalone/drakups:63
+#, c-format
+msgid "Connected through a serial port or an usb cable"
+msgstr ""
+
+#: standalone/drakups:69
+#, fuzzy, c-format
+msgid "Add an UPS device"
+msgstr "Bæta við hlut"
+
+#: standalone/drakups:72
+#, fuzzy, c-format
+msgid ""
+"Welcome to the UPS configuration utility.\n"
+"\n"
+"Here, you'll be add a new UPS to your system.\n"
+msgstr ""
+"Velkomin að póstuppsetningarforritnu.\n"
+"\n"
+"Hér getur þú stillt viðvörunarkerfi.\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 ""
+
+#: standalone/drakups:82
+#, fuzzy, c-format
+msgid "Autodetection"
+msgstr "Finna sjálfkrafa"
+
+#: standalone/drakups:90 standalone/harddrake2:134
+#, c-format
+msgid "Detection in progress"
+msgstr "Leitun í gangi"
+
+#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479
+#: standalone/logdrake:485
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Til hamingju!"
+
+#: standalone/drakups:109
+#, c-format
+msgid "The wizard successfully added the following UPS devices:"
+msgstr ""
+
+#: standalone/drakups:111
+#, fuzzy, c-format
+msgid "No new UPS devices was found"
+msgstr "Fann enginn tæki"
+
+#: standalone/drakups:116 standalone/drakups:128
+#, fuzzy, c-format
+msgid "UPS driver configuration"
+msgstr "CUPS prentarastillingar"
+
+#: standalone/drakups:116
+#, fuzzy, c-format
+msgid "Please select your UPS model."
+msgstr "Vinsamlega prófaðu músina:"
+
+#: standalone/drakups:117
+#, c-format
+msgid "Manufacturer / Model:"
+msgstr ""
+
+#: 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 ""
+
+#: standalone/drakups:133
+#, c-format
+msgid "Name:"
+msgstr "Nafn:"
+
+#: standalone/drakups:133
+#, fuzzy, c-format
+msgid "The name of your ups"
+msgstr "nafn örgjörvans"
+
+#: standalone/drakups:134
+#, c-format
+msgid "The driver that manage your ups"
+msgstr ""
+
+#: standalone/drakups:135
+#, fuzzy, c-format
+msgid "Port:"
+msgstr "Port"
+
+#: standalone/drakups:137
+#, fuzzy, c-format
+msgid "The port on which is connected your ups"
+msgstr "tegund brautar sem músin þín er tengd"
+
+#: standalone/drakups:144
+#, c-format
+msgid "The wizard successfully configured the new \"%s\" UPS device."
+msgstr ""
+
+#: standalone/drakups:232
+#, fuzzy, c-format
+msgid "UPS devices"
+msgstr "Þjónustur"
+
+#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266
+#: standalone/harddrake2:63
+#, c-format
+msgid "Name"
+msgstr "Nafn"
+
+#: standalone/drakups:250
+#, fuzzy, c-format
+msgid "UPS users"
+msgstr "Notendur"
+
+#: standalone/drakups:265
+#, fuzzy, c-format
+msgid "Access Control Lists"
+msgstr "aðgengi að nettólum"
+
+#: standalone/drakups:266
+#, c-format
+msgid "IP mask"
+msgstr ""
+
+#: standalone/drakups:277
+#, fuzzy, c-format
+msgid "Rules"
+msgstr "Beinar:"
+
+#: standalone/drakups:278
+#, fuzzy, c-format
+msgid "Action"
+msgstr "/_Aðgerðir"
+
+#: standalone/drakups:278 standalone/drakvpn:1144 standalone/harddrake2:57
+#, c-format
+msgid "Level"
+msgstr "Stig"
+
+#: standalone/drakups:278
+#, fuzzy, c-format
+msgid "ACL name"
+msgstr "LVM nafn?"
+
+#: standalone/drakups:297 standalone/drakups:301 standalone/drakups:310
+#, fuzzy, c-format
+msgid "DrakUPS"
+msgstr "Dvorak (US)"
+
+#: standalone/drakups:307
+#, fuzzy, c-format
+msgid "Welcome to the UPS configuration tools"
+msgstr "Prófun á stillingum"
+
 #: standalone/drakvpn:71
 #, fuzzy, c-format
 msgid "DrakVPN"
@@ -18375,7 +18630,7 @@ msgstr "Virkja miðlara..."
 msgid "The VPN connection is now enabled."
 msgstr "Samnýting Internetstengingar er nú virk."
 
-#: standalone/drakvpn:153 standalone/drakvpn:179
+#: standalone/drakvpn:153 standalone/drakvpn:181
 #, c-format
 msgid "Simple VPN setup."
 msgstr ""
@@ -18396,7 +18651,7 @@ msgid ""
 "drakconnect before going any further."
 msgstr ""
 
-#: standalone/drakvpn:180
+#: standalone/drakvpn:182
 #, c-format
 msgid ""
 "VPN connection.\n"
@@ -18413,12 +18668,12 @@ msgid ""
 msgstr ""
 
 # ## skrytid
-#: standalone/drakvpn:192
+#: standalone/drakvpn:194
 #, fuzzy, c-format
 msgid "Kernel module."
 msgstr "Fjarlægja einingu"
 
-#: standalone/drakvpn:193
+#: standalone/drakvpn:195
 #, c-format
 msgid ""
 "The kernel need to have ipsec support.\n"
@@ -18428,22 +18683,22 @@ msgid ""
 "This kernel has '%s' support."
 msgstr ""
 
-#: standalone/drakvpn:288
+#: standalone/drakvpn:290
 #, fuzzy, c-format
 msgid "Security Policies"
 msgstr "Öryggisviðvaranir:"
 
-#: standalone/drakvpn:288
+#: standalone/drakvpn:290
 #, c-format
 msgid "IKE daemon racoon"
 msgstr ""
 
-#: standalone/drakvpn:291 standalone/drakvpn:302
+#: standalone/drakvpn:293 standalone/drakvpn:304
 #, fuzzy, c-format
 msgid "Configuration file"
 msgstr "Stillingar"
 
-#: standalone/drakvpn:292
+#: standalone/drakvpn:294
 #, c-format
 msgid ""
 "Configuration step !\n"
@@ -18455,7 +18710,7 @@ msgid ""
 "What would you like to configure ?\n"
 msgstr ""
 
-#: standalone/drakvpn:303
+#: standalone/drakvpn:305
 #, c-format
 msgid ""
 "Next, we will configure the %s file.\n"
@@ -18464,12 +18719,12 @@ msgid ""
 "Simply click on Next.\n"
 msgstr ""
 
-#: standalone/drakvpn:321 standalone/drakvpn:681
+#: standalone/drakvpn:323 standalone/drakvpn:683
 #, fuzzy, c-format
 msgid "%s entries"
 msgstr ", %s geirar"
 
-#: standalone/drakvpn:322
+#: standalone/drakvpn:324
 #, c-format
 msgid ""
 "The %s file contents\n"
@@ -18483,23 +18738,27 @@ msgid ""
 "What would you like to do ?\n"
 msgstr ""
 
-#: standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakvpn:331 standalone/drakvpn:692
 #, fuzzy, c-format
-msgid "Display"
+msgid ""
+"_:display here is a verb\n"
+"Display"
 msgstr "daglega"
 
-#: standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakvpn:331 standalone/drakvpn:692
 #, fuzzy, c-format
 msgid "Commit"
 msgstr "samþjappað"
 
-#: standalone/drakvpn:343 standalone/drakvpn:347 standalone/drakvpn:705
-#: standalone/drakvpn:709
+#: standalone/drakvpn:345 standalone/drakvpn:349 standalone/drakvpn:707
+#: standalone/drakvpn:711
 #, fuzzy, c-format
-msgid "Display configuration"
+msgid ""
+"_:display here is a verb\n"
+"Display configuration"
 msgstr "Staðarnets-uppsetning"
 
-#: standalone/drakvpn:348
+#: standalone/drakvpn:350
 #, c-format
 msgid ""
 "The %s file does not exist.\n"
@@ -18509,12 +18768,12 @@ msgid ""
 "You'll have to go back and choose 'add'.\n"
 msgstr ""
 
-#: standalone/drakvpn:364
+#: standalone/drakvpn:366
 #, c-format
 msgid "ipsec.conf entries"
 msgstr ""
 
-#: standalone/drakvpn:365
+#: standalone/drakvpn:367
 #, c-format
 msgid ""
 "The %s file contains different sections.\n"
@@ -18529,27 +18788,27 @@ msgid ""
 "Choose the section you would like to add.\n"
 msgstr ""
 
-#: standalone/drakvpn:372
+#: standalone/drakvpn:374
 #, fuzzy, c-format
 msgid "config setup"
 msgstr "endurstilla"
 
-#: standalone/drakvpn:372
+#: standalone/drakvpn:374
 #, fuzzy, c-format
 msgid "conn %default"
 msgstr "sjálfgefið"
 
-#: standalone/drakvpn:372
+#: standalone/drakvpn:374
 #, fuzzy, c-format
 msgid "normal conn"
 msgstr "Venjulegur hamur"
 
-#: standalone/drakvpn:378 standalone/drakvpn:419 standalone/drakvpn:506
+#: standalone/drakvpn:380 standalone/drakvpn:421 standalone/drakvpn:508
 #, fuzzy, c-format
 msgid "Exists !"
 msgstr "Hætta"
 
-#: standalone/drakvpn:379 standalone/drakvpn:420
+#: standalone/drakvpn:381 standalone/drakvpn:422
 #, c-format
 msgid ""
 "A section with this name already exists.\n"
@@ -18559,7 +18818,7 @@ msgid ""
 "or change its name.\n"
 msgstr ""
 
-#: standalone/drakvpn:396
+#: standalone/drakvpn:398
 #, c-format
 msgid ""
 "This section has to be on top of your\n"
@@ -18571,37 +18830,37 @@ msgid ""
 "Choose continue or previous when you are done.\n"
 msgstr ""
 
-#: standalone/drakvpn:401
+#: standalone/drakvpn:403
 #, fuzzy, c-format
 msgid "interfaces"
 msgstr "Tengi"
 
-#: standalone/drakvpn:402
+#: standalone/drakvpn:404
 #, c-format
 msgid "klipsdebug"
 msgstr ""
 
-#: standalone/drakvpn:403
+#: standalone/drakvpn:405
 #, c-format
 msgid "plutodebug"
 msgstr ""
 
-#: standalone/drakvpn:404
+#: standalone/drakvpn:406
 #, c-format
 msgid "plutoload"
 msgstr ""
 
-#: standalone/drakvpn:405
+#: standalone/drakvpn:407
 #, c-format
 msgid "plutostart"
 msgstr ""
 
-#: standalone/drakvpn:406
+#: standalone/drakvpn:408
 #, c-format
 msgid "uniqueids"
 msgstr ""
 
-#: standalone/drakvpn:440
+#: standalone/drakvpn:442
 #, c-format
 msgid ""
 "This is the first section after the config\n"
@@ -18614,52 +18873,52 @@ msgid ""
 "section.\n"
 msgstr ""
 
-#: standalone/drakvpn:447
-#, c-format
-msgid "pfs"
-msgstr ""
+#: standalone/drakvpn:449
+#, fuzzy, c-format
+msgid "PFS"
+msgstr "HFS"
 
-#: standalone/drakvpn:448
+#: standalone/drakvpn:450
 #, c-format
 msgid "keyingtries"
 msgstr ""
 
-#: standalone/drakvpn:449
+#: standalone/drakvpn:451
 #, c-format
 msgid "compress"
 msgstr ""
 
-#: standalone/drakvpn:450
+#: standalone/drakvpn:452
 #, c-format
 msgid "disablearrivalcheck"
 msgstr ""
 
-#: standalone/drakvpn:451 standalone/drakvpn:490
+#: standalone/drakvpn:453 standalone/drakvpn:492
 #, fuzzy, c-format
 msgid "left"
 msgstr "Eyða"
 
-#: standalone/drakvpn:452 standalone/drakvpn:491
+#: standalone/drakvpn:454 standalone/drakvpn:493
 #, c-format
 msgid "leftcert"
 msgstr ""
 
-#: standalone/drakvpn:453 standalone/drakvpn:492
+#: standalone/drakvpn:455 standalone/drakvpn:494
 #, c-format
 msgid "leftrsasigkey"
 msgstr ""
 
-#: standalone/drakvpn:454 standalone/drakvpn:493
+#: standalone/drakvpn:456 standalone/drakvpn:495
 #, c-format
 msgid "leftsubnet"
 msgstr ""
 
-#: standalone/drakvpn:455 standalone/drakvpn:494
+#: standalone/drakvpn:457 standalone/drakvpn:496
 #, c-format
 msgid "leftnexthop"
 msgstr ""
 
-#: standalone/drakvpn:484
+#: standalone/drakvpn:486
 #, c-format
 msgid ""
 "Your %s file has several sections, or connections.\n"
@@ -18668,47 +18927,47 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:487
+#: standalone/drakvpn:489
 #, fuzzy, c-format
 msgid "section name"
 msgstr "Nafn tengingar"
 
-#: standalone/drakvpn:488
+#: standalone/drakvpn:490
 #, fuzzy, c-format
 msgid "authby"
 msgstr "Slóð"
 
-#: standalone/drakvpn:489
+#: standalone/drakvpn:491
 #, fuzzy, c-format
 msgid "auto"
 msgstr "Um forrit"
 
-#: standalone/drakvpn:495
+#: standalone/drakvpn:497
 #, fuzzy, c-format
 msgid "right"
 msgstr "Hátt"
 
-#: standalone/drakvpn:496
+#: standalone/drakvpn:498
 #, fuzzy, c-format
 msgid "rightcert"
 msgstr "Hærra"
 
-#: standalone/drakvpn:497
+#: standalone/drakvpn:499
 #, c-format
 msgid "rightrsasigkey"
 msgstr ""
 
-#: standalone/drakvpn:498
+#: standalone/drakvpn:500
 #, c-format
 msgid "rightsubnet"
 msgstr ""
 
-#: standalone/drakvpn:499
+#: standalone/drakvpn:501
 #, c-format
 msgid "rightnexthop"
 msgstr ""
 
-#: standalone/drakvpn:507
+#: standalone/drakvpn:509
 #, c-format
 msgid ""
 "A section with this name already exists.\n"
@@ -18718,7 +18977,7 @@ msgid ""
 "or change the name of the section.\n"
 msgstr ""
 
-#: standalone/drakvpn:539
+#: standalone/drakvpn:541
 #, c-format
 msgid ""
 "Add a Security Policy.\n"
@@ -18728,12 +18987,12 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:572 standalone/drakvpn:822
+#: standalone/drakvpn:574 standalone/drakvpn:824
 #, fuzzy, c-format
 msgid "Edit section"
 msgstr "Val á slóð"
 
-#: standalone/drakvpn:573
+#: standalone/drakvpn:575
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -18742,18 +19001,18 @@ msgid ""
 "and then click on next.\n"
 msgstr ""
 
-#: standalone/drakvpn:576 standalone/drakvpn:656 standalone/drakvpn:827
-#: standalone/drakvpn:873
+#: standalone/drakvpn:578 standalone/drakvpn:658 standalone/drakvpn:829
+#: standalone/drakvpn:875
 #, fuzzy, c-format
 msgid "Section names"
 msgstr "Nafn tengingar"
 
-#: standalone/drakvpn:586
+#: standalone/drakvpn:588
 #, fuzzy, c-format
 msgid "Can't edit !"
 msgstr "Get ekki opnað %s!"
 
-#: standalone/drakvpn:587
+#: standalone/drakvpn:589
 #, c-format
 msgid ""
 "You cannot edit this section.\n"
@@ -18764,7 +19023,7 @@ msgid ""
 "enable the oportunistic encryption.\n"
 msgstr ""
 
-#: standalone/drakvpn:596
+#: standalone/drakvpn:598
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -18773,7 +19032,7 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:607
+#: standalone/drakvpn:609
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -18782,7 +19041,7 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:620
+#: standalone/drakvpn:622
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -18792,7 +19051,7 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:641
+#: standalone/drakvpn:643
 #, c-format
 msgid ""
 "Edit a Security Policy.\n"
@@ -18802,12 +19061,12 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:652 standalone/drakvpn:869
+#: standalone/drakvpn:654 standalone/drakvpn:871
 #, fuzzy, c-format
 msgid "Remove section"
 msgstr "Fjarlægja lista"
 
-#: standalone/drakvpn:653 standalone/drakvpn:870
+#: standalone/drakvpn:655 standalone/drakvpn:872
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -18816,7 +19075,7 @@ msgid ""
 "and then click on next.\n"
 msgstr ""
 
-#: standalone/drakvpn:682
+#: standalone/drakvpn:684
 #, c-format
 msgid ""
 "The racoon.conf file configuration.\n"
@@ -18830,7 +19089,7 @@ msgid ""
 "  - commit \t\t (writes the changes to the real file)"
 msgstr ""
 
-#: standalone/drakvpn:710
+#: standalone/drakvpn:712
 #, c-format
 msgid ""
 "The %s file does not exist\n"
@@ -18840,12 +19099,12 @@ msgid ""
 "You'll have to go back and choose configure.\n"
 msgstr ""
 
-#: standalone/drakvpn:724
+#: standalone/drakvpn:726
 #, c-format
 msgid "racoonf.conf entries"
 msgstr ""
 
-#: standalone/drakvpn:725
+#: standalone/drakvpn:727
 #, c-format
 msgid ""
 "The 'add' sections step.\n"
@@ -18858,22 +19117,22 @@ msgid ""
 "Choose the section you would like to add.\n"
 msgstr ""
 
-#: standalone/drakvpn:731
-#, fuzzy, c-format
+#: standalone/drakvpn:733
+#, c-format
 msgid "path"
-msgstr "Slóð"
+msgstr "slóð"
 
-#: standalone/drakvpn:731
+#: standalone/drakvpn:733
 #, fuzzy, c-format
 msgid "remote"
 msgstr "Fjarlægja"
 
-#: standalone/drakvpn:731
+#: standalone/drakvpn:733
 #, fuzzy, c-format
 msgid "sainfo"
 msgstr "Upplýsingar"
 
-#: standalone/drakvpn:739
+#: standalone/drakvpn:741
 #, c-format
 msgid ""
 "The 'add path' section step.\n"
@@ -18883,12 +19142,12 @@ msgid ""
 "Put your mouse over the certificate entry to obtain online help."
 msgstr ""
 
-#: standalone/drakvpn:742
+#: standalone/drakvpn:744
 #, fuzzy, c-format
 msgid "path type"
 msgstr "Breyta tegund"
 
-#: standalone/drakvpn:746
+#: standalone/drakvpn:748
 #, c-format
 msgid ""
 "path include path : specifies a path to include\n"
@@ -18912,12 +19171,12 @@ msgid ""
 "Pre-shared key authentication method in phase 1."
 msgstr ""
 
-#: standalone/drakvpn:766
+#: standalone/drakvpn:768 standalone/drakvpn:861
 #, fuzzy, c-format
 msgid "real file"
 msgstr "Veljið skrá"
 
-#: standalone/drakvpn:789
+#: standalone/drakvpn:791
 #, c-format
 msgid ""
 "Make sure you already have the path sections\n"
@@ -18927,7 +19186,7 @@ msgid ""
 "Choose continue or previous when you are done.\n"
 msgstr ""
 
-#: standalone/drakvpn:806
+#: standalone/drakvpn:808
 #, c-format
 msgid ""
 "Make sure you already have the path sections\n"
@@ -18937,7 +19196,7 @@ msgid ""
 "Choose continue or previous when you are done.\n"
 msgstr ""
 
-#: standalone/drakvpn:823
+#: standalone/drakvpn:825
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -18946,7 +19205,7 @@ msgid ""
 "to edit and then click on next.\n"
 msgstr ""
 
-#: standalone/drakvpn:834
+#: standalone/drakvpn:836
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -18957,7 +19216,7 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:843
+#: standalone/drakvpn:845
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -18967,7 +19226,7 @@ msgid ""
 "Choose continue when you are done to write the data."
 msgstr ""
 
-#: standalone/drakvpn:851
+#: standalone/drakvpn:853
 #, c-format
 msgid ""
 "This section has to be on top of your\n"
@@ -18981,17 +19240,12 @@ msgid ""
 "Choose continue or previous when you are done.\n"
 msgstr ""
 
-#: standalone/drakvpn:858
+#: standalone/drakvpn:860
 #, c-format
 msgid "path_type"
 msgstr ""
 
-#: standalone/drakvpn:859
-#, fuzzy, c-format
-msgid "real_file"
-msgstr "Veljið skrá"
-
-#: standalone/drakvpn:899
+#: standalone/drakvpn:901
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -19003,12 +19257,12 @@ msgid ""
 "section is configured."
 msgstr ""
 
-#: standalone/drakvpn:919
+#: standalone/drakvpn:921
 #, c-format
 msgid "Sainfo source address"
 msgstr ""
 
-#: standalone/drakvpn:920
+#: standalone/drakvpn:922
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -19031,12 +19285,12 @@ msgid ""
 "\t172.16.1.0/24 is the source address"
 msgstr ""
 
-#: standalone/drakvpn:937
+#: standalone/drakvpn:939
 #, fuzzy, c-format
 msgid "Sainfo source protocol"
 msgstr "Evrópskan samskiptastaðal"
 
-#: standalone/drakvpn:938
+#: standalone/drakvpn:940
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -19056,12 +19310,12 @@ msgid ""
 "\tthe first 'any' allows any protocol for the source"
 msgstr ""
 
-#: standalone/drakvpn:952
+#: standalone/drakvpn:954
 #, c-format
 msgid "Sainfo destination address"
 msgstr ""
 
-#: standalone/drakvpn:953
+#: standalone/drakvpn:955
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -19084,12 +19338,12 @@ msgid ""
 "\t172.16.2.0/24 is the destination address"
 msgstr ""
 
-#: standalone/drakvpn:970
+#: standalone/drakvpn:972
 #, fuzzy, c-format
 msgid "Sainfo destination protocol"
 msgstr "Windows flutningstól"
 
-#: standalone/drakvpn:971
+#: standalone/drakvpn:973
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -19109,12 +19363,12 @@ msgid ""
 "\tthe last 'any' allows any protocol for the destination"
 msgstr ""
 
-#: standalone/drakvpn:985
+#: standalone/drakvpn:987
 #, c-format
 msgid "PFS group"
 msgstr ""
 
-#: standalone/drakvpn:987
+#: standalone/drakvpn:989
 #, c-format
 msgid ""
 "define the group of Diffie-Hellman exponentiations.\n"
@@ -19124,12 +19378,12 @@ msgid ""
 "Or you can define 1, 2, or 5 as the DH group number."
 msgstr ""
 
-#: standalone/drakvpn:992
+#: standalone/drakvpn:994
 #, fuzzy, c-format
 msgid "Lifetime number"
 msgstr "tala"
 
-#: standalone/drakvpn:993
+#: standalone/drakvpn:995
 #, c-format
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
@@ -19150,12 +19404,12 @@ msgid ""
 "So, here, the lifetime numbers are 1, 1, 30, 30, 60 and 12.\n"
 msgstr ""
 
-#: standalone/drakvpn:1009
+#: standalone/drakvpn:1011
 #, c-format
 msgid "Lifetime unit"
 msgstr ""
 
-#: standalone/drakvpn:1011
+#: standalone/drakvpn:1013
 #, c-format
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
@@ -19177,27 +19431,32 @@ msgid ""
 "'hour'.\n"
 msgstr ""
 
-#: standalone/drakvpn:1027 standalone/drakvpn:1112
+#: standalone/drakvpn:1029 standalone/drakvpn:1114
 #, fuzzy, c-format
 msgid "Encryption algorithm"
 msgstr "auðkenning"
 
-#: standalone/drakvpn:1029
+#: standalone/drakvpn:1031
 #, fuzzy, c-format
 msgid "Authentication algorithm"
 msgstr "auðkenning"
 
-#: standalone/drakvpn:1031
+#: standalone/drakvpn:1033
 #, c-format
 msgid "Compression algorithm"
 msgstr ""
 
-#: standalone/drakvpn:1039
+#: standalone/drakvpn:1034
+#, fuzzy, c-format
+msgid "deflate"
+msgstr "sjálfgefið"
+
+#: standalone/drakvpn:1041
 #, fuzzy, c-format
 msgid "Remote"
 msgstr "Fjarlægja"
 
-#: standalone/drakvpn:1040
+#: standalone/drakvpn:1042
 #, c-format
 msgid ""
 "remote (address | anonymous) [[port]] { statements }\n"
@@ -19212,12 +19471,12 @@ msgid ""
 "remote ::1 [8000]"
 msgstr ""
 
-#: standalone/drakvpn:1048
+#: standalone/drakvpn:1050
 #, fuzzy, c-format
 msgid "Exchange mode"
 msgstr "Hringihamur"
 
-#: standalone/drakvpn:1050
+#: standalone/drakvpn:1052
 #, c-format
 msgid ""
 "defines the exchange mode for phase 1 when racoon is the\n"
@@ -19228,12 +19487,22 @@ msgid ""
 "racoon uses when it is the initiator.\n"
 msgstr ""
 
-#: standalone/drakvpn:1056
+#: standalone/drakvpn:1058
 #, fuzzy, c-format
 msgid "Generate policy"
 msgstr "Öryggi"
 
-#: standalone/drakvpn:1058
+#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#, c-format
+msgid "off"
+msgstr ""
+
+#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#, fuzzy, c-format
+msgid "on"
+msgstr "Niður"
+
+#: standalone/drakvpn:1060
 #, c-format
 msgid ""
 "This directive is for the responder.  Therefore you\n"
@@ -19252,12 +19521,12 @@ msgid ""
 "the initiator case.  The default value is off."
 msgstr ""
 
-#: standalone/drakvpn:1072
+#: standalone/drakvpn:1074
 #, fuzzy, c-format
 msgid "Passive"
 msgstr "Palestína"
 
-#: standalone/drakvpn:1074
+#: standalone/drakvpn:1076
 #, c-format
 msgid ""
 "If you do not want to initiate the negotiation, set this\n"
@@ -19265,59 +19534,59 @@ msgid ""
 "server."
 msgstr ""
 
-#: standalone/drakvpn:1077
+#: standalone/drakvpn:1079
 #, c-format
 msgid "Certificate type"
 msgstr ""
 
-#: standalone/drakvpn:1079
+#: standalone/drakvpn:1081
 #, fuzzy, c-format
 msgid "My certfile"
 msgstr "Veljið skrá"
 
-#: standalone/drakvpn:1080
+#: standalone/drakvpn:1082
 #, fuzzy, c-format
 msgid "Name of the certificate"
 msgstr "Nafn prentara"
 
-#: standalone/drakvpn:1081
+#: standalone/drakvpn:1083
 #, c-format
 msgid "My private key"
 msgstr ""
 
-#: standalone/drakvpn:1082
+#: standalone/drakvpn:1084
 #, fuzzy, c-format
 msgid "Name of the private key"
 msgstr "Nafn prentara"
 
-#: standalone/drakvpn:1083
+#: standalone/drakvpn:1085
 #, fuzzy, c-format
 msgid "Peers certfile"
 msgstr "Veljið skrá"
 
-#: standalone/drakvpn:1084
+#: standalone/drakvpn:1086
 #, c-format
 msgid "Name of the peers certificate"
 msgstr ""
 
-#: standalone/drakvpn:1085
+#: standalone/drakvpn:1087
 #, fuzzy, c-format
 msgid "Verify cert"
 msgstr "mjög þægilegt"
 
-#: 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 ""
 
-#: standalone/drakvpn:1089
+#: standalone/drakvpn:1091
 #, c-format
 msgid "My identifier"
 msgstr ""
 
-#: standalone/drakvpn:1090
+#: standalone/drakvpn:1092
 #, c-format
 msgid ""
 "specifies the identifier sent to the remote host and the\n"
@@ -19344,17 +19613,17 @@ msgid ""
 "my_identifier user_fqdn \"myemail@mydomain.com\""
 msgstr ""
 
-#: standalone/drakvpn:1110
+#: standalone/drakvpn:1112
 #, fuzzy, c-format
 msgid "Peers identifier"
 msgstr "Prentari"
 
-#: standalone/drakvpn:1111
+#: standalone/drakvpn:1113
 #, fuzzy, c-format
 msgid "Proposal"
 msgstr "Samskiptaregla"
 
-#: standalone/drakvpn:1113
+#: standalone/drakvpn:1115
 #, c-format
 msgid ""
 "specify the encryption algorithm used for the\n"
@@ -19366,70 +19635,105 @@ msgid ""
 "For other transforms, this statement should not be used."
 msgstr ""
 
-#: standalone/drakvpn:1120
+#: standalone/drakvpn:1122
 #, c-format
 msgid "Hash algorithm"
 msgstr ""
 
-#: standalone/drakvpn:1121
+#: standalone/drakvpn:1123
 #, fuzzy, c-format
 msgid "Authentication method"
 msgstr "auðkenning"
 
-#: standalone/drakvpn:1122
+#: standalone/drakvpn:1124
 #, fuzzy, c-format
 msgid "DH group"
 msgstr "Hópur"
 
-#: standalone/drakvpn:1129
+#: standalone/drakvpn:1131
 #, fuzzy, c-format
 msgid "Command"
 msgstr "Skipanalína"
 
-#: standalone/drakvpn:1130
+#: standalone/drakvpn:1132
 #, c-format
 msgid "Source IP range"
 msgstr ""
 
-#: standalone/drakvpn:1131
+#: standalone/drakvpn:1133
 #, c-format
 msgid "Destination IP range"
 msgstr ""
 
-#: standalone/drakvpn:1132
+#: standalone/drakvpn:1134
 #, fuzzy, c-format
 msgid "Upper-layer protocol"
 msgstr "Evrópskan samskiptastaðal"
 
-#: standalone/drakvpn:1133
+#: standalone/drakvpn:1134 standalone/drakvpn:1141
+#, fuzzy, c-format
+msgid "any"
+msgstr "Dagur"
+
+#: standalone/drakvpn:1136
 #, fuzzy, c-format
 msgid "Flag"
 msgstr "Flögg"
 
-#: standalone/drakvpn:1134
+#: standalone/drakvpn:1137
 #, fuzzy, c-format
 msgid "Direction"
 msgstr "Lýsing"
 
-#: standalone/drakvpn:1135
+#: standalone/drakvpn:1138
 #, c-format
 msgid "IPsec policy"
 msgstr ""
 
-#: standalone/drakvpn:1137
+#: standalone/drakvpn:1138
+#, fuzzy, c-format
+msgid "ipsec"
+msgstr "Msek"
+
+#: standalone/drakvpn:1138
+#, fuzzy, c-format
+msgid "discard"
+msgstr "óvirkt"
+
+#: standalone/drakvpn:1141
 #, fuzzy, c-format
 msgid "Mode"
 msgstr "Tegund"
 
-#: standalone/drakvpn:1138
+#: standalone/drakvpn:1141
+#, fuzzy, c-format
+msgid "tunnel"
+msgstr "Rás"
+
+#: standalone/drakvpn:1141
+#, fuzzy, c-format
+msgid "transport"
+msgstr "sendi"
+
+#: standalone/drakvpn:1143
 #, fuzzy, c-format
 msgid "Source/destination"
 msgstr "Vinnustöð"
 
-#: standalone/drakvpn:1139 standalone/harddrake2:57
+#: standalone/drakvpn:1144
 #, c-format
-msgid "Level"
-msgstr "Stig"
+msgid "require"
+msgstr ""
+
+#: standalone/drakvpn:1144
+#, fuzzy, c-format
+msgid "use"
+msgstr "Mús"
+
+#: standalone/drakvpn:1144
+#, fuzzy, c-format
+msgid "unique"
+msgstr "Martiník"
 
 #: standalone/drakxtv:46
 #, c-format
@@ -19857,11 +20161,6 @@ msgstr "fjöldi hnappa sem músin hefur"
 
 #: standalone/harddrake2:63
 #, c-format
-msgid "Name"
-msgstr "Nafn"
-
-#: standalone/harddrake2:63
-#, c-format
 msgid "the name of the CPU"
 msgstr "nafn örgjörvans"
 
@@ -19918,13 +20217,13 @@ msgid ""
 "accesses to user memory (aka this is a bug guard)"
 msgstr ""
 
-#: 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 "/_Valkostir"
 
-#: 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
@@ -19972,11 +20271,6 @@ msgstr ""
 
 #: standalone/harddrake2:115
 #, c-format
-msgid "Select a device !"
-msgstr "Veldu tæki !"
-
-#: standalone/harddrake2:115
-#, c-format
 msgid ""
 "Once you've selected a device, you'll be able to see the device information "
 "in fields displayed on the right frame (\"Information\")"
@@ -20014,63 +20308,58 @@ msgstr ""
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 
-#: standalone/harddrake2:133
-#, c-format
-msgid "Detection in progress"
-msgstr "Leitun í gangi"
-
-#: standalone/harddrake2:140
+#: standalone/harddrake2:141
 #, c-format
 msgid "Harddrake2 version %s"
 msgstr "Harddrake2 útgáfa %s"
 
-#: standalone/harddrake2:156
+#: standalone/harddrake2:157
 #, c-format
 msgid "Detected hardware"
 msgstr "fundinn vélbúnaður"
 
-#: standalone/harddrake2:161
+#: standalone/harddrake2:162
 #, c-format
 msgid "Configure module"
 msgstr "Stilla einingu"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:169
 #, c-format
 msgid "Run config tool"
 msgstr "keyra stillieiningu"
 
-#: standalone/harddrake2:215
+#: standalone/harddrake2:216
 #, c-format
 msgid "unknown"
 msgstr "óþekkt"
 
-#: standalone/harddrake2:216
+#: standalone/harddrake2:217
 #, c-format
 msgid "Unknown"
 msgstr "Óþekkt"
 
-#: 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 "Smelltu á tæki í vinstri glugganum til að birta upplýsingar hér"
 
-#: standalone/harddrake2:282
+#: standalone/harddrake2:286
 #, c-format
 msgid "secondary"
 msgstr "auka"
 
-#: standalone/harddrake2:282
+#: standalone/harddrake2:286
 #, c-format
 msgid "primary"
 msgstr "aðal"
 
-#: standalone/harddrake2:290
+#: standalone/harddrake2:294
 #, c-format
 msgid "burner"
 msgstr "Brennari"
 
-#: standalone/harddrake2:290
+#: standalone/harddrake2:294
 #, c-format
 msgid "DVD"
 msgstr "DVD"
@@ -20092,210 +20381,210 @@ msgstr ""
 "Breytingar hafa verið gerðar, en til að virkja þær þá verður þú að stimpla "
 "þig út"
 
-#: standalone/logdrake:50
-#, c-format
-msgid "Mandrake Tools Explanation"
+#: standalone/logdrake:51
+#, fuzzy, c-format
+msgid "Mandrake Tools Logs"
 msgstr "Mandrake tólaskýringar"
 
-#: standalone/logdrake:51
+#: standalone/logdrake:52
 #, fuzzy, c-format
 msgid "Logdrake"
 msgstr "logdrake"
 
-#: standalone/logdrake:64
+#: standalone/logdrake:65
 #, c-format
 msgid "Show only for the selected day"
 msgstr "Sýna aðeins fyrir valinn dag"
 
-#: standalone/logdrake:71
+#: standalone/logdrake:72
 #, c-format
 msgid "/File/_New"
 msgstr "/Skrá/_Ný"
 
-#: 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 "/Skrá/_Opna"
 
-#: 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 "/Skrá/_Vista"
 
-#: 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 "/Skrá/Vista _sem"
 
-#: standalone/logdrake:75
+#: standalone/logdrake:76
 #, c-format
 msgid "/File/-"
 msgstr "/Skrá/-"
 
-#: standalone/logdrake:78
+#: standalone/logdrake:79
 #, c-format
 msgid "/Options/Test"
 msgstr "/Valkostir/Prófun"
 
-#: standalone/logdrake:80
+#: standalone/logdrake:81
 #, c-format
 msgid "/Help/_About..."
 msgstr "/Hjálp/_Um..."
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr ""
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr ""
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr ""
 
-#: standalone/logdrake:114
+#: standalone/logdrake:113
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
 msgstr ""
 
-#: standalone/logdrake:118
+#: standalone/logdrake:117
 #, c-format
 msgid "search"
 msgstr "leita"
 
-#: standalone/logdrake:130
+#: standalone/logdrake:129
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "Tól til að fylgjast með annálum"
 
-#: standalone/logdrake:131 standalone/net_monitor:85
+#: standalone/logdrake:130 standalone/net_monitor:85
 #, c-format
 msgid "Settings"
 msgstr "Stillingar"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "Matching"
 msgstr "Passar við"
 
-#: standalone/logdrake:137
+#: standalone/logdrake:136
 #, c-format
 msgid "but not matching"
 msgstr "en passar ekki við"
 
-#: standalone/logdrake:141
+#: standalone/logdrake:140
 #, c-format
 msgid "Choose file"
 msgstr "Veldu skrá"
 
-#: standalone/logdrake:150
+#: standalone/logdrake:149
 #, c-format
 msgid "Calendar"
 msgstr "Dagatal"
 
-#: standalone/logdrake:160
+#: standalone/logdrake:159
 #, c-format
 msgid "Content of the file"
 msgstr "Innihald skrár"
 
-#: standalone/logdrake:164 standalone/logdrake:377
+#: standalone/logdrake:163 standalone/logdrake:429
 #, c-format
 msgid "Mail alert"
 msgstr "Póstviðvörun"
 
-#: standalone/logdrake:171
+#: standalone/logdrake:170
 #, c-format
 msgid "The alert wizard had unexpectly failled:"
 msgstr ""
 
-#: standalone/logdrake:219
+#: standalone/logdrake:221
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr "Augnablik vinn úr skrá: %s"
 
-#: standalone/logdrake:355
+#: standalone/logdrake:406
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Apache World Wide Web miðlari"
 
-#: standalone/logdrake:356
+#: standalone/logdrake:407
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "Nafnauppflettingar léns"
 
-#: standalone/logdrake:357
+#: standalone/logdrake:408
 #, c-format
 msgid "Ftp Server"
 msgstr "Ftp miðlari"
 
-#: standalone/logdrake:358
+#: standalone/logdrake:409
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Postfix póstþjónn"
 
-#: standalone/logdrake:359
+#: standalone/logdrake:410
 #, c-format
 msgid "Samba Server"
 msgstr "Samba Miðlari"
 
-#: standalone/logdrake:360
+#: standalone/logdrake:411
 #, c-format
 msgid "SSH Server"
 msgstr "SSH Þjónn"
 
-#: standalone/logdrake:361
+#: standalone/logdrake:412
 #, c-format
 msgid "Webmin Service"
 msgstr "Webmin Þjónusta"
 
-#: standalone/logdrake:362
+#: standalone/logdrake:413
 #, c-format
 msgid "Xinetd Service"
 msgstr "Xinetd Þjónusta"
 
-#: standalone/logdrake:372
+#: standalone/logdrake:424
 #, fuzzy, c-format
 msgid "Configure the mail alert system"
 msgstr "Breyta CUPS prentkerfinu"
 
-#: standalone/logdrake:373
+#: standalone/logdrake:425
 #, c-format
 msgid "Stop the mail alert system"
 msgstr ""
 
-#: standalone/logdrake:380
+#: standalone/logdrake:432
 #, c-format
 msgid "Mail alert configuration"
 msgstr "Uppsetning póstviðvörunnar"
 
-#: standalone/logdrake:381
+#: standalone/logdrake:433
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -20306,71 +20595,66 @@ msgstr ""
 "\n"
 "Hér getur þú stillt viðvörunarkerfi.\n"
 
-#: standalone/logdrake:384
+#: standalone/logdrake:436
 #, fuzzy, c-format
 msgid "What do you want to do?"
 msgstr "Hvar viltu tengja tæki %s?"
 
-#: standalone/logdrake:391
+#: standalone/logdrake:443
 #, fuzzy, c-format
 msgid "Services settings"
 msgstr "Þjónustustillingar"
 
-#: 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 "Þú fært póst ef ein af eftirfarandi þjónustum eru ekki lengur keyrandi"
 
-#: standalone/logdrake:399
+#: standalone/logdrake:451
 #, c-format
 msgid "Load setting"
 msgstr "Álagsstillingar"
 
-#: standalone/logdrake:400
+#: standalone/logdrake:452
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "Þú færð póst ef álag er hærra en þetta gildi"
 
-#: standalone/logdrake:401
+#: standalone/logdrake:453
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr ""
 
-#: standalone/logdrake:406
+#: standalone/logdrake:458
 #, fuzzy, c-format
 msgid "Alert configuration"
 msgstr "Uppsetning viðvaranna"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:459
 #, c-format
 msgid "Please enter your email address below "
 msgstr "Vinsamlega gefðu upp netfang þitt "
 
-#: 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 ""
 
-#: standalone/logdrake:427 standalone/logdrake:433
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Til hamingju!"
-
-#: standalone/logdrake:427
+#: standalone/logdrake:479
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr ""
 
-#: standalone/logdrake:433
+#: standalone/logdrake:485
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr ""
 
-#: standalone/logdrake:492
+#: standalone/logdrake:544
 #, c-format
 msgid "Save as.."
 msgstr "Vista sem..."
@@ -20679,166 +20963,179 @@ msgstr "Höfundar: "
 msgid "Printer Management \n"
 msgstr "Stjórnun prentara \n"
 
-#: standalone/scannerdrake:53
+#: standalone/scannerdrake:50
+#, fuzzy, c-format
+msgid ""
+"SANE packages need to be installed to use scanners.\n"
+"\n"
+"Do you want to install the SANE packages?"
+msgstr "Pakkinn %s þarfnast innsetningar, viltu setja hann inn?"
+
+#: standalone/scannerdrake:54
+#, fuzzy, c-format
+msgid "Aborting Scannerdrake."
+msgstr "Scannerdrake"
+
+#: standalone/scannerdrake:59
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr ""
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:60
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr ""
 
-#: standalone/scannerdrake:60 standalone/scannerdrake:452
+#: standalone/scannerdrake:66 standalone/scannerdrake:459
 #, c-format
 msgid "Searching for configured scanners ..."
 msgstr "Leita að uppsettum myndskönnum..."
 
-#: standalone/scannerdrake:64 standalone/scannerdrake:456
+#: standalone/scannerdrake:70 standalone/scannerdrake:463
 #, c-format
 msgid "Searching for new scanners ..."
 msgstr "Leita að nýjum myndskönnum ..."
 
-#: standalone/scannerdrake:72 standalone/scannerdrake:478
+#: standalone/scannerdrake:78 standalone/scannerdrake:485
 #, c-format
 msgid "Re-generating list of configured scanners ..."
 msgstr "Endurgeri lista af uppsettum myndskönnum ..."
 
-#: standalone/scannerdrake:94 standalone/scannerdrake:135
-#: standalone/scannerdrake:149
+#: standalone/scannerdrake:100 standalone/scannerdrake:141
+#: standalone/scannerdrake:155
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "Það er ekki stuðningur fyrir %s í þessari útgáfu af Mandrake Linux"
+msgstr "Það er ekki stuðningur fyrir %s í þessari útgáfu af Mandrakelinux"
 
-#: standalone/scannerdrake:97
+#: standalone/scannerdrake:103
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "%s fannst á %s, stilla sjálfkrafa?"
 
-#: standalone/scannerdrake:109
+#: standalone/scannerdrake:115
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr "%s er ekki í grunni um myndskanna, stilla handvirkt?"
 
-#: standalone/scannerdrake:124
+#: standalone/scannerdrake:130
 #, c-format
 msgid "Select a scanner model"
 msgstr "Veldu tegund myndskanna"
 
-#: standalone/scannerdrake:125
+#: standalone/scannerdrake:131
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:126
+#: standalone/scannerdrake:132
 #, c-format
 msgid "Detected model: %s"
 msgstr "Fann tegund: %s"
 
-#: standalone/scannerdrake:128
+#: standalone/scannerdrake:134
 #, c-format
 msgid ", "
 msgstr ", "
 
-#: standalone/scannerdrake:129
+#: standalone/scannerdrake:135
 #, c-format
 msgid "Port: %s"
 msgstr "Gátt: %s"
 
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:161
 #, c-format
 msgid "The %s is not known by this version of Scannerdrake."
 msgstr "%s er óþekkt af þessarrí útgáfu af ScannerDrake"
 
-#: standalone/scannerdrake:163 standalone/scannerdrake:177
+#: standalone/scannerdrake:169 standalone/scannerdrake:183
 #, c-format
 msgid "Do not install firmware file"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "
 "can be installed."
 msgstr ""
 
-#: 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 "
 "manufacturer's home page, or on your Windows partition."
 msgstr ""
 
-#: standalone/scannerdrake:172 standalone/scannerdrake:231
+#: standalone/scannerdrake:178 standalone/scannerdrake:237
 #, c-format
 msgid "Install firmware file from"
 msgstr ""
 
-#: standalone/scannerdrake:192
+#: standalone/scannerdrake:198
 #, fuzzy, c-format
 msgid "Select firmware file"
 msgstr "Veljið skrá"
 
-#: 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 ""
 
-#: standalone/scannerdrake:218
+#: standalone/scannerdrake:224
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
 "everytime when they are turned on."
 msgstr ""
 
-#: 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 "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:225
+#: standalone/scannerdrake:231
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
 "firmware here by supplying the new firmware file."
 msgstr ""
 
-#: standalone/scannerdrake:227
+#: standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware for the"
 msgstr ""
 
-#: standalone/scannerdrake:250
+#: standalone/scannerdrake:256
 #, fuzzy, c-format
 msgid "Select firmware file for the %s"
 msgstr "Veljið skrá"
 
-#: standalone/scannerdrake:276
+#: standalone/scannerdrake:282
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr ""
 
-#: standalone/scannerdrake:286
+#: standalone/scannerdrake:292
 #, c-format
 msgid "The %s is unsupported"
 msgstr "Enginn stuðningur við %s"
 
-#: standalone/scannerdrake:291
+#: standalone/scannerdrake:297
 #, fuzzy, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
@@ -20848,44 +21145,44 @@ msgstr ""
 "Þú getur ræst printerdrake frá Mandrake stjórnborðinu í vélbúnaðar- "
 "uppsetningahluta"
 
-#: 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 "Leita að mögulegum gáttum"
 
-#: 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 "Vinsamlega veldu gátt þar sem %s er tengdur"
 
-#: standalone/scannerdrake:298
+#: standalone/scannerdrake:304
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(Athugið: Ekki er hægt að leita að hliðtengjum)"
 
-#: standalone/scannerdrake:300 standalone/scannerdrake:345
+#: standalone/scannerdrake:306 standalone/scannerdrake:351
 #, c-format
 msgid "choose device"
 msgstr "veldu tæki"
 
-#: standalone/scannerdrake:334
+#: standalone/scannerdrake:340
 #, c-format
 msgid "Searching for scanners ..."
 msgstr "Leita að myndlesara..."
 
-#: standalone/scannerdrake:368
-#, c-format
+#: standalone/scannerdrake:375
+#, fuzzy, 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 ""
 "%s þinn hefur nú verið stilltur\n"
 "Þú geetur nú skannað skjöl með því að velja \"Xsane\" í margmiðlun-grafík "
 "valmyndinni"
 
-#: standalone/scannerdrake:392
+#: standalone/scannerdrake:399
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -20898,7 +21195,7 @@ msgstr ""
 "%s\n"
 "eru tiltækir á kerfinu þínu\n"
 
-#: standalone/scannerdrake:393
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -20911,51 +21208,51 @@ msgstr ""
 "%s\n"
 "er tiltækur á kerfinu þínu\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 "Engir myndskannar fundust sem eru tiltækir fyrir kerfið þitt.\n"
 
-#: standalone/scannerdrake:413
+#: standalone/scannerdrake:420
 #, c-format
 msgid "Search for new scanners"
 msgstr "Leita að tiltækum myndskönnum"
 
-#: standalone/scannerdrake:419
+#: standalone/scannerdrake:426
 #, c-format
 msgid "Add a scanner manually"
 msgstr "Bæta við myndskanna handvirkt"
 
-#: standalone/scannerdrake:426
+#: standalone/scannerdrake:433
 #, fuzzy, c-format
 msgid "Install/Update firmware files"
 msgstr "Veljið skrá"
 
-#: standalone/scannerdrake:432
+#: standalone/scannerdrake:439
 #, c-format
 msgid "Scanner sharing"
 msgstr "Miðlun myndskanna"
 
-#: standalone/scannerdrake:491 standalone/scannerdrake:656
+#: standalone/scannerdrake:498 standalone/scannerdrake:663
 #, c-format
 msgid "All remote machines"
 msgstr "Allar aðrar vélar"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:806
+#: standalone/scannerdrake:510 standalone/scannerdrake:813
 #, c-format
 msgid "This machine"
 msgstr "Þessi vél"
 
-#: 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 ""
 "Hér getur þú valið hvort myndskanni tengur þessarri vél eigi að vera "
 "aðgengilegur frá öðrum vélum, og þá hvaða vélum."
 
-#: standalone/scannerdrake:544
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
@@ -20964,33 +21261,33 @@ msgstr ""
 "Þú getur einnig valið hvor myndskannar á fjarlægum vélum ættu að vera "
 "aðgengilegir frá þessari vél."
 
-#: standalone/scannerdrake:547
+#: standalone/scannerdrake:554
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr "Myndskannar á þessarri vél eru einnig aðgengilegir frá öðrum vélum"
 
-#: standalone/scannerdrake:549
+#: standalone/scannerdrake:556
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "Miðla myndskanna til véla: "
 
-#: standalone/scannerdrake:563
+#: standalone/scannerdrake:570
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "Nota myndskanna á öðrum vélum"
 
-#: standalone/scannerdrake:566
+#: standalone/scannerdrake:573
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "Nota myndskanna á vélum: "
 
-#: 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 "Miðlun staðbundinna myndskanna"
 
-#: standalone/scannerdrake:594
+#: standalone/scannerdrake:601
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
@@ -20999,56 +21296,64 @@ msgstr ""
 "Þetta eru vélarnar sem deila sínum staðbundnu myndskönnum, og ættu því að "
 "vera aðgengilegir:"
 
-#: standalone/scannerdrake:605 standalone/scannerdrake:755
+#: standalone/scannerdrake:612 standalone/scannerdrake:762
 #, c-format
 msgid "Add host"
 msgstr "Bæta við vél"
 
-#: standalone/scannerdrake:611 standalone/scannerdrake:761
+#: standalone/scannerdrake:618 standalone/scannerdrake:768
 #, c-format
 msgid "Edit selected host"
 msgstr "Breyta valinni vél"
 
-#: standalone/scannerdrake:620 standalone/scannerdrake:770
+#: standalone/scannerdrake:627 standalone/scannerdrake:777
 #, c-format
 msgid "Remove selected host"
 msgstr "Fjarlægja valda vél"
 
-#: 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 "Nafn/IP-vistfang vélar:"
 
-#: 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 "Veldu vélar þar sem staðbundnir myndskannar ættu að vera aðgengilegir:"
 
-#: 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 "Þú verður að gefa upp vélarnafn eða IP-vistfang.\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 ""
 "Þessi vél er nú þegar á listanum, þú getur ekki bætt henni við aftur.\n"
 
-#: standalone/scannerdrake:743
+#: standalone/scannerdrake:750
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "Nota myndskanna frá öðrum vélum"
 
-#: standalone/scannerdrake:744
+#: standalone/scannerdrake:751
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr "Þetta eru vélarnar frá hverjum ætti að vera hægt að nota myndskanna:"
 
-#: standalone/scannerdrake:904
+#: standalone/scannerdrake:908
+#, fuzzy, 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 "Pakkinn %s þarfnast innsetningar, viltu setja hann inn?"
+
+#: standalone/scannerdrake:912 standalone/scannerdrake:916
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr ""
@@ -21063,7 +21368,7 @@ msgstr "Nokkur tæki í \"%s\" vélbúnaðarhlutanum voru fjarlægð:\n"
 msgid "Some devices were added: %s\n"
 msgstr "Nokkrum tækjum var bætt við:\n"
 
-#: standalone/service_harddrake:94
+#: standalone/service_harddrake:98
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "Vélbúnaðarskönnun í gangi"
@@ -21158,22 +21463,22 @@ msgstr "Setja inn uppfærslur"
 msgid "Exit install"
 msgstr "Hætta innsetningu"
 
-#: ugtk2.pm:1047
+#: ugtk2.pm:1075
 #, c-format
 msgid "Is this correct?"
 msgstr "Er þetta rétt?"
 
-#: ugtk2.pm:1175
+#: ugtk2.pm:1203
 #, c-format
 msgid "Expand Tree"
 msgstr "Opna tré"
 
-#: ugtk2.pm:1176
+#: ugtk2.pm:1204
 #, c-format
 msgid "Collapse Tree"
 msgstr "Loka tré"
 
-#: ugtk2.pm:1177
+#: ugtk2.pm:1205
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "Víxla milli flats lista og raðaðra hópa"
@@ -21190,237 +21495,255 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Uppsetning þema mistókst!"
 
-#~ msgid "Configuration of a remote printer"
-#~ msgstr "Stilla fjartengdan prentara"
+#: ../../share/compssUsers:999
+msgid "Office Workstation"
+msgstr "Skrifstofu-vinnustöð"
 
-#, fuzzy
-#~ msgid "configure %s"
-#~ msgstr "endurstilla"
+#: ../../share/compssUsers:999
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Skrifstofu forrit: ritvinnsla (kword, abiword), töflureiknar (kspread, "
+"gnumeric) pdf skoðarar, o.s.frv"
 
-#, fuzzy
-#~ msgid "protocol = "
-#~ msgstr "Samskiptaregla"
+#: ../../share/compssUsers:999
+msgid "Game station"
+msgstr "Leikja-(vinnu)stöð"
 
-#, fuzzy
-#~ msgid "level = "
-#~ msgstr "stig"
+#: ../../share/compssUsers:999
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Leikjaforrit, skotleikir, borðleikir, herkænskuleikir og fleira"
 
-#~ msgid "Office Workstation"
-#~ msgstr "Skrifstofu-vinnustöð"
+#: ../../share/compssUsers:999
+msgid "Multimedia station"
+msgstr "Margmiðlunar-vinnustöð"
 
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Skrifstofu forrit: ritvinnsla (kword, abiword), töflureiknar (kspread, "
-#~ "gnumeric) pdf skoðarar, o.s.frv"
+#: ../../share/compssUsers:999
+msgid "Sound and video playing/editing programs"
+msgstr "Spila og breyta hljóðskrám og kvikmyndum"
 
-#~ msgid "Game station"
-#~ msgstr "Leikja-(vinnu)stöð"
+#: ../../share/compssUsers:999
+msgid "Internet station"
+msgstr "Internet-vinnustöð"
 
-#~ msgid "Amusement programs: arcade, boards, strategy, etc"
-#~ msgstr "Leikjaforrit, skotleikir, borðleikir, herkænskuleikir og fleira"
+#: ../../share/compssUsers:999
+#, fuzzy
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr ""
+"Tól og tæki til að lesa og senda póst og fréttir (pine, mutt,tin...) og til "
+"að flakka á vefnum"
 
-#~ msgid "Multimedia station"
-#~ msgstr "Margmiðlunar-vinnustöð"
+#: ../../share/compssUsers:999
+msgid "Network Computer (client)"
+msgstr "Netbiðlarar"
 
-#~ msgid "Sound and video playing/editing programs"
-#~ msgstr "Spila og breyta hljóðskrám og kvikmyndum"
+#: ../../share/compssUsers:999
+msgid "Clients for different protocols including ssh"
+msgstr "Biðlarar fyrir ýmsar samskiptareglur þ.m.t ssh"
 
-#~ msgid "Internet station"
-#~ msgstr "Internet-vinnustöð"
+#: ../../share/compssUsers:999
+msgid "Configuration"
+msgstr "Stillingar"
 
-#, fuzzy
-#~ msgid ""
-#~ "Set of tools to read and send mail and news (mutt, tin..) and to browse "
-#~ "the Web"
-#~ msgstr ""
-#~ "Tól og tæki til að lesa og senda póst og fréttir (pine, mutt,tin...) og "
-#~ "til að flakka á vefnum"
+#: ../../share/compssUsers:999
+msgid "Tools to ease the configuration of your computer"
+msgstr "Tæki til að auðvelda uppsetningu tölvunnar"
 
-#~ msgid "Network Computer (client)"
-#~ msgstr "Netbiðlarar"
+#: ../../share/compssUsers:999
+msgid "Console Tools"
+msgstr "Skjától"
 
-#~ msgid "Clients for different protocols including ssh"
-#~ msgstr "Biðlarar fyrir ýmsar samskiptareglur þ.m.t ssh"
+#: ../../share/compssUsers:999
+msgid "Editors, shells, file tools, terminals"
+msgstr "Ritlar, skeljar, skráartól, skjáhermar"
 
-#~ msgid "Configuration"
-#~ msgstr "Stillingar"
+#: ../../share/compssUsers:999
+msgid "KDE Workstation"
+msgstr "KDE Vinnustöð"
 
-#~ msgid "Tools to ease the configuration of your computer"
-#~ msgstr "Tæki til að auðvelda uppsetningu tölvunnar"
+#: ../../share/compssUsers:999
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "KDE (K Desktop Environment). Gluggastjóri með safni hjálparforrita"
 
-#~ msgid "Scientific Workstation"
-#~ msgstr "Vísindaleg vinnustöð"
+#: ../../share/compssUsers:999
+msgid "GNOME Workstation"
+msgstr "Gnome vinnustöð"
 
-#~ msgid "Scientific applications such as gnuplot"
-#~ msgstr "Vísindaforrit svo sem gnuplot"
+#: ../../share/compssUsers:999
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "Gluggastjóri með notendavænum forritum og skjáborðstólum"
 
-#~ msgid "Console Tools"
-#~ msgstr "Skjától"
+#: ../../share/compssUsers:999
+msgid "Other Graphical Desktops"
+msgstr "Aðrir gluggastjórar"
 
-#~ msgid "Editors, shells, file tools, terminals"
-#~ msgstr "Ritlar, skeljar, skráartól, skjáhermar"
+#: ../../share/compssUsers:999
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, o.s.frv"
 
-#~ msgid "KDE Workstation"
-#~ msgstr "KDE Vinnustöð"
+#: ../../share/compssUsers:999
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C og C++ undirforritasöfn, forrit og lýsingaskrár"
 
-#~ msgid ""
-#~ "The K Desktop Environment, the basic graphical environment with a "
-#~ "collection of accompanying tools"
-#~ msgstr "KDE (K Desktop Environment). Gluggastjóri með safni hjálparforrita"
+#: ../../share/compssUsers:999
+msgid "Documentation"
+msgstr "Handbækur"
 
-#~ msgid "Gnome Workstation"
-#~ msgstr "Gnome vinnustöð"
+#: ../../share/compssUsers:999
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Bækur og leiðbeinngar um Linux og frjálsan hugbúnað"
 
-#~ msgid ""
-#~ "A graphical environment with user-friendly set of applications and "
-#~ "desktop tools"
-#~ msgstr "Gluggastjóri með notendavænum forritum og skjáborðstólum"
+#: ../../share/compssUsers:999
+msgid "LSB"
+msgstr "LSB"
 
-#~ msgid "Other Graphical Desktops"
-#~ msgstr "Aðrir gluggastjórar"
+#: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr ""
 
-#~ msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-#~ msgstr "Icewm, Window Maker, Enlightenment, Fvwm, o.s.frv"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Vefur/FTP"
 
-#~ msgid "C and C++ development libraries, programs and include files"
-#~ msgstr "C og C++ undirforritasöfn, forrit og lýsingaskrár"
+#: ../../share/compssUsers:999
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
 
-#~ msgid "Documentation"
-#~ msgstr "Handbækur"
+#: ../../share/compssUsers:999
+msgid "Mail"
+msgstr "Póstur"
 
-#~ msgid "Books and Howto's on Linux and Free Software"
-#~ msgstr "Bækur og leiðbeinngar um Linux og frjálsan hugbúnað"
+#: ../../share/compssUsers:999
+msgid "Postfix mail server"
+msgstr "Postfix póstþjónn"
 
-#~ msgid "LSB"
-#~ msgstr "LSB"
+#: ../../share/compssUsers:999
+msgid "Database"
+msgstr "Gagnagrunnar"
 
-#~ msgid "Web/FTP"
-#~ msgstr "Vefur/FTP"
+#: ../../share/compssUsers:999
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL eða MySQL gagnagrunnsmiðlarar"
 
-#~ msgid "Apache, Pro-ftpd"
-#~ msgstr "Apache, Pro-ftpd"
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Eldveggur/beinir"
 
-#~ msgid "Mail"
-#~ msgstr "Póstur"
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Internet gátt"
 
-#~ msgid "Postfix mail server"
-#~ msgstr "Postfix póstþjónn"
+#: ../../share/compssUsers:999
+msgid "Network Computer server"
+msgstr "Netþjónar"
 
-#~ msgid "Database"
-#~ msgstr "Gagnagrunnar"
+#: ../../share/compssUsers:999
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-þjónn, SMB-þjónn, Proxy-þjónn ssh-þjónn"
 
-#~ msgid "PostgreSQL or MySQL database server"
-#~ msgstr "PostgreSQL eða MySQL gagnagrunnsmiðlarar"
+#: ../../share/compssUsers:999
+msgid "Set of tools to read and send mail and news and to browse the Web"
+msgstr ""
+"Tól og tæki til að lesa og senda póst og fréttir og til að flakka á vefnum"
 
-#~ msgid "Firewall/Router"
-#~ msgstr "Eldveggur/beinir"
+#~ msgid "Provider dns 1 (optional)"
+#~ msgstr "Nafnamiðlari 1 (ekki krafist)"
 
-#~ msgid "Internet gateway"
-#~ msgstr "Internet gátt"
+#~ msgid "Provider dns 2 (optional)"
+#~ msgstr "Nafnamiðlari 2 (ekki krafist)"
 
-#~ msgid "DNS/NIS "
-#~ msgstr "DNS/NIS "
+#~ msgid "Ethernet Card"
+#~ msgstr "Ethernet-kort"
 
-#~ msgid "Domain Name and Network Information Server"
-#~ msgstr "Nafnaþjónar og upplýsingaveitur"
+#~ msgid "DHCP Client"
+#~ msgstr "DHCP biðlari"
 
-#~ msgid "Network Computer server"
-#~ msgstr "Netþjónar"
+#, fuzzy
+#~ msgid "Display"
+#~ msgstr "daglega"
 
-#~ msgid "NFS server, SMB server, Proxy server, ssh server"
-#~ msgstr "NFS-þjónn, SMB-þjónn, Proxy-þjónn ssh-þjónn"
+#, fuzzy
+#~ msgid "Display configuration"
+#~ msgstr "Staðarnets-uppsetning"
 
-#~ msgid "Set of tools to read and send mail and news and to browse the Web"
+#~ msgid ""
+#~ "Change\n"
+#~ "Restore Path"
 #~ msgstr ""
-#~ "Tól og tæki til að lesa og senda póst og fréttir og til að flakka á vefnum"
+#~ "Breyta\n"
+#~ "Slóð endurheimtu"
 
-#, fuzzy
-#~ msgid "add"
-#~ msgstr "Bæta við"
+#~ msgid "European protocol"
+#~ msgstr "Evrópskan samskiptastaðal"
 
-#, fuzzy
-#~ msgid "edit"
-#~ msgstr "Sýsl"
+#~ msgid "Found \"%s\" interface do you want to use it ?"
+#~ msgstr "Fann \"%s\" kort vilu nota það ?"
 
-#, fuzzy
-#~ msgid "remove"
-#~ msgstr "Fjarlægja"
+#~ msgid "What kind is your ISDN connection?"
+#~ msgstr "Hvaða gerðar er ISDN tengingin þín?"
 
-#, fuzzy
-#~ msgid "Add an UPS device"
-#~ msgstr "Bæta við hlut"
+#~ msgid "Do you want to start a new configuration ?"
+#~ msgstr "Viltu prófa stillingarnar?"
 
-#, fuzzy
 #~ msgid ""
-#~ "Welcome to the UPS configuration utility.\n"
-#~ "\n"
-#~ "Here, you'll be add a new UPS to your system.\n"
+#~ "I have detected an ISDN PCI card, but I don't know its type. Please "
+#~ "select a PCI card on the next screen."
 #~ msgstr ""
-#~ "Velkomin að póstuppsetningarforritnu.\n"
-#~ "\n"
-#~ "Hér getur þú stillt viðvörunarkerfi.\n"
+#~ "Ég hef fundið ISDN PCI kort, en ég veit ekki hvaða tegund. Vinsamlega "
+#~ "veldu tegund á næsta skjá."
 
-#, fuzzy
-#~ msgid "Autodetection"
-#~ msgstr "Finna sjálfkrafa"
+#~ msgid "No ISDN PCI card found. Please select one on the next screen."
+#~ msgstr "Ekkert ISDN-PCI kort fannst. Vinsamlega veldu eitt á næsta skjá."
 
-#, fuzzy
-#~ msgid "No new UPS devices was found"
-#~ msgstr "Fann enginn tæki"
+#~ msgid "Under Devel ... please wait."
+#~ msgstr "Í þróun... Bíðið."
 
-#, fuzzy
-#~ msgid "UPS driver configuration"
-#~ msgstr "CUPS prentarastillingar"
+#~ msgid "Windows (FAT32)"
+#~ msgstr "Windows (FAT32)"
 
-#, fuzzy
-#~ msgid "Please select your UPS model."
-#~ msgstr "Vinsamlega prófaðu músina:"
-
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "Nafn: "
+#~ msgid "Scientific Workstation"
+#~ msgstr "Vísindaleg vinnustöð"
 
-#, fuzzy
-#~ msgid "The name of your ups"
-#~ msgstr "nafn örgjörvans"
+#~ msgid "Scientific applications such as gnuplot"
+#~ msgstr "Vísindaforrit svo sem gnuplot"
 
-#, fuzzy
-#~ msgid "Port:"
-#~ msgstr "Port"
+#~ msgid "DNS/NIS "
+#~ msgstr "DNS/NIS "
 
-#, fuzzy
-#~ msgid "The port on which is connected your ups"
-#~ msgstr "tegund brautar sem músin þín er tengd"
+#~ msgid "Domain Name and Network Information Server"
+#~ msgstr "Nafnaþjónar og upplýsingaveitur"
 
 #, fuzzy
-#~ msgid "UPS devices"
-#~ msgstr "Þjónustur"
+#~ msgid "No wireless network adapter on your system!"
+#~ msgstr "Ekkert nettengi á vélinni þinni!"
 
-#, fuzzy
-#~ msgid "UPS users"
-#~ msgstr "Notendur"
+#~ msgid "Can't create log file!"
+#~ msgstr "Get ekki búið til annál!"
 
 #, fuzzy
-#~ msgid "Access Control Lists"
-#~ msgstr "aðgengi að nettólum"
+#~ msgid "dhcp"
+#~ msgstr "nota dhcp"
 
 #, fuzzy
-#~ msgid "Rules"
-#~ msgstr "Beinar:"
+#~ msgid "real_file"
+#~ msgstr "Veljið skrá"
 
-#, fuzzy
-#~ msgid "Action"
-#~ msgstr "/_Aðgerðir"
+#~ msgid "Configuration of a remote printer"
+#~ msgstr "Stilla fjartengdan prentara"
 
 #, fuzzy
-#~ msgid "ACL name"
-#~ msgstr "LVM nafn?"
+#~ msgid "configure %s"
+#~ msgstr "endurstilla"
 
-#, fuzzy
-#~ msgid "Welcome to the UPS configuration tools"
-#~ msgstr "Prófun á stillingum"
+#~ msgid "Gnome Workstation"
+#~ msgstr "Gnome vinnustöð"
 
 #~ msgid "Running \"%s\" ..."
 #~ msgstr "Keyri \"%s\"..."
diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po
index df21c3a5d..e8640914e 100644
--- a/perl-install/share/po/ja.po
+++ b/perl-install/share/po/ja.po
@@ -1,20 +1,20 @@
 # translation of DrakX-ja.po to Japanese
 # Drakbootdisk Japanese translation
-# Copyright (C) 2000,2003 Free Software Foundation, Inc.
+# Copyright (C) 2000,2003, 2004 Free Software Foundation, Inc.
 # YAMAGATA Hiroo <hiyori13@alum.mit.edu>, 2000.
-# UTUMI Hirosi <*>, 2003.
+# UTUMI Hirosi <utuhiro78@yahoo.co.jp>, 2003, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-ja\n"
-"POT-Creation-Date: 2004-02-19 18:02+0100\n"
-"PO-Revision-Date: 2003-11-17 18:51+0900\n"
-"Last-Translator: UTUMI Hirosi <*>\n"
+"POT-Creation-Date: 2004-03-19 14:32+0100\n"
+"PO-Revision-Date: 2004-02-22 16:43-0500\n"
+"Last-Translator: UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.2\n"
+"X-Generator: KBabel 1.3\n"
 
 #: ../move/move.pm:359
 #, c-format
@@ -50,22 +50,22 @@ msgstr ""
 #: ../move/move.pm:380
 #, c-format
 msgid "Need a key to save your data"
-msgstr ""
+msgstr "データを保存するにはキーが必要です"
 
 #: ../move/move.pm:382
 #, c-format
 msgid "Detect USB key again"
-msgstr ""
+msgstr "再度USBキーを検出"
 
 #: ../move/move.pm:383 ../move/move.pm:413
 #, c-format
 msgid "Continue without USB key"
-msgstr ""
+msgstr "USBキーなしで続行"
 
 #: ../move/move.pm:394 ../move/move.pm:408
-#, fuzzy, c-format
+#, c-format
 msgid "Key isn't writable"
-msgstr "XawTVをインストールしていません"
+msgstr "キーが書き込み不可です"
 
 #: ../move/move.pm:396
 #, c-format
@@ -78,7 +78,7 @@ msgid ""
 "plug the key again, and launch Mandrake Move again."
 msgstr ""
 
-#: ../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 "再起動"
@@ -89,36 +89,38 @@ msgid ""
 "The USB key seems to have write protection enabled. Please\n"
 "unplug it, remove write protection, and then plug it again."
 msgstr ""
+"USBキーに書き込みプロテクトがかかっているようです。いったん\n"
+"抜いてプロテクトを外し、再度差し込んでください"
 
 #: ../move/move.pm:412
-#, fuzzy, c-format
+#, c-format
 msgid "Retry"
-msgstr "復元"
+msgstr "リトライ"
 
 #: ../move/move.pm:423
 #, c-format
 msgid "Setting up USB key"
-msgstr ""
+msgstr "USBキーを設定"
 
 #: ../move/move.pm:423
-#, fuzzy, c-format
+#, c-format
 msgid "Please wait, setting up system configuration files on USB key..."
-msgstr "お待ちください。セキュリティ水準を設定中.."
+msgstr "お待ちください。USBのシステム設定ファイルをセットアップ.."
 
 #: ../move/move.pm:445
 #, c-format
 msgid "Enter your user information, password will be used for screensaver"
-msgstr ""
+msgstr "スクリーンセーバで使用するユーザ情報とパスワードを入力"
 
 #: ../move/move.pm:455
-#, fuzzy, c-format
+#, c-format
 msgid "Auto configuration"
-msgstr "カスタム設定"
+msgstr "自動設定"
 
 #: ../move/move.pm:455
-#, fuzzy, c-format
+#, c-format
 msgid "Please wait, detecting and configuring devices..."
-msgstr "お待ちください。セキュリティ水準を設定中.."
+msgstr "お待ちください。デバイスの検出と設定.."
 
 #: ../move/move.pm:502 ../move/move.pm:559 ../move/move.pm:563
 #: ../move/tree/mdk_totem:86 diskdrake/dav.pm:77 diskdrake/hd_gtk.pm:117
@@ -127,44 +129,51 @@ msgstr "お待ちください。セキュリティ水準を設定中.."
 #: 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"
@@ -203,31 +212,46 @@ msgid ""
 "a look at log files in console #3 and #4 to try to\n"
 "guess what's happening."
 msgstr ""
+"エラーが発生しました:\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"This may come from corrupted system configuration files\n"
+"on the USB key, in this case removing them and then\n"
+"rebooting Mandrake Move would fix the problem. To do\n"
+"so, click on the corresponding button.\n"
+"\n"
+"\n"
+"You may also want to reboot and remove the USB key, or\n"
+"examine its contents under another OS, or even have\n"
+"a look at log files in console #3 and #4 to try to\n"
+"guess what's happening."
 
 #: ../move/move.pm:580
-#, fuzzy, c-format
+#, c-format
 msgid "Remove system config files"
-msgstr "ループバックファイルを削除しますか？"
+msgstr "システム設定ファイルを削除"
 
 #: ../move/move.pm:581
 #, c-format
 msgid "Simply reboot"
-msgstr ""
+msgstr "シンプルな再起動"
 
 #: ../move/tree/mdk_totem:60
 #, c-format
 msgid "You can only run with no CDROM support"
-msgstr ""
+msgstr "CDROMサポート無しでしか実行できません"
 
 #: ../move/tree/mdk_totem:81
-#, fuzzy, c-format
+#, c-format
 msgid "Kill those programs"
-msgstr "Xプログラムへのアクセス"
+msgstr "これらのプログラムをKill"
 
 #: ../move/tree/mdk_totem:82
-#, fuzzy, c-format
+#, c-format
 msgid "No CDROM support"
-msgstr "ラジオサポート:"
+msgstr "CDROMサポートなし"
 
 #: ../move/tree/mdk_totem:87
 #, c-format
@@ -235,6 +259,8 @@ msgid ""
 "You can't use another CDROM when the following programs are running: \n"
 "%s"
 msgstr ""
+"次のプログラムが動いているときは別のCDROMを使えません: \n"
+"%s"
 
 #: ../move/tree/mdk_totem:101
 #, c-format
@@ -311,9 +337,9 @@ msgstr ""
 "どうしますか？"
 
 #: Xconfig/card.pm:312
-#, fuzzy, c-format
+#, c-format
 msgid "Can't install XFree package: %s"
-msgstr "パッケージ %s をインストール"
+msgstr "XFreeパッケージをインストールできません: %s"
 
 #: Xconfig/card.pm:322
 #, c-format
@@ -399,15 +425,16 @@ msgstr ""
 msgid "Xpmac (installation display driver)"
 msgstr "Xpmac(インストールディスプレイドライバ)"
 
-#: 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 "カスタム"
 
 #: 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 "終了"
@@ -434,11 +461,11 @@ msgstr "テスト"
 
 #: 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 "オプション"
@@ -471,7 +498,7 @@ msgstr "プラグ＆プレイ"
 msgid "Generic"
 msgstr "一般"
 
-#: 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"
@@ -555,52 +582,51 @@ msgid "Graphics card: %s"
 msgstr "グラフィックカード: %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 "OK"
 
-#: 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 "キャンセル"
 
 #: 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 "ヘルプ"
@@ -743,19 +769,20 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "テレビの画像方式は何ですか？"
 
-#: 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 "お待ちください"
 
-#: any.pm:98
+#: any.pm:103
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "ブートローダをインストール中"
 
-#: any.pm:137
+#: any.pm:142
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -770,273 +797,273 @@ msgstr ""
 "\n"
 "どのドライブから起動しますか？"
 
-#: 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 "ドライブの最初のセクタ(MBR)"
 
-#: any.pm:161
+#: any.pm:166
 #, c-format
 msgid "First sector of the root partition"
 msgstr "rootパーティションの最初のセクタ"
 
-#: any.pm:163
+#: any.pm:168
 #, c-format
 msgid "On Floppy"
 msgstr "フロッピーで"
 
-#: 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 "スキップ"
 
-#: any.pm:170
+#: any.pm:175
 #, c-format
 msgid "SILO Installation"
 msgstr "SILOのインストール"
 
-#: any.pm:170
+#: any.pm:175
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "LILO/GRUBのインストール"
 
-#: any.pm:171
+#: any.pm:176
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "ブートローダをどこにインストールしますか？"
 
-#: any.pm:192
+#: any.pm:197
 #, c-format
 msgid "First sector of boot partition"
 msgstr "ブートパーティションの最初のセクタ"
 
-#: any.pm:204 any.pm:239
-#, c-format
-msgid "Bootloader main options"
-msgstr "ブートローダのメインオプション"
-
-#: any.pm:205
+#: any.pm:208
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "起動方式の設定"
 
-#: any.pm:209
+#: any.pm:210 any.pm:244
+#, c-format
+msgid "Bootloader main options"
+msgstr "ブートローダのメインオプション"
+
+#: any.pm:214
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "RAMのサイズをMBで入力"
 
-#: any.pm:211
+#: any.pm:216
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "コマンドラインオプションを制限するにはパスワードが必要です"
 
-#: 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 "パスワードが一致しません"
 
-#: 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 "もう一度試してください"
 
-#: 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 "使用するブートローダ"
 
-#: any.pm:219
+#: any.pm:224
 #, c-format
 msgid "Bootloader installation"
 msgstr "ブートローダのインストール"
 
-#: any.pm:221 any.pm:244 help.pm:768
+#: any.pm:226 any.pm:249 help.pm:768
 #, c-format
 msgid "Boot device"
 msgstr "起動デバイス"
 
-#: any.pm:223
+#: any.pm:228
 #, c-format
 msgid "Delay before booting default image"
 msgstr "デフォルトが起動するまでの秒数"
 
-#: any.pm:224 help.pm:768
+#: any.pm:229 help.pm:768
 #, c-format
 msgid "Enable ACPI"
 msgstr "ACPIを許可する"
 
-#: any.pm:225
+#: any.pm:230
 #, c-format
 msgid "Force No APIC"
 msgstr "APICを禁止する"
 
-#: 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 "パスワード"
 
-#: 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 "もう一度パスワードを入力"
 
-#: any.pm:229
+#: any.pm:234
 #, c-format
 msgid "Restrict command line options"
 msgstr "コマンドラインオプションの制限"
 
-#: any.pm:229
+#: any.pm:234
 #, c-format
 msgid "restrict"
 msgstr "制限"
 
-#: any.pm:231
+#: any.pm:236
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "起動するたびに/tmp以下を消す"
 
 # added a \n to the translation to avoid that the dialog window
 # in which it appears to be tooooo laaaaarge
-#: any.pm:232
+#: any.pm:237
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 "必要なら正確なRAMサイズを入力してください\n"
 "(検出したサイズ: %dMB)"
 
-#: any.pm:234
+#: any.pm:239
 #, c-format
 msgid "Enable multiple profiles"
 msgstr "マルチプロファイルを有効に"
 
-#: any.pm:243
+#: any.pm:248
 #, c-format
 msgid "Init Message"
 msgstr "初期化メッセージ"
 
-#: any.pm:245
+#: any.pm:250
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "オープンファームウェアの遅延"
 
-#: any.pm:246
+#: any.pm:251
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "カーネルブートの時間設定"
 
-#: any.pm:247
+#: any.pm:252
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "CDからの起動を有効にしますか？"
 
-#: any.pm:248
+#: any.pm:253
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "OFからの起動を有効にしますか？"
 
-#: any.pm:249
+#: any.pm:254
 #, c-format
 msgid "Default OS?"
 msgstr "デフォルトのOSは？"
 
-#: any.pm:290
+#: any.pm:295
 #, c-format
 msgid "Image"
 msgstr "イメージ"
 
-#: any.pm:291 any.pm:300
+#: any.pm:296 any.pm:305
 #, c-format
 msgid "Root"
 msgstr "root"
 
-#: any.pm:292 any.pm:313
+#: any.pm:297 any.pm:318
 #, c-format
 msgid "Append"
 msgstr "追加"
 
-#: any.pm:294
+#: any.pm:299
 #, c-format
 msgid "Video mode"
 msgstr "ビデオモード"
 
-#: 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 "ラベル"
 
-#: 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 "デフォルト"
 
-#: any.pm:314
+#: any.pm:319
 #, c-format
 msgid "Initrd-size"
 msgstr "Initrdサイズ"
 
-#: any.pm:316
+#: any.pm:321
 #, c-format
 msgid "NoVideo"
 msgstr "ビデオなし"
 
-#: any.pm:327
+#: any.pm:332
 #, c-format
 msgid "Empty label not allowed"
 msgstr "空白のラベルは使えません"
 
-#: any.pm:328
+#: any.pm:333
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "カーネルイメージを指定してください"
 
-#: any.pm:328
+#: any.pm:333
 #, c-format
 msgid "You must specify a root partition"
 msgstr "rootパーティションは必ず指定してください"
 
-#: any.pm:329
+#: any.pm:334
 #, c-format
 msgid "This label is already used"
 msgstr "このラベルは既に使われています"
 
-#: any.pm:342
+#: any.pm:347
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "どの種類を追加しますか"
 
-#: 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 "他のOS(SunOSなど)"
 
-#: any.pm:344
+#: any.pm:349
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "他のOS(MacOSなど)"
 
-#: any.pm:344
+#: any.pm:349
 #, c-format
 msgid "Other OS (windows...)"
 msgstr "他のOS(Windowsなど)"
 
-#: any.pm:372
+#: any.pm:377
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1045,73 +1072,73 @@ msgstr ""
 "起動メニューの項目は以下のとおりです。\n"
 "項目を追加/変更することができます。"
 
-#: any.pm:504
+#: any.pm:509
 #, c-format
 msgid "access to X programs"
 msgstr "Xプログラムへのアクセス"
 
-#: any.pm:505
+#: any.pm:510
 #, c-format
 msgid "access to rpm tools"
 msgstr "RPMツールへのアクセス"
 
-#: any.pm:506
+#: any.pm:511
 #, c-format
 msgid "allow \"su\""
 msgstr "suを許可する"
 
-#: any.pm:507
+#: any.pm:512
 #, c-format
 msgid "access to administrative files"
 msgstr "管理ファイルへのアクセス"
 
-#: any.pm:508
+#: any.pm:513
 #, c-format
 msgid "access to network tools"
 msgstr "ネットワークツールへのアクセス"
 
-#: any.pm:509
+#: any.pm:514
 #, c-format
 msgid "access to compilation tools"
 msgstr "コンパイルツールへのアクセス"
 
-#: any.pm:515
+#: any.pm:520
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s は追加済み)"
 
-#: any.pm:520
+#: any.pm:525
 #, c-format
 msgid "This password is too simple"
 msgstr "パスワードが簡単すぎます"
 
-#: any.pm:521
+#: any.pm:526
 #, c-format
 msgid "Please give a user name"
 msgstr "ユーザ名を入力してください"
 
-#: any.pm:522
+#: any.pm:527
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "ユーザ名には英語の小文字/数字/ - / _ しか使えません。"
 
-#: any.pm:523
+#: any.pm:528
 #, c-format
 msgid "The user name is too long"
 msgstr "このユーザ名は長すぎます"
 
-#: any.pm:524
+#: any.pm:529
 #, c-format
 msgid "This user name has already been added"
 msgstr "このユーザ名は既に存在しています"
 
-#: any.pm:528
+#: any.pm:533
 #, c-format
 msgid "Add user"
 msgstr "ユーザを追加"
 
-#: any.pm:529
+#: any.pm:534
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1120,125 +1147,125 @@ msgstr ""
 "ユーザ名を入力\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 "終了"
 
-#: any.pm:533 help.pm:52
+#: any.pm:538 help.pm:52
 #, c-format
 msgid "Accept user"
 msgstr "ユーザ受け入れ"
 
-#: any.pm:544
+#: any.pm:549
 #, c-format
 msgid "Real name"
 msgstr "本名"
 
-#: 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 "ユーザ名"
 
-#: any.pm:548
+#: any.pm:553
 #, c-format
 msgid "Shell"
 msgstr "シェル"
 
-#: any.pm:550
+#: any.pm:555
 #, c-format
 msgid "Icon"
 msgstr "アイコン"
 
-#: any.pm:591 security/l10n.pm:14
+#: any.pm:596 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "自動ログイン"
 
-#: any.pm:592
+#: any.pm:597
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "自動的に特定のユーザでログオンするよう設定できます。"
 
-#: any.pm:593 help.pm:52
+#: any.pm:598 help.pm:52
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "この機能を使いますか？"
 
-#: any.pm:594
+#: any.pm:599
 #, c-format
 msgid "Choose the default user:"
 msgstr "デフォルトのユーザを選択:"
 
-#: any.pm:595
+#: any.pm:600
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "ウィンドウマネージャを選んでください:"
 
-#: any.pm:607
+#: any.pm:612
 #, c-format
 msgid "Please choose a language to use."
 msgstr "使用する言語を選んでください。"
 
-#: 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では複数の言語を使うことができます。\n"
+"Mandrakelinuxでは複数の言語を使うことができます。\n"
 "インストールしたい言語を選んでください。\n"
 "インストール後に再選択することも可能です。"
 
-#: any.pm:646 help.pm:660
+#: any.pm:651 help.pm:660
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Unicodeをデフォルトにする"
 
-#: any.pm:647 help.pm:660
+#: any.pm:652 help.pm:660
 #, c-format
 msgid "All languages"
 msgstr "全ての言語"
 
-#: 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 "国名/地域"
 
-#: any.pm:684
+#: any.pm:689
 #, c-format
 msgid "Please choose your country."
 msgstr "使用する国名を選択してください。"
 
-#: any.pm:686
+#: any.pm:691
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "利用可能な国名の全リスト"
 
-#: 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 "詳細"
 
-#: any.pm:818
+#: any.pm:823
 #, c-format
 msgid "No sharing"
 msgstr "共有しない"
 
-#: any.pm:818
+#: any.pm:823
 #, c-format
 msgid "Allow all users"
 msgstr "全てのユーザを許可"
 
-#: any.pm:822
+#: any.pm:827
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1252,23 +1279,23 @@ msgstr ""
 "クリックしてください。\n"
 "'カスタム'を選ぶとユーザごとに細かく設定できます。\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 "エクスポートにはNFSかSambaを使えます。どちらにしますか？"
 
-#: any.pm:846
-#, fuzzy, c-format
+#: any.pm:851
+#, c-format
 msgid "The package %s is going to be removed."
-msgstr "以下のパッケージが削除されます"
+msgstr "パッケージ %s を削除します"
 
-#: any.pm:858
+#: any.pm:863
 #, c-format
 msgid "Launch userdrake"
 msgstr "userdrakeを起動"
 
-#: any.pm:860
+#: any.pm:865
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1379,10 +1406,9 @@ msgstr "NISドメインがないのでブロードキャストを使えません
 # NOTE: this message will be displayed by SILO at boot time; that is
 # only the ascii charset will be available
 # so use only 7bit for this message
-#
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:542
-#, fuzzy, c-format
+#: bootloader.pm:533
+#, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
 "\n"
@@ -1390,64 +1416,67 @@ msgid ""
 "wait for default boot.\n"
 "\n"
 msgstr ""
-"%s operating system chooser-he youkosou!\n"
-"\n"
-"Ichiran kara erande <ENTER> wo oshimasu. %d byou de Default ni narimasu.\n"
+"operating system chooser-he youkosou!\n"
 "\n"
+"Ichiran kara OS wo erabu ka Default no OS no kidou wo\n"
+"Matte kudasai.\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"
 
-#: bootloader.pm:677 help.pm:768
+#: bootloader.pm:670 help.pm:768
 #, c-format
 msgid "LILO with text menu"
 msgstr "テキスト表示のLILO"
 
-#: 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 の容量が不足しています"
 
-#: bootloader.pm:1178
+#: bootloader.pm:1175
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "ブートローダは %s パーティションにはインストールできません\n"
 
-#: bootloader.pm:1218
+#: bootloader.pm:1219
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr ""
+"ブートローダの設定を更新してください。パーティション番号が変わっています"
 
-#: 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 ""
+"ブートローダを正しくインストールできません。レスキューをブートして\"%s\"を選"
+"んでください。"
 
-#: bootloader.pm:1226
-#, fuzzy, c-format
+#: bootloader.pm:1227
+#, c-format
 msgid "Re-install Boot Loader"
-msgstr "ブートローダを設定"
+msgstr "ブートローダを再インストール"
 
 #: common.pm:125
 #, c-format
@@ -1484,90 +1513,91 @@ msgstr "1 分"
 msgid "%d seconds"
 msgstr "%d 秒"
 
-#: common.pm:196
+#: common.pm:197
 #, c-format
 msgid "Can't make screenshots before partitioning"
 msgstr "パーティション設定が終わるまでスクリーンショットは撮れません"
 
-#: common.pm:203
+#: common.pm:204
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "%s をインストールすればスクリーンショットが可能になります"
 
-#: common.pm:268
+#: common.pm:269
 #, c-format
 msgid "kdesu missing"
 msgstr "kdesuがありません"
 
-#: common.pm:271
+#: common.pm:272
 #, c-format
 msgid "consolehelper missing"
 msgstr "consolehelperがありません"
 
-#: 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 "フランス"
 
-#: crypto.pm:15 lang.pm:207
+#: crypto.pm:15 lang.pm:212
 #, c-format
 msgid "Costa Rica"
 msgstr "コスタリカ"
 
-#: 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 "ベルギー"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:212
+#: crypto.pm:17 crypto.pm:30 lang.pm:217
 #, c-format
 msgid "Czech Republic"
 msgstr "チェコ共和国"
 
-#: 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 "ドイツ"
 
-#: crypto.pm:19 crypto.pm:32 lang.pm:244
+#: crypto.pm:19 crypto.pm:32 lang.pm:249
 #, c-format
 msgid "Greece"
 msgstr "ギリシャ"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:317
+#: crypto.pm:20 crypto.pm:33 lang.pm:322
 #, c-format
 msgid "Norway"
 msgstr "ノルウェー"
 
-#: 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 "スウェーデン"
 
-#: 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 "オランダ"
 
-#: 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 "イタリア"
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:172
+#: crypto.pm:24 crypto.pm:38 lang.pm:177
 #, c-format
 msgid "Austria"
 msgstr "オーストリア"
 
-#: 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 "アメリカ合衆国"
@@ -1657,7 +1687,7 @@ msgstr "まずデータをバックアップしてください"
 #: 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 ""
@@ -1691,6 +1721,7 @@ msgid "Please click on a partition"
 msgstr "パーティションをクリックしてください"
 
 #: 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 "詳細"
@@ -1732,7 +1763,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 "その他"
@@ -1854,7 +1885,7 @@ msgstr "全てのプライマリパーティションが使われています"
 
 #: diskdrake/interactive.pm:330
 #, c-format
-msgid "I can't add any more partition"
+msgid "I can't add any more partitions"
 msgstr "これ以上パーティションを追加できません"
 
 #: diskdrake/interactive.pm:331
@@ -1905,13 +1936,19 @@ msgstr ""
 "バックアップのパーティションテーブルが同一サイズになっていません。\n"
 "続けますか？"
 
-#: 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 "警告"
@@ -2477,8 +2514,8 @@ msgstr "この暗号キーは簡単すぎます(最低でも %d 文字使って
 msgid "The encryption keys do not match"
 msgstr "暗号キーが一致しません"
 
-#: 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 "暗号キー"
@@ -2520,7 +2557,7 @@ msgid ""
 msgstr ""
 "このホストにアクセスするにはユーザ名/パスワード/ドメイン名を入力してください"
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3874
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3591
 #, c-format
 msgid "Username"
 msgstr "ユーザ名"
@@ -2550,17 +2587,17 @@ msgstr "パッケージ %s が必要です。インストールしますか？"
 msgid "Mandatory package %s is missing"
 msgstr "必要なパッケージ %s がありません"
 
-#: do_pkgs.pm:136
+#: do_pkgs.pm:143
 #, c-format
 msgid "Installing packages..."
 msgstr "パッケージをインストール中.."
 
-#: do_pkgs.pm:210
-#, fuzzy, c-format
+#: do_pkgs.pm:217
+#, c-format
 msgid "Removing packages..."
-msgstr "%s を削除中.."
+msgstr "パッケージを削除.."
 
-#: fs.pm:399
+#: fs.pm:409
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
@@ -2570,19 +2607,19 @@ msgstr ""
 "\n"
 "(e.g, for faster access on the news spool to speed up news servers)"
 
-#: fs.pm:402
+#: fs.pm:412
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
 "the -a option will not cause the file system to be mounted)."
 msgstr ""
 
-#: fs.pm:405
+#: fs.pm:415
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 
-#: fs.pm:407
+#: fs.pm:417
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2595,7 +2632,7 @@ msgstr ""
 "\n"
 "効果的です。"
 
-#: fs.pm:411
+#: fs.pm:421
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2607,17 +2644,17 @@ msgstr ""
 "\n"
 "しれません)"
 
-#: fs.pm:415
+#: fs.pm:425
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "ファイルシステムを読み込み専用でマウント"
 
-#: fs.pm:417
+#: fs.pm:427
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr "ファイルシステムへの全ての入出力を同期して行う"
 
-#: fs.pm:421
+#: fs.pm:431
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2628,52 +2665,57 @@ msgid ""
 "user,exec,dev,suid )."
 msgstr ""
 
-#: fs.pm:429
+#: fs.pm:439
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "一般ユーザに書き込み権限を与える"
 
-#: 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 "一般ユーザに読み取りのみの権限を与える"
+
+#: 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 は %s のフォーマットに失敗しました"
 
-#: fs.pm:628
+#: fs.pm:647
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "%s を %s でフォーマットする方法が分かりません"
 
-#: fs.pm:635 fs.pm:642
+#: fs.pm:654 fs.pm:661
 #, c-format
 msgid "Formatting partition %s"
 msgstr "パーティション %s をフォーマット中"
 
-#: fs.pm:639
+#: fs.pm:658
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "ファイル %s の作成とフォーマット"
 
-#: fs.pm:705 fs.pm:758
+#: fs.pm:718 fs.pm:771
 #, c-format
 msgid "Mounting partition %s"
 msgstr "パーティション %s をマウント中"
 
-#: fs.pm:706 fs.pm:759
+#: fs.pm:719 fs.pm:772
 #, c-format
 msgid "mounting partition %s in directory %s failed"
 msgstr "パーティション %s をディレクトリ %s にマウントできませんでした"
 
-#: fs.pm:726 fs.pm:734
+#: fs.pm:739 fs.pm:747
 #, c-format
 msgid "Checking %s"
 msgstr "%s をチェック中"
 
-#: fs.pm:775 partition_table.pm:636
+#: fs.pm:788 partition_table.pm:638
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "%s をアンマウント中にエラー: %s"
 
-#: fs.pm:807
+#: fs.pm:820
 #, c-format
 msgid "Enabling swap partition %s"
 msgstr "swapパーティション%sを有効化"
@@ -2710,32 +2752,32 @@ msgstr ""
 "\n"
 "全パーティションを消去しますか？\n"
 
-#: fsedit.pm:514
+#: fsedit.pm:513
 #, c-format
 msgid "You can't use JFS for partitions smaller than 16MB"
 msgstr "16MB以下のパーティションにJFSは使えません"
 
-#: fsedit.pm:515
+#: fsedit.pm:514
 #, c-format
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr "32MB以下のパーティションにReiserFSは使えません"
 
-#: fsedit.pm:534
+#: fsedit.pm:533
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "マウントポイントは / で始まります"
 
-#: fsedit.pm:535
+#: fsedit.pm:534
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "マウントポイントにはアルファベットしか使えません"
 
-#: fsedit.pm:536
+#: fsedit.pm:535
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "マウントポイント %s には既にパーティションがあります\n"
 
-#: fsedit.pm:538
+#: fsedit.pm:537
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2746,12 +2788,23 @@ msgstr ""
 "/bootパーティションがないとブートローダはこれを操作できません。\n"
 "/bootパーティションを追加してください。"
 
-#: fsedit.pm:541
+#: fsedit.pm:540
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "LVM論理ボリュームはマウントポイント %s には使えません"
 
-#: fsedit.pm:543
+#: fsedit.pm:542
+#, fuzzy, 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 ""
+"root(/)としてソフトウェアRAIDパーティションを選びました。\n"
+"/bootパーティションがないとブートローダはこれを操作できません。\n"
+"/bootパーティションを追加してください。"
+
+#: fsedit.pm:545
 #, c-format
 msgid ""
 "You may not be able to install lilo (since lilo doesn't handle a LV on "
@@ -2759,12 +2812,12 @@ msgid ""
 msgstr ""
 "liloをインストールできません(since lilo doesn't handle a LV on multiple PVs)"
 
-#: fsedit.pm:546 fsedit.pm:548
+#: fsedit.pm:548 fsedit.pm:550
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "このディレクトリはrootファイルシステム内に残してください"
 
-#: fsedit.pm:550
+#: fsedit.pm:552
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
@@ -2773,22 +2826,22 @@ msgstr ""
 "このマウントポイントには実在するファイルシステム(ext2, reiserfs, xfs, jfs)\n"
 "が必要です。\n"
 
-#: fsedit.pm:552
+#: fsedit.pm:554
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr "マウントポイント %s には暗号化ファイルシステムを使えません"
 
-#: fsedit.pm:613
+#: fsedit.pm:615
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "空き容量が少ないので自動的に割り当てられません"
 
-#: fsedit.pm:615
+#: fsedit.pm:617
 #, c-format
 msgid "Nothing to do"
 msgstr "することがありません"
 
-#: fsedit.pm:711
+#: fsedit.pm:713
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "%s を書き込み用に開こうとしてエラーが発生: %s"
@@ -2823,7 +2876,7 @@ msgstr "CD/DVDライタ"
 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 "テープ"
@@ -2863,36 +2916,41 @@ msgstr "プロセッサ"
 msgid "ISDN adapters"
 msgstr "ISDNアダプタ"
 
-#: harddrake/data.pm:71
+#: harddrake/data.pm:70
 #, c-format
 msgid "Ethernetcard"
 msgstr "イーサネットカード"
 
-#: 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 "モデム"
 
-#: harddrake/data.pm:80
+#: harddrake/data.pm:79
 #, c-format
 msgid "ADSL adapters"
 msgstr "ADSLアダプタ"
 
+#: harddrake/data.pm:81
+#, fuzzy, c-format
+msgid "AGP controllers"
+msgstr "USBコントローラ"
+
 #: harddrake/data.pm:82
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "ブリッジとシステムコントローラ"
 
 #: 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 "マウス"
@@ -2907,52 +2965,52 @@ msgstr "ジョイスティック"
 msgid "(E)IDE/ATA controllers"
 msgstr "(E)IDE/ATAコントローラ"
 
-#: harddrake/data.pm:93
+#: harddrake/data.pm:94
 #, c-format
 msgid "Firewire controllers"
 msgstr "Firewireコントローラ"
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:95
 #, c-format
 msgid "SCSI controllers"
 msgstr "SCSIコントローラ"
 
-#: harddrake/data.pm:95
+#: harddrake/data.pm:96
 #, c-format
 msgid "USB controllers"
 msgstr "USBコントローラ"
 
-#: harddrake/data.pm:96
+#: harddrake/data.pm:97
 #, c-format
 msgid "SMBus controllers"
 msgstr "SMBusコントローラ"
 
-#: harddrake/data.pm:97
+#: harddrake/data.pm:98
 #, c-format
 msgid "Scanner"
 msgstr "スキャナ"
 
-#: harddrake/data.pm:99 standalone/harddrake2:315
+#: harddrake/data.pm:100 standalone/harddrake2:319
 #, c-format
 msgid "Unknown/Others"
 msgstr "不明/その他"
 
-#: 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 "お待ちください。設定を適用しています"
 
-#: harddrake/sound.pm:182
+#: harddrake/sound.pm:186
 #, c-format
 msgid "No alternative driver"
 msgstr "代わりのドライバはありません"
 
-#: 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 "
@@ -2961,19 +3019,19 @@ msgstr ""
 "お使いのサウンドカード(%s)用の既知のOSS/ALSA代替ドライバはありません。\n"
 "現在 %s を使っています。"
 
-#: harddrake/sound.pm:189
+#: harddrake/sound.pm:193
 #, c-format
 msgid "Sound configuration"
 msgstr "サウンドの設定"
 
-#: 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 "お使いのサウンドカード(%s)用の代替ドライバ(OSSかALSA)を選択できます"
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:197
 #, c-format
 msgid ""
 "\n"
@@ -2986,7 +3044,7 @@ msgstr ""
 "お使いのカードは現在 %s %s ドライバを使用しています\n"
 "(このカードのデフォルトドライバは %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 "
@@ -3019,17 +3077,17 @@ msgstr ""
 "- 古いOSSとの互換性\n"
 "- 多くの拡張機能の提供。ただしALSAライブラリの使用が必要です。\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 "ドライバ:"
 
-#: harddrake/sound.pm:214
+#: harddrake/sound.pm:218
 #, c-format
 msgid "Trouble shooting"
 msgstr "不具合対策"
 
-#: harddrake/sound.pm:222
+#: harddrake/sound.pm:226
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
@@ -3044,12 +3102,12 @@ msgstr ""
 "\n"
 "新しい %s ドライバは次のブートストラップでのみ使われます。"
 
-#: harddrake/sound.pm:230
+#: harddrake/sound.pm:234
 #, c-format
 msgid "No open source driver"
 msgstr "オープンソースのドライバがありません"
 
-#: 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 "
@@ -3058,32 +3116,32 @@ msgstr ""
 "お使いのサウンドカード(%s)用のフリードライバはありません。しかし\n"
 "%s にフリーではないドライバがあります。"
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:238
 #, c-format
 msgid "No known driver"
 msgstr "既知のドライバなし"
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:239
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "お使いのサウンドカード(%s)用の既知のドライバはありません"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:243
 #, c-format
 msgid "Unknown driver"
 msgstr "不明なドライバ"
 
-#: harddrake/sound.pm:240
+#: harddrake/sound.pm:244
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "エラー: お使いのサウンドカードの %s ドライバはリストにありません"
 
-#: harddrake/sound.pm:253
+#: harddrake/sound.pm:257
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "サウンドの不具合修正"
 
-#: harddrake/sound.pm:254
+#: harddrake/sound.pm:258
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3126,17 +3184,17 @@ msgstr ""
 "\n"
 "- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound card.\n"
 
-#: harddrake/sound.pm:280
+#: harddrake/sound.pm:284
 #, c-format
 msgid "Let me pick any driver"
 msgstr "手動でドライバを選択"
 
-#: harddrake/sound.pm:283
+#: harddrake/sound.pm:287
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "ドライバを選択してください"
 
-#: 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 "
@@ -3220,25 +3278,26 @@ msgid "enable radio support"
 msgstr "ラジオサポートを有効にする"
 
 #: help.pm:11
-#, fuzzy, c-format
+#, 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 ""
-"先に進む前にライセンスをよく読んでください。これはMandrake Linux\n"
-"全体に適用されます。全ての項目に同意する場合は %s を押してください。\n"
-"そうでない場合はコンピュータの電源を切ってください。"
+"先に進む前にライセンスをよく読んでください。これはMandrakelinux\n"
+"全体に適用されます。全ての項目に同意する場合は \"%s\" を押してください。\n"
+"そうでない場合は \"%s\" をクリックしてコンピュータを\n"
+"再起動してください。"
 
 #: 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 "承諾する"
 
 #: help.pm:17
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "GNU/Linux is a multi-user system, meaning each user may have their own\n"
 "preferences, their own files and so on. You can read the ``Starter Guide''\n"
@@ -3292,7 +3351,7 @@ msgstr ""
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
 "you typed in this field and copy it to the \"%s\" field, which is the name\n"
 "this user will enter to log onto the system. If you like, you may override\n"
-"the default and change the username. The next step is to enter a password.\n"
+"the default and change the user name. The next step is to enter a password.\n"
 "From a security point of view, a non-privileged (regular) user password is\n"
 "not as crucial as the \"root\" password, but that is no reason to neglect\n"
 "it by making it blank or too simple: after all, your files could be the\n"
@@ -3305,18 +3364,17 @@ msgstr ""
 "Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
 "that user (bash by default).\n"
 "\n"
-"When you have finished adding users, you will be asked to choose a user\n"
-"that can automatically log into the system when the computer boots up. If\n"
-"you are interested in that feature (and do not care much about local\n"
-"security), choose the desired user and window manager, then click \"%s\".\n"
-"If you are not interested in this feature, uncheck the \"%s\" box."
+"When you have finished adding users, you will be asked to choose a user who\n"
+"can automatically log into the system when the computer boots up. If you\n"
+"are interested in that feature (and do not care much about local security),\n"
+"choose the desired user and window manager, then click \"%s\". If you are\n"
+"not interested in this feature, uncheck the \"%s\" box."
 
 #: 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 "次へ"
@@ -3390,26 +3448,26 @@ msgstr ""
 "\"second lowest SCSI ID\", etc."
 
 #: help.pm:86
-#, fuzzy, c-format
+#, 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 LinuxはCD-ROM数枚で提供しています。\n"
+"MandrakelinuxはCD-ROM数枚で提供しています。\n"
 "選択したパッケージが別のCD-ROMの中にある場合、DrakXは現在のCDを\n"
 "イジェクトして別のCDを入れるよう指示します。"
 
 #: help.pm:91
-#, fuzzy, c-format
+#, 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"
@@ -3452,21 +3510,20 @@ msgid ""
 "updating an existing system."
 msgstr ""
 "どのプログラムをインストールするか指定してください。\n"
-"Mandrake Linuxは多くのパッケージを用意しています。それらは\n"
-"類似したアプリケーションごとにグループに分けて表示されます。\n"
+"Mandrakelinuxは多くのパッケージを用意しています。それらは\n"
+"グループごとに分類して表示されます。\n"
 "\n"
 "Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrake Linux has four predefined installations available. You\n"
-"can think of these installation classes as containers for various packages.\n"
-"You can mix and match applications from the various groups, so a\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'' group installed.\n"
+"``Development'' category installed.\n"
 "\n"
 " * \"%s\": if you plan to use your machine as a workstation, select one or\n"
-"more of the applications that are in the workstation group.\n"
+"more of the groups that are in the workstation category.\n"
 "\n"
-" * \"%s\": if plan on using your machine for programming, choose the\n"
-"appropriate packages from that group.\n"
+" * \"%s\": if you plan on using your machine for programming, select the\n"
+"appropriate groups from that category.\n"
 "\n"
 " * \"%s\": if your machine is intended to be a server, select which of the\n"
 "more common services you wish to install on your machine.\n"
@@ -3540,7 +3597,7 @@ msgid "Upgrade"
 msgstr "更新"
 
 #: help.pm:140
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "If you told the installer that you wanted to individually select packages,\n"
 "it will present a tree containing all packages classified by groups and\n"
@@ -3553,10 +3610,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"
@@ -3586,10 +3643,10 @@ msgstr ""
 "!! 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"
@@ -3597,9 +3654,9 @@ msgstr ""
 "\n"
 "The \"%s\" option is used to disable the warning dialog which appears\n"
 "whenever the installer automatically selects a package to resolve a\n"
-"dependency issue. Some packages have relationships between each other such\n"
-"that installation of a package requires that some other program is also\n"
-"rerquired to be installed. The installer can determine which packages are\n"
+"dependency issue. Some packages have relationships between each them such\n"
+"that installation of one package requires that some other program is also\n"
+"required to be installed. The installer can determine which packages are\n"
 "required to satisfy a dependency to successfully complete the installation.\n"
 "\n"
 "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
@@ -3609,17 +3666,17 @@ msgstr ""
 "end of another installation. See the second tip of last step on how to\n"
 "create such a floppy."
 
-#: 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 "いいえ"
 
-#: 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 "はい"
@@ -3630,11 +3687,11 @@ msgid "Automatic dependencies"
 msgstr "自動的に依存関係を解決する"
 
 #: help.pm:175
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You will now set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"%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"
@@ -3649,7 +3706,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"
@@ -3658,19 +3715,23 @@ msgid ""
 msgstr ""
 "インターネット/ネットワークへの接続を設定します。\n"
 "インターネット/ローカルネットワークに接続する場合は\n"
-"%s をクリックしてください。Mandrake Linuxはネットワークデバイスと\n"
-"モデムを自動的に検出します。\n"
-"検出に失敗した場合は %s を切ってください。\n"
+"%s をクリックしてください。Mandrakelinuxはネットワークデバイスと\n"
+"モデムを自動的に検出します。検出に失敗した場合は %s を切ってください。\n"
 "ネットワークを設定しない場合は %s を押して次に進んでください。\n"
 "\n"
 "When configuring your network, the available connections options are:\n"
-"traditional modem, ISDN modem, ADSL connection, cable modem, and finally a\n"
-"simple LAN connection (Ethernet).\n"
+"Normal modem connection, Winmodem connection, ISDN modem, ADSL connection,\n"
+"cable modem, and finally a simple LAN connection (Ethernet).\n"
 "\n"
 "We will not detail each configuration option - just make sure that you have\n"
 "all the parameters, such as IP address, default gateway, DNS servers, etc.\n"
 "from your Internet Service Provider or system administrator.\n"
 "\n"
+"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 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"
 "for details about the configuration, or simply wait until your system is\n"
 "installed and use the program described there to configure your connection."
@@ -3693,8 +3754,8 @@ msgstr ""
 "載っています。インタフェースはインストール時に使用したものと似ています。"
 
 #: 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 "設定"
@@ -3736,7 +3797,7 @@ msgstr ""
 "!!"
 
 #: help.pm:224
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
 "local time according to the time zone you selected. If the clock on your\n"
@@ -3764,7 +3825,7 @@ msgstr ""
 "る\n"
 "タイムサーバの働きを行うことができるようになります。"
 
-#: 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 "ハードウェアクロックをGMTに設定する"
@@ -3775,7 +3836,7 @@ msgid "Automatic time synchronization"
 msgstr "自動的に時間を合わせる"
 
 #: help.pm:238
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Graphic Card\n"
 "\n"
@@ -3793,15 +3854,15 @@ msgstr ""
 "自動的に検出して設定します。うまく行かない場合はグラフィックカードの\n"
 "リストの中から適切なものを選んでください。\n"
 "\n"
-"お使いのカードで3Dアクセラレーションの有無についていくつか異なるサーバが\n"
-"ある場合は、適切なサーバを選択することができます。"
+"3Dアクセラレーションの有無についていくつか異なるサーバが\n"
+"ある場合は、適切なサーバを選ぶことができます。"
 
 #: help.pm:249
 #, fuzzy, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
+"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"
@@ -3854,7 +3915,7 @@ msgid ""
 "in getting the display configured."
 msgstr ""
 "X(X Window System)はLinuxのグラフィカルインタフェースの中心と\n"
-"なる部分で、Mandrake Linuxに収録している全てのグラフィカル環境\n"
+"なる部分で、Mandrakelinuxに収録している全てのグラフィカル環境\n"
 "(KDE, GNOME, AfterStep, WindowMakerなど)はこれに依拠しています。\n"
 "\n"
 "グラフィックカードの項目では、最適なグラフィック表示を得るために\n"
@@ -3963,7 +4024,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"
@@ -3990,7 +4051,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"
@@ -3999,7 +4060,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"
@@ -4017,10 +4078,10 @@ 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 ""
-"ここではMandrake Linuxをハードドライブのどこにインストールするかを\n"
+"ここではMandrakelinuxをハードドライブのどこにインストールするかを\n"
 "選択します。ハードドライブが空であったり既存のOSが全ての領域を使用して\n"
 "いたりする場合は、パーティションを設定しなければなりません。\n"
-"基本的に、Mandrake Linuxをインストールするには、ハードドライブを\n"
+"基本的に、Mandrakelinuxをインストールするには、ハードドライブを\n"
 "論理分割して領域を確保することが必要です。\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
@@ -4048,7 +4109,7 @@ msgstr ""
 "partition. Resizing can be performed without the loss of any data, provided\n"
 "you have previously defragmented the Windows partition and that it uses the\n"
 "FAT format. Backing up your data is strongly recommended.. Using this\n"
-"option is recommended if you want to use both Mandrake Linux and Microsoft\n"
+"option is recommended if you want to use both Mandrakelinux and Microsoft\n"
 "Windows on the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4057,7 +4118,7 @@ msgstr ""
 "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"
@@ -4168,21 +4229,21 @@ msgstr ""
 "\"mformat a:\")"
 
 #: help.pm:418
-#, fuzzy, c-format
+#, c-format
 msgid "Generate auto-install floppy"
 msgstr "インストール自動化フロッピーを作成"
 
-#: help.pm:418 install_steps_interactive.pm:1320
+#: help.pm:418 install_steps_interactive.pm:1329
 #, c-format
 msgid "Replay"
 msgstr "再現"
 
-#: help.pm:418 install_steps_interactive.pm:1320
+#: help.pm:418 install_steps_interactive.pm:1329
 #, c-format
 msgid "Automated"
 msgstr "自動"
 
-#: help.pm:418 install_steps_interactive.pm:1323
+#: help.pm:418 install_steps_interactive.pm:1332
 #, c-format
 msgid "Save packages selection"
 msgstr "パッケージの選択を保存する"
@@ -4210,7 +4271,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."
@@ -4232,18 +4293,18 @@ msgstr ""
 "Click on \"%s\" when you are ready to format 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."
 
 #: 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 "戻る"
@@ -4251,7 +4312,7 @@ msgstr "戻る"
 #: help.pm:447
 #, fuzzy, 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"
@@ -4263,7 +4324,7 @@ msgid ""
 "appear: review the selection, and press \"%s\" to retrieve and install the\n"
 "selected package(s), or \"%s\" to abort."
 msgstr ""
-"Mandrake Linuxのインストール中です。パッケージの中にはリリース後\n"
+"Mandrakelinuxのインストール中です。パッケージの中にはリリース後\n"
 "すでに更新しているものがあるでしょう。バグが修正されたりセキュリティの\n"
 "問題が解決されたものもあるでしょう。これらを反映させるにはインターネットか"
 "ら\n"
@@ -4277,7 +4338,7 @@ msgstr ""
 "the selected package(s), or \"%s\" to abort."
 
 #: 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 "インストール"
@@ -4308,15 +4369,15 @@ msgstr ""
 "何を選択していいか分からない場合は、デフォルトのままにしてください。"
 
 #: help.pm:472
-#, fuzzy, c-format
+#, c-format
 msgid "Security Administrator"
-msgstr "セキュリティ管理者:"
+msgstr "セキュリティ管理者"
 
 #: help.pm:475
 #, fuzzy, 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"
@@ -4386,7 +4447,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"ここではどのパーティションにMandrake Linuxをインストールするかを\n"
+"ここではどのパーティションにMandrakelinuxをインストールするかを\n"
 "選択します。以前のLinuxシステムが残っていたり、別のツールを使って\n"
 "既にパーティションを定義している場合は、既存のパーティションを利用する\n"
 "ことができます。そうでない場合はハードドライブのパーティションを定義\n"
@@ -4458,7 +4519,7 @@ msgstr ""
 "emergency boot situations."
 
 #: help.pm:544
-#, fuzzy, c-format
+#, c-format
 msgid "Removable media auto-mounting"
 msgstr "リムーバブルメディアを自動的にマウント"
 
@@ -4472,7 +4533,7 @@ msgstr "標準/エキスパートモードの切り替え"
 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"
@@ -4501,7 +4562,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Microsoftのパーティションがいくつかハードドライブにあります。\n"
-"Mandrake Linuxをインストールするため、リサイズするものを選んで\n"
+"Mandrakelinuxをインストールするため、リサイズするものを選んで\n"
 "ください。\n"
 "\n"
 "パーティションは次のように表示されます: \"Linux name\", \"Windows name\"\n"
@@ -4549,7 +4610,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"
@@ -4557,18 +4618,18 @@ 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 ""
 "このステップは、以前にLinuxを使っていてそのパーティションが残っていた\n"
 "場合にのみ表示されます。\n"
 "\n"
-"DrakXは既存のMandrake Linuxシステムを更新するかそれとも新規にインストール\n"
+"DrakXは既存のMandrakelinuxシステムを更新するかそれとも新規にインストール\n"
 "するかを尋ねます:\n"
 "\n"
 " * \"%s\": For the most part, this completely wipes out the old system. If\n"
@@ -4577,13 +4638,13 @@ msgstr ""
 "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."
 
 #: help.pm:605
 #, fuzzy, c-format
@@ -4631,7 +4692,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"
@@ -4744,9 +4805,9 @@ msgstr ""
 "mouse."
 
 #: help.pm:691
-#, fuzzy, c-format
+#, c-format
 msgid "with Wheel emulation"
-msgstr "ホイールエミュレーション付きの３ボタン"
+msgstr "ホイールエミュレーション付き"
 
 #: help.pm:694
 #, c-format
@@ -4835,7 +4896,7 @@ msgid "authentication"
 msgstr "認証"
 
 #. -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 "パスワードなし"
@@ -4870,7 +4931,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"
@@ -4896,7 +4957,7 @@ msgstr ""
 "default.\n"
 "\n"
 "!! Beware 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"
@@ -4929,9 +4990,9 @@ msgid "Delay before booting the default image"
 msgstr "デフォルトが起動するまでの秒数"
 
 #: help.pm:768
-#, fuzzy, c-format
+#, c-format
 msgid "Force no APIC"
-msgstr "APICを禁止する"
+msgstr "APIC無しを強制"
 
 #: help.pm:771
 #, c-format
@@ -4967,8 +5028,9 @@ msgstr ""
 "operating systems!"
 
 #: 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 "追加"
@@ -4979,7 +5041,8 @@ msgid "Modify"
 msgstr "変更"
 
 #: 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 "削除"
@@ -5020,7 +5083,7 @@ msgstr ""
 #, fuzzy, 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"
@@ -5045,7 +5108,7 @@ msgid ""
 "Center and clicking the expert button."
 msgstr ""
 "コンピュータの印刷システムを選択します。他のOSには１種類しか\n"
-"ありませんが、Mandrake Linuxには２種類あります。\n"
+"ありませんが、Mandrakelinuxには２種類あります。\n"
 "\n"
 " * %s - 'Print, Don't Queue(印刷する。キューはしない)'の略。\n"
 "マシンにプリンタを直接接続している/紙づまりのときにすぐ中断したい/\n"
@@ -5070,7 +5133,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"
@@ -5284,8 +5347,8 @@ msgstr ""
 "表示しているサウンドカードがお使いのシステムのものでない\n"
 "場合は、ボタンをクリックして別のドライバを選んでください。"
 
-#: 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 "サウンドカード"
@@ -5415,12 +5478,12 @@ msgstr ""
 "idea to review this setup."
 
 #: 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 "キーボード"
 
-#: help.pm:991 install_steps_interactive.pm:921
+#: help.pm:991 install_steps_interactive.pm:926
 #, c-format
 msgid "Timezone"
 msgstr "タイムゾーン"
@@ -5430,7 +5493,7 @@ msgstr "タイムゾーン"
 msgid "Graphical Interface"
 msgstr "グラフィカルインタフェース"
 
-#: help.pm:991 install_steps_interactive.pm:995
+#: help.pm:991 install_steps_interactive.pm:1000
 #, c-format
 msgid "TV card"
 msgstr "テレビカード"
@@ -5440,27 +5503,27 @@ msgstr "テレビカード"
 msgid "ISDN card"
 msgstr "ISDNカード"
 
-#: 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 "ネットワーク"
 
-#: help.pm:991 install_steps_interactive.pm:1039
+#: help.pm:991 install_steps_interactive.pm:1044
 #, c-format
 msgid "Security Level"
 msgstr "セキュリティレベル"
 
-#: help.pm:991 install_steps_interactive.pm:1053
+#: help.pm:991 install_steps_interactive.pm:1058
 #, c-format
 msgid "Firewall"
 msgstr "ファイアウォール"
 
-#: help.pm:991 install_steps_interactive.pm:1067
+#: help.pm:991 install_steps_interactive.pm:1072
 #, c-format
 msgid "Bootloader"
 msgstr "ブートローダ"
 
-#: 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 "サービス"
@@ -5469,10 +5532,10 @@ msgstr "サービス"
 #, fuzzy, 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 ""
-"Mandrake Linuxをインストールするために内容を消去するハードドライブを\n"
+"Mandrakelinuxをインストールするために内容を消去するハードドライブを\n"
 "選んでください。注意: このパーティションのデータは全て消えて\n"
 "回復できなくなります。"
 
@@ -5510,7 +5573,7 @@ msgstr ""
 msgid "You must also format %s"
 msgstr "%s もフォーマットしてください"
 
-#: install_any.pm:413
+#: install_any.pm:411
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -5533,7 +5596,7 @@ msgstr ""
 "\n"
 "本当にこれらのサーバをインストールしますか？\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"
@@ -5546,17 +5609,17 @@ msgstr ""
 "\n"
 "本当にこれらを削除しますか?\n"
 
-#: install_any.pm:812
+#: install_any.pm:827
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "FAT形式のフロッピーをドライブ %s に挿入"
 
-#: install_any.pm:816
+#: install_any.pm:831
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "このフロッピーはFAT形式ではありません"
 
-#: install_any.pm:828
+#: install_any.pm:843
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
@@ -5565,12 +5628,12 @@ msgstr ""
 "保存したパッケージ選択を使うには、インストールの起動時に'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 "ファイル %s を読み込み中にエラー"
 
-#: install_any.pm:973
+#: install_any.pm:995
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5694,11 +5757,11 @@ msgstr "Windowsパーティションのサイズを計算"
 #, 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 ""
 "Windowsパーティションが断片化しすぎています。再起動してWindowsを立ち上げ、\n"
-"デフラグを実行してください。その後再起動してMandrake Linuxをインストール\n"
+"デフラグを実行してください。その後再起動してMandrakelinuxをインストール\n"
 "してください。"
 
 #: install_interactive.pm:164
@@ -5805,17 +5868,17 @@ msgid "Bringing down the network"
 msgstr "ネットワークを切断する"
 
 #: install_messages.pm:9
-#, c-format
+#, fuzzy, c-format
 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"
@@ -5869,7 +5932,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"
@@ -5906,7 +5969,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"
@@ -5933,7 +5996,7 @@ msgstr ""
 "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"
@@ -5987,7 +6050,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"
@@ -6024,7 +6087,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"
@@ -6117,14 +6180,14 @@ msgstr ""
 "copyright laws applicable to software programs.\n"
 
 #: install_messages.pm:128
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of Mandrake "
-"Linux,\n"
+"For information on fixes which are available for this release of "
+"Mandrakelinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6132,19 +6195,19 @@ 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 ""
 "おめでとうございます。インストールが終わりました。\n"
 "起動用メディアを抜き、Enterを押して再起動してください。\n"
 "\n"
 "\n"
-"Mandrake Linuxの修正情報(Errata)は以下にあります。\n"
+"Mandrakelinuxの修正情報(Errata)は以下にあります。\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"システムの設定については公式Mandrake Linuxユーザガイドの\n"
+"システムの設定については公式Mandrakelinuxユーザガイドの\n"
 "'インストール後'の章をご覧ください。"
 
 #: install_messages.pm:141
@@ -6157,7 +6220,7 @@ msgstr "http://www.mandrakelinux.com/en/100errata.php3"
 msgid "Duplicate mount point %s"
 msgstr "マウントポイント %s は重複しています"
 
-#: install_steps.pm:410
+#: install_steps.pm:406
 #, c-format
 msgid ""
 "Some important packages didn't get installed properly.\n"
@@ -6169,7 +6232,7 @@ msgstr ""
 "CD-ROMドライブかCD-ROMに問題があります。\n"
 "rpm -qpl Mandrake/RPMS/*.rpm でCD-ROMをチェックしてください。\n"
 
-#: install_steps.pm:541
+#: install_steps.pm:535
 #, c-format
 msgid "No floppy drive available"
 msgstr "利用可能なフロッピードライブがありません"
@@ -6183,11 +6246,11 @@ msgstr "%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 ""
-"リソースが足りません。Mandrake Linuxをインストールするには\n"
+"リソースが足りません。Mandrakelinuxをインストールするには\n"
 "問題があります。\n"
 "代わりにテキストインストールを試すことができます。\n"
 "この場合はCD-ROMを起動したときにF1を押し、続いて'text'と入力して\n"
@@ -6390,8 +6453,8 @@ msgstr "続けますか？"
 msgid "There was an error installing packages:"
 msgstr "パッケージをインストール中にエラーが発生:"
 
-#: 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 "設定していません"
@@ -6486,7 +6549,7 @@ msgstr "IDE"
 msgid "Configuring IDE"
 msgstr "IDEを設定"
 
-#: 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 "利用可能なパーティションがありません"
@@ -6706,176 +6769,175 @@ msgstr ""
 #: install_steps_interactive.pm:782
 #, c-format
 msgid ""
-"Contacting Mandrake Linux web site to get the list of available mirrors..."
-msgstr "Mandrake Linuxのサイトに接続してミラーのリストを取得しています"
+"Contacting Mandrakelinux web site to get the list of available mirrors..."
+msgstr "Mandrakelinuxのサイトに接続してミラーのリストを取得しています"
 
-#: install_steps_interactive.pm:786
+#: install_steps_interactive.pm:787
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "パッケージを取得するミラーを選択"
 
-#: install_steps_interactive.pm:800
+#: install_steps_interactive.pm:801
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "ミラーに接続して利用可能なパッケージのリストを取得しています"
 
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:805
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "ミラー %s に接続できません"
 
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:805
 #, c-format
 msgid "Would you like to try again?"
 msgstr "もう一度試しますか？"
 
-#: install_steps_interactive.pm:830 standalone/drakclock:42
+#: install_steps_interactive.pm:831 standalone/drakclock:42
 #, c-format
 msgid "Which is your timezone?"
 msgstr "タイムゾーンを選んでください。"
 
-#: install_steps_interactive.pm:835
+#: install_steps_interactive.pm:836
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自動的に時間を合わせる(NTPを使用)"
 
-#: install_steps_interactive.pm:843
+#: install_steps_interactive.pm:844
 #, c-format
 msgid "NTP Server"
 msgstr "NTPサーバ"
 
-#: install_steps_interactive.pm:885 steps.pm:30
+#: install_steps_interactive.pm:886 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "要約"
 
-#: 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 "システム"
 
-#: 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 "ハードウェア"
 
-#: 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サーバ"
 
-#: install_steps_interactive.pm:940
+#: install_steps_interactive.pm:945
 #, c-format
 msgid "No printer"
 msgstr "プリンタなし"
 
-#: install_steps_interactive.pm:982
+#: install_steps_interactive.pm:987
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "ISAサウンドカードをお持ちですか？"
 
-#: install_steps_interactive.pm:984
+#: install_steps_interactive.pm:989
 #, c-format
 msgid "Run \"sndconfig\" after installation to configure your sound card"
 msgstr "インストール後にsndconfigを実行してサウンドカードを設定してください。"
 
-#: install_steps_interactive.pm:986
+#: install_steps_interactive.pm:991
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "サウンドカードがありません。インストール後にharddrakeを試してください"
 
-#: install_steps_interactive.pm:1006
+#: install_steps_interactive.pm:1011
 #, c-format
 msgid "Graphical interface"
 msgstr "グラフィカルインタフェース"
 
-#: 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 ""
 "ネットワークと\n"
 "インターネット"
 
-#: install_steps_interactive.pm:1028
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1033
+#, c-format
 msgid "Proxies"
-msgstr "プロファイル "
+msgstr "プロクシ"
 
-#: install_steps_interactive.pm:1029
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1034
+#, c-format
 msgid "configured"
-msgstr "再設定"
+msgstr "設定済み"
 
-#: 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 "セキュリティ"
 
-#: install_steps_interactive.pm:1057
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "activated"
 msgstr "有効化"
 
-#: install_steps_interactive.pm:1057
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "disabled"
 msgstr "無効化"
 
-#: install_steps_interactive.pm:1066
+#: install_steps_interactive.pm:1071
 #, c-format
 msgid "Boot"
 msgstr "起動"
 
 #. -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 on %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 "サービス: %d 個を起動(登録数は %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 "Xを設定していません。本当によろしいですか？"
 
-#: install_steps_interactive.pm:1149
+#: install_steps_interactive.pm:1154
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr "rootパスワードとネットワーク認証を設定"
 
-#: install_steps_interactive.pm:1150
+#: install_steps_interactive.pm:1155
 #, c-format
 msgid "Set root password"
 msgstr "rootパスワードを設定"
 
-#: 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 "このパスワードは短すぎます(最低でも %d 文字以上)"
 
-#: 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 "認証"
 
-#: install_steps_interactive.pm:1196
+#: install_steps_interactive.pm:1201
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "ブートローダを準備中.."
 
-#: install_steps_interactive.pm:1206
+#: install_steps_interactive.pm:1211
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -6888,12 +6950,12 @@ msgstr ""
 "インストールを続けますが、マシンの起動には\n"
 "BootXもしくは他の手段が必要です。"
 
-#: install_steps_interactive.pm:1212
+#: install_steps_interactive.pm:1217
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "abootを使いますか？"
 
-#: install_steps_interactive.pm:1215
+#: install_steps_interactive.pm:1220
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -6902,17 +6964,17 @@ msgstr ""
 "abootをインストール中にエラーが発生。\n"
 "最初のパーティションを破壊してでもインストールを強制しますか？"
 
-#: install_steps_interactive.pm:1226
+#: install_steps_interactive.pm:1231
 #, c-format
 msgid "Installing bootloader"
 msgstr "ブートローダをインストール中"
 
-#: install_steps_interactive.pm:1233
+#: install_steps_interactive.pm:1238
 #, c-format
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "ブートローダのインストールに失敗しました。以下のエラーが発生:"
 
-#: 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"
@@ -6930,24 +6992,31 @@ msgstr ""
 "と入力してください。\n"
 "次回の起動時にはブートローダのプロンプトが表示されるはずです。"
 
-#: 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 ""
+"このセキュリティベルでは、Windowsパーティションのファイルへのアクセスが管理者"
+"のみに限定されます"
 
-#: 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 "空のフロッピーをドライブ %s に入れてください"
 
-#: install_steps_interactive.pm:1287
+#: install_steps_interactive.pm:1293
+#, fuzzy, c-format
+msgid "Please insert another floppy for drivers disk"
+msgstr "使用した起動用フロッピーをドライブ %s に入れてください"
+
+#: install_steps_interactive.pm:1295
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "インストール自動化フロッピーを作成中.."
 
-#: install_steps_interactive.pm:1298
+#: install_steps_interactive.pm:1307
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -6958,12 +7027,12 @@ msgstr ""
 "\n"
 "本当に終了しますか？"
 
-#: install_steps_interactive.pm:1313
+#: install_steps_interactive.pm:1322
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "インストール自動化フロッピーを作成"
 
-#: install_steps_interactive.pm:1315
+#: install_steps_interactive.pm:1324
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -6980,8 +7049,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrake Linux Installation %s"
-msgstr "Mandrake Linuxのインストール %s"
+msgid "Mandrakelinux Installation %s"
+msgstr "Mandrakelinuxのインストール %s"
 
 #: install_steps_newt.pm:33
 #, c-format
@@ -6999,7 +7068,7 @@ msgstr "ファイルを選択"
 msgid "Basic"
 msgstr "基本"
 
-#: 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 "完了"
@@ -7113,7 +7182,7 @@ msgstr "フィンランド"
 msgid "French"
 msgstr "フランス"
 
-#: keyboard.pm:143 keyboard.pm:217
+#: keyboard.pm:143 keyboard.pm:220
 #, c-format
 msgid "Norwegian"
 msgstr "ノルウェー"
@@ -7123,22 +7192,22 @@ msgstr "ノルウェー"
 msgid "Polish"
 msgstr "ポーランド"
 
-#: keyboard.pm:145 keyboard.pm:226
+#: keyboard.pm:145 keyboard.pm:229
 #, c-format
 msgid "Russian"
 msgstr "ロシア"
 
-#: keyboard.pm:147 keyboard.pm:230
+#: keyboard.pm:147 keyboard.pm:233
 #, c-format
 msgid "Swedish"
 msgstr "スウェーデン"
 
-#: keyboard.pm:148 keyboard.pm:249
+#: keyboard.pm:148 keyboard.pm:252
 #, c-format
 msgid "UK keyboard"
 msgstr "イギリス式キーボード"
 
-#: keyboard.pm:149 keyboard.pm:250
+#: keyboard.pm:149 keyboard.pm:253
 #, c-format
 msgid "US keyboard"
 msgstr "アメリカ式キーボード"
@@ -7333,312 +7402,312 @@ msgstr "イタリア"
 msgid "Inuktitut"
 msgstr "イヌクティトト"
 
-#: keyboard.pm:197
+#: keyboard.pm:200
 #, c-format
 msgid "Japanese 106 keys"
 msgstr "日本語106キーボード"
 
-#: keyboard.pm:198
+#: keyboard.pm:201
 #, c-format
 msgid "Kannada"
 msgstr "カンナダ"
 
-#: keyboard.pm:201
+#: keyboard.pm:204
 #, c-format
 msgid "Korean keyboard"
 msgstr "韓国式キーボード"
 
-#: keyboard.pm:202
+#: keyboard.pm:205
 #, c-format
 msgid "Latin American"
 msgstr "ラテンアメリカ"
 
-#: keyboard.pm:203
+#: keyboard.pm:206
 #, c-format
 msgid "Laotian"
 msgstr "ラオス"
 
-#: keyboard.pm:204
+#: keyboard.pm:207
 #, c-format
 msgid "Lithuanian AZERTY (old)"
 msgstr "リトアニア AZERTY(旧)"
 
-#: keyboard.pm:206
+#: keyboard.pm:209
 #, c-format
 msgid "Lithuanian AZERTY (new)"
 msgstr "リトアニア AZERTY(新)"
 
-#: keyboard.pm:207
+#: keyboard.pm:210
 #, c-format
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "リトアニア(数字列QWERTY)"
 
-#: keyboard.pm:208
+#: keyboard.pm:211
 #, c-format
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "リトアニア(発音QWERTY)"
 
-#: keyboard.pm:209
+#: keyboard.pm:212
 #, c-format
 msgid "Latvian"
 msgstr "ラトヴィア"
 
-#: keyboard.pm:210
+#: keyboard.pm:213
 #, c-format
 msgid "Malayalam"
 msgstr "マレー半島"
 
-#: keyboard.pm:211
+#: keyboard.pm:214
 #, c-format
 msgid "Macedonian"
 msgstr "マケドニア"
 
-#: keyboard.pm:212
+#: keyboard.pm:215
 #, c-format
 msgid "Myanmar (Burmese)"
 msgstr "ミャンマー(ビルマ)"
 
-#: keyboard.pm:213
+#: keyboard.pm:216
 #, c-format
 msgid "Mongolian (cyrillic)"
 msgstr "モンゴル(cyrillic)"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
 msgid "Maltese (UK)"
 msgstr "マルタ(UK)"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
 msgid "Maltese (US)"
 msgstr "マルタ(US)"
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
 msgid "Dutch"
 msgstr "オランダ"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
 msgid "Oriya"
 msgstr "オリヤー"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
 msgid "Polish (qwerty layout)"
 msgstr "ポーランド(qwerty)"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
 msgid "Polish (qwertz layout)"
 msgstr "ポーランド(qwertz)"
 
-#: keyboard.pm:221
+#: keyboard.pm:224
 #, c-format
 msgid "Portuguese"
 msgstr "ポルトガル"
 
-#: keyboard.pm:222
+#: keyboard.pm:225
 #, c-format
 msgid "Canadian (Quebec)"
 msgstr "カナダ(ケベック)"
 
-#: keyboard.pm:224
+#: keyboard.pm:227
 #, c-format
 msgid "Romanian (qwertz)"
 msgstr "ルーマニア(qwertz)"
 
-#: keyboard.pm:225
+#: keyboard.pm:228
 #, c-format
 msgid "Romanian (qwerty)"
 msgstr "ルーマニア(qwerty)"
 
-#: keyboard.pm:227
+#: keyboard.pm:230
 #, c-format
 msgid "Russian (Phonetic)"
 msgstr "ロシア(発音記号)"
 
-#: keyboard.pm:228
+#: keyboard.pm:231
 #, c-format
 msgid "Saami (norwegian)"
 msgstr "Saami (norwegian)"
 
-#: keyboard.pm:229
+#: keyboard.pm:232
 #, c-format
 msgid "Saami (swedish/finnish)"
 msgstr "サーミ(swedish/finnish)"
 
-#: keyboard.pm:231
+#: keyboard.pm:234
 #, c-format
 msgid "Slovenian"
 msgstr "スロベニア"
 
-#: keyboard.pm:232
+#: keyboard.pm:235
 #, c-format
 msgid "Slovakian (QWERTZ)"
 msgstr "スロバキア(QWERTZ)"
 
-#: keyboard.pm:233
+#: keyboard.pm:236
 #, c-format
 msgid "Slovakian (QWERTY)"
 msgstr "スロバキア(QWERTY)"
 
-#: keyboard.pm:235
+#: keyboard.pm:238
 #, c-format
 msgid "Serbian (cyrillic)"
 msgstr "セルビア(cyrillic)"
 
-#: keyboard.pm:236
+#: keyboard.pm:239
 #, c-format
 msgid "Syriac"
 msgstr "シリア"
 
-#: keyboard.pm:237
+#: keyboard.pm:240
 #, c-format
 msgid "Syriac (phonetic)"
 msgstr "シリア(発音記号)"
 
-#: keyboard.pm:238
+#: keyboard.pm:241
 #, c-format
 msgid "Telugu"
 msgstr "テルグ"
 
-#: keyboard.pm:240
+#: keyboard.pm:243
 #, c-format
 msgid "Tamil (ISCII-layout)"
 msgstr "タミール(ISCII)"
 
-#: keyboard.pm:241
+#: keyboard.pm:244
 #, c-format
 msgid "Tamil (Typewriter-layout)"
 msgstr "タミール(タイプライタ)"
 
-#: keyboard.pm:242
+#: keyboard.pm:245
 #, c-format
 msgid "Thai keyboard"
 msgstr "タイ式キーボード"
 
-#: keyboard.pm:244
+#: keyboard.pm:247
 #, c-format
 msgid "Tajik keyboard"
 msgstr "タジク式キーボード"
 
-#: keyboard.pm:245
+#: keyboard.pm:248
 #, c-format
 msgid "Turkish (traditional \"F\" model)"
 msgstr "トルコ(伝統的Fモデル)"
 
-#: keyboard.pm:246
+#: keyboard.pm:249
 #, c-format
 msgid "Turkish (modern \"Q\" model)"
 msgstr "トルコ(モダンQモデル)"
 
-#: keyboard.pm:248
+#: keyboard.pm:251
 #, c-format
 msgid "Ukrainian"
 msgstr "ウクライナ"
 
-#: keyboard.pm:251
+#: keyboard.pm:254
 #, c-format
 msgid "US keyboard (international)"
 msgstr "アメリカ式キーボード(国際式)"
 
-#: keyboard.pm:252
+#: keyboard.pm:255
 #, c-format
 msgid "Uzbek (cyrillic)"
 msgstr "ウズベキスタン(cyrillic)"
 
-#: keyboard.pm:253
+#: keyboard.pm:256
 #, c-format
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "ベトナム(数字列)"
 
-#: keyboard.pm:254
+#: keyboard.pm:257
 #, c-format
 msgid "Yugoslavian (latin)"
 msgstr "ユーゴスラビア(ラテン)"
 
-#: keyboard.pm:261
+#: keyboard.pm:264
 #, c-format
 msgid "Right Alt key"
 msgstr "右側のAltキー"
 
-#: keyboard.pm:262
+#: keyboard.pm:265
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "左右のShiftを同時に押す"
 
-#: keyboard.pm:263
+#: keyboard.pm:266
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "CtrlとShiftを同時に押す"
 
-#: keyboard.pm:264
+#: keyboard.pm:267
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLockキー"
 
-#: keyboard.pm:265
+#: keyboard.pm:268
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "CtrlとAltを同時に押す"
 
-#: keyboard.pm:266
+#: keyboard.pm:269
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "AltとShiftを同時に押す"
 
-#: keyboard.pm:267
+#: keyboard.pm:270
 #, c-format
 msgid "\"Menu\" key"
 msgstr "メニューキー"
 
-#: keyboard.pm:268
+#: keyboard.pm:271
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "左側のWindowsキー"
 
-#: keyboard.pm:269
+#: keyboard.pm:272
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "右側のWindowsキー"
 
-#: keyboard.pm:270
+#: keyboard.pm:273
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "左右のCtrlを同時に押す"
 
-#: keyboard.pm:271
+#: keyboard.pm:274
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "左右のAltを同時に押す"
 
-#: keyboard.pm:272
+#: keyboard.pm:275
 #, c-format
 msgid "Left Shift key"
 msgstr "左側のShiftキー"
 
-#: keyboard.pm:273
+#: keyboard.pm:276
 #, c-format
 msgid "Right Shift key"
 msgstr "右側のShiftキー"
 
-#: keyboard.pm:274
+#: keyboard.pm:277
 #, c-format
 msgid "Left Alt key"
 msgstr "左側のAltキー"
 
-#: keyboard.pm:275
+#: keyboard.pm:278
 #, c-format
 msgid "Left Control key"
 msgstr "左のCtrlキー"
 
-#: keyboard.pm:276
+#: keyboard.pm:279
 #, c-format
 msgid "Right Control key"
 msgstr "右側のCtrlキー"
 
-#: keyboard.pm:307
+#: keyboard.pm:310
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -7648,7 +7717,7 @@ msgstr ""
 "キーボードの配列を切り替える(例:ラテンと非ラテン)キーの\n"
 "組み合わせを選んでください"
 
-#: keyboard.pm:312
+#: keyboard.pm:315
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -7659,1144 +7728,1144 @@ msgstr ""
 "インストール時は右Ctrlキーでキーボードのレイアウトを\n"
 "切り替えてください。"
 
-#: lang.pm:144
+#: lang.pm:149
 #, c-format
 msgid "default:LTR"
-msgstr "デフォルト:LTR"
+msgstr "default:LTR"
 
-#: lang.pm:160
+#: lang.pm:165
 #, c-format
 msgid "Afghanistan"
 msgstr "アフガニスタン"
 
-#: lang.pm:161
+#: lang.pm:166
 #, c-format
 msgid "Andorra"
 msgstr "アンドラ"
 
-#: lang.pm:162
+#: lang.pm:167
 #, c-format
 msgid "United Arab Emirates"
 msgstr "アラブ首長国連邦"
 
-#: lang.pm:163
+#: lang.pm:168
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "アンチグアバーブーダ"
 
-#: lang.pm:164
+#: lang.pm:169
 #, c-format
 msgid "Anguilla"
 msgstr "アングィラ島"
 
-#: lang.pm:165
+#: lang.pm:170
 #, c-format
 msgid "Albania"
 msgstr "アルバニア"
 
-#: lang.pm:166
+#: lang.pm:171
 #, c-format
 msgid "Armenia"
 msgstr "アルメニア"
 
-#: lang.pm:167
+#: lang.pm:172
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "オランダ領アンティル諸島"
 
-#: lang.pm:168
+#: lang.pm:173
 #, c-format
 msgid "Angola"
 msgstr "アンゴラ"
 
-#: lang.pm:169
+#: lang.pm:174
 #, c-format
 msgid "Antarctica"
 msgstr "アンタルチカ"
 
-#: lang.pm:170 standalone/drakxtv:51
+#: lang.pm:175 standalone/drakxtv:51
 #, c-format
 msgid "Argentina"
 msgstr "アルゼンチン"
 
-#: lang.pm:171
+#: lang.pm:176
 #, c-format
 msgid "American Samoa"
 msgstr "サモア(アメリカ)"
 
-#: lang.pm:173 standalone/drakxtv:49
+#: lang.pm:178 network/adsl_consts.pm:20 standalone/drakxtv:49
 #, c-format
 msgid "Australia"
 msgstr "オーストラリア"
 
-#: lang.pm:174
+#: lang.pm:179
 #, c-format
 msgid "Aruba"
 msgstr "アルーバ"
 
-#: lang.pm:175
+#: lang.pm:180
 #, c-format
 msgid "Azerbaijan"
 msgstr "アゼルバイジャン"
 
-#: lang.pm:176
+#: lang.pm:181
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "ボスニア・ヘルツェゴビナ"
 
-#: lang.pm:177
+#: lang.pm:182
 #, c-format
 msgid "Barbados"
 msgstr "バルバドス"
 
-#: lang.pm:178
+#: lang.pm:183
 #, c-format
 msgid "Bangladesh"
 msgstr "バングラデシュ"
 
-#: lang.pm:180
+#: lang.pm:185
 #, c-format
 msgid "Burkina Faso"
 msgstr "ブルキナファソ"
 
-#: lang.pm:181
+#: lang.pm:186
 #, c-format
 msgid "Bulgaria"
 msgstr "ブルガリア"
 
-#: lang.pm:182
+#: lang.pm:187
 #, c-format
 msgid "Bahrain"
 msgstr "バーレーン"
 
-#: lang.pm:183
+#: lang.pm:188
 #, c-format
 msgid "Burundi"
 msgstr "ブルンジ"
 
-#: lang.pm:184
+#: lang.pm:189
 #, c-format
 msgid "Benin"
 msgstr "ベニン"
 
-#: lang.pm:185
+#: lang.pm:190
 #, c-format
 msgid "Bermuda"
 msgstr "バーミューダ"
 
-#: lang.pm:186
+#: lang.pm:191
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "ブルネイ・ダルサラーム国"
 
-#: lang.pm:187
+#: lang.pm:192
 #, c-format
 msgid "Bolivia"
 msgstr "ボリビア"
 
-#: lang.pm:188
+#: lang.pm:193
 #, c-format
 msgid "Brazil"
 msgstr "ブラジル"
 
-#: lang.pm:189
+#: lang.pm:194
 #, c-format
 msgid "Bahamas"
 msgstr "バハマ"
 
-#: lang.pm:190
+#: lang.pm:195
 #, c-format
 msgid "Bhutan"
 msgstr "ブータン"
 
-#: lang.pm:191
+#: lang.pm:196
 #, c-format
 msgid "Bouvet Island"
 msgstr "ブーヴェ島"
 
-#: lang.pm:192
+#: lang.pm:197
 #, c-format
 msgid "Botswana"
 msgstr "ボツワナ"
 
-#: lang.pm:193
+#: lang.pm:198
 #, c-format
 msgid "Belarus"
 msgstr "ベラルーシ"
 
-#: lang.pm:194
+#: lang.pm:199
 #, c-format
 msgid "Belize"
 msgstr "ベリーズ"
 
-#: lang.pm:195
+#: lang.pm:200
 #, c-format
 msgid "Canada"
 msgstr "カナダ"
 
-#: lang.pm:196
+#: lang.pm:201
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "ココス諸島"
 
-#: lang.pm:197
+#: lang.pm:202
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "コンゴ(Kinshasa)"
 
-#: lang.pm:198
+#: lang.pm:203
 #, c-format
 msgid "Central African Republic"
 msgstr "中央アフリカ共和国"
 
-#: lang.pm:199
+#: lang.pm:204
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "コンゴ(Brazzaville)"
 
-#: lang.pm:200
+#: lang.pm:205
 #, c-format
 msgid "Switzerland"
 msgstr "スイス"
 
-#: lang.pm:201
+#: lang.pm:206
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "コートジボアール"
 
-#: lang.pm:202
+#: lang.pm:207
 #, c-format
 msgid "Cook Islands"
 msgstr "クック諸島"
 
-#: lang.pm:203
+#: lang.pm:208
 #, c-format
 msgid "Chile"
 msgstr "チリ"
 
-#: lang.pm:204
+#: lang.pm:209
 #, c-format
 msgid "Cameroon"
 msgstr "カメルーン"
 
-#: lang.pm:205
+#: lang.pm:210
 #, c-format
 msgid "China"
 msgstr "中国"
 
-#: lang.pm:206
+#: lang.pm:211
 #, c-format
 msgid "Colombia"
 msgstr "コロンビア"
 
-#: lang.pm:208
+#: lang.pm:213
 #, c-format
 msgid "Cuba"
 msgstr "キューバ"
 
-#: lang.pm:209
+#: lang.pm:214
 #, c-format
 msgid "Cape Verde"
 msgstr "カーボベルデ共和国"
 
-#: lang.pm:210
+#: lang.pm:215
 #, c-format
 msgid "Christmas Island"
 msgstr "クリスマス島"
 
-#: lang.pm:211
+#: lang.pm:216
 #, c-format
 msgid "Cyprus"
 msgstr "キプロス"
 
-#: lang.pm:214
+#: lang.pm:219
 #, c-format
 msgid "Djibouti"
 msgstr "ジブチ"
 
-#: lang.pm:215
+#: lang.pm:220
 #, c-format
 msgid "Denmark"
 msgstr "デンマーク"
 
-#: lang.pm:216
+#: lang.pm:221
 #, c-format
 msgid "Dominica"
 msgstr "ドミニカ"
 
-#: lang.pm:217
+#: lang.pm:222
 #, c-format
 msgid "Dominican Republic"
 msgstr "ドミニカ共和国"
 
-#: lang.pm:218
+#: lang.pm:223
 #, c-format
 msgid "Algeria"
 msgstr "アルジェリア"
 
-#: lang.pm:219
+#: lang.pm:224
 #, c-format
 msgid "Ecuador"
 msgstr "エクアドル"
 
-#: lang.pm:220
+#: lang.pm:225
 #, c-format
 msgid "Estonia"
 msgstr "エストニア"
 
-#: lang.pm:221
+#: lang.pm:226
 #, c-format
 msgid "Egypt"
 msgstr "エジプト"
 
-#: lang.pm:222
+#: lang.pm:227
 #, c-format
 msgid "Western Sahara"
 msgstr "西サハラ"
 
-#: lang.pm:223
+#: lang.pm:228
 #, c-format
 msgid "Eritrea"
 msgstr "エリトリア"
 
-#: 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 "スペイン"
 
-#: lang.pm:225
+#: lang.pm:230
 #, c-format
 msgid "Ethiopia"
 msgstr "エチオピア"
 
-#: lang.pm:226 network/adsl_consts.pm:119
+#: lang.pm:231 network/adsl_consts.pm:127
 #, c-format
 msgid "Finland"
 msgstr "フィンランド"
 
-#: lang.pm:227
+#: lang.pm:232
 #, c-format
 msgid "Fiji"
 msgstr "フィジー"
 
-#: lang.pm:228
+#: lang.pm:233
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "フォークランド諸島(Malvinas)"
 
-#: lang.pm:229
+#: lang.pm:234
 #, c-format
 msgid "Micronesia"
 msgstr "ミクロネシア"
 
-#: lang.pm:230
+#: lang.pm:235
 #, c-format
 msgid "Faroe Islands"
 msgstr "フェロー諸島"
 
-#: lang.pm:232
+#: lang.pm:237
 #, c-format
 msgid "Gabon"
 msgstr "ガボン"
 
-#: 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 "イギリス"
 
-#: lang.pm:234
+#: lang.pm:239
 #, c-format
 msgid "Grenada"
 msgstr "グレナダ"
 
-#: lang.pm:235
+#: lang.pm:240
 #, c-format
 msgid "Georgia"
 msgstr "ジョージア"
 
-#: lang.pm:236
+#: lang.pm:241
 #, c-format
 msgid "French Guiana"
 msgstr "仏領ギアナ"
 
-#: lang.pm:237
+#: lang.pm:242
 #, c-format
 msgid "Ghana"
 msgstr "ガーナ"
 
-#: lang.pm:238
+#: lang.pm:243
 #, c-format
 msgid "Gibraltar"
 msgstr "ジブラルタル"
 
-#: lang.pm:239
+#: lang.pm:244
 #, c-format
 msgid "Greenland"
 msgstr "グリーンランド"
 
-#: lang.pm:240
+#: lang.pm:245
 #, c-format
 msgid "Gambia"
 msgstr "ガンビア"
 
-#: lang.pm:241
+#: lang.pm:246
 #, c-format
 msgid "Guinea"
 msgstr "ギニア"
 
-#: lang.pm:242
+#: lang.pm:247
 #, c-format
 msgid "Guadeloupe"
 msgstr "グアドループ島"
 
-#: lang.pm:243
+#: lang.pm:248
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "赤道ギニア共和国"
 
-#: lang.pm:245
+#: lang.pm:250
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "サウスジョージア島とサウスサンドイッチ島"
 
-#: lang.pm:246
+#: lang.pm:251
 #, c-format
 msgid "Guatemala"
 msgstr "グアテマラ"
 
-#: lang.pm:247
+#: lang.pm:252
 #, c-format
 msgid "Guam"
 msgstr "グアム"
 
-#: lang.pm:248
+#: lang.pm:253
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "ギニアビサウ共和国"
 
-#: lang.pm:249
+#: lang.pm:254
 #, c-format
 msgid "Guyana"
 msgstr "ガイアナ"
 
-#: lang.pm:250
+#: lang.pm:255
 #, c-format
 msgid "China (Hong Kong)"
 msgstr "China (Hong Kong)"
 
-#: lang.pm:251
+#: lang.pm:256
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "ハード島とマクドナルド島"
 
-#: lang.pm:252
+#: lang.pm:257
 #, c-format
 msgid "Honduras"
 msgstr "ホンジュラス"
 
-#: lang.pm:253
+#: lang.pm:258
 #, c-format
 msgid "Croatia"
 msgstr "クロアチア"
 
-#: lang.pm:254
+#: lang.pm:259
 #, c-format
 msgid "Haiti"
 msgstr "ハイチ"
 
-#: lang.pm:255 network/adsl_consts.pm:144
+#: lang.pm:260 network/adsl_consts.pm:152
 #, c-format
 msgid "Hungary"
 msgstr "ハンガリー"
 
-#: lang.pm:256
+#: lang.pm:261
 #, c-format
 msgid "Indonesia"
 msgstr "インドネシア"
 
-#: lang.pm:257 standalone/drakxtv:48
+#: lang.pm:262 standalone/drakxtv:48
 #, c-format
 msgid "Ireland"
 msgstr "アイルランド"
 
-#: lang.pm:258
+#: lang.pm:263
 #, c-format
 msgid "Israel"
 msgstr "イスラエル"
 
-#: lang.pm:259
+#: lang.pm:264
 #, c-format
 msgid "India"
 msgstr "インド"
 
-#: lang.pm:260
+#: lang.pm:265
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "インド洋イギリス領"
 
-#: lang.pm:261
+#: lang.pm:266
 #, c-format
 msgid "Iraq"
 msgstr "イラク"
 
-#: lang.pm:262
+#: lang.pm:267
 #, c-format
 msgid "Iran"
 msgstr "イラン"
 
-#: lang.pm:263
+#: lang.pm:268
 #, c-format
 msgid "Iceland"
 msgstr "アイスランド"
 
-#: lang.pm:265
+#: lang.pm:270
 #, c-format
 msgid "Jamaica"
 msgstr "ジャマイカ"
 
-#: lang.pm:266
+#: lang.pm:271
 #, c-format
 msgid "Jordan"
 msgstr "ヨルダン"
 
-#: lang.pm:267
+#: lang.pm:272
 #, c-format
 msgid "Japan"
 msgstr "日本"
 
-#: lang.pm:268
+#: lang.pm:273
 #, c-format
 msgid "Kenya"
 msgstr "ケニア"
 
-#: lang.pm:269
+#: lang.pm:274
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "キルギスタン"
 
-#: lang.pm:270
+#: lang.pm:275
 #, c-format
 msgid "Cambodia"
 msgstr "カンボジア"
 
-#: lang.pm:271
+#: lang.pm:276
 #, c-format
 msgid "Kiribati"
 msgstr "キリバス共和国"
 
-#: lang.pm:272
+#: lang.pm:277
 #, c-format
 msgid "Comoros"
 msgstr "コモロ"
 
-#: lang.pm:273
+#: lang.pm:278
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "セントキッツ島とネビス島"
 
-#: lang.pm:274
+#: lang.pm:279
 #, c-format
 msgid "Korea (North)"
 msgstr "北朝鮮"
 
-#: lang.pm:275
+#: lang.pm:280
 #, c-format
 msgid "Korea"
 msgstr "韓国"
 
-#: lang.pm:276
+#: lang.pm:281
 #, c-format
 msgid "Kuwait"
 msgstr "クウェート"
 
-#: lang.pm:277
+#: lang.pm:282
 #, c-format
 msgid "Cayman Islands"
 msgstr "イギリス領ケイマン諸島 "
 
-#: lang.pm:278
+#: lang.pm:283
 #, c-format
 msgid "Kazakhstan"
 msgstr "カザフスタン"
 
-#: lang.pm:279
+#: lang.pm:284
 #, c-format
 msgid "Laos"
 msgstr "ラオス"
 
-#: lang.pm:280
+#: lang.pm:285
 #, c-format
 msgid "Lebanon"
 msgstr "レバノン"
 
-#: lang.pm:281
+#: lang.pm:286
 #, c-format
 msgid "Saint Lucia"
 msgstr "セントルシア"
 
-#: lang.pm:282
+#: lang.pm:287
 #, c-format
 msgid "Liechtenstein"
 msgstr "リヒテンシュタイン"
 
-#: lang.pm:283
+#: lang.pm:288
 #, c-format
 msgid "Sri Lanka"
 msgstr "スリランカ"
 
-#: lang.pm:284
+#: lang.pm:289
 #, c-format
 msgid "Liberia"
 msgstr "リベリア"
 
-#: lang.pm:285
+#: lang.pm:290
 #, c-format
 msgid "Lesotho"
 msgstr "レソト"
 
-#: lang.pm:286
+#: lang.pm:291
 #, c-format
 msgid "Lithuania"
 msgstr "リトアニア"
 
-#: lang.pm:287
+#: lang.pm:292
 #, c-format
 msgid "Luxembourg"
 msgstr "ルクセンブルグ"
 
-#: lang.pm:288
+#: lang.pm:293
 #, c-format
 msgid "Latvia"
 msgstr "ラトヴィア"
 
-#: lang.pm:289
+#: lang.pm:294
 #, c-format
 msgid "Libya"
 msgstr "リビア"
 
-#: lang.pm:290
+#: lang.pm:295
 #, c-format
 msgid "Morocco"
 msgstr "モロッコ"
 
-#: lang.pm:291
+#: lang.pm:296
 #, c-format
 msgid "Monaco"
 msgstr "モナコ"
 
-#: lang.pm:292
+#: lang.pm:297
 #, c-format
 msgid "Moldova"
 msgstr "モルドバ"
 
-#: lang.pm:293
+#: lang.pm:298
 #, c-format
 msgid "Madagascar"
 msgstr "マダガスカル"
 
-#: lang.pm:294
+#: lang.pm:299
 #, c-format
 msgid "Marshall Islands"
 msgstr "マーシャル諸島"
 
-#: lang.pm:295
+#: lang.pm:300
 #, c-format
 msgid "Macedonia"
 msgstr "マケドニア"
 
-#: lang.pm:296
+#: lang.pm:301
 #, c-format
 msgid "Mali"
 msgstr "マリ"
 
-#: lang.pm:297
+#: lang.pm:302
 #, c-format
 msgid "Myanmar"
 msgstr "ミャンマー"
 
-#: lang.pm:298
+#: lang.pm:303
 #, c-format
 msgid "Mongolia"
 msgstr "モンゴル"
 
-#: lang.pm:299
+#: lang.pm:304
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "北マリアナ諸島"
 
-#: lang.pm:300
+#: lang.pm:305
 #, c-format
 msgid "Martinique"
 msgstr "マルティニク島"
 
-#: lang.pm:301
+#: lang.pm:306
 #, c-format
 msgid "Mauritania"
 msgstr "モーリタニア"
 
-#: lang.pm:302
+#: lang.pm:307
 #, c-format
 msgid "Montserrat"
 msgstr "モンセラート"
 
-#: lang.pm:303
+#: lang.pm:308
 #, c-format
 msgid "Malta"
 msgstr "マルタ"
 
-#: lang.pm:304
+#: lang.pm:309
 #, c-format
 msgid "Mauritius"
 msgstr "モーリシャス"
 
-#: lang.pm:305
+#: lang.pm:310
 #, c-format
 msgid "Maldives"
 msgstr "モルディブ"
 
-#: lang.pm:306
+#: lang.pm:311
 #, c-format
 msgid "Malawi"
 msgstr "マラウイ"
 
-#: lang.pm:307
+#: lang.pm:312
 #, c-format
 msgid "Mexico"
 msgstr "メキシコ"
 
-#: lang.pm:308
+#: lang.pm:313
 #, c-format
 msgid "Malaysia"
 msgstr "マレーシア"
 
-#: lang.pm:309
+#: lang.pm:314
 #, c-format
 msgid "Mozambique"
 msgstr "モザンビーク"
 
-#: lang.pm:310
+#: lang.pm:315
 #, c-format
 msgid "Namibia"
 msgstr "ナミビア"
 
-#: lang.pm:311
+#: lang.pm:316
 #, c-format
 msgid "New Caledonia"
 msgstr "ニューカレドニア"
 
-#: lang.pm:312
+#: lang.pm:317
 #, c-format
 msgid "Niger"
 msgstr "ナイジェリア"
 
-#: lang.pm:313
+#: lang.pm:318
 #, c-format
 msgid "Norfolk Island"
 msgstr "ノーフォーク島"
 
-#: lang.pm:314
+#: lang.pm:319
 #, c-format
 msgid "Nigeria"
 msgstr "ナイジェリア"
 
-#: lang.pm:315
+#: lang.pm:320
 #, c-format
 msgid "Nicaragua"
 msgstr "ニカラグア"
 
-#: lang.pm:318
+#: lang.pm:323
 #, c-format
 msgid "Nepal"
 msgstr "ネパール"
 
-#: lang.pm:319
+#: lang.pm:324
 #, c-format
 msgid "Nauru"
 msgstr "ナウル"
 
-#: lang.pm:320
+#: lang.pm:325
 #, c-format
 msgid "Niue"
 msgstr "ニウエ"
 
-#: lang.pm:321
+#: lang.pm:326
 #, c-format
 msgid "New Zealand"
 msgstr "ニュージーランド"
 
-#: lang.pm:322
+#: lang.pm:327
 #, c-format
 msgid "Oman"
 msgstr "オーメン"
 
-#: lang.pm:323
+#: lang.pm:328
 #, c-format
 msgid "Panama"
 msgstr "パナマ"
 
-#: lang.pm:324
+#: lang.pm:329
 #, c-format
 msgid "Peru"
 msgstr "ペルー"
 
-#: lang.pm:325
+#: lang.pm:330
 #, c-format
 msgid "French Polynesia"
 msgstr "フランス領ポリネシア"
 
-#: lang.pm:326
+#: lang.pm:331
 #, c-format
 msgid "Papua New Guinea"
 msgstr "パプアニューギニア"
 
-#: lang.pm:327
+#: lang.pm:332
 #, c-format
 msgid "Philippines"
 msgstr "フィリピン"
 
-#: lang.pm:328
+#: lang.pm:333
 #, c-format
 msgid "Pakistan"
 msgstr "パキスタン"
 
-#: lang.pm:329 network/adsl_consts.pm:177
+#: lang.pm:334 network/adsl_consts.pm:186
 #, c-format
 msgid "Poland"
 msgstr "ポーランド"
 
-#: lang.pm:330
+#: lang.pm:335
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "セントピエールとミケロン"
 
-#: lang.pm:331
+#: lang.pm:336
 #, c-format
 msgid "Pitcairn"
 msgstr "ピトケアン島"
 
-#: lang.pm:332
+#: lang.pm:337
 #, c-format
 msgid "Puerto Rico"
 msgstr "プエルトリコ"
 
-#: lang.pm:333
+#: lang.pm:338
 #, c-format
 msgid "Palestine"
 msgstr "パレスティナ"
 
-#: lang.pm:334 network/adsl_consts.pm:187
+#: lang.pm:339 network/adsl_consts.pm:196
 #, c-format
 msgid "Portugal"
 msgstr "ポルトガル"
 
-#: lang.pm:335
+#: lang.pm:340
 #, c-format
 msgid "Paraguay"
 msgstr "パラグアイ"
 
-#: lang.pm:336
+#: lang.pm:341
 #, c-format
 msgid "Palau"
 msgstr "パラオ"
 
-#: lang.pm:337
+#: lang.pm:342
 #, c-format
 msgid "Qatar"
 msgstr "カタール"
 
-#: lang.pm:338
+#: lang.pm:343
 #, c-format
 msgid "Reunion"
 msgstr "Reunion"
 
-#: lang.pm:339
+#: lang.pm:344
 #, c-format
 msgid "Romania"
 msgstr "ルーマニア"
 
-#: lang.pm:340
+#: lang.pm:345
 #, c-format
 msgid "Russia"
 msgstr "ロシア"
 
-#: lang.pm:341
+#: lang.pm:346
 #, c-format
 msgid "Rwanda"
 msgstr "ルワンダ"
 
-#: lang.pm:342
+#: lang.pm:347
 #, c-format
 msgid "Saudi Arabia"
 msgstr "サウジアラビア"
 
-#: lang.pm:343
+#: lang.pm:348
 #, c-format
 msgid "Solomon Islands"
 msgstr "ソロモン諸島"
 
-#: lang.pm:344
+#: lang.pm:349
 #, c-format
 msgid "Seychelles"
 msgstr "セーシェル"
 
-#: lang.pm:345
+#: lang.pm:350
 #, c-format
 msgid "Sudan"
 msgstr "スーダン"
 
-#: lang.pm:347
+#: lang.pm:352
 #, c-format
 msgid "Singapore"
 msgstr "シンガポール"
 
-#: lang.pm:348
+#: lang.pm:353
 #, c-format
 msgid "Saint Helena"
 msgstr "セントヘレナ"
 
-#: lang.pm:349
+#: lang.pm:354
 #, c-format
 msgid "Slovenia"
 msgstr "スロベニア"
 
-#: lang.pm:350
+#: lang.pm:355
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "スバルバールとジャンマイエン諸島"
 
-#: lang.pm:351
+#: lang.pm:356
 #, c-format
 msgid "Slovakia"
 msgstr "スロバキア"
 
-#: lang.pm:352
+#: lang.pm:357
 #, c-format
 msgid "Sierra Leone"
 msgstr "シエラレオネ"
 
-#: lang.pm:353
+#: lang.pm:358
 #, c-format
 msgid "San Marino"
 msgstr "サンマリノ"
 
-#: lang.pm:354
+#: lang.pm:359
 #, c-format
 msgid "Senegal"
 msgstr "セネガル"
 
-#: lang.pm:355
+#: lang.pm:360
 #, c-format
 msgid "Somalia"
 msgstr "ソマリア"
 
-#: lang.pm:356
+#: lang.pm:361
 #, c-format
 msgid "Suriname"
 msgstr "スリナム"
 
-#: lang.pm:357
+#: lang.pm:362
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "サントメプリンシペ"
 
-#: lang.pm:358
+#: lang.pm:363
 #, c-format
 msgid "El Salvador"
 msgstr "エルサルバドル"
 
-#: lang.pm:359
+#: lang.pm:364
 #, c-format
 msgid "Syria"
 msgstr "シリア"
 
-#: lang.pm:360
+#: lang.pm:365
 #, c-format
 msgid "Swaziland"
 msgstr "スワジランド"
 
-#: lang.pm:361
+#: lang.pm:366
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "タークス・ケーコス諸島"
 
-#: lang.pm:362
+#: lang.pm:367
 #, c-format
 msgid "Chad"
 msgstr "チャド"
 
-#: lang.pm:363
+#: lang.pm:368
 #, c-format
 msgid "French Southern Territories"
 msgstr "南フランス領"
 
-#: lang.pm:364
+#: lang.pm:369
 #, c-format
 msgid "Togo"
 msgstr "トーゴ"
 
-#: lang.pm:365
+#: lang.pm:370
 #, c-format
 msgid "Thailand"
 msgstr "タイ"
 
-#: lang.pm:366
+#: lang.pm:371
 #, c-format
 msgid "Tajikistan"
 msgstr "タジキスタン"
 
-#: lang.pm:367
+#: lang.pm:372
 #, c-format
 msgid "Tokelau"
 msgstr "トケラウ諸島"
 
-#: lang.pm:368
+#: lang.pm:373
 #, c-format
 msgid "East Timor"
 msgstr "東ティモール"
 
-#: lang.pm:369
+#: lang.pm:374
 #, c-format
 msgid "Turkmenistan"
 msgstr "トルクメニスタン"
 
-#: lang.pm:370
+#: lang.pm:375
 #, c-format
 msgid "Tunisia"
 msgstr "チュニジア"
 
-#: lang.pm:371
+#: lang.pm:376
 #, c-format
 msgid "Tonga"
 msgstr "トンガ"
 
-#: lang.pm:372
+#: lang.pm:377
 #, c-format
 msgid "Turkey"
 msgstr "トルコ"
 
-#: lang.pm:373
+#: lang.pm:378
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "トリニダードトバゴ"
 
-#: lang.pm:374
+#: lang.pm:379
 #, c-format
 msgid "Tuvalu"
 msgstr "ツバル"
 
-#: lang.pm:375
+#: lang.pm:380
 #, c-format
 msgid "Taiwan"
 msgstr "台湾"
 
-#: lang.pm:376
+#: lang.pm:381
 #, c-format
 msgid "Tanzania"
 msgstr "タンザニア"
 
-#: lang.pm:377
+#: lang.pm:382
 #, c-format
 msgid "Ukraine"
 msgstr "ウクライナ"
 
-#: lang.pm:378
+#: lang.pm:383
 #, c-format
 msgid "Uganda"
 msgstr "ウガンダ"
 
-#: lang.pm:379
+#: lang.pm:384
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr "アメリカ辺境諸島"
 
-#: lang.pm:381
+#: lang.pm:386
 #, c-format
 msgid "Uruguay"
 msgstr "ウルグアイ"
 
-#: lang.pm:382
+#: lang.pm:387
 #, c-format
 msgid "Uzbekistan"
 msgstr "ウズベキスタン"
 
-#: lang.pm:383
+#: lang.pm:388
 #, c-format
 msgid "Vatican"
 msgstr "バチカン"
 
-#: lang.pm:384
+#: lang.pm:389
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "セントビンセントグレナディーン"
 
-#: lang.pm:385
+#: lang.pm:390
 #, c-format
 msgid "Venezuela"
 msgstr "ベネズエラ"
 
-#: lang.pm:386
+#: lang.pm:391
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "バージン諸島(イギリス)"
 
-#: lang.pm:387
+#: lang.pm:392
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "バージン諸島(アメリカ)"
 
-#: lang.pm:388
+#: lang.pm:393
 #, c-format
 msgid "Vietnam"
 msgstr "ベトナム"
 
-#: lang.pm:389
+#: lang.pm:394
 #, c-format
 msgid "Vanuatu"
 msgstr "バヌアツ"
 
-#: lang.pm:390
+#: lang.pm:395
 #, c-format
 msgid "Wallis and Futuna"
 msgstr "ワリー・エ・フトゥーナ諸島"
 
-#: lang.pm:391
+#: lang.pm:396
 #, c-format
 msgid "Samoa"
 msgstr "サモア"
 
-#: lang.pm:392
+#: lang.pm:397
 #, c-format
 msgid "Yemen"
 msgstr "イエメン"
 
-#: lang.pm:393
+#: lang.pm:398
 #, c-format
 msgid "Mayotte"
 msgstr "メイヨット"
 
-#: lang.pm:394
+#: lang.pm:399
 #, c-format
 msgid "Serbia & Montenegro"
-msgstr ""
+msgstr "Serbia & Montenegro"
 
-#: lang.pm:395 standalone/drakxtv:50
+#: lang.pm:400 standalone/drakxtv:50
 #, c-format
 msgid "South Africa"
 msgstr "南アフリカ"
 
-#: lang.pm:396
+#: lang.pm:401
 #, c-format
 msgid "Zambia"
 msgstr "ザンビア"
 
-#: lang.pm:397
+#: lang.pm:402
 #, c-format
 msgid "Zimbabwe"
 msgstr "ジンバブエ"
 
-#: lang.pm:966
+#: lang.pm:983
 #, c-format
 msgid "Welcome to %s"
 msgstr "%s へようこそ"
@@ -8811,7 +8880,7 @@ msgstr "巡回マウント %s\n"
 msgid "Remove the logical volumes first\n"
 msgstr "まず論理ボリュームを削除してください。\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:962
+#: modules/interactive.pm:21 standalone/drakconnect:959
 #, c-format
 msgid "Parameters"
 msgstr "パラメータ"
@@ -8984,15 +9053,14 @@ msgstr "一般的なPS/2ホイールマウス"
 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
-#, fuzzy, c-format
+#: 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 "自動的なIP"
+msgstr "自動"
 
 #: mouse.pm:39 mouse.pm:73
 #, c-format
@@ -9125,16 +9193,16 @@ msgid "3 buttons with Wheel emulation"
 msgstr "ホイールエミュレーション付きの３ボタン"
 
 #: mouse.pm:86
-#, fuzzy, c-format
+#, c-format
 msgid "Universal"
-msgstr "アンインストール後の処理"
+msgstr "ユニバーサル"
 
 #: mouse.pm:88
 #, c-format
 msgid "Any PS/2 & USB mice"
-msgstr ""
+msgstr "PS/2 & USB マウス"
 
-#: mouse.pm:92
+#: mouse.pm:92 standalone/drakvpn:1138
 #, c-format
 msgid "none"
 msgstr "なし"
@@ -9194,12 +9262,12 @@ msgstr "Sagem(pppoaを使用)usb"
 msgid "Sagem (using dhcp) usb"
 msgstr "Sagem(dhcpを使用)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 "インターネットに接続"
 
-#: 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"
@@ -9210,10 +9278,10 @@ msgstr ""
 "場合によってはpptpやdhcpを使うこともあります。\n"
 "わからなければ'pppoeを使う'を選んでください。"
 
-#: network/adsl.pm:41 network/netconnect.pm:684
-#, fuzzy, c-format
+#: network/adsl.pm:41 network/netconnect.pm:759
+#, c-format
 msgid "ADSL connection type :"
-msgstr "ADSL接続"
+msgstr "ADSL接続の種類 :"
 
 #: network/drakfirewall.pm:12
 #, c-format
@@ -9275,13 +9343,13 @@ msgstr "ネットワークカードがありません"
 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 ""
 "drakfirewallを設定\n"
 "\n"
-"Mandrake Linuxマシンの個人用ファイアウォール設定を行います。\n"
+"Mandrakelinuxマシンの個人用ファイアウォール設定を行います。\n"
 "強力な専用ファイアウォールをお求めの際は、高度なMandrakeSecurity\n"
 "ファイアウォールディストリビューションをご検討ください。"
 
@@ -9307,15 +9375,15 @@ msgstr "インターネットで接続するサービスを選んでください
 #, 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 ""
 "各種のポートを入力できます。\n"
-"有効な例: 139/tcp 139/udp\n"
+"有効な例: 139/tcp 139/udp 600:610/tcp 600:610/udp\n"
 "詳しくは /etc/services をご覧ください。"
 
 #: network/drakfirewall.pm:176
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Invalid port given: %s.\n"
 "The proper format is \"port/tcp\" or \"port/udp\", \n"
@@ -9323,9 +9391,11 @@ msgid ""
 "\n"
 "You can also give a range of ports (eg: 24300:24350/udp)"
 msgstr ""
-"無効なポートを指定しました: %s\n"
+"無効なポート: %s\n"
 "正しい形式は port/tcp または port/udp で、\n"
-"portは 1 から 65535 までです。"
+"portは 1 から 65535 までです。\n"
+"\n"
+"ポートの範囲を指定することもできます (例: 24300:24350/udp)"
 
 #: network/drakfirewall.pm:186
 #, c-format
@@ -9337,321 +9407,272 @@ msgstr "全て(ファイアウォールなし)"
 msgid "Other ports"
 msgstr "その他のポート"
 
-#: 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
+#: network/isdn.pm:113 network/netconnect.pm:424
 #, c-format
-msgid "ISDN Configuration"
-msgstr "ISDNの設定"
-
-#: network/isdn.pm:127
-#, c-format
-msgid ""
-"Select your provider.\n"
-"If it isn't listed, choose Unlisted."
+msgid "Unlisted - edit manually"
 msgstr ""
-"プロバイダを選んでください。\n"
-"リストにない場合はUnlistedを選んでください。"
-
-#: network/isdn.pm:140 standalone/drakconnect:503
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "ヨーロッパのプロトコル(EDSS1)"
-
-#: network/isdn.pm:140
-#, c-format
-msgid "European protocol"
-msgstr "ヨーロッパのプロトコル"
 
-#: network/isdn.pm:142 standalone/drakconnect:504
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"その他のプロトコル\n"
-"No D-Channel (leased lines)"
-
-#: network/isdn.pm:142
-#, c-format
-msgid "Protocol for the rest of the world"
-msgstr "その他のプロトコル"
-
-#: network/isdn.pm:146
-#, c-format
-msgid "Which protocol do you want to use?"
-msgstr "どのプロトコルを使いますか？"
-
-#: network/isdn.pm:157
-#, c-format
-msgid "Found \"%s\" interface do you want to use it ?"
-msgstr "%s インタフェースが見つかりました。使用しますか?"
-
-#: network/isdn.pm:164
-#, c-format
-msgid "What kind of card do you have?"
-msgstr "お使いのカードは何ですか？"
-
-#: 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 "不明"
+
+#: 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 "不明"
-
-#: 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"
-"ISAカードをお持ちの場合は次の画面の値が適切でしょう。\n"
-"\n"
-"PCMCIAカードをお持ちの場合はカードのirqとioを調べる必要があります。\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 "続ける"
+msgid "Manual"
+msgstr "手動"
 
-#: network/isdn.pm:178
-#, c-format
-msgid "Abort"
-msgstr "中止"
+#: network/netconnect.pm:88 network/netconnect.pm:453
+#: network/netconnect.pm:463 network/netconnect.pm:822
+#: network/netconnect.pm:827
+#, fuzzy, c-format
+msgid "Manual choice"
+msgstr "手動"
 
-#: network/isdn.pm:184
+#: network/netconnect.pm:88
 #, c-format
-msgid "Which of the following is your ISDN card?"
-msgstr "お使いのISDNカードはどれですか？"
+msgid "Internal ISDN card"
+msgstr "内蔵ISDNカード"
 
-#: network/netconnect.pm:95
+#: network/netconnect.pm:97
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: network/netconnect.pm:96
+#: network/netconnect.pm:98
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "言語を選択"
 
-#: network/netconnect.pm:97
-#, fuzzy, c-format
+#: network/netconnect.pm:99
+#, c-format
 msgid "Master"
-msgstr "メイヨット"
+msgstr "マスター"
 
-#: network/netconnect.pm:98
+#: network/netconnect.pm:100
 #, fuzzy, c-format
 msgid "Repeater"
 msgstr "復元"
 
-#: network/netconnect.pm:99
-#, fuzzy, c-format
+#: network/netconnect.pm:101
+#, c-format
 msgid "Secondary"
 msgstr "２次"
 
-#: network/netconnect.pm:100
-#, fuzzy, c-format
+#: network/netconnect.pm:102
+#, c-format
 msgid "Auto"
-msgstr "作者: "
+msgstr "自動"
 
-#: 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 "手動設定"
 
-#: network/netconnect.pm:104
-#, fuzzy, c-format
+#: network/netconnect.pm:106
+#, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
-msgstr "自動的なIP"
+msgstr "IPを自動設定 (BOOTP/DHCP)"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:108
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
-msgstr ""
+msgstr "IPを自動設定 (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:156
-#, fuzzy, c-format
-msgid "Alcatel speedtouch USB modem"
-msgstr "Alcatel speedtouch usb"
+#: network/netconnect.pm:111
+#, c-format
+msgid "Protocol for the rest of the world"
+msgstr "その他のプロトコル"
 
-#: network/netconnect.pm:157
-#, fuzzy, c-format
-msgid "Sagem USB modem"
-msgstr "システムモード"
+#: network/netconnect.pm:113 standalone/drakconnect:528
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "ヨーロッパのプロトコル(EDSS1)"
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:114 standalone/drakconnect:529
 #, c-format
-msgid "Bewan USB modem"
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
 msgstr ""
+"その他のプロトコル\n"
+"No D-Channel (leased lines)"
 
-#: network/netconnect.pm:159
+#: network/netconnect.pm:146
 #, c-format
-msgid "Bewan PCI modem"
-msgstr ""
+msgid "Alcatel speedtouch USB modem"
+msgstr "Alcatel speedtouch USB modem"
 
-#: network/netconnect.pm:160
+#: network/netconnect.pm:147
+#, c-format
+msgid "Sagem USB modem"
+msgstr "Sagem USB modem"
+
+#: network/netconnect.pm:148
+#, c-format
+msgid "Bewan modem"
+msgstr "Bewan modem"
+
+#: network/netconnect.pm:149
 #, c-format
 msgid "ECI Hi-Focus modem"
-msgstr ""
+msgstr "ECI Hi-Focus modem"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:153
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
-msgstr ""
+msgstr "Dynamic Host Configuration Protocol (DHCP)"
 
-#: network/netconnect.pm:165
-#, fuzzy, c-format
+#: network/netconnect.pm:154
+#, c-format
 msgid "Manual TCP/IP configuration"
-msgstr "手動設定"
+msgstr "手動によるTCP/IP設定"
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:155
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
-msgstr ""
+msgstr "Point to Point Tunneling Protocol (PPTP)"
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:156
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
-msgstr ""
+msgstr "PPP over Ethernet (PPPoE)"
 
-#: network/netconnect.pm:168
+#: network/netconnect.pm:157
 #, c-format
 msgid "PPP over ATM (PPPoA)"
-msgstr ""
+msgstr "PPP over ATM (PPPoA)"
 
-#: network/netconnect.pm:172
-#, fuzzy, c-format
+#: network/netconnect.pm:161
+#, c-format
 msgid "Bridged Ethernet LLC"
-msgstr "イーサネットカード"
+msgstr "Bridged Ethernet LLC"
 
-#: network/netconnect.pm:173
-#, fuzzy, c-format
+#: network/netconnect.pm:162
+#, c-format
 msgid "Bridged Ethernet VC"
-msgstr "イーサネットカード"
+msgstr "Bridged Ethernet VC"
 
-#: network/netconnect.pm:174
+#: network/netconnect.pm:163
 #, c-format
 msgid "Routed IP LLC"
-msgstr ""
+msgstr "Routed IP LLC"
 
-#: network/netconnect.pm:175
+#: network/netconnect.pm:164
 #, c-format
 msgid "Routed IP VC"
-msgstr ""
+msgstr "Routed IP VC"
 
-#: network/netconnect.pm:176
+#: network/netconnect.pm:165
 #, c-format
 msgid "PPPOA LLC"
-msgstr ""
+msgstr "PPPOA LLC"
 
-#: network/netconnect.pm:177
+#: network/netconnect.pm:166
 #, c-format
 msgid "PPPOA VC"
-msgstr ""
+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 "スクリプトを使う認証"
 
-#: 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 "ターミナルからの認証"
 
-#: 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
-#, fuzzy, c-format
+#: network/netconnect.pm:174 standalone/drakconnect:466
+#, c-format
 msgid "PAP/CHAP"
-msgstr "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 "ネットワークとインターネット"
 
-#: network/netconnect.pm:205
-#, fuzzy, c-format
+#: network/netconnect.pm:225
+#, c-format
 msgid "(detected on port %s)"
-msgstr "ポート %s で検出しました"
+msgstr "(ポート %s で検出)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:207
-#, fuzzy, c-format
+#: network/netconnect.pm:227
+#, c-format
 msgid "(detected %s)"
-msgstr "%s を検出"
+msgstr "(%s を検出)"
 
-#: network/netconnect.pm:207
-#, fuzzy, c-format
+#: network/netconnect.pm:227
+#, c-format
 msgid "(detected)"
-msgstr "検出しました"
+msgstr "(検出)"
 
-#: network/netconnect.pm:209
-#, fuzzy, c-format
+#: network/netconnect.pm:229
+#, c-format
 msgid "Modem connection"
-msgstr "Winmodem接続"
+msgstr "モデム接続"
 
-#: network/netconnect.pm:210
+#: network/netconnect.pm:230
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN接続"
 
-#: network/netconnect.pm:211
+#: network/netconnect.pm:231
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL接続"
 
-#: network/netconnect.pm:212
+#: network/netconnect.pm:232
 #, c-format
 msgid "Cable connection"
 msgstr "ケーブル接続"
 
-#: network/netconnect.pm:213
+#: network/netconnect.pm:233
 #, c-format
 msgid "LAN connection"
 msgstr "LAN接続"
 
-#: network/netconnect.pm:214 network/netconnect.pm:228
-#, fuzzy, c-format
+#: network/netconnect.pm:234 network/netconnect.pm:248
+#, c-format
 msgid "Wireless connection"
-msgstr "ケーブル接続"
+msgstr "ワイヤレス接続"
 
-#: network/netconnect.pm:224
+#: network/netconnect.pm:244
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "設定する接続を選んでください"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:261
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -9664,138 +9685,191 @@ msgstr ""
 "\n"
 "\"%s\" を押すと続けます。"
 
-#: network/netconnect.pm:249 network/netconnect.pm:710
+#: network/netconnect.pm:269 network/netconnect.pm:781
 #, c-format
 msgid "Connection Configuration"
 msgstr "接続の設定"
 
-#: 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 "下記の項目を埋めるかチェックしてください"
 
-#: network/netconnect.pm:256 standalone/drakconnect:494
-#: standalone/drakconnect:899
+#: network/netconnect.pm:277 standalone/drakconnect:519
 #, c-format
 msgid "Card IRQ"
 msgstr "カード 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 "カード mem(DMA)"
 
-#: network/netconnect.pm:258 standalone/drakconnect:496
-#: standalone/drakconnect:901
+#: network/netconnect.pm:279 standalone/drakconnect:521
 #, c-format
 msgid "Card IO"
 msgstr "カード 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 "カード IO_0"
 
-#: network/netconnect.pm:260 standalone/drakconnect:903
+#: network/netconnect.pm:281
 #, c-format
 msgid "Card IO_1"
 msgstr "カード IO_1"
 
-#: network/netconnect.pm:261 standalone/drakconnect:904
+#: network/netconnect.pm:282
 #, c-format
 msgid "Your personal phone number"
 msgstr "あなたの電話番号"
 
-#: 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 "プロバイダの名前(例: provider.net)"
 
-#: network/netconnect.pm:263 standalone/drakconnect:440
-#: standalone/drakconnect:906
+#: network/netconnect.pm:284 standalone/drakconnect:463
 #, c-format
 msgid "Provider phone number"
 msgstr "プロバイダの電話番号"
 
-#: network/netconnect.pm:264
-#, fuzzy, c-format
+#: network/netconnect.pm:285
+#, c-format
 msgid "Provider DNS 1 (optional)"
-msgstr "プロバイダのdns 1(オプション)"
+msgstr "プロバイダのDNS 1(オプション)"
 
-#: network/netconnect.pm:265
-#, fuzzy, c-format
+#: network/netconnect.pm:286
+#, c-format
 msgid "Provider DNS 2 (optional)"
-msgstr "プロバイダのdns 2(オプション)"
+msgstr "プロバイダのDNS 2(オプション)"
 
-#: 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 "ダイアルモード"
 
-#: 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 "接続の速度"
 
-#: 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 "接続のタイムアウト(秒)"
 
-#: 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 "アカウントのログイン(ユーザ名)"
 
-#: 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 "アカウントのパスワード"
 
-#: 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 "お使いのISDN接続を選んでください。"
+msgid "Select the network interface to configure:"
+msgstr "設定するネットワークインタフェースを選択:"
 
-#: 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 "内蔵ISDNカード"
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "2.4以上のカーネルのみをサポートしています。"
+
+#: 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 "ネットデバイス"
 
-#: network/netconnect.pm:301
+#: network/netconnect.pm:326 network/netconnect.pm:334
 #, c-format
 msgid "External ISDN modem"
 msgstr "外付ISDNモデム"
 
-#: network/netconnect.pm:332
+#: network/netconnect.pm:365 standalone/harddrake2:115
+#, c-format
+msgid "Select a device !"
+msgstr "デバイスを選んでください"
+
+#: network/netconnect.pm:374 network/netconnect.pm:384
+#: network/netconnect.pm:394 network/netconnect.pm:410
+#: network/netconnect.pm:421
 #, c-format
-msgid "Do you want to start a new configuration ?"
-msgstr "新しい設定を開始しますか？"
+msgid "ISDN Configuration"
+msgstr "ISDNの設定"
 
-#: network/netconnect.pm:335
+#: network/netconnect.pm:375
+#, c-format
+msgid "What kind of card do you have?"
+msgstr "お使いのカードは何ですか？"
+
+#: network/netconnect.pm:385
 #, 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."
+"\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 ""
-"ISDNカードを検出しましたが、種類が分かりません。次の画面からPCIカードを\n"
-"選んでください。"
+"\n"
+"ISAカードをお持ちの場合は次の画面の値が適切でしょう。\n"
+"\n"
+"PCMCIAカードをお持ちの場合はカードのirqとioを調べる必要があります。\n"
+
+#: network/netconnect.pm:389
+#, c-format
+msgid "Continue"
+msgstr "続ける"
+
+#: network/netconnect.pm:389
+#, c-format
+msgid "Abort"
+msgstr "中止"
+
+#: network/netconnect.pm:395
+#, c-format
+msgid "Which of the following is your ISDN card?"
+msgstr "お使いのISDNカードはどれですか？"
+
+#: network/netconnect.pm:410
+#, c-format
+msgid "Which protocol do you want to use?"
+msgstr "どのプロトコルを使いますか？"
 
-#: network/netconnect.pm:344
+#: network/netconnect.pm:412 standalone/drakconnect:116
+#: standalone/drakconnect:527 standalone/drakvpn:1140
 #, c-format
-msgid "No ISDN PCI card found. Please select one on the next screen."
-msgstr "ISDN PCIカードは見つかりませんでした。下記の中から選んでください"
+msgid "Protocol"
+msgstr "プロトコル"
 
-#: network/netconnect.pm:353
+#: network/netconnect.pm:421
+#, c-format
+msgid ""
+"Select your provider.\n"
+"If it isn't listed, choose Unlisted."
+msgstr ""
+"プロバイダを選んでください。\n"
+"リストにない場合はUnlistedを選んでください。"
+
+#: network/netconnect.pm:423 network/netconnect.pm:529
+#: network/netconnect.pm:675
+#, c-format
+msgid "Provider:"
+msgstr "プロバイダ:"
+
+#: network/netconnect.pm:438
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -9804,140 +9878,117 @@ msgstr ""
 "このモデムはサポートしていません。\n"
 "http://www.linmodems.org をご覧ください"
 
-#: network/netconnect.pm:364
-#, fuzzy, c-format
+#: network/netconnect.pm:450
+#, c-format
 msgid "Select the modem to configure:"
-msgstr "ネットワークインタフェースを選択"
+msgstr "設定するモデムを選択:"
 
-#: network/netconnect.pm:403
+#: network/netconnect.pm:498
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "モデムを接続しているシリアルポートを選んでください。"
 
-#: network/netconnect.pm:427
-#, fuzzy, c-format
+#: network/netconnect.pm:527
+#, c-format
 msgid "Select your provider:"
-msgstr "プリンタのスプーラを選んでください"
+msgstr "プロバイダを選択:"
 
-#: network/netconnect.pm:429 network/netconnect.pm:599
-#, fuzzy, c-format
-msgid "Provider:"
-msgstr "プロファイル: "
-
-#: network/netconnect.pm:481 network/netconnect.pm:482
-#: network/netconnect.pm:483 network/netconnect.pm:508
-#: network/netconnect.pm:525 network/netconnect.pm:541
-#, fuzzy, c-format
-msgid "Manual"
-msgstr "手動"
-
-#: network/netconnect.pm:485
-#, fuzzy, c-format
+#: network/netconnect.pm:556
+#, c-format
 msgid "Dialup: account options"
-msgstr "ダイアルアップのオプション"
+msgstr "ダイアルアップ: アカウントのオプション"
 
-#: network/netconnect.pm:488 standalone/drakconnect:913
+#: network/netconnect.pm:559
 #, c-format
 msgid "Connection name"
 msgstr "接続名"
 
-#: network/netconnect.pm:489 standalone/drakconnect:914
+#: network/netconnect.pm:560
 #, c-format
 msgid "Phone number"
 msgstr "電話番号"
 
-#: network/netconnect.pm:490 standalone/drakconnect:915
+#: network/netconnect.pm:561
 #, c-format
 msgid "Login ID"
 msgstr "ログインID"
 
-#: network/netconnect.pm:505 network/netconnect.pm:538
-#, fuzzy, c-format
+#: network/netconnect.pm:576 network/netconnect.pm:609
+#, c-format
 msgid "Dialup: IP parameters"
-msgstr "パラメータ"
+msgstr "ダイアルアップ: IPパラメータ"
 
-#: network/netconnect.pm:508
-#, fuzzy, c-format
+#: network/netconnect.pm:579
+#, c-format
 msgid "IP parameters"
-msgstr "パラメータ"
+msgstr "IPパラメータ"
 
-#: 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アドレス"
 
-#: network/netconnect.pm:510
-#, fuzzy, c-format
+#: network/netconnect.pm:581
+#, c-format
 msgid "Subnet mask"
-msgstr "サブネットマスク:"
+msgstr "サブネットマスク"
 
-#: network/netconnect.pm:522
+#: network/netconnect.pm:593
 #, c-format
 msgid "Dialup: DNS parameters"
-msgstr ""
+msgstr "ダイアルアップ: DNSパラメータ"
 
-#: network/netconnect.pm:525
-#, fuzzy, c-format
+#: network/netconnect.pm:596
+#, c-format
 msgid "DNS"
-msgstr "NIS"
+msgstr "DNS"
 
-#: network/netconnect.pm:526 standalone/drakconnect:918
+#: network/netconnect.pm:597
 #, c-format
 msgid "Domain name"
 msgstr "ドメイン名"
 
-#: 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 "DNSサーバ(オプション)"
 
-#: 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 "セカンドDNSサーバ(オプション)"
 
-#: network/netconnect.pm:529
-#, fuzzy, c-format
+#: network/netconnect.pm:600
+#, c-format
 msgid "Set hostname from IP"
-msgstr "プリンタホスト名かIP"
+msgstr "IPからホスト名を設定"
 
-#: network/netconnect.pm:541 standalone/drakconnect:317
-#: standalone/drakconnect:912
+#: network/netconnect.pm:612 standalone/drakconnect:336
 #, c-format
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
-#: network/netconnect.pm:542
-#, fuzzy, c-format
+#: network/netconnect.pm:613
+#, c-format
 msgid "Gateway IP address"
-msgstr "IPアドレス"
+msgstr "Gateway IPアドレス"
 
-#: network/netconnect.pm:567
-#, fuzzy, c-format
+#: network/netconnect.pm:637
+#, c-format
 msgid "ADSL configuration"
-msgstr "LANの設定"
+msgstr "ADSLの設定"
 
-#: network/netconnect.pm:567 network/netconnect.pm:746
-#, fuzzy, c-format
-msgid "Select the network interface to configure:"
-msgstr "ネットワークインタフェースを選択"
-
-#: network/netconnect.pm:568 network/netconnect.pm:748 network/shorewall.pm:77
-#: standalone/drakconnect:602 standalone/drakgw:218 standalone/drakvpn:217
+#: network/netconnect.pm:673
 #, c-format
-msgid "Net Device"
-msgstr "ネットデバイス"
-
-#: network/netconnect.pm:597
-#, fuzzy, c-format
 msgid "Please choose your ADSL provider"
-msgstr "使用する国名を選択してください。"
+msgstr "ADSLプロバイダを選んでください"
 
-#: network/netconnect.pm:616
+#: network/netconnect.pm:691
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -9948,32 +9999,32 @@ msgstr ""
 "フロッピー/Windows経由で導入するか、スキップして\n"
 "後で行ってください。"
 
-#: network/netconnect.pm:620 network/netconnect.pm:625
+#: network/netconnect.pm:695 network/netconnect.pm:700
 #, c-format
 msgid "Use a floppy"
 msgstr "フロッピーを使う"
 
-#: network/netconnect.pm:620 network/netconnect.pm:629
+#: network/netconnect.pm:695 network/netconnect.pm:704
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Windowsのパーティションを使う"
 
-#: network/netconnect.pm:620 network/netconnect.pm:633
+#: network/netconnect.pm:695 network/netconnect.pm:708
 #, c-format
 msgid "Do it later"
 msgstr "後で行う"
 
-#: network/netconnect.pm:640
+#: network/netconnect.pm:715
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr "ファームウェアのコピーに失敗。ファイル %s がありません"
 
-#: network/netconnect.pm:647
+#: network/netconnect.pm:722
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "ファームウェアのコピーが完了"
 
-#: network/netconnect.pm:662
+#: network/netconnect.pm:737
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -9986,22 +10037,22 @@ msgstr ""
 "からダウンロードして、\n"
 "mgmt.o を /usr/share/speedtouch にコピーしてください。"
 
-#: network/netconnect.pm:719
+#: network/netconnect.pm:790
 #, c-format
 msgid "Virtual Path ID (VPI):"
-msgstr ""
+msgstr "Virtual Path ID (VPI):"
 
-#: network/netconnect.pm:720
+#: network/netconnect.pm:791
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
-msgstr ""
+msgstr "Virtual Circuit ID (VCI):"
 
-#: network/netconnect.pm:721
-#, fuzzy, c-format
+#: network/netconnect.pm:793
+#, c-format
 msgid "Encapsulation :"
-msgstr "暗号キー"
+msgstr "カプセル化 :"
 
-#: network/netconnect.pm:736
+#: network/netconnect.pm:810
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10010,17 +10061,7 @@ msgid ""
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
 
-#: network/netconnect.pm:753
-#, fuzzy, c-format
-msgid "No wireless network adapter on your system!"
-msgstr "ネットワークアダプタがありません"
-
-#: network/netconnect.pm:754 standalone/drakgw:240 standalone/drakpxe:137
-#, c-format
-msgid "No network adapter on your system!"
-msgstr "ネットワークアダプタがありません"
-
-#: network/netconnect.pm:766
+#: network/netconnect.pm:837
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
@@ -10032,24 +10073,35 @@ msgstr ""
 "OKを押すとこのデバイスの設定を維持します。\n"
 "以下の項目を変更すると設定を上書きします。"
 
-#: network/netconnect.pm:784
-#, fuzzy, c-format
+#: network/netconnect.pm:850 network/netconnect.pm:1222
+#, c-format
+msgid ""
+"Congratulations, the network and Internet configuration is finished.\n"
+"\n"
+msgstr ""
+"おめでとうございます。ネットワークと\n"
+"インターネットを設定しました。\n"
+"\n"
+
+#: network/netconnect.pm:864
+#, c-format
 msgid "Zeroconf hostname resolution"
-msgstr "Zeroconfホスト名"
+msgstr "Zeroconfホスト名の決定"
 
-#: network/netconnect.pm:785 network/netconnect.pm:816
-#, fuzzy, c-format
+#: network/netconnect.pm:865 network/netconnect.pm:899
+#, c-format
 msgid "Configuring network device %s (driver %s)"
-msgstr "ネットワークデバイス %s を設定"
+msgstr "ネットワークデバイス %s を設定 (ドライバ %s)"
 
-#: network/netconnect.pm:786
+#: network/netconnect.pm:866
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
 "Please choose the one you want to use"
 msgstr ""
+"以下のプロトコルをethernet接続で使います。使用するものを１つ選んでください"
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:900
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10060,89 +10112,89 @@ msgstr ""
 "それぞれの項目にはドットで区切られた数字(例: 1.2.3.4)が\n"
 "IPアドレスとして入ります。"
 
-#: network/netconnect.pm:824
+#: network/netconnect.pm:907
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "DHCPアドレスからホスト名を割り当てる"
 
-#: network/netconnect.pm:825
+#: network/netconnect.pm:908
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCPホスト名"
 
-#: 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 "ネットマスク"
 
-#: 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 "ネットワークカードのIDを追跡(ラップトップで役に立つ)"
 
-#: network/netconnect.pm:833 standalone/drakconnect:390
+#: network/netconnect.pm:916 standalone/drakconnect:413
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Network Hotplugging"
 
-#: network/netconnect.pm:834 standalone/drakconnect:384
+#: network/netconnect.pm:917 standalone/drakconnect:407
 #, c-format
 msgid "Start at boot"
 msgstr "起動時に開始"
 
-#: network/netconnect.pm:836 standalone/drakconnect:768
+#: network/netconnect.pm:919 standalone/drakconnect:810
 #, c-format
 msgid "DHCP client"
 msgstr "DHCPクライアント"
 
-#: 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アドレスは 1.2.3.4 のように入力してください"
 
-#: network/netconnect.pm:849
+#: network/netconnect.pm:932
 #, c-format
 msgid "Warning : IP address %s is usually reserved !"
 msgstr "警告: IPアドレス %s はたいてい保留されています"
 
-#: network/netconnect.pm:879 network/netconnect.pm:908
-#, fuzzy, c-format
+#: network/netconnect.pm:962 network/netconnect.pm:991
+#, c-format
 msgid "Please enter the wireless parameters for this card:"
-msgstr "ホスト名かIPを入力してください。"
+msgstr "このカードのワイヤレスパラメータを入力してください:"
 
-#: network/netconnect.pm:882 standalone/drakconnect:355
-#, fuzzy, c-format
+#: network/netconnect.pm:965 standalone/drakconnect:378
+#, c-format
 msgid "Operating Mode"
-msgstr "エキスパートモード"
+msgstr "操作モード"
 
-#: network/netconnect.pm:884 standalone/drakconnect:356
+#: network/netconnect.pm:967 standalone/drakconnect:379
 #, c-format
 msgid "Network name (ESSID)"
-msgstr ""
+msgstr "ネットワーク名 (ESSID)"
 
-#: network/netconnect.pm:885 standalone/drakconnect:357
-#, fuzzy, c-format
+#: network/netconnect.pm:968 standalone/drakconnect:380
+#, c-format
 msgid "Network ID"
-msgstr "ネットワーク"
+msgstr "ネットワーク ID"
 
-#: network/netconnect.pm:886 standalone/drakconnect:358
+#: network/netconnect.pm:969 standalone/drakconnect:381
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: network/netconnect.pm:887 standalone/drakconnect:359
+#: network/netconnect.pm:970 standalone/drakconnect:382
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: network/netconnect.pm:888 standalone/drakconnect:360
+#: network/netconnect.pm:971 standalone/drakconnect:383
 #, c-format
 msgid "Bitrate (in b/s)"
-msgstr ""
+msgstr "ビットレート(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 "
@@ -10151,7 +10203,7 @@ msgstr ""
 "単位は k, M, G で入力してください(2.46 GHzの場合は 2.46G)。\n"
 "もしくは0(ゼロ)で桁を増やしてください。"
 
-#: 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 "
@@ -10160,12 +10212,12 @@ msgstr ""
 "単位は k, M, G で入力してください(例: 11M)。\n"
 "もしくは0(ゼロ)で桁を増やしてください。"
 
-#: network/netconnect.pm:911 standalone/drakconnect:371
+#: network/netconnect.pm:994 standalone/drakconnect:394
 #, c-format
 msgid "RTS/CTS"
-msgstr ""
+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 "
@@ -10179,17 +10231,17 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:919 standalone/drakconnect:372
+#: network/netconnect.pm:1002 standalone/drakconnect:395
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "ゲームステーション"
 
-#: network/netconnect.pm:920 standalone/drakconnect:373
+#: network/netconnect.pm:1003 standalone/drakconnect:396
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:921
+#: network/netconnect.pm:1004
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -10200,12 +10252,12 @@ msgid ""
 msgstr ""
 
 #. -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 ""
 
-#: 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"
@@ -10217,12 +10269,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:937 standalone/drakconnect:375
+#: network/netconnect.pm:1020 standalone/drakconnect:398
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:938
+#: network/netconnect.pm:1021
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10240,7 +10292,7 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:965
+#: network/netconnect.pm:1048
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system.\n"
@@ -10249,18 +10301,18 @@ msgstr ""
 "システムにイーサネットアダプタがありません。この種類の\n"
 "接続を設定することができません。"
 
-#: 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 "ネットワークインタフェースを選択"
 
-#: 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 "インターネット接続に使うネットワークアダプタを選んでください"
 
-#: network/netconnect.pm:991
+#: network/netconnect.pm:1074
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10272,84 +10324,84 @@ msgstr ""
 "ホスト名は“mybox.mylab.myco.com”のようにしてください。\n"
 "ゲートウェイのIPアドレスがあれば、それも入力してください。"
 
-#: 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 ""
 
-#: network/netconnect.pm:997
-#, fuzzy, c-format
+#: network/netconnect.pm:1080 standalone/drakconnect:923
+#, c-format
 msgid "Host name (optional)"
-msgstr "DNSサーバ(オプション)"
+msgstr "ホスト名 (オプション)"
 
-#: network/netconnect.pm:997
+#: network/netconnect.pm:1080
 #, c-format
 msgid "Host name"
 msgstr "ホスト名:"
 
-#: network/netconnect.pm:998
-#, fuzzy, c-format
+#: network/netconnect.pm:1082
+#, c-format
 msgid "DNS server 1"
-msgstr "DNSサーバ"
+msgstr "DNSサーバ 1"
 
-#: network/netconnect.pm:999
-#, fuzzy, c-format
+#: network/netconnect.pm:1083
+#, c-format
 msgid "DNS server 2"
-msgstr "DNSサーバ"
+msgstr "DNSサーバ 2"
 
-#: network/netconnect.pm:1000
-#, fuzzy, c-format
+#: network/netconnect.pm:1084
+#, c-format
 msgid "DNS server 3"
-msgstr "DNSサーバ"
+msgstr "DNSサーバ 3"
 
-#: network/netconnect.pm:1001
-#, fuzzy, c-format
+#: network/netconnect.pm:1085
+#, c-format
 msgid "Search domain"
-msgstr "NISドメイン"
+msgstr "検索ドメイン"
 
-#: 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 ""
 
-#: network/netconnect.pm:1003
+#: network/netconnect.pm:1087
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "ゲートウェイ(例 %s)"
 
-#: network/netconnect.pm:1005
+#: network/netconnect.pm:1089
 #, c-format
 msgid "Gateway device"
 msgstr "ゲートウェイデバイス"
 
-#: network/netconnect.pm:1014
+#: network/netconnect.pm:1098
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNSサーバのアドレスは 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 "Gatewayアドレスは 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 "
 "back to other machines on the network:"
 msgstr ""
 
-#: network/netconnect.pm:1031
+#: network/netconnect.pm:1115
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconfホスト名"
 
-#: network/netconnect.pm:1034
+#: network/netconnect.pm:1118
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconfホスト名は以下を含んではいけません:"
 
-#: network/netconnect.pm:1044
+#: network/netconnect.pm:1128
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10360,32 +10412,32 @@ msgstr ""
 "どれを使うか選んでください。\n"
 "\n"
 
-#: network/netconnect.pm:1046
+#: network/netconnect.pm:1130
 #, c-format
 msgid "Internet connection"
 msgstr "インターネット接続"
 
-#: network/netconnect.pm:1054
+#: network/netconnect.pm:1144
 #, c-format
 msgid "Configuration is complete, do you want to apply settings ?"
 msgstr "設定が完了しました。適用しますか？"
 
-#: network/netconnect.pm:1070
+#: network/netconnect.pm:1154
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "起動時に接続を開始しますか？"
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1166
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it ?"
 msgstr "ネットワークの再起動が必要です。再起動しますか？"
 
-#: network/netconnect.pm:1100 network/netconnect.pm:1165
+#: network/netconnect.pm:1173 network/netconnect.pm:1238
 #, c-format
 msgid "Network Configuration"
 msgstr "ネットワークを設定"
 
-#: network/netconnect.pm:1101
+#: network/netconnect.pm:1174
 #, c-format
 msgid ""
 "A problem occured while restarting the network: \n"
@@ -10396,27 +10448,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 "今インターネットに接続しますか？"
 
-#: network/netconnect.pm:1118 standalone/drakconnect:958
+#: network/netconnect.pm:1190 standalone/drakconnect:955
 #, c-format
 msgid "Testing your connection..."
 msgstr "接続をテストしています.."
 
-#: network/netconnect.pm:1134
+#: network/netconnect.pm:1206
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "システムはインターネットに接続しました。"
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1207
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "セキュリティ上の理由で、接続を切ります。"
 
-#: network/netconnect.pm:1136
+#: network/netconnect.pm:1208
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -10425,17 +10477,7 @@ msgstr ""
 "このシステムはインターネットにつながっていないようです。\n"
 "接続を再設定してください。"
 
-#: network/netconnect.pm:1150
-#, c-format
-msgid ""
-"Congratulations, the network and Internet configuration is finished.\n"
-"\n"
-msgstr ""
-"おめでとうございます。ネットワークと\n"
-"インターネットを設定しました。\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 "
@@ -10444,7 +10486,7 @@ msgstr ""
 "設定が完了したらXウィンドウを再起動して、\n"
 "ホスト名に関する問題を回避してください。"
 
-#: network/netconnect.pm:1154
+#: network/netconnect.pm:1226
 #, c-format
 msgid ""
 "Problems occured during configuration.\n"
@@ -10455,7 +10497,7 @@ msgstr ""
 "net_monitor か mccで接続を調べてください。接続できていない場合は\n"
 "再設定してください。"
 
-#: network/netconnect.pm:1166
+#: network/netconnect.pm:1239
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10467,37 +10509,46 @@ msgstr ""
 "いまの設定をそのまま使うには OK をクリックしてください。ネットワーク/\n"
 "インターネットを再設定するにはキャンセルを押します。\n"
 
-#: network/network.pm:314
+#: network/netconnect.pm:1327
+#, c-format
+msgid ""
+"An unexpected error has happened:\n"
+"%s"
+msgstr ""
+"予期せぬエラーが発生しました:\n"
+"%s"
+
+#: network/network.pm:315
 #, c-format
 msgid "Proxies configuration"
 msgstr "プロクシを設定"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTPプロクシ"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "FTP proxy"
 msgstr "FTPプロクシ"
 
-#: network/network.pm:319
+#: network/network.pm:320
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "プロクシは http://.. で始まります"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URLは ftp: か http: で始まります"
 
-#: network/shorewall.pm:26
+#: network/shorewall.pm:28
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "ファイアウォールの設定を検出しました"
 
-#: network/shorewall.pm:27
+#: network/shorewall.pm:29
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
@@ -10506,31 +10557,29 @@ msgstr ""
 "警告: 既存のファイアウォールの設定を検出しました。\n"
 "インストール後に手動で修正する必要があるかもしれません。"
 
-#: 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 ""
-"ネット接続のインタフェースを入力してくださ"
-"い。                                          \n"
-"                \n"
+"インターネットに接続しているインタフェースの名前を入力してください。\n"
+"\n"
 "例:\n"
-"                ppp+(モデム/DSL接続の場合)\n"
-"                eth0, eth1(ケーブル接続の場合)\n"
-"                ippp+(ISDN接続の場合)\n"
+"\t\tppp+(モデム/DSL接続の場合)\n"
+"\t\teth0, eth1(ケーブル接続の場合)\n"
+"\t\tippp+(ISDN接続の場合)\n"
 
-#: network/tools.pm:207
+#: network/tools.pm:205
 #, c-format
 msgid "Insert floppy"
 msgstr "フロッピーを挿入"
 
-#: 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 "
@@ -10539,22 +10588,22 @@ msgstr ""
 "FAT形式のフロッピーをドライブ %s に挿入(with %s in root directory)\n"
 "して、%s を押す"
 
-#: network/tools.pm:209
+#: network/tools.pm:207
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "フロッピーアクセスエラー。デバイス %s をマウントできません"
 
-#: partition_table.pm:642
+#: partition_table.pm:644
 #, c-format
 msgid "mount failed: "
 msgstr "マウントに失敗: "
 
-#: partition_table.pm:747
+#: partition_table.pm:749
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "このプラットフォームでは拡張パーティションをサポートしていません"
 
-#: 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"
@@ -10565,22 +10614,22 @@ msgstr ""
 "The only solution is to move your primary partitions to have the hole next "
 "to the extended partitions."
 
-#: partition_table.pm:852
+#: partition_table.pm:854
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "ファイル %s からの復元は失敗しました: %s"
 
-#: partition_table.pm:854
+#: partition_table.pm:856
 #, c-format
 msgid "Bad backup file"
 msgstr "不正なバックアップファイル"
 
-#: partition_table.pm:874
+#: partition_table.pm:876
 #, c-format
 msgid "Error writing to file %s"
 msgstr "ファイル %s に書き込み中にエラー"
 
-#: partition_table/raw.pm:181
+#: partition_table/raw.pm:187
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -10617,70 +10666,70 @@ msgstr "秀"
 msgid "maybe"
 msgstr "可"
 
-#: printer/cups.pm:87
+#: printer/cups.pm:103
 #, c-format
 msgid "(on %s)"
 msgstr "(%s で)"
 
-#: printer/cups.pm:87
+#: printer/cups.pm:103
 #, c-format
 msgid "(on this machine)"
 msgstr "(このマシンで)"
 
-#: printer/cups.pm:99 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:197
 #, c-format
 msgid "Configured on other machines"
 msgstr "設定済み(他のマシン)"
 
-#: printer/cups.pm:101
+#: printer/cups.pm:117
 #, c-format
 msgid "On CUPS server \"%s\""
 msgstr "CUPSサーバ %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 " (デフォルト)"
 
-#: printer/data.pm:21
+#: printer/data.pm:22
 #, c-format
 msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - Print, Don't Queue(キューなしで印刷)"
 
-#: 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 "LPD - ラインプリンタデーモン"
 
-#: 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 New Generation"
 
-#: 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 - Common Unix Printing System(共通Unix印刷システム)"
 
 #: 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 "Unknown Model"
@@ -10700,7 +10749,7 @@ msgstr "リモートプリンタ"
 msgid "Printer on remote CUPS server"
 msgstr "リモートCUPSサーバのプリンタ"
 
-#: 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 "Printer on remote lpd server"
@@ -10720,7 +10769,7 @@ msgstr "Printer on SMB/Windows 95/98/NT server"
 msgid "Printer on NetWare server"
 msgstr "NetWareサーバのプリンタ"
 
-#: 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 "Enter a printer device URI"
@@ -10731,8 +10780,8 @@ msgid "Pipe job into a command"
 msgstr "Pipe job into a command"
 
 #: 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 "Unknown model"
@@ -10742,12 +10791,12 @@ msgstr "Unknown model"
 msgid "Configured on this machine"
 msgstr "設定済み(このマシン)"
 
-#: printer/main.pm:337 printer/printerdrake.pm:948
+#: printer/main.pm:337 printer/printerdrake.pm:963
 #, c-format
 msgid " on parallel port #%s"
 msgstr " on parallel port #%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"
@@ -10818,8 +10867,8 @@ msgstr ", using command %s"
 msgid "Parallel port #%s"
 msgstr "パラレルポート #%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プリンタ #%s"
@@ -10890,8 +10939,8 @@ msgstr "コマンド %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 "Rawプリンタ(ドライバなし)"
@@ -10949,7 +10998,7 @@ msgstr "CUPSプリンタの設定"
 #, 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 "リモートマシンからのプリンタアクセスを設定します。"
 
 #: printer/printerdrake.pm:64
@@ -10981,8 +11030,8 @@ msgstr "ホスト/ネットワークでのプリンタ共有: "
 msgid "Custom configuration"
 msgstr "カスタム設定"
 
-#: 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 "リモートマシンがありません"
@@ -11186,7 +11235,7 @@ msgstr "IPサーバがありません"
 msgid "The entered IP is not correct.\n"
 msgstr "入力したIPは正しくありません\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 "ポート番号は整数です"
@@ -11196,36 +11245,37 @@ msgstr "ポート番号は整数です"
 msgid "This server is already in the list, it cannot be added again.\n"
 msgstr "このサーバは既にリストにあります。重複することはできません。\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 "ポート"
 
 #: 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"
@@ -11256,17 +11306,21 @@ msgstr ""
 "リモートCUPSサーバのプリンタをここで設定する必要はありません。\n"
 "それらのプリンタは自動的に検出します。"
 
-#: 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"
+"警告: ローカルネットワーク接続が無効です。リモートプリンタを検出していません"
+"しテストもしていません"
 
 #: printer/printerdrake.pm:515
-#, c-format
-msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
+#, fuzzy, c-format
+msgid ""
+"Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
 msgstr "プリンタを自動的に検出(ローカル,TCP/Socket,SMBプリンタ)"
 
 #: printer/printerdrake.pm:545
@@ -11274,17 +11328,17 @@ msgstr "プリンタを自動的に検出(ローカル,TCP/Socket,SMBプリン
 msgid "Checking your system..."
 msgstr "システムを調査中.."
 
-#: printer/printerdrake.pm:560
+#: printer/printerdrake.pm:561
 #, c-format
 msgid "and one unknown printer"
 msgstr "と 1 台の不明なプリンタが"
 
-#: printer/printerdrake.pm:562
+#: printer/printerdrake.pm:563
 #, c-format
 msgid "and %d unknown printers"
 msgstr "と %d 台の不明なプリンタが"
 
-#: printer/printerdrake.pm:566
+#: printer/printerdrake.pm:567
 #, c-format
 msgid ""
 "The following printers\n"
@@ -11297,7 +11351,7 @@ msgstr ""
 "%s%s\n"
 "はシステムに直接接続しています"
 
-#: printer/printerdrake.pm:568
+#: printer/printerdrake.pm:569
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11310,7 +11364,7 @@ msgstr ""
 "%s%s\n"
 "はシステムに直接接続しています"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:570
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11323,7 +11377,7 @@ msgstr ""
 "%s%s\n"
 "はシステムに直接接続しています"
 
-#: printer/printerdrake.pm:573
+#: printer/printerdrake.pm:574
 #, c-format
 msgid ""
 "\n"
@@ -11332,7 +11386,7 @@ msgstr ""
 "\n"
 "１台の不明なプリンタをマシンに接続しています"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:575
 #, c-format
 msgid ""
 "\n"
@@ -11341,42 +11395,42 @@ msgstr ""
 "\n"
 "%d 台の不明なプリンタをマシンに接続しています"
 
-#: printer/printerdrake.pm:577
+#: printer/printerdrake.pm:578
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr "マシンに接続したプリンタが見つかりません"
 
-#: printer/printerdrake.pm:580
+#: printer/printerdrake.pm:581
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr ""
 " \n"
 "(全てのプリンタを接続して電源を入れてください)。\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 "
 "printers in the local network?\n"
 msgstr "上記のプリンタやローカルネットワークのプリンタで印刷を行いますか？\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 "ローカルネットワークのプリンタで印刷を行いますか？\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 "上記のプリンタで印刷を行いますか？\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 "本当に印刷を設定しますか？\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 "
@@ -11385,48 +11439,48 @@ msgstr ""
 "注意: プリンタの機種と印刷方式によっては、最大で %d MBの\n"
 "追加ソフトをインストールします。"
 
-#: printer/printerdrake.pm:622
+#: printer/printerdrake.pm:629
 #, c-format
 msgid "Searching for new printers..."
 msgstr "新しいプリンタを検索中.."
 
-#: printer/printerdrake.pm:706
+#: printer/printerdrake.pm:713
 #, c-format
 msgid "Configuring printer ..."
 msgstr "プリンタを設定中.."
 
-#: 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 "プリンタ %s を設定中.."
 
-#: 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 " on "
 
-#: 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 "プリンタの機種を選ぶ"
 
-#: 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 "どのプリンタをお使いですか？"
 
-#: printer/printerdrake.pm:736
+#: printer/printerdrake.pm:743
 #, c-format
 msgid ""
 "\n"
@@ -11439,7 +11493,7 @@ msgstr ""
 "Printerdrakeはお使いのプリンタ %s の機種を検出できませんでした。\n"
 "リストの中から正しい機種を選択してください。"
 
-#: 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 "
@@ -11449,21 +11503,21 @@ msgstr ""
 "お使いのプリンタがなければ、互換性のあるプリンタ\n"
 "(プリンタのマニュアルを参照)か類似プリンタを選んでください。"
 
-#: 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 "アプリケーションを設定中.."
 
-#: 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 "プリンタを追加"
 
-#: printer/printerdrake.pm:825
+#: printer/printerdrake.pm:832
 #, c-format
 msgid ""
 "\n"
@@ -11485,7 +11539,7 @@ msgstr ""
 "プリンタドライバ/オプション/プリンタの接続方式\n"
 "を選択してプリンタを設定してください。"
 
-#: printer/printerdrake.pm:838
+#: printer/printerdrake.pm:845
 #, c-format
 msgid ""
 "\n"
@@ -11523,7 +11577,7 @@ msgstr ""
 "準備ができましたら'次へ'をクリックしてください。プリンタを設定しない場合は\n"
 "'キャンセル'をクリックしてください。"
 
-#: printer/printerdrake.pm:847
+#: printer/printerdrake.pm:854
 #, c-format
 msgid ""
 "\n"
@@ -11549,7 +11603,7 @@ msgstr ""
 "準備ができましたら'次へ'をクリックしてください。プリンタを設定しない場合は\n"
 "'キャンセル'をクリックしてください。"
 
-#: printer/printerdrake.pm:855
+#: printer/printerdrake.pm:862
 #, c-format
 msgid ""
 "\n"
@@ -11586,7 +11640,7 @@ msgstr ""
 "準備ができましたら'次へ'をクリックしてください。プリンタを設定しない場合は\n"
 "'キャンセル'をクリックしてください。"
 
-#: printer/printerdrake.pm:864
+#: printer/printerdrake.pm:871
 #, c-format
 msgid ""
 "\n"
@@ -11612,22 +11666,22 @@ msgstr ""
 "準備ができましたら'次'をクリックしてください。プリンタを設定しない場合は\n"
 "'キャンセル'をクリックしてください。"
 
-#: printer/printerdrake.pm:873
+#: printer/printerdrake.pm:880
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "このマシンに接続しているプリンタを自動的に検出する"
 
-#: printer/printerdrake.pm:876
+#: printer/printerdrake.pm:883
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "ローカルネットワークに接続しているプリンタを自動的に検出する"
 
-#: printer/printerdrake.pm:879
+#: printer/printerdrake.pm:886
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr "Windowsマシンに接続しているプリンタを自動的に検出する"
 
-#: printer/printerdrake.pm:895
+#: printer/printerdrake.pm:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -11650,54 +11704,70 @@ msgstr ""
 "行う場合は、Mandrakeコントロールセンタの ハードウェア -> プリンタ を\n"
 "選んでください。"
 
-#: 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
+#, fuzzy, c-format
+msgid "Could not install the %s packages!"
+msgstr "XFreeパッケージをインストールできません: %s"
+
+#: printer/printerdrake.pm:939
+#, c-format
+msgid "Skipping Windows/SMB server auto-detection"
+msgstr ""
+
+#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
 #, c-format
 msgid "Printer auto-detection"
 msgstr "プリンタを自動的に検出する"
 
-#: printer/printerdrake.pm:930
+#: printer/printerdrake.pm:945
 #, c-format
 msgid "Detecting devices..."
 msgstr "デバイスを検出中.."
 
-#: printer/printerdrake.pm:952
+#: printer/printerdrake.pm:967
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", ネットワークプリンタ %s, ポート %s"
 
-#: printer/printerdrake.pm:954
+#: printer/printerdrake.pm:969
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", printer \"%s\" on SMB/Windows server \"%s\""
 
-#: printer/printerdrake.pm:958
+#: printer/printerdrake.pm:973
 #, c-format
 msgid "Detected %s"
 msgstr "%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 "パラレルポート #%s のプリンタ"
 
-#: printer/printerdrake.pm:966
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "ネットワークプリンタ %s, ポート %s"
 
-#: printer/printerdrake.pm:968
+#: printer/printerdrake.pm:983
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "プリンタ %s、SMB/Windowsサーバ %s"
 
-#: printer/printerdrake.pm:1047
+#: printer/printerdrake.pm:1062
 #, c-format
 msgid "Local Printer"
 msgstr "Local 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/"
@@ -11709,32 +11779,32 @@ msgstr ""
 "ファイル名を入力します(パラレルポートなら /dev/lp0, /dev/lp1 、\n"
 "USBプリンタなら /dev/usb/lp0, /dev/usb/lp1 のようになります)。"
 
-#: printer/printerdrake.pm:1052
+#: printer/printerdrake.pm:1067
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "デバイス名かファイル名を入力してください"
 
-#: printer/printerdrake.pm:1061
+#: printer/printerdrake.pm:1076
 #, c-format
 msgid "No printer found!"
 msgstr "プリンタが見つかりません"
 
-#: printer/printerdrake.pm:1069
+#: printer/printerdrake.pm:1084
 #, c-format
 msgid "Local Printers"
 msgstr "Local Printers"
 
-#: printer/printerdrake.pm:1070
+#: printer/printerdrake.pm:1085
 #, c-format
 msgid "Available printers"
 msgstr "利用可能なプリンタ"
 
-#: 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 "以下のプリンタを自動的に検出しました。"
 
-#: 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 "
@@ -11744,18 +11814,18 @@ msgstr ""
 "手持ちの機器と異なる場合は、入力欄にデバイス名/ファイル名を\n"
 "入力してください"
 
-#: 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 "代わりにデバイス名/ファイル名を指定することもできます"
 
-#: 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 "自動的に検出したプリンタのリスト "
 
-#: 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 "
@@ -11763,7 +11833,7 @@ msgid ""
 msgstr ""
 "セットアップするプリンタを選択するかデバイス名/ファイル名を入力してください"
 
-#: 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 "
@@ -11771,7 +11841,7 @@ msgid ""
 msgstr ""
 "印刷ジョブを行うプリンタを選択するか、デバイス名/ファイル名を入力してください"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1100
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -11781,12 +11851,12 @@ msgstr ""
 "プリンタの設定は全自動で行われます。お使いのプリンタが正確に検出されない/\n"
 "プリンタの設定をカスタマイズしたい場合は、'手動設定'を有効にしてください。"
 
-#: printer/printerdrake.pm:1086
+#: printer/printerdrake.pm:1101
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "現在のところ別の選択肢はありません"
 
-#: printer/printerdrake.pm:1089
+#: printer/printerdrake.pm:1104
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -11799,12 +11869,12 @@ msgstr ""
 "プリンタが正確に検出されない/プリンタの設定をカスタマイズしたい場合は、\n"
 "'手動設定'を有効にしてください。"
 
-#: printer/printerdrake.pm:1090
+#: printer/printerdrake.pm:1105
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "印刷ジョブを行うプリンタを選んでください。"
 
-#: 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 "
@@ -11812,12 +11882,12 @@ msgid ""
 msgstr ""
 "プリンタを接続しているポートを選ぶか、デバイス名/ファイル名を入力してください"
 
-#: printer/printerdrake.pm:1093
+#: printer/printerdrake.pm:1108
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "お使いのプリンタを接続しているポートを選んでください。"
 
-#: printer/printerdrake.pm:1095
+#: printer/printerdrake.pm:1110
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -11827,17 +11897,26 @@ msgstr ""
 "(パラレルポート: /dev/lp0, /dev/lp1, .., が LPT1:, LPT2:, .., \n"
 "１台目のUSBプリンタ: /dev/usb/lp0, ２台目のUSBプリンタ: /dev/usb/lp1, ..)"
 
-#: printer/printerdrake.pm:1099
+#: printer/printerdrake.pm:1114
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "プリンタかデバイスを入力/選択してください"
 
-#: 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
+#, fuzzy, c-format
+msgid "Aborting"
+msgstr "中止"
+
+#: printer/printerdrake.pm:1189
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "リモートlpdプリンタのオプション"
 
-#: 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 "
@@ -11846,66 +11925,65 @@ msgstr ""
 "リモートlpdプリンタを使うには、プリンタサーバのホスト名と\n"
 "サーバのプリンタの名前が必要です。"
 
-#: printer/printerdrake.pm:1170
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "Remote host name"
 msgstr "リモートホスト名"
 
-#: printer/printerdrake.pm:1171
+#: printer/printerdrake.pm:1192
 #, c-format
 msgid "Remote printer name"
 msgstr "リモートプリンタ名"
 
-#: printer/printerdrake.pm:1174
+#: printer/printerdrake.pm:1195
 #, c-format
 msgid "Remote host name missing!"
 msgstr "リモートホストの名前がありません"
 
-#: printer/printerdrake.pm:1178
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "リモートプリンタの名前がありません"
 
-#: 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 "情報"
 
-#: printer/printerdrake.pm:1200 printer/printerdrake.pm:1714
+#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "検出した機種: %s %s"
 
-#: printer/printerdrake.pm:1276 printer/printerdrake.pm:1516
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
 #, c-format
 msgid "Scanning network..."
 msgstr "ネットワークをスキャンしています.."
 
-#: 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\" on server \"%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\" on server \"%s\""
 
-#: printer/printerdrake.pm:1332
+#: printer/printerdrake.pm:1366
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB(Windows9x/NT)プリンタのオプション"
 
-#: 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 "
@@ -11917,7 +11995,7 @@ msgstr ""
 "プリントサーバのIPアドレス、アクセスしたいプリンタの共有名、\n"
 "適切なユーザ名、パスワード、ワークグループの情報 が必要になります。"
 
-#: printer/printerdrake.pm:1334
+#: printer/printerdrake.pm:1368
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -11926,47 +12004,47 @@ msgstr ""
 "適切なプリンタを検出したら、それをそのまま選択し、必要に応じてユーザ名/\n"
 "パスワード/ワークグループなどを入力してください。"
 
-#: printer/printerdrake.pm:1336
+#: printer/printerdrake.pm:1370
 #, c-format
 msgid "SMB server host"
 msgstr "SMBサーバのホスト名"
 
-#: printer/printerdrake.pm:1337
+#: printer/printerdrake.pm:1371
 #, c-format
 msgid "SMB server IP"
 msgstr "SMBサーバのIP"
 
-#: printer/printerdrake.pm:1338
+#: printer/printerdrake.pm:1372
 #, c-format
 msgid "Share name"
 msgstr "共有名"
 
-#: printer/printerdrake.pm:1341
+#: printer/printerdrake.pm:1375
 #, c-format
 msgid "Workgroup"
 msgstr "ワークグループ"
 
-#: printer/printerdrake.pm:1343
+#: printer/printerdrake.pm:1377
 #, c-format
 msgid "Auto-detected"
 msgstr "自動的に検出"
 
-#: printer/printerdrake.pm:1353
+#: printer/printerdrake.pm:1387
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "サーバ名かサーバのIPを入力してください"
 
-#: printer/printerdrake.pm:1357
+#: printer/printerdrake.pm:1391
 #, c-format
 msgid "Samba share name missing!"
 msgstr "Sambaの共有名がありません"
 
-#: printer/printerdrake.pm:1363
+#: printer/printerdrake.pm:1397
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "セキュリティ警告"
 
-#: 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 "
@@ -12007,7 +12085,7 @@ msgstr ""
 "type in Printerdrake.\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 "
@@ -12019,7 +12097,7 @@ msgstr ""
 "そしてこのマシンからの印刷をPrinterdrakeの接続タイプ %s で設定する。\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) "
@@ -12032,12 +12110,12 @@ msgstr ""
 "\n"
 "現在の状態でプリンタの設定を続けますか?"
 
-#: printer/printerdrake.pm:1449
+#: printer/printerdrake.pm:1489
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "Netwareプリンタのオプション"
 
-#: 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 "
@@ -12049,42 +12127,42 @@ msgstr ""
 "TCP/IPホスト名ではない)と、アクセスするプリンタの印刷キュー名、\n"
 "適切なユーザ名、パスワードが必要になります。"
 
-#: printer/printerdrake.pm:1451
+#: printer/printerdrake.pm:1491
 #, c-format
 msgid "Printer Server"
 msgstr "プリンタサーバ"
 
-#: printer/printerdrake.pm:1452
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Print Queue Name"
 msgstr "印刷キューの名前"
 
-#: printer/printerdrake.pm:1457
+#: printer/printerdrake.pm:1497
 #, c-format
 msgid "NCP server name missing!"
 msgstr "NCPサーバの名前がありません"
 
-#: printer/printerdrake.pm:1461
+#: printer/printerdrake.pm:1501
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "NCPキューの名前がありません"
 
-#: printer/printerdrake.pm:1527 printer/printerdrake.pm:1547
+#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", ホスト %s, ポート %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 "ホスト %s, ポート %s"
 
-#: printer/printerdrake.pm:1571
+#: printer/printerdrake.pm:1618
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "TCP/ソケットプリンタのオプション"
 
-#: 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 "
@@ -12093,7 +12171,7 @@ msgstr ""
 "自動的に検出したプリンタをリストから選ぶか、入力項目にホスト名かIPと、\n"
 "オプションでポート番号(デフォルトは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 "
@@ -12106,22 +12184,27 @@ msgstr ""
 "HP JetDirectサーバのポート番号は通常9100ですが、他のサーバでは異なることが\n"
 "あります。ハードウェアのマニュアルをご覧ください。"
 
-#: printer/printerdrake.pm:1578
+#: printer/printerdrake.pm:1625
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "プリンタホスト名かIPがありません"
 
-#: printer/printerdrake.pm:1601
+#: printer/printerdrake.pm:1648
 #, c-format
 msgid "Printer host name or IP"
 msgstr "プリンタホスト名かIP"
 
-#: printer/printerdrake.pm:1649 printer/printerdrake.pm:1651
+#: printer/printerdrake.pm:1704
+#, fuzzy, c-format
+msgid "Refreshing Device URI list..."
+msgstr "プリンタデータを更新中.."
+
+#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
 #, c-format
 msgid "Printer Device URI"
 msgstr "プリンタデバイスの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 "
@@ -12132,17 +12215,17 @@ msgstr ""
 "このURIはCUPSかFoomaticの仕様で指定してください。\n"
 "全てのスプーラが全てのURIタイプをサポートしているわけではありません。"
 
-#: printer/printerdrake.pm:1668
+#: printer/printerdrake.pm:1731
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "有効なURIを入力してください"
 
-#: printer/printerdrake.pm:1749
+#: printer/printerdrake.pm:1834
 #, c-format
 msgid "Pipe into command"
 msgstr "コマンドにパイプする"
 
-#: 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 "
@@ -12151,17 +12234,17 @@ msgstr ""
 "プリンタにジョブを直接送る代わりに、パイプさせるコマンドラインを入力できま"
 "す。"
 
-#: printer/printerdrake.pm:1751
+#: printer/printerdrake.pm:1836
 #, c-format
 msgid "Command line"
 msgstr "コマンドライン"
 
-#: printer/printerdrake.pm:1755
+#: printer/printerdrake.pm:1840
 #, c-format
 msgid "A command line must be entered!"
 msgstr "コマンドラインを入力してください"
 
-#: printer/printerdrake.pm:1788
+#: printer/printerdrake.pm:1873
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -12173,58 +12256,73 @@ msgstr ""
 "LaserJet 1100/1200/1220/3200/3300, DeskJet 450,\n"
 "Sony IJP-V100), HP PhotoSmart もしくは HP LaserJet 2200"
 
-#: printer/printerdrake.pm:1801
+#: printer/printerdrake.pm:1887
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "HPOJパッケージをインストール中.."
 
-#: printer/printerdrake.pm:1809 printer/printerdrake.pm:1893
+#: printer/printerdrake.pm:1894
+#, c-format
+msgid "Only printing will be possible on the %s."
+msgstr ""
+
+#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
 #, c-format
 msgid "Checking device and configuring HPOJ..."
 msgstr "デバイス確認とHPOJを設定中.."
 
-#: printer/printerdrake.pm:1831
+#: printer/printerdrake.pm:1946
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "SANEパッケージをインストール中.."
 
-#: printer/printerdrake.pm:1858
+#: printer/printerdrake.pm:1956
+#, c-format
+msgid "Scanning on the %s will not be possible."
+msgstr ""
+
+#: printer/printerdrake.pm:1983
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "mtoolsパッケージをインストール中.."
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1990
+#, fuzzy, c-format
+msgid "Photo memory card access on the %s will not be possible."
+msgstr "HP多機能デバイスのフォトメモリーカードアクセス"
+
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "HP多機能デバイスのスキャン"
 
-#: printer/printerdrake.pm:1881
+#: printer/printerdrake.pm:2013
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr "HP多機能デバイスのフォトメモリーカードアクセス"
 
-#: printer/printerdrake.pm:1930
+#: printer/printerdrake.pm:2062
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "CUPS用のプリンタポートを作成中.."
 
-#: 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 "プリンタデータベースを読み込み中.."
 
-#: printer/printerdrake.pm:2149
+#: printer/printerdrake.pm:2281
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "プリンタ名とコメントを入力"
 
-#: 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 "プリンタ名には文字と数字とアンダースコア(_)しか使えません"
 
-#: 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"
@@ -12233,7 +12331,7 @@ msgstr ""
 "プリンタ %s は既に存在しています。\n"
 "設定を上書きしますか？"
 
-#: printer/printerdrake.pm:2168
+#: printer/printerdrake.pm:2300
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -12242,35 +12340,35 @@ msgstr ""
 "プリンタにはそれぞれ名前が必要です(たとえば'printer')。\n"
 "説明/場所の欄は空のままでも構いません。ユーザ用のメモ欄です。"
 
-#: printer/printerdrake.pm:2169
+#: printer/printerdrake.pm:2301
 #, c-format
 msgid "Name of printer"
 msgstr "プリンタの名前"
 
-#: 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 "説明"
 
-#: printer/printerdrake.pm:2171 standalone/printerdrake:212
+#: printer/printerdrake.pm:2303 standalone/printerdrake:212
 #: standalone/printerdrake:219
 #, c-format
 msgid "Location"
 msgstr "プリンタの場所"
 
-#: printer/printerdrake.pm:2188
+#: printer/printerdrake.pm:2320
 #, c-format
 msgid "Preparing printer database..."
 msgstr "プリンタデータベースを準備中.."
 
-#: printer/printerdrake.pm:2306
+#: printer/printerdrake.pm:2438
 #, c-format
 msgid "Your printer model"
 msgstr "プリンタの機種"
 
-#: printer/printerdrake.pm:2307
+#: printer/printerdrake.pm:2439
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -12295,18 +12393,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 "この機種を使う"
 
-#: 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 "手動で選ぶ"
 
-#: printer/printerdrake.pm:2340
+#: printer/printerdrake.pm:2472
 #, c-format
 msgid ""
 "\n"
@@ -12321,38 +12419,38 @@ msgstr ""
 "間違った機種もしくはRawプリンタを表示している場合は、\n"
 "リストから正しい機種を探してください。"
 
-#: printer/printerdrake.pm:2359
+#: printer/printerdrake.pm:2491
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
-msgstr ""
+msgstr "メーカー提供のPPDファイルをインストール"
 
-#: printer/printerdrake.pm:2390
+#: printer/printerdrake.pm:2522
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
 "printer's options and features."
 msgstr ""
 
-#: 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 "
 "delivered with the printer."
 msgstr ""
 
-#: 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 ""
 
-#: 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 "
 "your Windows partition, too."
 msgstr ""
 
-#: 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 "
@@ -12360,65 +12458,65 @@ msgid ""
 "printer's hardware"
 msgstr ""
 
-#: 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 "
 "then be used for the setup of your printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2397
-#, fuzzy, c-format
+#: printer/printerdrake.pm:2529
+#, c-format
 msgid "Install PPD file from"
-msgstr "RPMをインストール"
+msgstr "PPDファイルを次からインストール"
 
-#: printer/printerdrake.pm:2399 printer/printerdrake.pm:2406
-#: standalone/scannerdrake:174 standalone/scannerdrake:182
-#: standalone/scannerdrake:233 standalone/scannerdrake:240
-#, fuzzy, c-format
+#: 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 "CDROM"
+msgstr "CD-ROM"
 
-#: printer/printerdrake.pm:2400 printer/printerdrake.pm:2408
-#: standalone/scannerdrake:175 standalone/scannerdrake:184
-#: standalone/scannerdrake:234 standalone/scannerdrake:242
-#, fuzzy, c-format
+#: 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 "フロッピー"
+msgstr "フロッピーディスク"
 
-#: printer/printerdrake.pm:2401 printer/printerdrake.pm:2410
-#: standalone/scannerdrake:176 standalone/scannerdrake:186
-#: standalone/scannerdrake:235 standalone/scannerdrake:244
-#, fuzzy, c-format
+#: 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 "その他のポート"
+msgstr "その他の場所"
 
-#: printer/printerdrake.pm:2416
-#, fuzzy, c-format
+#: printer/printerdrake.pm:2548
+#, c-format
 msgid "Select PPD file"
-msgstr "ファイルを選択"
+msgstr "PPDファイルを選択"
 
-#: printer/printerdrake.pm:2420
+#: printer/printerdrake.pm:2552
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
-msgstr ""
+msgstr "PPDファイル %s が無いか読み取り不能です"
 
-#: printer/printerdrake.pm:2426
+#: printer/printerdrake.pm:2558
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr ""
 
-#: printer/printerdrake.pm:2437
-#, fuzzy, c-format
+#: printer/printerdrake.pm:2569
+#, c-format
 msgid "Installing PPD file..."
-msgstr "%s をインストール中.."
+msgstr "PPDファイルをインストール.."
 
-#: printer/printerdrake.pm:2539
+#: printer/printerdrake.pm:2682
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "OKI winプリンタの設定"
 
-#: printer/printerdrake.pm:2540
+#: printer/printerdrake.pm:2683
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -12434,12 +12532,12 @@ msgstr ""
 "テストページを印刷する前に最初のパラレルポートにつなぎなおしてください。\n"
 "そうしないと使えません。接続種類の設定は無視されます。"
 
-#: printer/printerdrake.pm:2564 printer/printerdrake.pm:2593
+#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Lexmarkインクジェットを設定"
 
-#: printer/printerdrake.pm:2565
+#: printer/printerdrake.pm:2708
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -12451,7 +12549,7 @@ msgstr ""
 "サポートしません。リモートマシンやプリンタサーバのプリンタには使えません。\n"
 "プリンタをローカルポートに接続するか、接続しているマシンで設定してください。"
 
-#: printer/printerdrake.pm:2594
+#: printer/printerdrake.pm:2737
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -12475,12 +12573,29 @@ msgstr ""
 "ページを lexmarkmaintain で印刷し、このプログラムでヘッドのアラインメントを\n"
 "調整してください。"
 
-#: printer/printerdrake.pm:2597
+#: printer/printerdrake.pm:2746
+#, fuzzy, c-format
+msgid "Lexmark X125 configuration"
+msgstr "Lexmarkインクジェットを設定"
+
+#: printer/printerdrake.pm:2747
+#, fuzzy, 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 ""
+"Lexmarkのインクジェットプリンタドライバは、ローカルプリンタしか\n"
+"サポートしません。リモートマシンやプリンタサーバのプリンタには使えません。\n"
+"プリンタをローカルポートに接続するか、接続しているマシンで設定してください。"
+
+#: printer/printerdrake.pm:2765
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "HP LaserJet 1000のファームウェアをアップロード"
 
-#: printer/printerdrake.pm:2710
+#: printer/printerdrake.pm:2878
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -12496,27 +12611,27 @@ msgstr ""
 "しているか確認してください。\n"
 "注意: 超高品質/高解像度の印刷には非常に時間がかかることがあります。"
 
-#: printer/printerdrake.pm:2835
+#: printer/printerdrake.pm:3003
 #, c-format
 msgid "Printer default settings"
 msgstr "プリンタのデフォルト設定"
 
-#: printer/printerdrake.pm:2842
+#: printer/printerdrake.pm:3010
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "オプション %s は整数にしてください"
 
-#: printer/printerdrake.pm:2846
+#: printer/printerdrake.pm:3014
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "オプション %s は数字にしてください"
 
-#: printer/printerdrake.pm:2850
+#: printer/printerdrake.pm:3018
 #, c-format
 msgid "Option %s out of range!"
 msgstr "オプション %s は範囲外です"
 
-#: printer/printerdrake.pm:2901
+#: printer/printerdrake.pm:3069
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -12525,12 +12640,12 @@ msgstr ""
 "このプリンタ(%s)を\n"
 "デフォルトのプリンタにしますか？"
 
-#: printer/printerdrake.pm:2916
+#: printer/printerdrake.pm:3084
 #, c-format
 msgid "Test pages"
 msgstr "テストページ"
 
-#: printer/printerdrake.pm:2917
+#: printer/printerdrake.pm:3085
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -12543,47 +12658,57 @@ msgstr ""
 "メモリの少ないレーザプリンタでは出力できないかもしれません。\n"
 "'標準'を印刷できれば大抵のばあい問題ないでしょう。"
 
-#: printer/printerdrake.pm:2921
+#: printer/printerdrake.pm:3089
 #, c-format
 msgid "No test pages"
 msgstr "テストしない"
 
-#: printer/printerdrake.pm:2922
+#: printer/printerdrake.pm:3090
 #, c-format
 msgid "Print"
 msgstr "印刷"
 
-#: printer/printerdrake.pm:2947
+#: printer/printerdrake.pm:3115
 #, c-format
 msgid "Standard test page"
 msgstr "標準"
 
-#: printer/printerdrake.pm:2950
+#: printer/printerdrake.pm:3118
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "レター"
 
-#: printer/printerdrake.pm:2953
+#: printer/printerdrake.pm:3121
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "A4"
 
-#: printer/printerdrake.pm:2955
+#: printer/printerdrake.pm:3123
 #, c-format
 msgid "Photo test page"
 msgstr "写真"
 
-#: printer/printerdrake.pm:2959
+#: printer/printerdrake.pm:3127
 #, c-format
 msgid "Do not print any test page"
 msgstr "テストページを印刷しない"
 
-#: printer/printerdrake.pm:2967 printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "テストページを印刷中.."
 
-#: printer/printerdrake.pm:2992
+#: printer/printerdrake.pm:3150
+#, fuzzy, c-format
+msgid "Could not install the %s package!"
+msgstr "XFreeパッケージをインストールできません: %s"
+
+#: printer/printerdrake.pm:3152
+#, fuzzy, c-format
+msgid "Skipping photo test page."
+msgstr "写真"
+
+#: printer/printerdrake.pm:3169
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -12598,7 +12723,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"
@@ -12607,17 +12732,17 @@ msgstr ""
 "テストページをプリンタデーモンに送りました。\n"
 "プリンタが動くまで少し時間がかかります。\n"
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3180
 #, c-format
 msgid "Did it work properly?"
 msgstr "うまく動きましたか？"
 
-#: printer/printerdrake.pm:3024 printer/printerdrake.pm:4192
+#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
 #, c-format
 msgid "Raw printer"
 msgstr "Rawプリンタ"
 
-#: 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 "
@@ -12629,7 +12754,7 @@ msgstr ""
 "%s <file>、GUIの場合は xpp <file> もしくは kprinter <file> を使います。\n"
 "グラフィカルなツールを使うとプリンタの選択とオプションの設定が楽になります\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 "
@@ -12640,8 +12765,8 @@ msgstr ""
 "'印刷'でも使えます。この場合はファイル名の指定は必要ありません。\n"
 "アプリケーションのほうが印刷するファイルを指定します。\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"
@@ -12654,7 +12779,7 @@ msgstr ""
 "できます。必要な設定をコマンドラインに追加してください。\n"
 "例: %s <file>"
 
-#: 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 "
@@ -12665,7 +12790,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"
@@ -12674,7 +12799,7 @@ msgstr ""
 "現在のプリンタで使える印刷オプションの一覧は以下の通りです:\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 "
@@ -12683,8 +12808,8 @@ msgstr ""
 "コマンドライン(ターミナルウィンドウ)からファイルを印刷するには、\n"
 "%s <file> を使います。\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 "
@@ -12695,7 +12820,7 @@ msgstr ""
 "この場合はファイル名の指定は必要ありません。アプリケーションのほうから\n"
 "指定されます。\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 "
@@ -12704,7 +12829,7 @@ msgstr ""
 "現在のプリンタで使えるオプションのリストを見るには、'印刷オプションの一覧'\n"
 "をクリックしてください。"
 
-#: 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 "
@@ -12713,7 +12838,7 @@ msgstr ""
 "コマンドライン(ターミナルウィンドウ)からファイルを印刷するには、\n"
 "%s <file> または %s <file> を使います。\n"
 
-#: printer/printerdrake.pm:3095
+#: printer/printerdrake.pm:3272
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -12728,7 +12853,7 @@ msgstr ""
 "あります。これをクリックすると印刷ジョブがすぐに止まります。\n"
 "これは紙づまりのときなどに便利です。\n"
 
-#: printer/printerdrake.pm:3099
+#: printer/printerdrake.pm:3276
 #, c-format
 msgid ""
 "\n"
@@ -12741,42 +12866,42 @@ msgstr ""
 "できます。必要な設定をコマンドラインに追加してください。\n"
 "例: %s <file>\n"
 
-#: printer/printerdrake.pm:3109
+#: printer/printerdrake.pm:3286
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "%s で印刷/スキャン/フォトカード"
 
-#: printer/printerdrake.pm:3110
+#: printer/printerdrake.pm:3287
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "%s で印刷/スキャン"
 
-#: printer/printerdrake.pm:3112
+#: printer/printerdrake.pm:3289
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "%s で印刷/フォトカードアクセス"
 
-#: printer/printerdrake.pm:3113
+#: printer/printerdrake.pm:3290
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "プリンタ %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 "閉じる"
 
-#: printer/printerdrake.pm:3119
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Print option list"
 msgstr "印刷オプションの一覧"
 
-#: printer/printerdrake.pm:3140
+#: printer/printerdrake.pm:3317
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -12797,7 +12922,7 @@ msgstr ""
 "\n"
 "このデバイスでは scannerdrake を使わないでください。"
 
-#: printer/printerdrake.pm:3163
+#: printer/printerdrake.pm:3343
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -12818,18 +12943,18 @@ msgstr ""
 "カードのファイルシステムは、ドライブp: 以降となります。\n"
 "MtoolsFMではファイルリストの右上の項目でドライブ文字を変えられます。"
 
-#: printer/printerdrake.pm:3185 printer/printerdrake.pm:3575
+#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
 #, c-format
 msgid "Reading printer data..."
 msgstr "プリンタの情報を読み込み中.."
 
-#: 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 "プリンタの設定を変換"
 
-#: printer/printerdrake.pm:3206
+#: printer/printerdrake.pm:3386
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -12843,7 +12968,7 @@ msgstr ""
 "オプション設定)コピーされますが、ジョブは変換されません。\n"
 "以下の理由で変換できないキューもあります:\n"
 
-#: printer/printerdrake.pm:3209
+#: printer/printerdrake.pm:3389
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
@@ -12852,7 +12977,7 @@ msgstr ""
 "CUPSはNovellサーバのプリンタや、自由形式のコマンドにデータを送るプリンタを\n"
 "サポートしません。\n"
 
-#: printer/printerdrake.pm:3211
+#: printer/printerdrake.pm:3391
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -12861,12 +12986,12 @@ msgstr ""
 "PDQはローカルプリンタ、リモートのLPDプリンタ、ソケット/TCPプリンタのみを\n"
 "サポートします。\n"
 
-#: printer/printerdrake.pm:3213
+#: printer/printerdrake.pm:3393
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPDとLPRngはIPPプリンタをサポートしません。\n"
 
-#: printer/printerdrake.pm:3215
+#: printer/printerdrake.pm:3395
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
@@ -12875,7 +13000,7 @@ msgstr ""
 "さらにこのプログラムやfoomatic-configureで作っていないキューは変換できませ"
 "ん。"
 
-#: printer/printerdrake.pm:3216
+#: printer/printerdrake.pm:3396
 #, c-format
 msgid ""
 "\n"
@@ -12886,7 +13011,7 @@ msgstr ""
 "またメーカー提供のPPDファイルやネイティブのCUPSドライバで設定したプリンタは\n"
 "変換できません。"
 
-#: printer/printerdrake.pm:3217
+#: printer/printerdrake.pm:3397
 #, c-format
 msgid ""
 "\n"
@@ -12896,17 +13021,17 @@ msgstr ""
 "\n"
 "変換するプリンタを選んで'変換'をクリックしてください。"
 
-#: printer/printerdrake.pm:3220
+#: printer/printerdrake.pm:3400
 #, c-format
 msgid "Do not transfer printers"
 msgstr "プリンタを変換しない"
 
-#: printer/printerdrake.pm:3221 printer/printerdrake.pm:3237
+#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
 #, c-format
 msgid "Transfer"
 msgstr "変換"
 
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3413
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -12917,17 +13042,17 @@ msgstr ""
 "上書きするには'変換'を押してください。\n"
 "新しい名前を入力するか、このプリンタをスキップすることもできます。"
 
-#: printer/printerdrake.pm:3254
+#: printer/printerdrake.pm:3434
 #, c-format
 msgid "New printer name"
 msgstr "新しいプリンタの名前"
 
-#: printer/printerdrake.pm:3257
+#: printer/printerdrake.pm:3437
 #, c-format
 msgid "Transferring %s..."
 msgstr "%s を変換中.."
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3448
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -12936,28 +13061,28 @@ msgstr ""
 "以前のデフォルトプリンタ(%s)を変換しました。新しい印刷システム %s でも\n"
 "これをデフォルトのプリンタにしますか？"
 
-#: printer/printerdrake.pm:3278
+#: printer/printerdrake.pm:3458
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "プリンタデータを更新中.."
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3467
 #, c-format
 msgid "Starting network..."
 msgstr "ネットワークを起動中.."
 
-#: 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 "ネットワークを設定する"
 
-#: printer/printerdrake.pm:3329
+#: printer/printerdrake.pm:3509
 #, c-format
 msgid "Network functionality not configured"
 msgstr "ネットワーク機能を設定していません"
 
-#: printer/printerdrake.pm:3330
+#: printer/printerdrake.pm:3510
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -12969,16 +13094,16 @@ msgstr ""
 "ネットワークは未設定です。ネットワークを設定しないとこのプリンタを使用する\n"
 "ことはできません。どうしますか？"
 
-#: printer/printerdrake.pm:3333
+#: printer/printerdrake.pm:3513
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "ネットワークを設定せずに先へ進む"
 
-#: printer/printerdrake.pm:3367
+#: printer/printerdrake.pm:3547
 #, fuzzy, 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\""
@@ -12989,7 +13114,7 @@ msgstr ""
 "その後Mandrakeコントロールセンタの ハードウェア -> プリンタ で\n"
 "プリンタを設定してください。"
 
-#: printer/printerdrake.pm:3368
+#: printer/printerdrake.pm:3548
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -12999,34 +13124,34 @@ msgstr ""
 "ネットワークアクセスを起動できませんでした。設定とハードウェアを確認して\n"
 "ください。そのあとでリモートプリンタの設定をやりなおしてください。"
 
-#: printer/printerdrake.pm:3378
+#: printer/printerdrake.pm:3558
 #, c-format
 msgid "Restarting printing system..."
 msgstr "プリンタシステムを再起動中.."
 
-#: printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3597
 #, c-format
 msgid "high"
 msgstr "高い"
 
-#: printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3597
 #, c-format
 msgid "paranoid"
 msgstr "極度に高い"
 
-#: printer/printerdrake.pm:3418
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "印刷システムをセキュリティレベル %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"
@@ -13043,12 +13168,12 @@ msgstr ""
 "\n"
 "本当に印刷システムを設定しますか？"
 
-#: printer/printerdrake.pm:3453
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "起動時に印刷システムを開始"
 
-#: printer/printerdrake.pm:3454
+#: printer/printerdrake.pm:3634
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -13068,47 +13193,68 @@ msgstr ""
 "\n"
 "印刷システムの自動起動を有効にしますか？"
 
-#: printer/printerdrake.pm:3475 printer/printerdrake.pm:3690
+#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
 #, c-format
 msgid "Checking installed software..."
 msgstr "インストール済みソフトをチェック中.."
 
-#: printer/printerdrake.pm:3481
+#: printer/printerdrake.pm:3661
 #, c-format
 msgid "Removing %s ..."
 msgstr "%s を削除中.."
 
-#: printer/printerdrake.pm:3488
+#: printer/printerdrake.pm:3665
+#, fuzzy, c-format
+msgid "Could not remove the %s printing system!"
+msgstr "印刷システムを変更"
+
+#: printer/printerdrake.pm:3674
 #, c-format
 msgid "Installing %s ..."
 msgstr "%s をインストール中.."
 
-#: printer/printerdrake.pm:3535
+#: printer/printerdrake.pm:3678
+#, fuzzy, c-format
+msgid "Could not install the %s printing system!"
+msgstr "印刷システムを変更"
+
+#: printer/printerdrake.pm:3727
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "デフォルトのプリンタを設定中.."
 
-#: printer/printerdrake.pm:3555
+#: printer/printerdrake.pm:3747
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "プリンタのスプーラを選んでください"
 
-#: printer/printerdrake.pm:3556
+#: printer/printerdrake.pm:3748
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "どの印刷システム(スプーラ)を使いますか？"
 
-#: printer/printerdrake.pm:3607
+#: printer/printerdrake.pm:3799
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "プリンタ %s の設定に失敗"
 
-#: printer/printerdrake.pm:3620
+#: printer/printerdrake.pm:3812
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Foomaticをインストール中.."
 
-#: printer/printerdrake.pm:3806
+#: printer/printerdrake.pm:3818
+#, fuzzy, c-format
+msgid "Could not install %s packages, %s cannot be started!"
+msgstr "スキャナを共有するのに必要なパッケージをインストールできません"
+
+#: printer/printerdrake.pm:3910
+#, fuzzy, c-format
+msgid "Could not install necessary packages, %s cannot be started!"
+msgstr ""
+"Scannerdrakeでスキャナを設定するのに必要なファイルをインストールできません"
+
+#: printer/printerdrake.pm:4011
 #, fuzzy, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -13118,48 +13264,48 @@ msgstr ""
 "以下のプリンタは設定済みです。ダブルクリックで設定を変更/\n"
 "デフォルトのプリンタに指定/情報を参照 することができます。"
 
-#: printer/printerdrake.pm:3834
+#: printer/printerdrake.pm:4039
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "利用可能なリモートCUPSプリンタを全て表示"
 
-#: printer/printerdrake.pm:3835
+#: printer/printerdrake.pm:4040
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr "プリンタリストを更新(リモートCUPSプリンタを全て表示)"
 
-#: printer/printerdrake.pm:3845
+#: printer/printerdrake.pm:4050
 #, c-format
 msgid "CUPS configuration"
 msgstr "CUPSを設定"
 
-#: printer/printerdrake.pm:3857
+#: printer/printerdrake.pm:4062
 #, c-format
 msgid "Change the printing system"
 msgstr "印刷システムを変更"
 
-#: printer/printerdrake.pm:3866
+#: printer/printerdrake.pm:4071
 #, c-format
 msgid "Normal Mode"
 msgstr "ノーマルモード"
 
-#: printer/printerdrake.pm:3867
+#: printer/printerdrake.pm:4072
 #, c-format
 msgid "Expert Mode"
 msgstr "エキスパートモード"
 
-#: 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 "プリンタのオプション"
 
-#: printer/printerdrake.pm:4174
+#: printer/printerdrake.pm:4379
 #, c-format
 msgid "Modify printer configuration"
 msgstr "プリンタ設定の変更"
 
-#: printer/printerdrake.pm:4176
+#: printer/printerdrake.pm:4381
 #, c-format
 msgid ""
 "Printer %s\n"
@@ -13168,118 +13314,118 @@ msgstr ""
 "プリンタ %s\n"
 "このプリンタの何を変更しますか？"
 
-#: printer/printerdrake.pm:4180
+#: printer/printerdrake.pm:4385
 #, c-format
 msgid "Do it!"
 msgstr "実行"
 
-#: printer/printerdrake.pm:4185 printer/printerdrake.pm:4243
+#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
 #, c-format
 msgid "Printer connection type"
 msgstr "プリンタ接続の種類"
 
-#: printer/printerdrake.pm:4186 printer/printerdrake.pm:4247
+#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
 #, c-format
 msgid "Printer name, description, location"
 msgstr "プリンタの名前/説明/場所"
 
-#: printer/printerdrake.pm:4188 printer/printerdrake.pm:4266
+#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "プリンタのメーカー/機種/ドライバ"
 
-#: printer/printerdrake.pm:4189 printer/printerdrake.pm:4267
+#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "プリンタのメーカー/機種"
 
-#: 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 "このプリンタをデフォルトにする"
 
-#: 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 "このプリンタを Star Office/OpenOffice.org/GIMP に追加"
 
-#: 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 "このプリンタを Star Office/OpenOffice.org/GIMP から削除"
 
-#: printer/printerdrake.pm:4199 printer/printerdrake.pm:4295
+#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
 #, c-format
 msgid "Print test pages"
 msgstr "テストページの印刷"
 
-#: 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 "このプリンタの使いかたを調べる"
 
-#: printer/printerdrake.pm:4201 printer/printerdrake.pm:4299
+#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
 #, c-format
 msgid "Remove printer"
 msgstr "プリンタを削除"
 
-#: printer/printerdrake.pm:4255
+#: printer/printerdrake.pm:4460
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "古いプリンタ %s を削除中.."
 
-#: printer/printerdrake.pm:4286
+#: printer/printerdrake.pm:4491
 #, c-format
 msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
 msgstr "プリンタを Star Office/OpenOffice.org/GIMP に追加"
 
-#: printer/printerdrake.pm:4288
+#: printer/printerdrake.pm:4493
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
 msgstr "プリンタ %s を Star Office/OpenOffice.org/GIMP に追加しました。"
 
-#: printer/printerdrake.pm:4289
+#: printer/printerdrake.pm:4494
 #, c-format
 msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
 msgstr ""
 "プリンタ %s を Star Office/OpenOffice.org/GIMP に追加できませんでした。"
 
-#: printer/printerdrake.pm:4291
+#: printer/printerdrake.pm:4496
 #, c-format
 msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
 msgstr "プリンタを Star Office/OpenOffice.org/GIMP から削除中"
 
-#: printer/printerdrake.pm:4293
+#: printer/printerdrake.pm:4498
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
 "GIMP."
 msgstr "プリンタ %s を Star Office/OpenOffice.org/GIMP から削除しました。"
 
-#: printer/printerdrake.pm:4294
+#: printer/printerdrake.pm:4499
 #, c-format
 msgid ""
 "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
 msgstr ""
 "プリンタ %s を Star Office/OpenOffice.org/GIMP から削除できませんでした。"
 
-#: printer/printerdrake.pm:4338
+#: printer/printerdrake.pm:4543
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "プリンタ %s を本当に削除しますか？"
 
-#: printer/printerdrake.pm:4342
+#: printer/printerdrake.pm:4547
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "プリンタ %s を削除中.."
 
-#: printer/printerdrake.pm:4366
+#: printer/printerdrake.pm:4571
 #, c-format
 msgid "Default printer"
 msgstr "デフォルトのプリンタ"
 
-#: printer/printerdrake.pm:4367
+#: printer/printerdrake.pm:4572
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "プリンタ %s がデフォルトのプリンタになりました。"
@@ -13307,36 +13453,42 @@ msgstr "RAIDレベル %d にはパーティションが足りません\n"
 #: scanner.pm:96
 #, c-format
 msgid "Could not create directory /usr/share/sane/firmware!"
-msgstr ""
+msgstr "ディレクトリ /usr/share/sane/firmware を作れません"
+
+#: scanner.pm:107
+#, fuzzy, c-format
+msgid "Could not create link /usr/share/sane/%s!"
+msgstr "ディレクトリ /usr/share/sane/firmware を作れません"
 
-#: scanner.pm:102
+#: scanner.pm:114
 #, c-format
 msgid "Could not copy firmware file %s to /usr/share/sane/firmware!"
 msgstr ""
+"ファームウェアファイル %s を /usr/share/sane/firmware にコピーできません"
 
-#: scanner.pm:109
+#: scanner.pm:121
 #, c-format
 msgid "Could not set permissions of firmware file %s!"
-msgstr ""
+msgstr "ファームウェアファイル %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 "スキャナを共有するのに必要なパッケージをインストールできません"
 
-#: scanner.pm:190
-#, fuzzy, c-format
+#: scanner.pm:202
+#, c-format
 msgid "Your scanner(s) will not be available for non-root users."
-msgstr "お使いのスキャナはネットワークで使用できません"
+msgstr "お使いのスキャナはroot以外では利用できません"
 
 #: security/help.pm:11
 #, c-format
@@ -13636,7 +13788,7 @@ msgstr "'はい'にすると確認結果をメールで報告します。"
 #: security/help.pm:120
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
-msgstr ""
+msgstr "警告がない場合はメールを送らない"
 
 #: security/help.pm:121
 #, c-format
@@ -13666,7 +13818,7 @@ msgstr "シェルのタイムアウトを設定。ゼロはタイムアウトな
 #: security/help.pm:127
 #, c-format
 msgid "Timeout unit is second"
-msgstr ""
+msgstr "タイムアウトの単位は秒です"
 
 #: security/help.pm:129
 #, c-format
@@ -14088,6 +14240,9 @@ msgid ""
 "change.\n"
 "It is used by GNOME and KDE"
 msgstr ""
+"FAMはファイルモニタリングデーモンです。ファイル変更時にレポートを得るのに使い"
+"ます。\n"
+"これはGNOMEとKDEで使います"
 
 #: services.pm:30
 #, c-format
@@ -14420,7 +14575,7 @@ msgstr ""
 "このサービスについての\n"
 "追加情報はありません。"
 
-#: services.pm:226 ugtk2.pm:1139
+#: services.pm:226 ugtk2.pm:1167
 #, c-format
 msgid "Info"
 msgstr "情報"
@@ -14428,7 +14583,7 @@ msgstr "情報"
 #: services.pm:229
 #, c-format
 msgid "Start when requested"
-msgstr ""
+msgstr "リクエストがあったときに開始"
 
 #: services.pm:229
 #, c-format
@@ -14447,23 +14602,25 @@ msgstr "停止"
 
 #: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13
 #: share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
-#, fuzzy, c-format
-msgid "<b>Congratulations for choosing Mandrake Linux!</b>"
-msgstr "Mandrake Linux 9.2をお選びいただきありがとうございます"
+#, c-format
+msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
+msgstr "<b>Mandrakelinuxをお選びいただきありがとうございます</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
-#, fuzzy, c-format
+#, c-format
 msgid "Welcome to the Open Source world!"
 msgstr "オープンソースの世界へようこそ"
 
 #: share/advertising/dis-01.pl:17
-#, c-format
+#, fuzzy, 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 ""
+"Mandrakelinuxは、MandrakeSoftの開発者と世界中の貢献者によるコラボレーションに"
+"よって成り立っています。"
 
 #: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
 #: share/advertising/ppp-01.pl:19
@@ -14472,6 +14629,7 @@ msgid ""
 "We would like to thank everyone who participated in the development of this "
 "latest release."
 msgstr ""
+"この最新リリースの開発に参加してくださった全てのかたがたに感謝いたします。"
 
 #: share/advertising/dis-02.pl:13
 #, fuzzy, c-format
@@ -14557,58 +14715,58 @@ msgstr ""
 #: share/advertising/dis-06.pl:15
 #, c-format
 msgid "You can also:"
-msgstr ""
+msgstr "このようなことも行えます:"
 
 #: share/advertising/dis-06.pl:16
 #, c-format
 msgid "\t- browse the Web"
-msgstr ""
+msgstr "\t- Webの閲覧"
 
 #: share/advertising/dis-06.pl:17
 #, c-format
 msgid "\t- chat"
-msgstr ""
+msgstr "\t- チャット"
 
 #: share/advertising/dis-06.pl:18
 #, c-format
 msgid "\t- organize a video-conference"
-msgstr ""
+msgstr "\t- 動画関連の処理"
 
 #: share/advertising/dis-06.pl:19
 #, c-format
 msgid "\t- create your own Web site"
-msgstr ""
+msgstr "\t- Webサイトの作成"
 
 #: share/advertising/dis-06.pl:20
 #, c-format
 msgid "\t- ..."
-msgstr ""
+msgstr "\t- ..."
 
 #: share/advertising/dis-07.pl:13
 #, c-format
 msgid "<b>Multimedia</b>: Software for every need!"
-msgstr ""
+msgstr "<b>マルチメディア</b>: 誰もが必要とするもの"
 
 #: share/advertising/dis-07.pl:15
 #, c-format
 msgid "Listen to audio CDs with <b>KsCD</b>."
-msgstr ""
+msgstr "<b>KsCD</b>でオーディオCDを観賞"
 
 #: share/advertising/dis-07.pl:17
 #, c-format
 msgid "Listen to music files and watch videos with <b>Totem</b>."
-msgstr ""
+msgstr "<b>Totem</b>で音楽ファイルと動画を楽しむ"
 
 #: share/advertising/dis-07.pl:19
 #, c-format
 msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
-msgstr ""
+msgstr "<b>GQview</b>と<b>Gimp</b>で画像と写真を処理"
 
 #: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
 #: share/advertising/pwp-07.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Mandrake Control Center</b>"
-msgstr "Mandrakeコントロールセンタ"
+msgstr "<b>Mandrakeコントロールセンタ</b>"
 
 #: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
 #: share/advertising/pwp-07.pl:15
@@ -14617,6 +14775,8 @@ msgid ""
 "The Mandrake Control Center is an essential collection of Mandrake-specific "
 "utilities for simplifying the configuration of your computer."
 msgstr ""
+"Mandrakeコントロールセンタは、Mandrake独自のツールを集めたものです。コン"
+"ピュータの設定を簡単に行うことができます。"
 
 #: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
 #: share/advertising/pwp-07.pl:17
@@ -14630,9 +14790,9 @@ msgstr ""
 
 #: share/advertising/dis-09.pl:13 share/advertising/dwd-06.pl:13
 #: share/advertising/ppp-09.pl:13 share/advertising/pwp-08.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>MandrakeStore</b>"
-msgstr "Mandrakeコントロールセンタ"
+msgstr "<b>MandrakeStore</b>"
 
 #: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
 #: share/advertising/pwp-08.pl:15
@@ -14641,18 +14801,20 @@ msgid ""
 "Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
 "full service e-commerce platform."
 msgstr ""
+"MandrakeSoftの製品とサービスは <b>MandrakeStore</b> -- Eコマースでのサービス "
+"をご利用ください。"
 
 #: share/advertising/dis-09.pl:17 share/advertising/dwd-06.pl:19
 #: share/advertising/ppp-09.pl:17 share/advertising/pwp-08.pl:17
 #, c-format
 msgid "Stop by today at <b>www.mandrakestore.com</b>"
-msgstr ""
+msgstr "<b>www.mandrakestore.com</b> にお立ちよりください"
 
 #: share/advertising/dis-10.pl:13 share/advertising/ppp-10.pl:13
 #: share/advertising/pwp-09.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "Become a <b>MandrakeClub</b> member!"
-msgstr "MandrakeExpertのメンバーになる"
+msgstr "<b>MandrakeClub</b> のメンバーになりましょう"
 
 #: share/advertising/dis-10.pl:15 share/advertising/ppp-10.pl:15
 #: share/advertising/pwp-09.pl:15
@@ -14661,30 +14823,31 @@ msgid ""
 "Take advantage of valuable benefits, products and services by joining "
 "MandrakeClub, such as:"
 msgstr ""
+"MandrakeClubに参加されると、以下のような製品とサービスを受けることができます:"
 
 #: share/advertising/dis-10.pl:16 share/advertising/dwd-07.pl:16
 #: share/advertising/ppp-10.pl:17 share/advertising/pwp-09.pl:16
-#, fuzzy, c-format
+#, c-format
 msgid "\t- Full access to commercial applications"
-msgstr "コンパイルツールへのアクセス"
+msgstr "\t- 商用アプリケーションへのアクセス"
 
 #: share/advertising/dis-10.pl:17 share/advertising/dwd-07.pl:17
 #: share/advertising/ppp-10.pl:18 share/advertising/pwp-09.pl:17
 #, c-format
 msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
-msgstr ""
+msgstr "\t- MandrakeClubメンバー専用のダウンロードミラー"
 
 #: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
 #: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
-#, fuzzy, c-format
-msgid "\t- Voting for software to put in Mandrake Linux"
-msgstr "Mandrake Linux 9.2をお選びいただきありがとうございます"
+#, c-format
+msgid "\t- Voting for software to put in Mandrakelinux"
+msgstr "\t- Mandrakelinuxに何を収録するかを投票"
 
 #: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
 #: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
 #, c-format
 msgid "\t- Special discounts for products and services at MandrakeStore"
-msgstr ""
+msgstr "\t- MandrakeStoreでの製品とサービスの優待"
 
 #: share/advertising/dis-10.pl:20 share/advertising/dwd-07.pl:20
 #: share/advertising/ppp-04.pl:21 share/advertising/ppp-06.pl:19
@@ -14692,24 +14855,24 @@ msgstr ""
 #: share/advertising/pwp-09.pl:20
 #, c-format
 msgid "\t- Plus much more"
-msgstr ""
+msgstr "\t- ほかにも各種ございます"
 
 #: share/advertising/dis-10.pl:22 share/advertising/dwd-07.pl:22
 #: share/advertising/ppp-10.pl:23 share/advertising/pwp-09.pl:22
 #, c-format
 msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
-msgstr ""
+msgstr "詳しくは <b>www.mandrakeclub.com</b> をご覧ください"
 
 #: share/advertising/dis-11.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "Do you require assistance?"
-msgstr "%s インタフェースはありますか？"
+msgstr "ヘルプが必要ですか？"
 
 #: share/advertising/dis-11.pl:15 share/advertising/dwd-08.pl:16
 #: share/advertising/ppp-11.pl:15 share/advertising/pwp-10.pl:15
 #, c-format
 msgid "<b>MandrakeExpert</b> is the primary source for technical support."
-msgstr ""
+msgstr "<b>MandrakeExpert</b> で技術サポートを行っています。"
 
 #: share/advertising/dis-11.pl:17 share/advertising/dwd-08.pl:18
 #: share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
@@ -14718,20 +14881,22 @@ msgid ""
 "If you have Linux questions, subscribe to MandrakeExpert at <b>www."
 "mandrakeexpert.com</b>"
 msgstr ""
+"Linuxに関する質問がありましたらMandrakeExpert <b>www.mandrakeexpert.com</b> "
+"にご参加ください。"
 
 #: 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 ""
 
 #: share/advertising/dwd-02.pl:13
 #, c-format
-msgid "<b>Join the Mandrake Linux community!</b>"
-msgstr ""
+msgid "<b>Join the Mandrakelinux community!</b>"
+msgstr "<b>Mandrakelinuxのコミュニティに参加してください</b>"
 
 #: share/advertising/dwd-02.pl:15
 #, c-format
@@ -14739,6 +14904,8 @@ msgid ""
 "If you would like to get involved, please subscribe to the \"Cooker\" "
 "mailing list by visiting <b>mandrake-linux.com/cooker</b>"
 msgstr ""
+"いっしょにやってみようと思うかたは、 <b>mandrake-linux.com/cooker</b> の "
+"\"Cooker\" メーリングリストにご参加ください。"
 
 #: share/advertising/dwd-02.pl:17
 #, c-format
@@ -14746,33 +14913,42 @@ msgid ""
 "To learn more about our dynamic community, please visit <b>www.mandrake-"
 "linux.com</b>!"
 msgstr ""
+"コミュニティの様子を知るには、 <b>www.mandrake-linux.com</b> を参照してくださ"
+"い。"
 
 #: share/advertising/dwd-03.pl:13
 #, c-format
-msgid "<b>What is Mandrake Linux?</b>"
-msgstr ""
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "<b>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 ""
+"Mandrakelinuxは、何千ものフリーソフトウェアからなるオープンソースディストリ"
+"ビューションです。Mandrakelinuxは世界中で最も広く使われているディストリビュー"
+"ションの１つです。"
 
 #: 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 ""
+"MandrakelinuxにはKDEやGNOMEといった有名なデスクトップ環境や、多くの有名なオー"
+"プンソフトアプリケーションの最新版が含まれています。"
 
 #: 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 ""
+"Mandrakelinuxは、インストールが簡単で使いやすいディストリビューションとして広"
+"く知られています。"
 
 #: share/advertising/dwd-04.pl:15
 #, c-format
@@ -14781,7 +14957,7 @@ msgstr ""
 
 #: share/advertising/dwd-04.pl:16
 #, c-format
-msgid "\t- Find out Mandrake Linux on a bootable CD with <b>MandrakeMove</b>"
+msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
 msgstr ""
 
 #: share/advertising/dwd-04.pl:17
@@ -14830,7 +15006,7 @@ 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 ""
 
@@ -14850,9 +15026,9 @@ msgid ""
 msgstr ""
 
 #: share/advertising/dwd-07.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "MandrakeExpertのメンバーになる"
+msgstr "<b>MandrakeClubのメンバーになる</b>"
 
 #: share/advertising/dwd-07.pl:15
 #, c-format
@@ -14860,22 +15036,23 @@ msgid ""
 "Take advantage of valuable benefits, products and services by joining "
 "Mandrake Club, such as:"
 msgstr ""
+"Mandrake Clubのメンバーになると、以下のような製品とサービスを受けられます:"
 
 #: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
 #: share/advertising/pwp-10.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Do you require assistance?</b>"
-msgstr "%s インタフェースはありますか？"
+msgstr "<b>ヘルプが必要ですか？</b>"
 
 #: share/advertising/dwd-09.pl:16
 #, c-format
 msgid "<b>Note</b>"
-msgstr ""
+msgstr "<b>ご注意</b>"
 
 #: share/advertising/dwd-09.pl:18
 #, c-format
-msgid "This is the Mandrake Linux <b>Download version</b>."
-msgstr ""
+msgid "This is the Mandrakelinux <b>Download version</b>."
+msgstr "これはMandrakelinuxの <b>ダウンロードバージョン</b> です。"
 
 #: share/advertising/dwd-09.pl:20
 #, c-format
@@ -14884,19 +15061,24 @@ msgid ""
 "therefore may not work with certain modems (such as some ADSL and RTC) and "
 "video cards (such as ATI® and NVIDIA®)."
 msgstr ""
+"フリーダウンロードバージョンには商用ソフトが入っていません。従ってモデム(ADSL"
+"とRTCの一部)やビデオカード(ATIやNVIDIAなど)によっては正常に動かない場合があり"
+"ます。"
 
 #: share/advertising/ppp-01.pl:17
-#, c-format
+#, fuzzy, 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 ""
+"お使いのMandrakelinuxとそれに含まれる多くのアプリケーションは、MandrakeSoftの"
+"開発者と世界中の寄贈者との共同作業の成果です。"
 
 #: share/advertising/ppp-02.pl:13
 #, c-format
 msgid "<b>PowerPack+</b>"
-msgstr ""
+msgstr "<b>PowerPack+</b>"
 
 #: share/advertising/ppp-02.pl:15
 #, c-format
@@ -14909,61 +15091,65 @@ 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 ""
 
 #: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "ファイルシステムの暗号キーを選んでください"
+msgstr "<b>デスクトップ環境を選んでください</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 ""
+"最初にMandrakelinuxにログインするとき、ユーザは以下のようなデスクトップ環境を"
+"選択することができます: KDE, GNOME, WindowMaker, IceWM など"
 
 #: 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 ""
+"Mandrakelinuxのメニューを使うと、用途に応じたアプリを簡単に見つけることができ"
+"ます:"
 
 #: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
 #, c-format
 msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
-msgstr ""
+msgstr "\t- <b>OpenOffice.org</b> でオフィス文書の作成と編集"
 
 #: share/advertising/ppp-04.pl:16
 #, c-format
 msgid ""
 "\t- Take charge of your personal data with the integrated personal "
 "information suites: <b>Kontact</b> and <b>Evolution</b>"
-msgstr ""
+msgstr "\t- 個人情報の管理は <b>Kontact</b> と <b>Evolution</b>"
 
 #: share/advertising/ppp-04.pl:17
 #, c-format
 msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
-msgstr ""
+msgstr "\t- Webの閲覧は <b>Mozilla</b> と <b>Konqueror</b>"
 
 #: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
 #, c-format
 msgid "\t- Participate in online chat with <b>Kopete</b>"
-msgstr ""
+msgstr "\t- オンラインでのチャットは <b>Kopete</b>"
 
 #: share/advertising/ppp-04.pl:19
 #, c-format
 msgid ""
 "\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
-msgstr ""
+msgstr "\t- オーディオCDと音楽ファイルの観賞は <b>KsCD</b> と <b>Totem</b>"
 
 #: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
 #, c-format
 msgid "\t- Edit images and photos with <b>The Gimp</b>"
-msgstr ""
+msgstr "\t- 画像と写真の編集は <b>The Gimp</b>"
 
 #: share/advertising/ppp-05.pl:13
 #, c-format
@@ -14977,120 +15163,122 @@ msgstr ""
 msgid ""
 "\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
 "Environment for C++ programming"
-msgstr ""
+msgstr "\t- <b>Kdevelop</b>: C++用の統合型開発環境"
 
 #: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
 #, c-format
 msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
-msgstr ""
+msgstr "\t- <b>GCC</b>: GNUコンパイラコレクション"
 
 #: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
 #, c-format
 msgid "\t- <b>GDB</b>: the GNU Project debugger"
-msgstr ""
+msgstr "\t- <b>GDB</b>: GNUプロジェクトデバッガ"
 
 #: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
 #, c-format
 msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
-msgstr ""
+msgstr "\t- <b>Emacs</b>: カスタマイズ可能なエディタ"
 
 #: share/advertising/ppp-05.pl:19
 #, c-format
 msgid ""
 "\t- <b>Xemacs</b>: open source text editor and application development system"
-msgstr ""
+msgstr "\t- <b>Xemacs</b>: オープンソースによるテキストエディタ/開発システム"
 
 #: share/advertising/ppp-05.pl:20
 #, c-format
 msgid ""
 "\t- <b>Vim</b>: advanced text editor with more features than standard Vi"
-msgstr ""
+msgstr "\t- <b>Vim</b>: Vi を拡張した高度なテキストエディタ"
 
 #: share/advertising/ppp-06.pl:13
 #, c-format
 msgid "<b>Discover the full-featured groupware solution!</b>"
-msgstr ""
+msgstr "<b>機能豊富なグループウェア</b>"
 
 #: share/advertising/ppp-06.pl:15
 #, c-format
 msgid "It includes both server and client features for:"
-msgstr ""
+msgstr "以下の機能を備えたサーバとクライアントがあります:"
 
 #: share/advertising/ppp-06.pl:16
 #, c-format
 msgid "\t- Sending and receiving emails"
-msgstr ""
+msgstr "\t- メールの送受信"
 
 #: share/advertising/ppp-06.pl:17
 #, c-format
 msgid ""
 "\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
 "receiving), Task Requests (sending and receiving)"
-msgstr ""
+msgstr "\t- カレンダー, タスクリスト, メモ, 予定, リクエスト"
 
 #: share/advertising/ppp-06.pl:18
 #, c-format
 msgid "\t- Address Book (server and client)"
-msgstr ""
+msgstr "\t- アドレスブック"
 
 #: share/advertising/ppp-07.pl:13
 #, c-format
 msgid ""
 "Empower your business network with <b>premier server solutions</b> including:"
-msgstr ""
+msgstr "<b>最上のサーバソリューション</b>でビジネスネットワークを強化"
 
 #: share/advertising/ppp-07.pl:15
 #, c-format
 msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
-msgstr ""
+msgstr "\t- <b>Samba</b>: MS-Windowsクライアントへのファイル/印刷サービス"
 
 #: share/advertising/ppp-07.pl:16
-#, fuzzy, c-format
+#, c-format
 msgid "\t- <b>Apache</b>: The most widely used Web server"
-msgstr "Apache WWWサーバ"
+msgstr "\t- <b>Apache</b>: 最も広く使われているWebサーバ"
 
 #: share/advertising/ppp-07.pl:17
 #, c-format
 msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
-msgstr ""
+msgstr "\t- <b>MySQL</b>: 最も有名なオープンソースデータベース"
 
 #: share/advertising/ppp-07.pl:18
 #, c-format
 msgid ""
 "\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
 "transparent version control system"
-msgstr ""
+msgstr "\t- <b>CVS</b>: オープンソースネットワークのバージョン管理システム"
 
 #: share/advertising/ppp-07.pl:19
 #, c-format
 msgid ""
 "\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
-msgstr ""
+msgstr "\t- <b>ProFTPD</b>: 高度に設定可能なFTPサーバソフトウェア"
 
 #: share/advertising/ppp-07.pl:20
 #, c-format
 msgid "\t- And others"
-msgstr ""
+msgstr "\t- その他"
 
 #: 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 ""
+"お使いのMandrakelinuxは、MandrakeSoftの開発者と世界中の寄贈者との共同作業の成"
+"果です。"
 
 #: share/advertising/pwp-01.pl:19
 #, c-format
 msgid ""
 "We would like to thank everyone who participated in the development of our "
 "latest release."
-msgstr ""
+msgstr "この最新リリースの開発に携わった全てのかたがたに感謝いたします。"
 
 #: share/advertising/pwp-02.pl:13
 #, c-format
 msgid "<b>PowerPack</b>"
-msgstr ""
+msgstr "<b>PowerPack</b>"
 
 #: share/advertising/pwp-02.pl:15
 #, c-format
@@ -15104,9 +15292,11 @@ msgstr ""
 #: 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 ""
+"Mandrakelinuxのメニューを使うと、用途に応じたアプリを簡単に見つけることができ"
+"ます:"
 
 #: share/advertising/pwp-04.pl:16
 #, c-format
@@ -15114,46 +15304,47 @@ msgid ""
 "\t- Take charge of your personal data with the integrated personal "
 "information suites <b>Kontact</b> and <b>Evolution</b>"
 msgstr ""
+"\t- 個人データの管理は <b>Kontact</b> と <b>Evolution</b> にお任せください"
 
 #: share/advertising/pwp-04.pl:17
 #, c-format
 msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
-msgstr ""
+msgstr "\t- Webの閲覧は <b>Mozilla</b> と <b>Konqueror</b>"
 
 #: share/advertising/pwp-04.pl:19
 #, c-format
 msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
-msgstr ""
+msgstr "\t- オーディオCDと音楽ファイルの観賞は <b>KsCD</b> と <b>Totem</b>"
 
 #: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Development tools</b>"
-msgstr "開発用"
+msgstr "<b>開発用ツール</b>"
 
 #: share/advertising/pwp-05.pl:15
 #, c-format
 msgid ""
 "PowerPack includes everything needed for developing and creating your own "
 "software, including:"
-msgstr ""
+msgstr "PowerPackにはソフトウェア作成に必要な全てが入っています:"
 
 #: share/advertising/pwp-06.pl:15
 #, c-format
 msgid "And of course the editors!"
-msgstr ""
+msgstr "もちろんエディタも。"
 
 #: share/advertising/pwp-06.pl:17
 #, c-format
 msgid ""
 "\t- <b>Xemacs</b>: another open source text editor and application "
 "development system"
-msgstr ""
+msgstr "\t- <b>Xemacs</b>: オープンソースによるテキストエディタ/開発システム"
 
 #: share/advertising/pwp-06.pl:18
 #, c-format
 msgid ""
 "\t- <b>Vim</b>: an advanced text editor with more features than standard Vi"
-msgstr ""
+msgstr "\t- <b>Vim</b>: Vi を拡張した高度なテキストエディタ"
 
 #: standalone.pm:21
 #, c-format
@@ -15222,6 +15413,11 @@ msgid ""
 "  --splash          - enable to configure boot theme\n"
 "default mode: offer to configure autologin feature"
 msgstr ""
+"[--boot] [--splash]\n"
+"オプション:\n"
+"  --boot            - ブートローダの設定を有効に\n"
+"  --splash          - 起動テーマの設定を有効に\n"
+"default mode: offer to configure autologin feature"
 
 #: standalone.pm:57
 #, c-format
@@ -15250,9 +15446,15 @@ msgid ""
 "  --internet        - configure internet\n"
 "  --wizard          - like --add"
 msgstr ""
+"[--add]\n"
+"  --add             - \"add a network interface\" wizard\n"
+"  --del             - \"delete a network interface\" wizard\n"
+"  --skip-wizard     - manage connections\n"
+"  --internet        - configure internet\n"
+"  --wizard          - like --add"
 
 #: standalone.pm:69
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Font Importation and monitoring application\n"
@@ -15268,11 +15470,12 @@ msgid ""
 "                 : name_of_application like  so for staroffice \n"
 "                 : and gs for ghostscript for only this one."
 msgstr ""
-"Font Importation and monitoring "
-"application                                     \n"
+"\n"
+"Font Importation and monitoring application\n"
+"\n"
+"OPTIONS:\n"
 "--windows_import : import from all available windows partitions.\n"
 "--xls_fonts      : show all fonts that already exist from xls\n"
-"--strong         : strong verification of font.\n"
 "--install        : accept any font file and any directry.\n"
 "--uninstall      : uninstall any font or any directory of font.\n"
 "--replace        : replace all font if already exist\n"
@@ -15410,17 +15613,17 @@ msgstr "ログアウトして Ctrl-Alt-BackSpace を押してください"
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "変更を有効にするには再ログインしてください。"
 
-#: standalone/drakTermServ:71
+#: standalone/drakTermServ:77
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "ターミナルサーバなしでは使えません"
 
-#: 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"
 
-#: standalone/drakTermServ:121
+#: standalone/drakTermServ:134
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -15429,78 +15632,78 @@ msgstr ""
 "%s: %s には以下が必要です: hostname, MAC address, IP, nbi-image, 0/1 for "
 "THIN_CLIENT, 0/1 for Local Config..\n"
 
-#: standalone/drakTermServ:128
+#: standalone/drakTermServ:141
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: %s にはホスト名が必要です..\n"
 
-#: standalone/drakTermServ:140
+#: standalone/drakTermServ:153
 #, c-format
 msgid "You must be root to read configuration file. \n"
 msgstr "設定ファイルを読み込むにはrootになってください\n"
 
-#: standalone/drakTermServ:219 standalone/drakTermServ:488
-#: standalone/drakfont:572
+#: standalone/drakTermServ:238 standalone/drakTermServ:511
+#: standalone/drakfont:575
 #, c-format
 msgid "OK"
 msgstr "OK"
 
-#: standalone/drakTermServ:235
-#, fuzzy, c-format
-msgid "Terminal Server Configuration"
-msgstr "Mandrakeターミナルサーバの設定"
-
-#: standalone/drakTermServ:240
+#: standalone/drakTermServ:249 standalone/drakTermServ:252
 #, c-format
-msgid "DrakTermServ"
-msgstr "DrakTermServ"
+msgid "Terminal Server Configuration"
+msgstr "ターミナルサーバの設定"
 
-#: standalone/drakTermServ:264
+#: standalone/drakTermServ:267
 #, c-format
 msgid "Enable Server"
 msgstr "サーバを有効に"
 
-#: standalone/drakTermServ:270
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Disable Server"
 msgstr "サーバを無効に"
 
-#: standalone/drakTermServ:278
+#: standalone/drakTermServ:281
 #, c-format
 msgid "Start Server"
 msgstr "サーバを起動"
 
-#: standalone/drakTermServ:284
+#: standalone/drakTermServ:287
 #, c-format
 msgid "Stop Server"
 msgstr "サーバを停止"
 
-#: standalone/drakTermServ:292
+#: standalone/drakTermServ:295
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Etherboot Floppy/ISO"
 
-#: standalone/drakTermServ:296
+#: standalone/drakTermServ:299
 #, c-format
 msgid "Net Boot Images"
 msgstr "ネット用起動イメージ"
 
-#: standalone/drakTermServ:302
+#: standalone/drakTermServ:305
 #, c-format
 msgid "Add/Del Users"
 msgstr "ユーザを追加/削除"
 
-#: standalone/drakTermServ:306
+#: standalone/drakTermServ:309
 #, c-format
 msgid "Add/Del Clients"
 msgstr "クライアントを追加/削除"
 
-#: standalone/drakTermServ:317 standalone/drakbug:54
+#: standalone/drakTermServ:320 standalone/drakbug:54
 #, c-format
 msgid "First Time Wizard"
 msgstr "初回設定ウィザード"
 
-#: standalone/drakTermServ:342
+#: standalone/drakTermServ:351 standalone/drakTermServ:352
+#, c-format
+msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
+msgstr ""
+
+#: standalone/drakTermServ:358
 #, c-format
 msgid ""
 "\n"
@@ -15523,64 +15726,71 @@ msgid ""
 "    f) If it's thin clients, ask if you want to restart KDM.\n"
 msgstr ""
 
-#: standalone/drakTermServ:387
-#, fuzzy, c-format
+#: standalone/drakTermServ:403
+#, c-format
 msgid "Cancel Wizard"
-msgstr "ウィザードを起動"
+msgstr "ウィザードをキャンセル"
 
-#: standalone/drakTermServ:399
+#: standalone/drakTermServ:415
 #, c-format
 msgid "Please save dhcpd config!"
-msgstr ""
+msgstr "dhcpdの設定を保存してください"
 
-#: standalone/drakTermServ:427
+#: standalone/drakTermServ:443
+#, fuzzy, c-format
+msgid "Use thin clients."
+msgstr "thinクライアントを許可"
+
+#: 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."
 msgstr ""
 
-#: standalone/drakTermServ:433
-#, fuzzy, c-format
-msgid "Allow thin clients."
-msgstr "Thinクライアントを許可"
+#: standalone/drakTermServ:457 standalone/drakTermServ:1071
+#, c-format
+msgid "Sync client X keyboard settings with server."
+msgstr ""
 
-#: standalone/drakTermServ:441
+#: standalone/drakTermServ:464
 #, c-format
 msgid "Creating net boot images for all kernels"
-msgstr ""
+msgstr "全カーネル用のネットブートイメージを作成"
 
-#: 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 "数分かかります。"
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:466
-#, fuzzy, c-format
+#: standalone/drakTermServ:469 standalone/drakTermServ:489
+#, c-format
 msgid "Done!"
-msgstr "終了"
+msgstr "完了"
 
-#: standalone/drakTermServ:452
+#: standalone/drakTermServ:475
 #, c-format
 msgid "Syncing server user list with client list, including root."
-msgstr ""
+msgstr "サーバのユーザリストをクライアントのリストと同期(root含む)"
 
-#: standalone/drakTermServ:472
+#: standalone/drakTermServ:495
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
 "be restarted. Restart now?"
 msgstr ""
+"thinクライアントの変更を有効にするには、ディスプレイマネージャの再起動が必要"
+"です。再起動しますか？"
 
-#: standalone/drakTermServ:507
-#, c-format
-msgid "drakTermServ Overview"
+#: standalone/drakTermServ:530
+#, fuzzy, c-format
+msgid "Terminal Server Overview"
 msgstr "drakTermServの概観"
 
-#: standalone/drakTermServ:508
+#: standalone/drakTermServ:531
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -15595,8 +15805,19 @@ msgid ""
 "        \tdhcpd.conf, you should create the etherboot images for at least "
 "one full kernel."
 msgstr ""
+"        - Etherbootを有効にしたブートイメージを作成:\n"
+"        \tTo boot a kernel via etherboot, a special kernel/initrd image must "
+"be created.\n"
+"        \tmkinitrd-net does much of this work and drakTermServ is just a "
+"graphical \n"
+"        \tinterface to help manage/customize these images. To create the "
+"file \n"
+"        \t/etc/dhcpd.conf.etherboot-pcimap.include that is pulled in as an "
+"include in \n"
+"        \tdhcpd.conf, you should create the etherboot images for at least "
+"one full kernel."
 
-#: standalone/drakTermServ:514
+#: standalone/drakTermServ:537
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -15616,7 +15837,7 @@ msgid ""
 "like:"
 msgstr ""
 
-#: standalone/drakTermServ:532
+#: standalone/drakTermServ:555
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -15655,7 +15876,7 @@ msgid ""
 "clients."
 msgstr ""
 
-#: standalone/drakTermServ:552
+#: standalone/drakTermServ:575
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -15673,7 +15894,7 @@ msgid ""
 "        \tWith SUBNET/MASK being defined for your network."
 msgstr ""
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:587
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -15684,7 +15905,7 @@ msgid ""
 "file."
 msgstr ""
 
-#: standalone/drakTermServ:568
+#: standalone/drakTermServ:591
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -15695,7 +15916,7 @@ msgid ""
 "        \tdrakTermServ will help create these files."
 msgstr ""
 
-#: standalone/drakTermServ:573
+#: standalone/drakTermServ:596
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -15715,7 +15936,7 @@ msgid ""
 "machine is configured."
 msgstr ""
 
-#: standalone/drakTermServ:582
+#: standalone/drakTermServ:605
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -15745,7 +15966,7 @@ msgid ""
 "        \tputs its images."
 msgstr ""
 
-#: standalone/drakTermServ:603
+#: standalone/drakTermServ:626
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
@@ -15762,58 +15983,76 @@ msgid ""
 "        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 msgstr ""
+"        - Etherbootフロッピー/CDを作成:\n"
+"        \tThe diskless client machines need either ROM images on the NIC, or "
+"a boot floppy\n"
+"        \tor CD to initate the boot sequence.  drakTermServ will help "
+"generate these\n"
+"        \timages, based on the NIC in the client machine.\n"
+"        \t\t\n"
+"        \tA basic example of creating a boot floppy for a 3Com 3c509 "
+"manually:\n"
+"        \t\t\n"
+"        \tcat /usr/lib/etherboot/floppyload.bin \\\n"
+"        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
+"        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 
-#: standalone/drakTermServ:638
+#: standalone/drakTermServ:661
 #, c-format
 msgid "Boot Floppy"
 msgstr "起動用フロッピー"
 
-#: standalone/drakTermServ:640
+#: standalone/drakTermServ:663
 #, c-format
 msgid "Boot ISO"
 msgstr "起動用ISO"
 
-#: standalone/drakTermServ:642
-#, fuzzy, c-format
+#: standalone/drakTermServ:665
+#, c-format
 msgid "PXE Image"
-msgstr "イメージ"
+msgstr "PXEイメージ"
+
+#: standalone/drakTermServ:734
+#, fuzzy, c-format
+msgid "Default kernel version"
+msgstr "カーネルのバージョンを送る"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:761
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "カーネル全体を構築 -->"
 
-#: standalone/drakTermServ:730
+#: standalone/drakTermServ:768
 #, c-format
 msgid "No kernel selected!"
 msgstr "カーネルを選択していません"
 
-#: standalone/drakTermServ:733
+#: standalone/drakTermServ:771
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "単一NICを構築 -->"
 
-#: standalone/drakTermServ:737
+#: standalone/drakTermServ:775
 #, c-format
 msgid "No NIC selected!"
 msgstr "NICを選択していません"
 
-#: standalone/drakTermServ:740
+#: standalone/drakTermServ:778
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "全カーネルを構築 -->"
 
-#: standalone/drakTermServ:747
+#: standalone/drakTermServ:786
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- 削除"
 
-#: standalone/drakTermServ:754
+#: standalone/drakTermServ:793
 #, c-format
 msgid "Delete All NBIs"
 msgstr "全てのNBIを削除"
 
-#: standalone/drakTermServ:841
+#: standalone/drakTermServ:880
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -15824,27 +16063,27 @@ msgstr ""
 "パスワードが異なっています。\n"
 "ログインするにはターミナルサーバにユーザを削除/再追加してください。"
 
-#: standalone/drakTermServ:846
+#: standalone/drakTermServ:885
 #, c-format
 msgid "Add User -->"
 msgstr "ユーザを追加 -->"
 
-#: standalone/drakTermServ:852
+#: standalone/drakTermServ:891
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- ユーザを削除"
 
-#: standalone/drakTermServ:888
+#: standalone/drakTermServ:927
 #, c-format
 msgid "type: %s"
 msgstr "種類: %s"
 
-#: standalone/drakTermServ:892
+#: standalone/drakTermServ:931
 #, c-format
 msgid "local config: %s"
 msgstr "ローカル設定: %s"
 
-#: standalone/drakTermServ:922
+#: standalone/drakTermServ:961
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -15853,67 +16092,67 @@ msgstr ""
 "ローカルハードウェアの\n"
 "設定を許可"
 
-#: standalone/drakTermServ:931
+#: standalone/drakTermServ:970
 #, c-format
 msgid "No net boot images created!"
 msgstr "ネット用起動イメージを作っていません"
 
-#: standalone/drakTermServ:949
+#: standalone/drakTermServ:988
 #, c-format
 msgid "Thin Client"
 msgstr "Thinクライアント"
 
-#: standalone/drakTermServ:953
+#: standalone/drakTermServ:992
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "Thinクライアントを許可"
 
-#: standalone/drakTermServ:954
+#: standalone/drakTermServ:993
 #, c-format
 msgid "Add Client -->"
 msgstr "クライアントを追加 -->"
 
-#: standalone/drakTermServ:968
+#: standalone/drakTermServ:1007
 #, c-format
 msgid "type: fat"
 msgstr "種類: fat"
 
-#: standalone/drakTermServ:969
+#: standalone/drakTermServ:1008
 #, c-format
 msgid "type: thin"
 msgstr "種類: thin"
 
-#: standalone/drakTermServ:976
+#: standalone/drakTermServ:1015
 #, c-format
 msgid "local config: false"
 msgstr "ローカル設定: false"
 
-#: standalone/drakTermServ:977
+#: standalone/drakTermServ:1016
 #, c-format
 msgid "local config: true"
 msgstr "ローカル設定: true"
 
-#: standalone/drakTermServ:985
+#: standalone/drakTermServ:1024
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- クライアントを編集"
 
-#: standalone/drakTermServ:1011
+#: standalone/drakTermServ:1050
 #, c-format
 msgid "Disable Local Config"
 msgstr "ローカル設定を無効"
 
-#: standalone/drakTermServ:1018
+#: standalone/drakTermServ:1057
 #, c-format
 msgid "Delete Client"
 msgstr "クライアントを削除"
 
-#: standalone/drakTermServ:1027
+#: standalone/drakTermServ:1066
 #, c-format
 msgid "dhcpd Config..."
 msgstr "dhcpdを設定中.."
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1082
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -15922,57 +16161,67 @@ msgstr ""
 "全ての変更を有効にするにはディスプレイマネージャを再起動してください。\n"
 "(service dm restart - at the console)"
 
-#: standalone/drakTermServ:1084
+#: standalone/drakTermServ:1122
+#, c-format
+msgid "Thin clients won't work with autologin. Disable autologin?"
+msgstr ""
+
+#: standalone/drakTermServ:1138
+#, c-format
+msgid "All clients will use %s"
+msgstr ""
+
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Subnet:"
 msgstr "サブネット:"
 
-#: standalone/drakTermServ:1091
+#: standalone/drakTermServ:1175
 #, c-format
 msgid "Netmask:"
 msgstr "ネットマスク:"
 
-#: standalone/drakTermServ:1098
+#: standalone/drakTermServ:1182
 #, c-format
 msgid "Routers:"
 msgstr "ルータ:"
 
-#: standalone/drakTermServ:1105
+#: standalone/drakTermServ:1189
 #, c-format
 msgid "Subnet Mask:"
 msgstr "サブネットマスク:"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1196
 #, c-format
 msgid "Broadcast Address:"
 msgstr "Broadcastアドレス:"
 
-#: standalone/drakTermServ:1119
+#: standalone/drakTermServ:1203
 #, c-format
 msgid "Domain Name:"
 msgstr "ドメイン名:"
 
-#: standalone/drakTermServ:1127
+#: standalone/drakTermServ:1211
 #, c-format
 msgid "Name Servers:"
 msgstr "ネームサーバ:"
 
-#: standalone/drakTermServ:1138
+#: standalone/drakTermServ:1222
 #, c-format
 msgid "IP Range Start:"
 msgstr "IP幅の最初:"
 
-#: standalone/drakTermServ:1139
+#: standalone/drakTermServ:1223
 #, c-format
 msgid "IP Range End:"
 msgstr "IP幅の最後:"
 
-#: standalone/drakTermServ:1191
+#: standalone/drakTermServ:1275
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "dhcpdサーバを設定"
 
-#: standalone/drakTermServ:1192
+#: standalone/drakTermServ:1276
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -15983,133 +16232,133 @@ msgstr ""
 "お使いのシステムから抽出しています。\n"
 "必要に応じて変更してください。"
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1279
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr "Dynamic IP Address Pool:"
 
-#: standalone/drakTermServ:1208
+#: standalone/drakTermServ:1292
 #, c-format
 msgid "Write Config"
 msgstr "設定を書き込む"
 
-#: standalone/drakTermServ:1326
+#: standalone/drakTermServ:1411
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "フロッピーを挿入してください:"
 
-#: standalone/drakTermServ:1330
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr "フロッピーにアクセスできません"
 
-#: standalone/drakTermServ:1332
+#: standalone/drakTermServ:1417
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "フロッピーを取り除くことができます"
 
-#: standalone/drakTermServ:1335
+#: standalone/drakTermServ:1420
 #, c-format
 msgid "No floppy drive available!"
 msgstr "有効なフロッピードライブがありません"
 
-#: standalone/drakTermServ:1340
-#, fuzzy, c-format
+#: standalone/drakTermServ:1425
+#, c-format
 msgid "PXE image is %s/%s"
-msgstr "Etherboot ISOイメージは %s"
+msgstr "PXEイメージは %s/%s"
 
-#: standalone/drakTermServ:1342
-#, fuzzy, c-format
+#: standalone/drakTermServ:1427
+#, c-format
 msgid "Error writing %s/%s"
-msgstr "ファイル %s に書き込み中にエラー"
+msgstr "%s/%s を書き込み中にエラー"
 
-#: standalone/drakTermServ:1351
+#: standalone/drakTermServ:1436
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "Etherboot ISOイメージは %s"
 
-#: standalone/drakTermServ:1353
+#: standalone/drakTermServ:1438
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "何かおかしいようです - mkisofsをインストールしていますか？"
 
-#: standalone/drakTermServ:1372
+#: standalone/drakTermServ:1458
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "最初に /etc/dhcpd.conf を作ってください"
 
-#: standalone/drakTermServ:1533
+#: standalone/drakTermServ:1619
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
-msgstr ""
+msgstr "ターミナルサーバの %s passwd に不具合 - 再書き込み..\n"
 
-#: standalone/drakTermServ:1551
-#, fuzzy, c-format
+#: standalone/drakTermServ:1637
+#, c-format
 msgid "%s is not a user..\n"
-msgstr "%s が見つかりません..\n"
+msgstr "%s はユーザではありません..\n"
 
-#: standalone/drakTermServ:1552
-#, fuzzy, c-format
+#: standalone/drakTermServ:1638
+#, c-format
 msgid "%s is already a Terminal Server user\n"
-msgstr "%s は使用中です\n"
+msgstr "%s は既にターミナルサーバのユーザです\n"
 
-#: standalone/drakTermServ:1554
+#: standalone/drakTermServ:1640
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
-msgstr ""
+msgstr "%s のターミナルサーバへの追加は失敗しました\n"
 
-#: standalone/drakTermServ:1556
-#, fuzzy, c-format
+#: standalone/drakTermServ:1642
+#, c-format
 msgid "%s added to Terminal Server\n"
-msgstr "ターミナルサーバなしでは使えません"
+msgstr "%s をターミナルサーバに追加\n"
 
-#: standalone/drakTermServ:1608
-#, fuzzy, c-format
+#: standalone/drakTermServ:1694
+#, c-format
 msgid "Deleted %s...\n"
-msgstr "%s を検出"
+msgstr "%s を検出..\n"
 
-#: standalone/drakTermServ:1610 standalone/drakTermServ:1687
+#: standalone/drakTermServ:1696 standalone/drakTermServ:1773
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s が見つかりません..\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 は使用中です\n"
 
-#: standalone/drakTermServ:1658
+#: standalone/drakTermServ:1744
 #, c-format
 msgid "Can't open %s!"
 msgstr "%s を開けません"
 
-#: standalone/drakTermServ:1715
+#: standalone/drakTermServ:1801
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr "/etc/hosts.allow と /etc/hosts.deny は設定済みです - 変更しません"
 
-#: standalone/drakTermServ:1872
+#: standalone/drakTermServ:1958
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "設定を変更しました - clusternfs/dhcpdを再起動しますか？"
 
-#: standalone/drakautoinst:37
+#: standalone/drakautoinst:38
 #, c-format
 msgid "Error!"
 msgstr "エラー"
 
-#: standalone/drakautoinst:38
+#: standalone/drakautoinst:39
 #, c-format
 msgid "I can't find needed image file `%s'."
 msgstr "必要な画像ファイル %s が見つかりません。"
 
-#: standalone/drakautoinst:40
+#: standalone/drakautoinst:41
 #, c-format
 msgid "Auto Install Configurator"
 msgstr "自動インストールの設定"
 
-#: standalone/drakautoinst:41
+#: standalone/drakautoinst:42
 #, fuzzy, c-format
 msgid ""
 "You are about to configure an Auto Install floppy. This feature is somewhat "
@@ -16135,34 +16384,45 @@ msgstr ""
 "\n"
 "続けますか？"
 
-#: standalone/drakautoinst:59
+#: standalone/drakautoinst:60
 #, c-format
 msgid "replay"
 msgstr "再現"
 
-#: standalone/drakautoinst:59 standalone/drakautoinst:68
+#: standalone/drakautoinst:60 standalone/drakautoinst:69
 #, c-format
 msgid "manual"
 msgstr "手動"
 
-#: standalone/drakautoinst:63
+#: standalone/drakautoinst:64
 #, c-format
 msgid "Automatic Steps Configuration"
 msgstr "自動化するステップの設定"
 
-#: standalone/drakautoinst:64
+#: standalone/drakautoinst:65
 #, c-format
 msgid ""
 "Please choose for each step whether it will replay like your install, or it "
 "will be manual"
 msgstr "インストールを再現するか手動で設定するかを段階ごとに選んでください。"
 
-#: standalone/drakautoinst:76 standalone/drakautoinst:77
+#: standalone/drakautoinst:77 standalone/drakautoinst:78
+#: standalone/drakautoinst:92
 #, c-format
 msgid "Creating auto install floppy"
 msgstr "インストール自動化フロッピーを作成"
 
-#: standalone/drakautoinst:141
+#: standalone/drakautoinst:90
+#, fuzzy, c-format
+msgid "Insert another blank floppy in drive %s (for drivers disk)"
+msgstr "空のフロッピーをドライブ %s に入れてください"
+
+#: standalone/drakautoinst:91
+#, fuzzy, c-format
+msgid "Creating auto install floppy (drivers disk)"
+msgstr "インストール自動化フロッピーを作成"
+
+#: standalone/drakautoinst:158
 #, c-format
 msgid ""
 "\n"
@@ -16175,13 +16435,13 @@ msgstr ""
 "\n"
 "左に自動インストールのパラメータを表示しています"
 
-#: 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 "おめでとうございます。"
 
-#: standalone/drakautoinst:236
+#: standalone/drakautoinst:253
 #, c-format
 msgid ""
 "The floppy has been successfully generated.\n"
@@ -16190,49 +16450,49 @@ msgstr ""
 "フロッピーを正しく作成しました。\n"
 "インストールを再現することができます。"
 
-#: standalone/drakautoinst:272
+#: standalone/drakautoinst:289
 #, c-format
 msgid "Auto Install"
 msgstr "自動インストール"
 
-#: standalone/drakautoinst:341
+#: standalone/drakautoinst:358
 #, c-format
 msgid "Add an item"
 msgstr "アイテムを追加"
 
-#: standalone/drakautoinst:348
+#: standalone/drakautoinst:365
 #, c-format
 msgid "Remove the last item"
 msgstr "最後のアイテムを削除"
 
-#: standalone/drakbackup:87
+#: standalone/drakbackup:88
 #, c-format
 msgid "hd"
 msgstr "hd"
 
-#: standalone/drakbackup:87
+#: standalone/drakbackup:88
 #, c-format
 msgid "tape"
 msgstr "テープ"
 
-#: standalone/drakbackup:158
+#: standalone/drakbackup:112
 #, c-format
 msgid "No devices found"
 msgstr "デバイスがありません"
 
-#: standalone/drakbackup:196
+#: standalone/drakbackup:154
 #, c-format
 msgid ""
 "Expect is an extension to the Tcl scripting language that allows interactive "
 "sessions without user intervention."
 msgstr ""
 
-#: standalone/drakbackup:197
+#: standalone/drakbackup:155
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr "パスワードを保存する"
 
-#: standalone/drakbackup:198
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
@@ -16241,14 +16501,7 @@ msgstr ""
 "マルチセッションCDの場合はCD-RWの最初のセッションのみを消去します。\n"
 "それ以外の場合はバックアップ前にCD-RWを消去します。"
 
-#: 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 ""
-
-#: standalone/drakbackup:200
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
@@ -16256,14 +16509,14 @@ msgid ""
 msgstr ""
 "変更があったファイルを保存する。実際の動作はバックアップのモードに依存する。"
 
-#: standalone/drakbackup:201
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
 "last backup."
 msgstr "積み重ねバックアップは、前回のバックアップからの差分のみを保存します。"
 
-#: standalone/drakbackup:202
+#: standalone/drakbackup:159
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
@@ -16272,14 +16525,14 @@ msgstr ""
 "差分バックアップは、ベースバックアップからの差分のみを\n"
 "保存します。"
 
-#: standalone/drakbackup:203
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "This should be a local user or email addresse that you want the backup "
 "results sent to. You will need to define a functioning mail server."
 msgstr ""
 
-#: standalone/drakbackup:204
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -16288,7 +16541,7 @@ msgstr ""
 ".backupignoreで指定したファイル/ワイルドカードは\n"
 "バックアップされません。"
 
-#: standalone/drakbackup:205
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -16300,7 +16553,7 @@ msgstr ""
 "このオプションを有効にすると、バックアップ後に\n"
 "tarファイルを削除します。"
 
-#: standalone/drakbackup:206
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -16308,46 +16561,58 @@ msgid ""
 "path."
 msgstr ""
 
-#: standalone/drakbackup:207
+#: standalone/drakbackup:164
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
 "run-parts in /etc/crontab."
 msgstr ""
 
-#: standalone/drakbackup:604
-#, fuzzy, c-format
+#: standalone/drakbackup:396
+#, c-format
+msgid "No media selected for cron operation."
+msgstr ""
+
+#: standalone/drakbackup:400
+#, c-format
+msgid "No interval selected for cron operation."
+msgstr ""
+
+#: standalone/drakbackup:447
+#, c-format
 msgid "Interval cron not available as non-root"
-msgstr "Cronは現在root以外では使えません"
+msgstr "cronの間隔はroot以外では使えません"
 
-#: 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 ""
+msgstr "\"%s\" はEmailとしてもローカルユーザ名としても無効です"
 
-#: 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 "
 "a complete email address!"
 msgstr ""
+"\"%s\" はローカルユーザですが、ローカルsmtpを選んでいないのでEmailアドレスを"
+"使ってください"
 
-#: standalone/drakbackup:728
+#: standalone/drakbackup:545
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr "ユーザリストを変更しました。設定ファイルを書き換えます"
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:547
 #, c-format
 msgid "Old user list:\n"
 msgstr "古いユーザリスト:\n"
 
-#: standalone/drakbackup:732
+#: standalone/drakbackup:549
 #, c-format
 msgid "New user list:\n"
 msgstr "新規ユーザリスト:\n"
 
-#: standalone/drakbackup:779
+#: standalone/drakbackup:594
 #, c-format
 msgid ""
 "\n"
@@ -16356,7 +16621,7 @@ msgstr ""
 "\n"
 "                      DrakBackupの報告 \n"
 
-#: standalone/drakbackup:780
+#: standalone/drakbackup:595
 #, c-format
 msgid ""
 "\n"
@@ -16365,7 +16630,7 @@ msgstr ""
 "\n"
 "                      DrakBackupのデーモンの報告\n"
 
-#: standalone/drakbackup:786
+#: standalone/drakbackup:601
 #, c-format
 msgid ""
 "\n"
@@ -16378,61 +16643,61 @@ 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 "全体の進行"
 
-#: standalone/drakbackup:865
-#, fuzzy, c-format
+#: standalone/drakbackup:678
+#, c-format
 msgid ""
 "%s exists, delete?\n"
 "\n"
 "If you've already done this process you'll probably\n"
 " need to purge the entry from authorized_keys on the server."
 msgstr ""
-"%s は既に存在します。削除しますか?\n"
+"%s は存在します。削除しますか?\n"
 "\n"
-"警告: このプロセスを既に行った場合は、おそらくサーバの\n"
+"このプロセスを既に行った場合は、おそらくサーバの\n"
 "authorized_keys から項目を削除する必要があります。"
 
-#: standalone/drakbackup:874
+#: standalone/drakbackup:687
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "キーの生成にはしばらく時間がかかります。"
 
-#: standalone/drakbackup:881
-#, fuzzy, c-format
+#: standalone/drakbackup:694
+#, c-format
 msgid "Cannot spawn %s."
-msgstr "エラー: %s を展開できません。"
+msgstr "%s を作れません。"
 
-#: standalone/drakbackup:898
+#: standalone/drakbackup:711
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "%s のパスワードプロンプト(ポート %s)がありません"
 
-#: standalone/drakbackup:899
+#: standalone/drakbackup:712
 #, c-format
 msgid "Bad password on %s"
 msgstr "%s のパスワードが間違っています"
 
-#: standalone/drakbackup:900
+#: standalone/drakbackup:713
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "%s を %s に転送する権限がありません"
 
-#: standalone/drakbackup:901
+#: standalone/drakbackup:714
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "%s が %s で見つかりません"
 
-#: standalone/drakbackup:904
+#: standalone/drakbackup:718
 #, c-format
 msgid "%s not responding"
 msgstr "%s が応答しません"
 
-#: standalone/drakbackup:908
+#: standalone/drakbackup:722
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -16449,47 +16714,47 @@ msgstr ""
 "\n"
 "パスワードのプロンプトが出なければ成功です。"
 
-#: standalone/drakbackup:953
+#: standalone/drakbackup:766
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "WebDAVリモートサイトと既に同期済みです"
 
-#: standalone/drakbackup:957
+#: standalone/drakbackup:770
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr "WebDAV転送に失敗"
 
-#: standalone/drakbackup:978
+#: standalone/drakbackup:791
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "CD-R/DVD-Rがドライブにありません"
 
-#: standalone/drakbackup:982
+#: standalone/drakbackup:795
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "記録可能なメディアではありません"
 
-#: standalone/drakbackup:986
+#: standalone/drakbackup:799
 #, c-format
 msgid "Not erasable media!"
 msgstr "消去可能なメディアではありません"
 
-#: standalone/drakbackup:1027
+#: standalone/drakbackup:840
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr "メディアの消去にはしばらく時間がかかります。"
 
-#: standalone/drakbackup:1103
+#: standalone/drakbackup:898
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "CDにアクセスする権限に問題が発生"
 
-#: standalone/drakbackup:1130
+#: standalone/drakbackup:925
 #, c-format
 msgid "No tape in %s!"
 msgstr "%s にテープがありません"
 
-#: standalone/drakbackup:1232
+#: standalone/drakbackup:1025
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
@@ -16498,37 +16763,37 @@ msgstr ""
 "Backupの割り当てを超えています\n"
 "%d Mb(割り当て量は%d Mb)使用しています"
 
-#: standalone/drakbackup:1251 standalone/drakbackup:1305
+#: standalone/drakbackup:1044 standalone/drakbackup:1077
 #, c-format
 msgid "Backup system files..."
 msgstr "システムファイルをバックアップ"
 
-#: standalone/drakbackup:1306 standalone/drakbackup:1368
+#: standalone/drakbackup:1078 standalone/drakbackup:1119
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "ハードディスクにバックアップ"
 
-#: standalone/drakbackup:1367
+#: standalone/drakbackup:1118
 #, c-format
 msgid "Backup User files..."
 msgstr "ユーザファイルのバックアップ"
 
-#: standalone/drakbackup:1421
+#: standalone/drakbackup:1153
 #, c-format
 msgid "Backup Other files..."
 msgstr "他のファイルをバックアップ"
 
-#: standalone/drakbackup:1422
+#: standalone/drakbackup:1154
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "ハードディスクバックアップの進行"
 
-#: standalone/drakbackup:1427
+#: standalone/drakbackup:1159
 #, c-format
 msgid "No changes to backup!"
 msgstr "バックアップする変更がありません"
 
-#: standalone/drakbackup:1445 standalone/drakbackup:1469
+#: standalone/drakbackup:1177 standalone/drakbackup:1201
 #, c-format
 msgid ""
 "\n"
@@ -16539,7 +16804,7 @@ msgstr ""
 "%s 経由のDrakbackup:\n"
 "\n"
 
-#: standalone/drakbackup:1454
+#: standalone/drakbackup:1186
 #, c-format
 msgid ""
 "\n"
@@ -16549,22 +16814,18 @@ msgstr ""
 "\n"
 " FTP接続に問題が発生: FTPでバックアップファイルを送れません。\n"
 
-#: standalone/drakbackup:1455
-#, fuzzy, c-format
+#: standalone/drakbackup:1187
+#, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
-msgstr ""
-"FTPでのファイル転送中にエラーが発生。\n"
-"FTPの設定を修正してください。"
+msgstr "FTPでのファイル送信中にエラーが発生。FTPの設定を修正してください。"
 
-#: standalone/drakbackup:1457
-#, fuzzy, c-format
+#: standalone/drakbackup:1189
+#, c-format
 msgid "file list sent by FTP: %s\n"
-msgstr ""
-"FTPで送ったファイルのリスト: %s\n"
-" "
+msgstr "FTPで送ったファイルのリスト: %s\n"
 
-#: standalone/drakbackup:1474
+#: standalone/drakbackup:1206
 #, c-format
 msgid ""
 "\n"
@@ -16575,7 +16836,7 @@ msgstr ""
 "CD経由のDrakbackup:\n"
 "\n"
 
-#: standalone/drakbackup:1479
+#: standalone/drakbackup:1211
 #, c-format
 msgid ""
 "\n"
@@ -16586,41 +16847,27 @@ msgstr ""
 "テープ経由のDrakbackup:\n"
 "\n"
 
-#: standalone/drakbackup:1488
-#, fuzzy, c-format
+#: standalone/drakbackup:1220
+#, c-format
 msgid "Error sending mail. Your report mail was not sent."
-msgstr ""
-"メール送信エラー\n"
-"  報告メールを送信できません。\n"
-"  sendmailを設定してください"
+msgstr "メール送信中にエラー。報告メールを送りませんでした。"
 
-#: standalone/drakbackup:1489
+#: standalone/drakbackup:1221
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " メール送信中にエラー。 \n"
 
-#: standalone/drakbackup:1518
+#: standalone/drakbackup:1249
 #, c-format
 msgid "Can't create catalog!"
 msgstr "カタログを作成できません"
 
-#: standalone/drakbackup:1639
-#, c-format
-msgid "Can't create log file!"
-msgstr "ログファイルを作成できません"
-
-#: standalone/drakbackup:1656 standalone/drakbackup:1667
-#: standalone/drakfont:584
-#, c-format
-msgid "File Selection"
-msgstr "ファイルを選択"
-
-#: standalone/drakbackup:1695
+#: standalone/drakbackup:1455
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "ファイルかディレクトリを選んで'OK'をクリックしてください"
 
-#: standalone/drakbackup:1723
+#: standalone/drakbackup:1484
 #, c-format
 msgid ""
 "\n"
@@ -16629,42 +16876,42 @@ msgstr ""
 "\n"
 "必要なオプションをチェックしてください。\n"
 
-#: standalone/drakbackup:1724
+#: standalone/drakbackup:1485
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 msgstr ""
 "このオプションを使うと /etc のファイルを全てバックアップ/復元できます。\n"
 
-#: standalone/drakbackup:1725
+#: standalone/drakbackup:1486
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "システムファイルをバックアップする(/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 "積み重ね/比較バックアップ  (古いバックアップを残す)"
 
-#: 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 "積み重ねバックアップを行う"
 
-#: 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 "比較バックアップを使う"
 
-#: standalone/drakbackup:1730
+#: standalone/drakbackup:1491
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "危険なファイル(passwd, group, fstab)は含まない"
 
-#: standalone/drakbackup:1731
+#: standalone/drakbackup:1492
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -16673,186 +16920,172 @@ msgstr ""
 "このオプションを使うと、好きなバージョンの /etc ディレクトリを\n"
 "復元できます。"
 
-#: standalone/drakbackup:1762
+#: standalone/drakbackup:1523
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr "バックアップするユーザにチェックを入れてください。"
 
-#: standalone/drakbackup:1789
+#: standalone/drakbackup:1550
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "ブラウザのキャッシュは含まない"
 
-#: standalone/drakbackup:1844 standalone/drakfont:650
+#: standalone/drakbackup:1605 standalone/drakfont:656
 #, c-format
 msgid "Remove Selected"
 msgstr "リストから削除"
 
-#: standalone/drakbackup:1891 standalone/drakbackup:1895
-#, c-format
-msgid "Under Devel ... please wait."
-msgstr "開発中です。お待ちください。"
-
-#: standalone/drakbackup:1909
-#, c-format
-msgid "Windows (FAT32)"
-msgstr "Windows(FAT32)"
-
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1668
 #, c-format
 msgid "Users"
 msgstr "ユーザ名"
 
-#: standalone/drakbackup:1961
+#: standalone/drakbackup:1688
 #, c-format
 msgid "Use network connection to backup"
 msgstr "ネットワーク接続を使用"
 
-#: standalone/drakbackup:1963
+#: standalone/drakbackup:1690
 #, c-format
 msgid "Net Method:"
 msgstr "ネットの方式:"
 
-#: standalone/drakbackup:1967
+#: standalone/drakbackup:1694
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "Use Expect for SSH"
 
-#: standalone/drakbackup:1968
+#: standalone/drakbackup:1695
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "SSHのバックアップキーを作成/転送"
 
-#: standalone/drakbackup:1970
+#: standalone/drakbackup:1697
 #, c-format
 msgid "Transfer Now"
 msgstr "今すぐ転送"
 
-#: standalone/drakbackup:1972
+#: standalone/drakbackup:1699
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "既に他の(drakbackupのものではない)キーがあります"
 
-#: standalone/drakbackup:1975
+#: standalone/drakbackup:1702
 #, c-format
 msgid "Host name or IP."
 msgstr "ホスト名もしくはIP"
 
-#: standalone/drakbackup:1980
+#: standalone/drakbackup:1707
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr "バックアップを保存するディレクトリ(もしくはモジュール名)"
 
-#: standalone/drakbackup:1985
+#: standalone/drakbackup:1712
 #, c-format
 msgid "Login name"
 msgstr "ログイン名"
 
-#: standalone/drakbackup:1992
+#: standalone/drakbackup:1719
 #, c-format
 msgid "Remember this password"
 msgstr "このパスワードを記憶する"
 
-#: standalone/drakbackup:2004
+#: standalone/drakbackup:1735
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "ホスト名とユーザ名とパスワードが必要です"
 
-#: standalone/drakbackup:2106
+#: standalone/drakbackup:1833
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "CD/DVDROMにバックアップ"
 
-#: standalone/drakbackup:2109
+#: standalone/drakbackup:1836
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "CD/DVDデバイスを選んでください"
 
-#: standalone/drakbackup:2114
-#, fuzzy, c-format
+#: standalone/drakbackup:1841
+#, c-format
 msgid "Choose your CD/DVD media size"
-msgstr "CD/DVDメディアのサイズを選んでください(MB)"
+msgstr "CD/DVDメディアのサイズを選んでください"
 
-#: standalone/drakbackup:2121
+#: standalone/drakbackup:1848
 #, c-format
 msgid "Multisession CD"
 msgstr "マルチセッションCD"
 
-#: standalone/drakbackup:2123
+#: standalone/drakbackup:1850
 #, c-format
 msgid "CDRW media"
 msgstr "CD-RWメディア"
 
-#: standalone/drakbackup:2128
+#: standalone/drakbackup:1856
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "RWメディアを消去(最初のセッション)"
 
-#: standalone/drakbackup:2129
+#: standalone/drakbackup:1857
 #, c-format
 msgid " Erase Now "
 msgstr "今すぐ消去"
 
-#: standalone/drakbackup:2136
-#, fuzzy, c-format
+#: standalone/drakbackup:1863
+#, c-format
 msgid "DVD+RW media"
-msgstr "CD-RWメディア"
+msgstr "DVD+RWメディア"
 
-#: standalone/drakbackup:2138
-#, fuzzy, c-format
+#: standalone/drakbackup:1865
+#, c-format
 msgid "DVD-R media"
-msgstr "CD-RWメディア"
+msgstr "DVD-Rメディア"
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:1867
 #, c-format
 msgid "DVDRAM device"
-msgstr "DVD-RAMデバイス"
-
-#: standalone/drakbackup:2145
-#, c-format
-msgid ""
-"Enter your CD Writer device name\n"
-" ex: 0,1,0"
-msgstr ""
-"CDライタのデバイス名を入力してください\n"
-"例: 0,1,0"
+msgstr "DVDRAMデバイス"
 
-#: standalone/drakbackup:2177
+#: standalone/drakbackup:1898
 #, c-format
 msgid "No CD device defined!"
 msgstr "CDデバイスを定義していません"
 
-#: standalone/drakbackup:2227
+#: standalone/drakbackup:1945
 #, c-format
 msgid "Use tape to backup"
 msgstr "テープにバックアップ"
 
-#: standalone/drakbackup:2230
+#: standalone/drakbackup:1948
 #, c-format
 msgid "Device name to use for backup"
 msgstr "バックアップに使うデバイスの名前"
 
-#: standalone/drakbackup:2237
+#: standalone/drakbackup:1954
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr "バックアップ後にテープを巻き戻さない"
 
-#: standalone/drakbackup:2243
+#: standalone/drakbackup:1960
 #, c-format
 msgid "Erase tape before backup"
 msgstr "バックアップ前にテープを消去"
 
-#: standalone/drakbackup:2249
+#: standalone/drakbackup:1966
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "バックアップしたらテープをイジェクト"
 
-#: standalone/drakbackup:2317
+#: standalone/drakbackup:2033
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "保存先のディレクトリ:"
 
-#: standalone/drakbackup:2326
+#: standalone/drakbackup:2037
+#, fuzzy, c-format
+msgid "Directory to save to"
+msgstr "保存先のディレクトリ:"
+
+#: standalone/drakbackup:2042
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -16861,316 +17094,309 @@ msgstr ""
 "Drakbackupに割り当てる最大の容量を\n"
 "MBで入力してください"
 
-#: standalone/drakbackup:2399
+#: standalone/drakbackup:2106
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CDROM/DVDROM"
 
-#: standalone/drakbackup:2404
+#: standalone/drakbackup:2111
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "ハードドライブ/NFS"
 
-#: standalone/drakbackup:2420 standalone/drakbackup:2425
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2127 standalone/drakbackup:2132
+#: standalone/drakbackup:2137
 #, c-format
 msgid "hourly"
 msgstr "毎時間"
 
-#: standalone/drakbackup:2421 standalone/drakbackup:2426
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2128 standalone/drakbackup:2133
+#: standalone/drakbackup:2137
 #, c-format
 msgid "daily"
 msgstr "毎日"
 
-#: standalone/drakbackup:2422 standalone/drakbackup:2427
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2129 standalone/drakbackup:2134
+#: standalone/drakbackup:2137
 #, c-format
 msgid "weekly"
 msgstr "毎週"
 
-#: standalone/drakbackup:2423 standalone/drakbackup:2428
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2130 standalone/drakbackup:2135
+#: standalone/drakbackup:2137
 #, c-format
 msgid "monthly"
 msgstr "毎月"
 
-#: standalone/drakbackup:2424 standalone/drakbackup:2429
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2131 standalone/drakbackup:2136
+#: standalone/drakbackup:2137
 #, c-format
 msgid "custom"
 msgstr "カスタム"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "January"
 msgstr "1 月"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "February"
 msgstr "2 月"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "March"
 msgstr "3 月"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "April"
 msgstr "4 月"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "May"
 msgstr "5 月"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "June"
 msgstr "6 月"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "July"
 msgstr "7 月"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "August"
 msgstr "8 月"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "September"
 msgstr "9 月"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "October"
 msgstr "10 月"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "November"
 msgstr "11 月"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "December"
 msgstr "12 月"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Sunday"
 msgstr "日曜日"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Monday"
 msgstr "月曜日"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Tuesday"
 msgstr "火曜日"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Thursday"
 msgstr "木曜日"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Friday"
 msgstr "金曜日"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Saturday"
 msgstr "土曜日"
 
-#: standalone/drakbackup:2478
+#: standalone/drakbackup:2185
 #, c-format
 msgid "Use daemon"
 msgstr "デーモンを使う"
 
-#: standalone/drakbackup:2483
+#: standalone/drakbackup:2190
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr ""
 "バックアップの間隔を\n"
 "選んでください"
 
-#: standalone/drakbackup:2489
+#: standalone/drakbackup:2196
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "カスタムセットアップ/crontab項目:"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2201
 #, c-format
 msgid "Minute"
 msgstr "分"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Hour"
 msgstr "時間"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2209
 #, c-format
 msgid "Day"
 msgstr "日"
 
-#: standalone/drakbackup:2506
+#: standalone/drakbackup:2213
 #, c-format
 msgid "Month"
 msgstr "月"
 
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2217
 #, c-format
 msgid "Weekday"
 msgstr "ウィークデー"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2223
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "バックアップ先のメディアを選んでください。"
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2230
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr "サービスにcronデーモンがあることを確認してください。"
 
-#: standalone/drakbackup:2524
+#: standalone/drakbackup:2231
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr "注意: 現在すべての'ネット'メディアはハードドライブを使います。"
 
-#: standalone/drakbackup:2571
-#, c-format
-msgid "Use tar and bzip2 (rather than tar and gzip)"
-msgstr "tarとbzip2を使う(tarとgzipではなく)"
+#: standalone/drakbackup:2281
+#, fuzzy, c-format
+msgid "Please choose the compression type"
+msgstr "復元する日付を選んでください:"
 
-#: standalone/drakbackup:2572
+#: standalone/drakbackup:2285
 #, c-format
 msgid "Use .backupignore files"
 msgstr ".backupignoreファイルを使う"
 
-#: standalone/drakbackup:2574
+#: standalone/drakbackup:2287
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "バックアップしたら以下にメールを送る:"
 
-#: standalone/drakbackup:2580
-#, fuzzy, c-format
+#: standalone/drakbackup:2293
+#, c-format
 msgid "SMTP server for mail:"
-msgstr "SMBサーバのホスト名"
+msgstr "メールのSMTPサーバ:"
 
-#: standalone/drakbackup:2585
+#: standalone/drakbackup:2298
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr "他のメディアにバックアップしたらハードドライブのtarファイルを削除"
 
-#: standalone/drakbackup:2624
+#: standalone/drakbackup:2338
 #, c-format
 msgid "What"
 msgstr "何を"
 
-#: standalone/drakbackup:2629
+#: standalone/drakbackup:2343
 #, c-format
 msgid "Where"
 msgstr "どこに"
 
-#: standalone/drakbackup:2634
+#: standalone/drakbackup:2348
 #, c-format
 msgid "When"
 msgstr "いつ"
 
-#: standalone/drakbackup:2639
+#: standalone/drakbackup:2353
 #, c-format
 msgid "More Options"
 msgstr "その他のオプション"
 
-#: standalone/drakbackup:2651
-#, fuzzy, c-format
+#: standalone/drakbackup:2366
+#, c-format
 msgid "Backup destination not configured..."
-msgstr "ネットワーク機能を設定していません"
+msgstr "バックアップ先を設定していません.."
 
-#: standalone/drakbackup:2667 standalone/drakbackup:4731
+#: standalone/drakbackup:2385 standalone/drakbackup:4413
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Drakbackupの設定"
 
-#: standalone/drakbackup:2684
+#: standalone/drakbackup:2402
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "バックアップ先を選んでください"
 
-#: standalone/drakbackup:2686
-#, fuzzy, c-format
+#: standalone/drakbackup:2404
+#, c-format
 msgid "Hard Drive used to prepare backups for all media"
-msgstr "他のメディアにバックアップしたらハードドライブのtarファイルを削除"
+msgstr "全てのメディアにバックアップするための準備用ハードドライブ"
 
-#: standalone/drakbackup:2694
+#: standalone/drakbackup:2412
 #, c-format
 msgid "Across Network"
 msgstr "ネットワークへ"
 
-#: standalone/drakbackup:2702
+#: standalone/drakbackup:2420
 #, c-format
 msgid "On CD-R"
 msgstr "CD-Rへ"
 
-#: standalone/drakbackup:2710
+#: standalone/drakbackup:2428
 #, c-format
 msgid "On Tape Device"
 msgstr "テープデバイスへ"
 
-#: standalone/drakbackup:2738
-#, c-format
-msgid "Please select media for backup..."
-msgstr ""
-"バックアップ用メディアを\n"
-"選んでください"
-
-#: standalone/drakbackup:2760
+#: standalone/drakbackup:2468
 #, c-format
 msgid "Backup Users"
 msgstr "ユーザをバックアップ"
 
-#: standalone/drakbackup:2761
+#: standalone/drakbackup:2469
 #, c-format
 msgid " (Default is all users)"
 msgstr " (デフォルトは全ユーザ)"
 
-#: standalone/drakbackup:2773
+#: standalone/drakbackup:2481
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "バックアップするものを選んでください"
 
-#: standalone/drakbackup:2774
+#: standalone/drakbackup:2482
 #, c-format
 msgid "Backup System"
 msgstr "システムをバックアップ"
 
-#: standalone/drakbackup:2776
+#: standalone/drakbackup:2484
 #, c-format
 msgid "Select user manually"
 msgstr "ユーザを手動で選ぶ"
 
-#: standalone/drakbackup:2805
+#: standalone/drakbackup:2513
 #, c-format
 msgid "Please select data to backup..."
 msgstr "バックアップするデータを選んでください。"
 
-#: standalone/drakbackup:2879
+#: standalone/drakbackup:2585
 #, c-format
 msgid ""
 "\n"
@@ -17179,7 +17405,7 @@ msgstr ""
 "\n"
 "バックアップ元: \n"
 
-#: standalone/drakbackup:2880
+#: standalone/drakbackup:2586
 #, c-format
 msgid ""
 "\n"
@@ -17188,7 +17414,7 @@ msgstr ""
 "\n"
 "- システムファイル:\n"
 
-#: standalone/drakbackup:2882
+#: standalone/drakbackup:2588
 #, c-format
 msgid ""
 "\n"
@@ -17197,7 +17423,7 @@ msgstr ""
 "\n"
 "- ユーザファイル:\n"
 
-#: standalone/drakbackup:2884
+#: standalone/drakbackup:2590
 #, c-format
 msgid ""
 "\n"
@@ -17206,7 +17432,7 @@ msgstr ""
 "\n"
 "- その他のファイル:\n"
 
-#: standalone/drakbackup:2886
+#: standalone/drakbackup:2592
 #, c-format
 msgid ""
 "\n"
@@ -17215,12 +17441,12 @@ msgstr ""
 "\n"
 "- ハードドライブの保存パス: %s\n"
 
-#: standalone/drakbackup:2887
+#: standalone/drakbackup:2593
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tディスクの使用は%s MBまで\n"
 
-#: standalone/drakbackup:2890
+#: standalone/drakbackup:2596
 #, c-format
 msgid ""
 "\n"
@@ -17229,17 +17455,17 @@ msgstr ""
 "\n"
 "- バックアップ後にハードドライブのtarファイルを削除\n"
 
-#: standalone/drakbackup:2894
+#: standalone/drakbackup:2600
 #, c-format
 msgid "NO"
 msgstr "いいえ"
 
-#: standalone/drakbackup:2895
+#: standalone/drakbackup:2601
 #, c-format
 msgid "YES"
 msgstr "はい"
 
-#: standalone/drakbackup:2896
+#: standalone/drakbackup:2602
 #, c-format
 msgid ""
 "\n"
@@ -17248,22 +17474,22 @@ msgstr ""
 "\n"
 "- CDに書き込む"
 
-#: 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 " on device: %s"
 
-#: standalone/drakbackup:2899
+#: standalone/drakbackup:2605
 #, c-format
 msgid " (multi-session)"
 msgstr " (マルチセッション)"
 
-#: standalone/drakbackup:2900
+#: standalone/drakbackup:2606
 #, c-format
 msgid ""
 "\n"
@@ -17272,12 +17498,12 @@ msgstr ""
 "\n"
 "- デバイス %s のテープに保存"
 
-#: standalone/drakbackup:2901
+#: standalone/drakbackup:2607
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tErase=%s"
 
-#: standalone/drakbackup:2904
+#: standalone/drakbackup:2610
 #, c-format
 msgid ""
 "\n"
@@ -17286,7 +17512,7 @@ msgstr ""
 "\n"
 "- %s から ホスト %s に保存\n"
 
-#: standalone/drakbackup:2905
+#: standalone/drakbackup:2611
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -17295,7 +17521,7 @@ msgstr ""
 "\t\t ユーザ名: %s\n"
 "\t\t パス: %s \n"
 
-#: standalone/drakbackup:2906
+#: standalone/drakbackup:2612
 #, c-format
 msgid ""
 "\n"
@@ -17304,37 +17530,42 @@ msgstr ""
 "\n"
 "- オプション:\n"
 
-#: standalone/drakbackup:2907
+#: standalone/drakbackup:2613
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tシステムファイルは含まない\n"
 
-#: standalone/drakbackup:2910
+#: standalone/drakbackup:2615
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\tバックアップでtarとbzip2を使う\n"
 
-#: standalone/drakbackup:2912
+#: standalone/drakbackup:2616
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tバックアップでtarとgzipを使う\n"
 
-#: standalone/drakbackup:2915
+#: standalone/drakbackup:2617
+#, fuzzy, c-format
+msgid "\tBackups use tar only\n"
+msgstr "\tバックアップでtarとgzipを使う\n"
+
+#: standalone/drakbackup:2619
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\t.backupignoreファイルを使う\n"
 
-#: standalone/drakbackup:2916
+#: standalone/drakbackup:2620
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\tメールを %s に送ってください\n"
 
-#: standalone/drakbackup:2917
-#, fuzzy, c-format
+#: standalone/drakbackup:2621
+#, c-format
 msgid "\tUsing SMTP server %s\n"
-msgstr "CUPSサーバ %s で"
+msgstr "\tSMTPサーバ %s を使う\n"
 
-#: standalone/drakbackup:2919
+#: standalone/drakbackup:2623
 #, c-format
 msgid ""
 "\n"
@@ -17343,47 +17574,47 @@ msgstr ""
 "\n"
 "- デーモン, %s via:\n"
 
-#: standalone/drakbackup:2920
+#: standalone/drakbackup:2624
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-ハードドライブ\n"
 
-#: standalone/drakbackup:2921
+#: standalone/drakbackup:2625
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-CDROM\n"
 
-#: standalone/drakbackup:2922
+#: standalone/drakbackup:2626
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-テープ \n"
 
-#: standalone/drakbackup:2923
+#: standalone/drakbackup:2627
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-FTPネットワーク\n"
 
-#: standalone/drakbackup:2924
+#: standalone/drakbackup:2628
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-SSHネットワーク\n"
 
-#: standalone/drakbackup:2925
+#: standalone/drakbackup:2629
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-rsyncネットワーク\n"
 
-#: standalone/drakbackup:2926
+#: standalone/drakbackup:2630
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-webdavネットワーク\n"
 
-#: standalone/drakbackup:2928
+#: standalone/drakbackup:2632
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr "設定がありません。ウィザードか詳細をクリックしてください\n"
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2637
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -17392,33 +17623,27 @@ msgstr ""
 "復元するデータの一覧:\n"
 "\n"
 
-#: standalone/drakbackup:2935
-#, fuzzy, c-format
+#: standalone/drakbackup:2639
+#, c-format
 msgid "- Restore System Files.\n"
-msgstr ""
-"\n"
-"- システムファイル:\n"
+msgstr "- システムファイルを復旧\n"
 
-#: standalone/drakbackup:2937 standalone/drakbackup:2947
+#: standalone/drakbackup:2641 standalone/drakbackup:2651
 #, c-format
 msgid "   - from date: %s %s\n"
-msgstr ""
+msgstr "   - この日付から: %s %s\n"
 
-#: standalone/drakbackup:2940
-#, fuzzy, c-format
+#: standalone/drakbackup:2644
+#, c-format
 msgid "- Restore User Files: \n"
-msgstr ""
-"\n"
-"- ユーザファイル:\n"
+msgstr "- ユーザファイルを復旧: \n"
 
-#: standalone/drakbackup:2945
-#, fuzzy, c-format
+#: standalone/drakbackup:2649
+#, c-format
 msgid "- Restore Other Files: \n"
-msgstr ""
-"\n"
-"- その他のファイル:\n"
+msgstr "- その他のファイルを復旧: \n"
 
-#: standalone/drakbackup:3121
+#: standalone/drakbackup:2830
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -17427,124 +17652,136 @@ msgstr ""
 "壊れているデータの一覧:\n"
 "\n"
 
-#: standalone/drakbackup:3123
+#: standalone/drakbackup:2832
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "次回にチェックを外すか削除してください。"
 
-#: standalone/drakbackup:3133
+#: standalone/drakbackup:2842
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "バックアップファイルが壊れています"
 
-#: standalone/drakbackup:3154
+#: standalone/drakbackup:2863
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "          選択したデータは全て          "
 
-#: standalone/drakbackup:3155
+#: standalone/drakbackup:2864
 #, c-format
 msgid "          Successfuly Restored on %s       "
 msgstr "          %s に復元しました      "
 
-#: standalone/drakbackup:3270
+#: standalone/drakbackup:2987
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         復元の設定       "
 
-#: standalone/drakbackup:3298
+#: standalone/drakbackup:3015
 #, c-format
 msgid "OK to restore the other files."
 msgstr "OK で他のファイルを復元します"
 
-#: standalone/drakbackup:3316
+#: standalone/drakbackup:3031
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr "復元するユーザのリスト(各ユーザの最新の日付だけが重要です)"
 
-#: standalone/drakbackup:3382
-#, fuzzy, c-format
+#: standalone/drakbackup:3098
+#, c-format
 msgid "Please choose the date to restore:"
-msgstr "復元する日付を選んでください"
+msgstr "復元する日付を選んでください:"
 
-#: standalone/drakbackup:3420
+#: standalone/drakbackup:3135
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "ハードディスクから復元する"
 
-#: standalone/drakbackup:3422
+#: standalone/drakbackup:3137
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "バックアップを保存するディレクトリを入力"
 
-#: standalone/drakbackup:3478
+#: standalone/drakbackup:3141
+#, fuzzy, c-format
+msgid "Directory with backups"
+msgstr "全バックアップを復元"
+
+#: standalone/drakbackup:3194
 #, c-format
 msgid "Select another media to restore from"
 msgstr "別の復元するメディアを選んでください"
 
-#: standalone/drakbackup:3480
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Other Media"
 msgstr "その他のメディア"
 
-#: standalone/drakbackup:3485
+#: standalone/drakbackup:3201
 #, c-format
 msgid "Restore system"
 msgstr "システムを復元"
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3202
 #, c-format
 msgid "Restore Users"
 msgstr "ユーザを復元"
 
-#: standalone/drakbackup:3487
+#: standalone/drakbackup:3203
 #, c-format
 msgid "Restore Other"
 msgstr "その他を復元"
 
-#: standalone/drakbackup:3489
+#: standalone/drakbackup:3205
 #, c-format
-msgid "select path to restore (instead of /)"
+msgid "Select path to restore (instead of /)"
 msgstr "復元するパスを選択( / の代わり)"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3209 standalone/drakbackup:3490
+#, fuzzy, c-format
+msgid "Path To Restore To"
+msgstr "カスタム復元"
+
+#: standalone/drakbackup:3212
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr "復元前にバックアップを行う(積み重ねバックアップの場合のみ)"
 
-#: standalone/drakbackup:3495
+#: standalone/drakbackup:3214
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "復元前にユーザディレクトリを削除"
 
-#: standalone/drakbackup:3575
-#, fuzzy, c-format
+#: standalone/drakbackup:3298
+#, c-format
 msgid "Filename text substring to search for (empty string matches all):"
-msgstr "検索するファイル名:"
+msgstr "検索するファイル名(空にすると全てに合致):"
 
-#: standalone/drakbackup:3578
+#: standalone/drakbackup:3301
 #, c-format
 msgid "Search Backups"
 msgstr "Backupを検索"
 
-#: standalone/drakbackup:3597
-#, fuzzy, c-format
+#: standalone/drakbackup:3320
+#, c-format
 msgid "No matches found..."
-msgstr "イメージが見つかりません"
+msgstr "合うものがありません"
 
-#: standalone/drakbackup:3601
+#: standalone/drakbackup:3324
 #, c-format
 msgid "Restore Selected"
 msgstr "選択したものを復元"
 
-#: standalone/drakbackup:3735
+#: standalone/drakbackup:3458
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
 "Ctrl-Click files to select multiple files."
 msgstr ""
+"バックアップファイルを見るには 日付/時刻 をクリック\n"
+"複数ファイルの選択はCtrlを押しながらクリック"
 
-#: standalone/drakbackup:3741
+#: standalone/drakbackup:3464
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -17553,7 +17790,7 @@ msgstr ""
 "選んだカタログ項目を\n"
 "復元"
 
-#: standalone/drakbackup:3750
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -17562,26 +17799,17 @@ msgstr ""
 "選んだファイルを\n"
 "復元"
 
-#: standalone/drakbackup:3766
-#, c-format
-msgid ""
-"Change\n"
-"Restore Path"
-msgstr ""
-"復元パスを\n"
-"変更"
-
-#: standalone/drakbackup:3833
+#: standalone/drakbackup:3550
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "%s にバックアップファイルがありません"
 
-#: standalone/drakbackup:3846
+#: standalone/drakbackup:3563
 #, c-format
 msgid "Restore From CD"
 msgstr "CDから復元する"
 
-#: standalone/drakbackup:3846
+#: standalone/drakbackup:3563
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -17590,17 +17818,17 @@ msgstr ""
 "ボリュームラベル %s のCDを\n"
 "/mnt/cdrom のCDドライブに入れてください"
 
-#: standalone/drakbackup:3848
+#: standalone/drakbackup:3565
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "CDのラベルが間違っています。このディスクは %s です。"
 
-#: standalone/drakbackup:3858
+#: standalone/drakbackup:3575
 #, c-format
 msgid "Restore From Tape"
 msgstr "テープから復元"
 
-#: standalone/drakbackup:3858
+#: standalone/drakbackup:3575
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -17609,214 +17837,219 @@ msgstr ""
 "ボリュームラベル %s のテープを\n"
 "テープドライブ %s に入れてください"
 
-#: standalone/drakbackup:3860
+#: standalone/drakbackup:3577
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "テープのラベルが間違っています。このテープは %s です。"
 
-#: standalone/drakbackup:3871
+#: standalone/drakbackup:3588
 #, c-format
 msgid "Restore Via Network"
 msgstr "ネットワークから復元"
 
-#: standalone/drakbackup:3871
+#: standalone/drakbackup:3588
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "ネットワークプロトコル %s から復元"
 
-#: standalone/drakbackup:3872
+#: standalone/drakbackup:3589
 #, c-format
 msgid "Host Name"
 msgstr "ホスト名"
 
-#: standalone/drakbackup:3873
+#: standalone/drakbackup:3590
 #, c-format
 msgid "Host Path or Module"
 msgstr "ホストのパスかモジュール"
 
-#: standalone/drakbackup:3880
+#: standalone/drakbackup:3597
 #, c-format
 msgid "Password required"
 msgstr "パスワードが必要です"
 
-#: standalone/drakbackup:3886
+#: standalone/drakbackup:3603
 #, c-format
 msgid "Username required"
 msgstr "ユーザ名が必要です"
 
-#: standalone/drakbackup:3889
+#: standalone/drakbackup:3606
 #, c-format
 msgid "Hostname required"
 msgstr "ホスト名が必要です"
 
-#: standalone/drakbackup:3894
+#: standalone/drakbackup:3611
 #, c-format
 msgid "Path or Module required"
 msgstr "パスかモジュールが必要です"
 
-#: standalone/drakbackup:3907
+#: standalone/drakbackup:3624
 #, c-format
 msgid "Files Restored..."
 msgstr "ファイルを復元.."
 
-#: standalone/drakbackup:3910
+#: standalone/drakbackup:3627
 #, c-format
 msgid "Restore Failed..."
 msgstr "復元に失敗しました"
 
-#: standalone/drakbackup:4015 standalone/drakbackup:4031
-#, fuzzy, c-format
+#: standalone/drakbackup:3737 standalone/drakbackup:3754
+#, c-format
 msgid "%s not retrieved..."
-msgstr "%s が見つかりません..\n"
+msgstr "%s が見つかりません.."
 
-#: standalone/drakbackup:4155 standalone/drakbackup:4228
+#: standalone/drakbackup:3880 standalone/drakbackup:3953
 #, c-format
 msgid "Search for files to restore"
 msgstr "復元するファイルを検索"
 
-#: standalone/drakbackup:4160
+#: standalone/drakbackup:3885
 #, c-format
 msgid "Restore all backups"
 msgstr "全バックアップを復元"
 
-#: standalone/drakbackup:4169
+#: standalone/drakbackup:3894
 #, c-format
 msgid "Custom Restore"
 msgstr "カスタム復元"
 
-#: standalone/drakbackup:4174 standalone/drakbackup:4224
+#: standalone/drakbackup:3899 standalone/drakbackup:3949
 #, c-format
 msgid "Restore From Catalog"
 msgstr "カタログから復元"
 
-#: standalone/drakbackup:4196
+#: standalone/drakbackup:3921
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "復元するバックアップがありません..\n"
 
-#: standalone/drakbackup:4197
+#: standalone/drakbackup:3922
 #, c-format
 msgid "Verify that %s is the correct path"
-msgstr "%s は正しいパス"
+msgstr "%s が正しいパスなのか確認"
 
-#: standalone/drakbackup:4198
+#: standalone/drakbackup:3923
 #, c-format
 msgid " and the CD is in the drive"
-msgstr ""
+msgstr "/CDがドライブに入っているか"
 
-#: standalone/drakbackup:4200
+#: standalone/drakbackup:3925
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 "マウント不能なメディア上のバックアップ - 復旧にはCatalogを使ってください"
 
-#: standalone/drakbackup:4216
+#: standalone/drakbackup:3941
 #, c-format
 msgid "CD in place - continue."
 msgstr "CDを入れる - 継続"
 
-#: standalone/drakbackup:4221
+#: standalone/drakbackup:3946
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "新しい復元レポジトリを見る"
 
-#: standalone/drakbackup:4258
+#: standalone/drakbackup:3947
+#, fuzzy, c-format
+msgid "Directory To Restore From"
+msgstr "CDから復元する"
+
+#: standalone/drakbackup:3986
 #, c-format
 msgid "Restore Progress"
 msgstr "復元の進行"
 
-#: standalone/drakbackup:4292 standalone/drakbackup:4404
-#: standalone/logdrake:175
+#: standalone/drakbackup:4016 standalone/drakbackup:4123
+#: standalone/logdrake:174
 #, c-format
 msgid "Save"
 msgstr "保存"
 
-#: standalone/drakbackup:4378
+#: standalone/drakbackup:4099
 #, c-format
 msgid "Build Backup"
 msgstr "バックアップを作成"
 
-#: standalone/drakbackup:4430 standalone/drakbackup:4829
+#: standalone/drakbackup:4147 standalone/drakbackup:4512
 #, c-format
 msgid "Restore"
 msgstr "復元"
 
-#: standalone/drakbackup:4600
+#: standalone/drakbackup:4277
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "以下のパッケージをインストールします:\n"
 
-#: standalone/drakbackup:4622
+#: standalone/drakbackup:4304
 #, c-format
 msgid "Please select data to restore..."
 msgstr "復元するデータを選んでください。"
 
-#: standalone/drakbackup:4662
+#: standalone/drakbackup:4344
 #, c-format
 msgid "Backup system files"
 msgstr "システムファイルをバックアップ"
 
-#: standalone/drakbackup:4665
+#: standalone/drakbackup:4347
 #, c-format
 msgid "Backup user files"
 msgstr "ユーザファイルをバックアップ"
 
-#: standalone/drakbackup:4668
+#: standalone/drakbackup:4350
 #, c-format
 msgid "Backup other files"
 msgstr "その他のファイルをバックアップ"
 
-#: standalone/drakbackup:4671 standalone/drakbackup:4707
+#: standalone/drakbackup:4353 standalone/drakbackup:4389
 #, c-format
 msgid "Total Progress"
 msgstr "全体の進行状況"
 
-#: standalone/drakbackup:4699
+#: standalone/drakbackup:4381
 #, c-format
 msgid "Sending files by FTP"
 msgstr "FTPでファイルを送信中.."
 
-#: standalone/drakbackup:4702
+#: standalone/drakbackup:4384
 #, c-format
 msgid "Sending files..."
 msgstr "ファイルを送信中.."
 
-#: standalone/drakbackup:4772
+#: standalone/drakbackup:4455
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "設定ファイルから今すぐバックアップ"
 
-#: standalone/drakbackup:4777
+#: standalone/drakbackup:4460
 #, c-format
 msgid "View Backup Configuration."
 msgstr "バックアップの設定を見る"
 
-#: standalone/drakbackup:4803
+#: standalone/drakbackup:4486
 #, c-format
 msgid "Wizard Configuration"
 msgstr "ウィザード設定"
 
-#: standalone/drakbackup:4808
+#: standalone/drakbackup:4491
 #, c-format
 msgid "Advanced Configuration"
 msgstr "高度な設定"
 
-#: standalone/drakbackup:4813
+#: standalone/drakbackup:4496
 #, c-format
 msgid "View Configuration"
 msgstr "設定を見る"
 
-#: standalone/drakbackup:4817
+#: standalone/drakbackup:4500
 #, c-format
 msgid "View Last Log"
 msgstr "最後のログを見る"
 
-#: standalone/drakbackup:4822
+#: standalone/drakbackup:4505
 #, c-format
 msgid "Backup Now"
 msgstr "今すぐパックアップ"
 
-#: standalone/drakbackup:4826
+#: standalone/drakbackup:4509
 #, c-format
 msgid ""
 "No configuration file found \n"
@@ -17825,67 +18058,69 @@ msgstr ""
 "設定ファイルが見つかりません。\n"
 "ウィザードか詳細をクリックしてください。"
 
-#: standalone/drakbackup:4858 standalone/drakbackup:4865
+#: standalone/drakbackup:4530 standalone/drakbackup:4533
 #, c-format
 msgid "Drakbackup"
 msgstr "Drakbackup"
 
-#: standalone/drakboot:56
-#, fuzzy, c-format
+#: standalone/drakboot:57
+#, c-format
 msgid "Graphical boot theme selection"
-msgstr "プリンタの機種を選ぶ"
+msgstr "グラフィカルな起動テーマを選択"
 
-#: standalone/drakboot:56
+#: standalone/drakboot:57
 #, c-format
 msgid "System mode"
 msgstr "システムモード"
 
-#: 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 "/ファイル(_F)"
 
-#: standalone/drakboot:67 standalone/drakfloppy:47 standalone/logdrake:76
+#: standalone/drakboot:68 standalone/drakfloppy:47 standalone/logdrake:77
 #, c-format
 msgid "/File/_Quit"
 msgstr "/ファイル(F)/終了(_Q)"
 
-#: 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 "テーマをインストール"
 
-#: standalone/drakboot:119
+#: standalone/drakboot:120
 #, c-format
 msgid "Create new theme"
 msgstr "新しいテーマを作成"
 
-#: standalone/drakboot:133
+#: standalone/drakboot:134
 #, c-format
 msgid "Use graphical boot"
-msgstr ""
+msgstr "グラフィカルブートを使う"
 
-#: standalone/drakboot:138
+#: 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."
 msgstr ""
+"ブートローダがフレームバッファモードではありません。グラフィカルブートを有効"
+"にするには、ブートローダ設定ツールでビデオモードを選んでください。"
 
-#: standalone/drakboot:145
-#, fuzzy, c-format
+#: standalone/drakboot:146
+#, c-format
 msgid "Theme"
 msgstr "テーマ"
 
-#: standalone/drakboot:147
+#: standalone/drakboot:149
 #, c-format
 msgid ""
 "Display theme\n"
@@ -17894,32 +18129,32 @@ msgstr ""
 "コンソールで\n"
 "テーマを表示"
 
-#: standalone/drakboot:156
+#: standalone/drakboot:158
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "起動時にXウィンドウを実行"
 
-#: standalone/drakboot:164
-#, c-format
-msgid "Yes, I want autologin with this (user, desktop)"
-msgstr "以下のユーザとデスクトップで自動的にログインする"
-
-#: standalone/drakboot:165
+#: standalone/drakboot:166
 #, c-format
 msgid "No, I don't want autologin"
 msgstr "自動ログインを使わない"
 
-#: standalone/drakboot:171
+#: standalone/drakboot:167
+#, c-format
+msgid "Yes, I want autologin with this (user, desktop)"
+msgstr "以下のユーザとデスクトップで自動的にログインする"
+
+#: standalone/drakboot:173
 #, c-format
 msgid "Default user"
 msgstr "デフォルトのユーザ"
 
-#: standalone/drakboot:172
+#: standalone/drakboot:174
 #, c-format
 msgid "Default desktop"
 msgstr "デフォルトのデスクトップ"
 
-#: standalone/drakboot:236
+#: standalone/drakboot:238
 #, c-format
 msgid "Installation of %s failed. The following error occured:"
 msgstr "%s のインストールに失敗しました。以下のエラーが発生:"
@@ -18126,34 +18361,34 @@ msgid "Please enter summary text."
 msgstr "summary textを入力してください"
 
 #: standalone/drakclock:29
-#, fuzzy, c-format
+#, c-format
 msgid "DrakClock"
-msgstr "Drakbackup"
+msgstr "DrakClock"
 
 #: standalone/drakclock:36
-#, fuzzy, c-format
+#, c-format
 msgid "Change Time Zone"
-msgstr "タイムゾーン"
+msgstr "タイムゾーンを変更"
 
 #: standalone/drakclock:42
 #, c-format
 msgid "Timezone - DrakClock"
-msgstr ""
+msgstr "タイムゾーン - DrakClock"
 
 #: standalone/drakclock:44
 #, c-format
 msgid "GMT - DrakClock"
-msgstr ""
+msgstr "GMT - DrakClock"
 
 #: standalone/drakclock:44
-#, fuzzy, c-format
+#, c-format
 msgid "Is your hardware clock set to GMT?"
-msgstr "ハードウェアクロックをGMTに設定する"
+msgstr "ハードウェアクロックをGMTに設定しますか？"
 
 #: standalone/drakclock:71
-#, fuzzy, c-format
+#, c-format
 msgid "Network Time Protocol"
-msgstr "ネットワークインタフェース"
+msgstr "ネットワークタイムプロトコル"
 
 #: standalone/drakclock:73
 #, c-format
@@ -18161,23 +18396,25 @@ msgid ""
 "Your computer can synchronize its clock\n"
 " with a remote time server using NTP"
 msgstr ""
+"NTPを使ったリモートタイムサーバで、\n"
+"マシンの時計を同期させることができます"
 
 #: standalone/drakclock:74
-#, fuzzy, c-format
+#, c-format
 msgid "Enable Network Time Protocol"
-msgstr "ネットワークプロトコル %s から復元"
+msgstr "ネットワークタイムプロトコルを有効に"
 
 #: standalone/drakclock:82
 #, c-format
 msgid "Server:"
 msgstr "サーバ:"
 
-#: standalone/drakclock:125 standalone/drakclock:137
-#, fuzzy, c-format
+#: standalone/drakclock:129 standalone/drakclock:141
+#, c-format
 msgid "Reset"
-msgstr "拒否する"
+msgstr "リセット"
 
-#: standalone/drakclock:200
+#: standalone/drakclock:204
 #, c-format
 msgid ""
 "We need to install ntp package\n"
@@ -18185,270 +18422,265 @@ msgid ""
 "\n"
 "Do you want to install ntp ?"
 msgstr ""
+"ネットワークタイムプロトコルを有効にするには、\n"
+"ntpパッケージが必要です。\n"
+"\n"
+"ntpをインストールしますか？"
 
-#: standalone/drakconnect:78
+#: standalone/drakconnect:81
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "ネットワークの設定(%d アダプタ)"
 
-#: standalone/drakconnect:89 standalone/drakconnect:686
+#: standalone/drakconnect:92 standalone/drakconnect:728
 #, c-format
 msgid "Gateway:"
 msgstr "ゲートウェイ:"
 
-#: standalone/drakconnect:89 standalone/drakconnect:686
+#: standalone/drakconnect:92 standalone/drakconnect:728
 #, c-format
 msgid "Interface:"
 msgstr "インタフェース:"
 
-#: standalone/drakconnect:93 standalone/net_monitor:105
+#: standalone/drakconnect:96 standalone/net_monitor:105
 #, c-format
 msgid "Wait please"
 msgstr "お待ちください"
 
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116
 #, c-format
 msgid "Interface"
 msgstr "インタフェース"
 
-#: standalone/drakconnect:113 standalone/drakconnect:502
-#: standalone/drakvpn:1136
-#, c-format
-msgid "Protocol"
-msgstr "プロトコル"
-
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116 standalone/drakups:233
 #, c-format
 msgid "Driver"
 msgstr "ドライバ"
 
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116
 #, c-format
 msgid "State"
 msgstr "状態"
 
-#: standalone/drakconnect:130
+#: standalone/drakconnect:133
 #, c-format
 msgid "Hostname: "
 msgstr "ホスト名: "
 
-#: standalone/drakconnect:132
+#: standalone/drakconnect:135
 #, c-format
 msgid "Configure hostname..."
 msgstr "ホスト名を設定.."
 
-#: standalone/drakconnect:146 standalone/drakconnect:727
+#: standalone/drakconnect:149 standalone/drakconnect:769
 #, c-format
 msgid "LAN configuration"
 msgstr "LANの設定"
 
-#: standalone/drakconnect:151
+#: standalone/drakconnect:154
 #, c-format
 msgid "Configure Local Area Network..."
 msgstr "LANを設定"
 
-#: standalone/drakconnect:159 standalone/drakconnect:228
-#: standalone/drakconnect:232
+#: standalone/drakconnect:162 standalone/drakconnect:237
+#: standalone/drakconnect:241
 #, c-format
 msgid "Apply"
 msgstr "適用"
 
-#: standalone/drakconnect:254 standalone/drakconnect:263
-#: standalone/drakconnect:277 standalone/drakconnect:283
-#: standalone/drakconnect:293 standalone/drakconnect:294
-#: standalone/drakconnect:540
+#: standalone/drakconnect:197
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "ケーブル接続"
+
+#: 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 ""
+msgstr "TCP/IP"
 
-#: standalone/drakconnect:254 standalone/drakconnect:263
-#: standalone/drakconnect:277 standalone/drakconnect:421
-#: standalone/drakconnect:425 standalone/drakconnect:540
-#, fuzzy, c-format
+#: standalone/drakconnect:263 standalone/drakconnect:272
+#: standalone/drakconnect:292 standalone/drakconnect:444
+#: standalone/drakconnect:448 standalone/drakconnect:576
+#, c-format
 msgid "Account"
-msgstr "About"
+msgstr "アカウント"
 
-#: 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 ""
+msgstr "ワイヤレス"
 
-#: standalone/drakconnect:325
-#, fuzzy, c-format
+#: standalone/drakconnect:344
+#, c-format
 msgid "DNS servers"
 msgstr "DNSサーバ"
 
-#: standalone/drakconnect:332
-#, fuzzy, c-format
+#: standalone/drakconnect:351
+#, c-format
 msgid "Search Domain"
-msgstr "NISドメイン"
+msgstr "ドメイン検索"
 
-#: standalone/drakconnect:338
-#, fuzzy, c-format
+#: standalone/drakconnect:359
+#, c-format
 msgid "static"
-msgstr "自動的なIP"
+msgstr "スタティック"
 
-#: standalone/drakconnect:338
-#, fuzzy, c-format
-msgid "dhcp"
-msgstr "dhcpを使う"
+#: standalone/drakconnect:359
+#, c-format
+msgid "DHCP"
+msgstr ""
 
-#: standalone/drakconnect:457
+#: standalone/drakconnect:482
 #, fuzzy, c-format
 msgid "Flow control"
 msgstr "<control>S"
 
-#: standalone/drakconnect:458
+#: standalone/drakconnect:483
 #, fuzzy, c-format
 msgid "Line termination"
 msgstr "インターネットステーション"
 
-#: standalone/drakconnect:463
+#: standalone/drakconnect:493
 #, c-format
-msgid "Tone dialing"
-msgstr ""
-
-#: standalone/drakconnect:463
-#, c-format
-msgid "Pulse dialing"
-msgstr ""
-
-#: standalone/drakconnect:468
-#, fuzzy, c-format
 msgid "Use lock file"
-msgstr "ファイルを選択"
+msgstr "ロックファイルを使う"
 
-#: standalone/drakconnect:471
-#, fuzzy, c-format
+#: standalone/drakconnect:496
+#, c-format
 msgid "Modem timeout"
-msgstr "シェルの時間設定"
+msgstr "モデムのタイムアウト"
 
-#: standalone/drakconnect:475
+#: standalone/drakconnect:500
 #, c-format
 msgid "Wait for dialup tone before dialing"
-msgstr ""
+msgstr "ダイアル前にトーンを待つ"
 
-#: standalone/drakconnect:478
-#, fuzzy, c-format
+#: standalone/drakconnect:503
+#, c-format
 msgid "Busy wait"
-msgstr "クウェート"
+msgstr "ビジー待ち"
 
-#: standalone/drakconnect:482
-#, fuzzy, c-format
+#: standalone/drakconnect:507
+#, c-format
 msgid "Modem sound"
-msgstr "モデム"
+msgstr "モデムの音"
 
-#: standalone/drakconnect:483
-#, fuzzy, c-format
+#: standalone/drakconnect:508
+#, c-format
 msgid "Enable"
-msgstr "有効に"
+msgstr "有効"
 
-#: standalone/drakconnect:483
-#, fuzzy, c-format
+#: standalone/drakconnect:508
+#, c-format
 msgid "Disable"
-msgstr "無効に"
+msgstr "無効"
 
-#: standalone/drakconnect:522 standalone/harddrake2:58
+#: standalone/drakconnect:558 standalone/harddrake2:58
 #, c-format
 msgid "Media class"
 msgstr "メディアクラス"
 
-#: standalone/drakconnect:523 standalone/drakfloppy:140
+#: standalone/drakconnect:559 standalone/drakfloppy:140
 #, c-format
 msgid "Module name"
 msgstr "モジュール名"
 
-#: standalone/drakconnect:524
-#, fuzzy, c-format
+#: standalone/drakconnect:560
+#, c-format
 msgid "Mac Address"
-msgstr "Broadcastアドレス:"
+msgstr "Macアドレス"
 
-#: standalone/drakconnect:525 standalone/harddrake2:21
+#: standalone/drakconnect:561 standalone/harddrake2:21
 #, c-format
 msgid "Bus"
 msgstr "バス"
 
-#: standalone/drakconnect:526 standalone/harddrake2:29
+#: standalone/drakconnect:562 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr "バスの位置"
 
-#: 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 ""
+"システムにイーサネットアダプタがありません。\n"
+"ハードウェア設定ツールを実行してください。"
 
-#: standalone/drakconnect:597
-#, fuzzy, c-format
+#: standalone/drakconnect:638
+#, c-format
 msgid "Remove a network interface"
-msgstr "ネットワークインタフェースを選択"
+msgstr "リモートネットワークインタフェース"
 
-#: standalone/drakconnect:601
-#, fuzzy, c-format
+#: standalone/drakconnect:642
+#, c-format
 msgid "Select the network interface to remove:"
-msgstr "ネットワークインタフェースを選択"
+msgstr "削除するネットワークインタフェースを選択:"
 
-#: standalone/drakconnect:617
-#, fuzzy, c-format
+#: standalone/drakconnect:656
+#, c-format
 msgid ""
 "An error occured while deleting the \"%s\" network interface:\n"
 "\n"
 "%s"
 msgstr ""
-"ネットワークの再起動中に問題が発生: \n"
+"\"%s\" ネットワークインタフェースを削除中にエラー発生:\n"
 "\n"
 "%s"
 
-#: standalone/drakconnect:619
+#: standalone/drakconnect:658
 #, c-format
 msgid ""
 "Congratulations, the \"%s\" network interface has been succesfully deleted"
-msgstr ""
+msgstr "\"%s\" ネットワークインタフェースを削除しました"
 
-#: standalone/drakconnect:636
+#: standalone/drakconnect:675
 #, c-format
 msgid "No Ip"
 msgstr "Ipなし"
 
-#: standalone/drakconnect:637
+#: standalone/drakconnect:676
 #, c-format
 msgid "No Mask"
 msgstr "マスクなし"
 
-#: standalone/drakconnect:638 standalone/drakconnect:798
+#: standalone/drakconnect:677 standalone/drakconnect:840
 #, c-format
 msgid "up"
 msgstr "上"
 
-#: standalone/drakconnect:638 standalone/drakconnect:798
+#: standalone/drakconnect:677 standalone/drakconnect:840
 #, c-format
 msgid "down"
 msgstr "下"
 
-#: standalone/drakconnect:677 standalone/net_monitor:415
+#: standalone/drakconnect:718 standalone/net_monitor:415
 #, c-format
 msgid "Connected"
 msgstr "接続完了"
 
-#: standalone/drakconnect:677 standalone/net_monitor:415
+#: standalone/drakconnect:718 standalone/net_monitor:415
 #, c-format
 msgid "Not connected"
 msgstr "接続していません"
 
-#: standalone/drakconnect:678
+#: standalone/drakconnect:720
 #, c-format
 msgid "Disconnect..."
 msgstr "切断.."
 
-#: standalone/drakconnect:678
+#: standalone/drakconnect:720
 #, c-format
 msgid "Connect..."
 msgstr "接続.."
 
-#: standalone/drakconnect:707
+#: standalone/drakconnect:749
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
@@ -18457,17 +18689,17 @@ msgstr ""
 "警告: 別のインターネット接続を検出しました。ネットワークは使用中かもしれませ"
 "ん"
 
-#: standalone/drakconnect:723
+#: standalone/drakconnect:765
 #, c-format
 msgid "Deactivate now"
 msgstr "いますぐ無効に"
 
-#: standalone/drakconnect:723
+#: standalone/drakconnect:765
 #, c-format
 msgid "Activate now"
 msgstr "いますぐ有効に"
 
-#: standalone/drakconnect:731
+#: standalone/drakconnect:773
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -18476,85 +18708,70 @@ msgstr ""
 "設定済みのインタフェースがありません。\n"
 "'設定'をクリックしてまず設定してください。"
 
-#: standalone/drakconnect:745
+#: standalone/drakconnect:787
 #, c-format
 msgid "LAN Configuration"
 msgstr "LANを設定"
 
-#: standalone/drakconnect:757
+#: standalone/drakconnect:799
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "アダプタ %s: %s"
 
-#: standalone/drakconnect:766
+#: standalone/drakconnect:808
 #, c-format
 msgid "Boot Protocol"
 msgstr "起動プロトコル"
 
-#: standalone/drakconnect:767
+#: standalone/drakconnect:809
 #, c-format
 msgid "Started on boot"
 msgstr "起動時に開始"
 
-#: standalone/drakconnect:803
-#, fuzzy, c-format
+#: standalone/drakconnect:845
+#, c-format
 msgid ""
 "This interface has not been configured yet.\n"
 "Run the \"Add an interface\" assistant from the Mandrake Control Center"
 msgstr ""
 "このインタフェースはまだ設定していません。\n"
-"メインウィンドウで設定ウィザードを起動してください"
+"Mandrakeコントロールセンタの \"インタフェースを追加\" を実行してください"
 
-#: standalone/drakconnect:858
-#, fuzzy, c-format
+#: standalone/drakconnect:900
+#, c-format
 msgid ""
 "You don't have any configured Internet connection.\n"
 "Please run \"Internet access\" in control center."
 msgstr ""
-"インターネット接続がありません。\n"
-"'設定'をクリックして作成してください"
+"インターネット接続を設定していません。\n"
+"コントロールセンタの'インターネットアクセス'を実行してください"
 
-#: standalone/drakconnect:866
+#: standalone/drakconnect:908
 #, c-format
 msgid "Internet connection configuration"
 msgstr "インターネット接続の設定"
 
-#: standalone/drakconnect:907
-#, c-format
-msgid "Provider dns 1 (optional)"
-msgstr "プロバイダのdns 1(オプション)"
-
-#: standalone/drakconnect:908
-#, c-format
-msgid "Provider dns 2 (optional)"
-msgstr "プロバイダのdns 2(オプション)"
-
-#: standalone/drakconnect:921
-#, c-format
-msgid "Ethernet Card"
-msgstr "イーサネットカード"
-
-#: standalone/drakconnect:922
-#, c-format
-msgid "DHCP Client"
-msgstr "DHCPクライアント"
+#: standalone/drakconnect:926
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "DNSサーバ(オプション)"
 
-#: standalone/drakconnect:951
+#: standalone/drakconnect:948
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "インターネット接続を設定"
 
-#: standalone/drakconnect:952
+#: standalone/drakconnect:949
 #, c-format
 msgid "Internet access"
 msgstr "インターネット"
 
-#: standalone/drakconnect:954 standalone/net_monitor:87
+#: standalone/drakconnect:951 standalone/net_monitor:87
 #, c-format
 msgid "Connection type: "
 msgstr "接続の種類: "
 
-#: standalone/drakconnect:957
+#: standalone/drakconnect:954
 #, c-format
 msgid "Status:"
 msgstr "状態:"
@@ -18618,9 +18835,9 @@ msgid "Size"
 msgstr "サイズ"
 
 #: standalone/drakfloppy:143
-#, fuzzy, c-format
+#, c-format
 msgid "Mkinitrd optional arguments"
-msgstr "mkinitrdのオプションの引数"
+msgstr "Mkinitrdのオプション引数"
 
 #: standalone/drakfloppy:145
 #, c-format
@@ -18693,109 +18910,109 @@ msgstr ""
 "\n"
 "<span foreground=\"Red\"><tt>%s</tt></span>"
 
-#: standalone/drakfont:181
+#: standalone/drakfont:183
 #, c-format
 msgid "Search installed fonts"
 msgstr "インストール済みフォントを検索"
 
-#: standalone/drakfont:183
+#: standalone/drakfont:185
 #, c-format
 msgid "Unselect fonts installed"
 msgstr "インストール済みフォントを選択しない"
 
-#: standalone/drakfont:206
+#: standalone/drakfont:208
 #, c-format
 msgid "parse all fonts"
 msgstr "全てのフォントを分析"
 
-#: standalone/drakfont:208
-#, fuzzy, c-format
+#: standalone/drakfont:210
+#, c-format
 msgid "No fonts found"
 msgstr "フォントが見つかりません"
 
-#: 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 "完了"
 
-#: standalone/drakfont:221
-#, fuzzy, c-format
+#: standalone/drakfont:223
+#, c-format
 msgid "Could not find any font in your mounted partitions"
 msgstr "マウントしたパーティションにはフォントがありません"
 
-#: standalone/drakfont:254
+#: standalone/drakfont:256
 #, c-format
 msgid "Reselect correct fonts"
 msgstr "正しいフォントを再選択"
 
-#: standalone/drakfont:257
-#, fuzzy, c-format
+#: standalone/drakfont:259
+#, c-format
 msgid "Could not find any font.\n"
 msgstr "フォントが見つかりません。\n"
 
-#: standalone/drakfont:267
+#: standalone/drakfont:269
 #, c-format
 msgid "Search for fonts in installed list"
 msgstr "インストール済みリストからフォントを探す"
 
-#: standalone/drakfont:292
+#: standalone/drakfont:294
 #, c-format
 msgid "%s fonts conversion"
 msgstr "%s フォントの変換"
 
-#: standalone/drakfont:321
+#: standalone/drakfont:323
 #, c-format
 msgid "Fonts copy"
 msgstr "フォントをコピー"
 
-#: standalone/drakfont:324
+#: standalone/drakfont:326
 #, c-format
 msgid "True Type fonts installation"
 msgstr "True Typeフォントをインストール"
 
-#: standalone/drakfont:331
+#: standalone/drakfont:333
 #, c-format
 msgid "please wait during ttmkfdir..."
 msgstr "ttmkfdir中です。お待ちください。"
 
-#: standalone/drakfont:332
+#: standalone/drakfont:334
 #, c-format
 msgid "True Type install done"
 msgstr "True Typeのインストールが完了"
 
-#: standalone/drakfont:338 standalone/drakfont:353
+#: standalone/drakfont:340 standalone/drakfont:355
 #, c-format
 msgid "type1inst building"
 msgstr "type1instを構築"
 
-#: standalone/drakfont:347
+#: standalone/drakfont:349
 #, c-format
 msgid "Ghostscript referencing"
 msgstr "Ghostscriptを参照"
 
-#: standalone/drakfont:357
+#: standalone/drakfont:359
 #, c-format
 msgid "Suppress Temporary Files"
 msgstr "一時ファイルを作らない"
 
-#: standalone/drakfont:360
+#: standalone/drakfont:362
 #, c-format
 msgid "Restart XFS"
 msgstr "XFSを再起動"
 
-#: standalone/drakfont:406 standalone/drakfont:416
+#: standalone/drakfont:408 standalone/drakfont:418
 #, c-format
 msgid "Suppress Fonts Files"
 msgstr "フォントファイルを作らない"
 
-#: standalone/drakfont:418
+#: standalone/drakfont:420
 #, c-format
 msgid "xfs restart"
 msgstr "xfsを再起動"
 
-#: standalone/drakfont:426
+#: standalone/drakfont:428
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -18810,32 +19027,32 @@ msgstr ""
 "フォントはたいていインストールできるはずですが、まれに不適切なフォントで\n"
 "Xサーバが固まる場合があります。"
 
-#: standalone/drakfont:474 standalone/drakfont:483
+#: standalone/drakfont:477 standalone/drakfont:486
 #, c-format
 msgid "DrakFont"
-msgstr ""
+msgstr "DrakFont"
 
-#: standalone/drakfont:484
+#: standalone/drakfont:487
 #, c-format
 msgid "Font List"
 msgstr "フォントのリスト"
 
-#: standalone/drakfont:490
+#: standalone/drakfont:493
 #, c-format
 msgid "About"
 msgstr "About"
 
-#: standalone/drakfont:492 standalone/drakfont:681 standalone/drakfont:719
-#, fuzzy, c-format
+#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
+#, c-format
 msgid "Uninstall"
-msgstr "アンインストール後の処理"
+msgstr "アンインストール"
 
-#: standalone/drakfont:493
-#, fuzzy, c-format
+#: standalone/drakfont:496
+#, c-format
 msgid "Import"
-msgstr "フォントをインポート"
+msgstr "インポート"
 
-#: standalone/drakfont:509
+#: standalone/drakfont:512
 #, c-format
 msgid ""
 "Copyright (C) 2001-2002 by MandrakeSoft \n"
@@ -18847,9 +19064,17 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
+"Copyright (C) 2001-2002 by MandrakeSoft \n"
+"\n"
+"\n"
+"       DUPONT Sebastien (original version)\n"
+"\n"
+"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"\n"
+"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 
-#: standalone/drakfont:518
-#, fuzzy, c-format
+#: standalone/drakfont:521
+#, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 " it under the terms of the GNU General Public License as published by\n"
@@ -18868,20 +19093,22 @@ msgid ""
 " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 "This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2, or (at your option)\n"
-"any later version.\n"
+" it under the terms of the GNU General Public License as published by\n"
+" the Free Software Foundation; either version 2, or (at your option)\n"
+" any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+" This program is distributed in the hope that it will be useful,\n"
+" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+" GNU General Public License for more details.\n"
+"\n"
+"\n"
+" You should have received a copy of the GNU General Public License\n"
+" along with this program; if not, write to the Free Software\n"
+" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: standalone/drakfont:534
+#: standalone/drakfont:537
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -18898,14 +19125,27 @@ msgid ""
 "\t  by Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
 "             Convert ttf font files to afm and pfb fonts\n"
 msgstr ""
+"Thanks:\n"
+"\n"
+"    -  pfm2afm:   \n"
+"\t by Ken Borgendale:\n"
+"\t    Convert a Windows .pfm  file to a .afm (Adobe Font Metrics)\n"
+"\n"
+"    -  type1inst:\n"
+"\t by James Macnicol: \n"
+"\t    type1inst generates files fonts.dir fonts.scale & Fontmap.\n"
+"\n"
+"    -  ttf2pt1:   \n"
+"\t  by Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
+"             Convert ttf font files to afm and pfb fonts\n"
 
-#: standalone/drakfont:553
+#: standalone/drakfont:556
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "このフォントを使用するアプリケーションを選んでください:"
 
-#: standalone/drakfont:554
-#, fuzzy, c-format
+#: standalone/drakfont:557
+#, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
 "install them on your system.\n"
@@ -18913,201 +19153,201 @@ msgid ""
 "You can install the fonts the normal way. In rare cases, bogus fonts may "
 "hang up your X Server."
 msgstr ""
-"フォントをインストールする前に、これらのフォントを使用する権利や\n"
-"インストールする権利があることを確認してください。\n"
+"フォントをインストールする前に、これらのフォントを使用する権利やインストール"
+"する権利があることを確認してください。\n"
 "\n"
-"フォントはたいていインストールできるはずですが、まれに不適切なフォントで\n"
-"Xサーバが固まる場合があります。"
+"フォントはたいていインストールできるはずですが、まれに不適切なフォントでXサー"
+"バが固まる場合があります。"
 
-#: 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 "一般プリンタ"
 
-#: standalone/drakfont:583
+#: standalone/drakfont:586
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "フォントファイルかディレクトリを選んで'追加'をクリック"
 
-#: standalone/drakfont:597
+#: standalone/drakfont:587
+#, c-format
+msgid "File Selection"
+msgstr "ファイルを選択"
+
+#: standalone/drakfont:600
 #, c-format
 msgid "You've not selected any font"
 msgstr "フォントを選んでいません"
 
-#: standalone/drakfont:646
-#, fuzzy, c-format
+#: standalone/drakfont:652
+#, c-format
 msgid "Import fonts"
 msgstr "フォントをインポート"
 
-#: standalone/drakfont:651
-#, fuzzy, c-format
+#: standalone/drakfont:657
+#, c-format
 msgid "Install fonts"
-msgstr "フォントをアンインストール"
+msgstr "フォントをインストール"
 
-#: standalone/drakfont:686
+#: standalone/drakfont:692
 #, c-format
 msgid "click here if you are sure."
 msgstr "よろしければクリックしてください"
 
-#: standalone/drakfont:688
+#: standalone/drakfont:694
 #, c-format
 msgid "here if no."
 msgstr "here if no."
 
-#: standalone/drakfont:727
+#: standalone/drakfont:733
 #, c-format
 msgid "Unselected All"
 msgstr "選択を解除"
 
-#: standalone/drakfont:730
+#: standalone/drakfont:736
 #, c-format
 msgid "Selected All"
 msgstr "全て選択"
 
-#: standalone/drakfont:733
+#: standalone/drakfont:739
 #, c-format
 msgid "Remove List"
 msgstr "フォントを削除"
 
-#: standalone/drakfont:744 standalone/drakfont:763
-#, fuzzy, c-format
+#: standalone/drakfont:750 standalone/drakfont:769
+#, c-format
 msgid "Importing fonts"
 msgstr "フォントをインポート"
 
-#: standalone/drakfont:748 standalone/drakfont:768
+#: standalone/drakfont:754 standalone/drakfont:774
 #, c-format
 msgid "Initial tests"
 msgstr "初期テスト"
 
-#: standalone/drakfont:749
+#: standalone/drakfont:755
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "お使いのシステムのフォントをコピー"
 
-#: standalone/drakfont:750
+#: standalone/drakfont:756
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "フォントのインストールと変換"
 
-#: standalone/drakfont:751
+#: standalone/drakfont:757
 #, c-format
 msgid "Post Install"
 msgstr "インストール後の処理"
 
-#: standalone/drakfont:769
+#: standalone/drakfont:775
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "システムからフォントを削除"
 
-#: standalone/drakfont:770
+#: standalone/drakfont:776
 #, c-format
 msgid "Post Uninstall"
 msgstr "アンインストール後の処理"
 
-#: standalone/drakgw:59 standalone/drakgw:190
+#: standalone/drakgw:58 standalone/drakgw:193
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "インターネット接続を共有"
 
-#: standalone/drakgw:117 standalone/drakvpn:49
-#, fuzzy, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "2.4カーネルのみをサポートしています。"
-
-#: standalone/drakgw:128
+#: standalone/drakgw:124
 #, c-format
-msgid "Internet Connection Sharing currently enabled"
-msgstr "インターネット接続の共有は現在有効です"
+msgid "Internet Connection Sharing currently disabled"
+msgstr "インターネット接続の共有は現在停止しています"
 
-#: 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 ""
-"インターネット接続を共有するセットアップは既に完了しています。\n"
-"現在は有効になっています。\n"
+"インターネット接続の共有のセットアップは既に完了しています。\n"
+"現在は停止しています。\n"
 "\n"
 "どうしますか？"
 
-#: standalone/drakgw:133 standalone/drakvpn:99
+#: standalone/drakgw:129 standalone/drakvpn:125
 #, c-format
-msgid "disable"
-msgstr "無効に"
+msgid "enable"
+msgstr "有効に"
 
-#: 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 "再設定"
 
-#: 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 "無視"
 
 #: standalone/drakgw:136
 #, c-format
-msgid "Disabling servers..."
-msgstr "サーバを停止しています.."
+msgid "Enabling servers..."
+msgstr "サーバを有効にしています.."
 
-#: standalone/drakgw:150
+#: standalone/drakgw:148
 #, c-format
-msgid "Internet Connection Sharing is now disabled."
-msgstr "インターネット接続の共有を停止しました。"
+msgid "Internet Connection Sharing is now enabled."
+msgstr "インターネット接続の共有が有効になりました。"
 
-#: standalone/drakgw:157
+#: standalone/drakgw:151
 #, c-format
-msgid "Internet Connection Sharing currently disabled"
-msgstr "インターネット接続の共有は現在停止しています"
+msgid "Internet Connection Sharing currently enabled"
+msgstr "インターネット接続の共有は現在有効です"
 
-#: 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 ""
-"インターネット接続の共有のセットアップは既に完了しています。\n"
-"現在は停止しています。\n"
+"インターネット接続を共有するセットアップは既に完了しています。\n"
+"現在は有効になっています。\n"
 "\n"
 "どうしますか？"
 
-#: standalone/drakgw:162 standalone/drakvpn:125
+#: standalone/drakgw:156 standalone/drakvpn:99
 #, c-format
-msgid "enable"
-msgstr "有効に"
+msgid "disable"
+msgstr "無効に"
 
-#: standalone/drakgw:169
+#: standalone/drakgw:159
 #, c-format
-msgid "Enabling servers..."
-msgstr "サーバを有効にしています.."
+msgid "Disabling servers..."
+msgstr "サーバを停止しています.."
 
-#: standalone/drakgw:175
+#: standalone/drakgw:174
 #, c-format
-msgid "Internet Connection Sharing is now enabled."
-msgstr "インターネット接続の共有が有効になりました。"
+msgid "Internet Connection Sharing is now disabled."
+msgstr "インターネット接続の共有を停止しました。"
 
-#: standalone/drakgw:191
+#: standalone/drakgw:194
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -19126,48 +19366,27 @@ msgstr ""
 "注意: ローカルエリアネットワーク(LAN)を構築するには\n"
 "専用のネットワークアダプタが必要です。"
 
-#: 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 ""
-"インターネットに接続しているインタフェースの名前を入力してください。\n"
-"\n"
-"例:\n"
-"\t\tppp+(モデム/DSL接続の場合)\n"
-"\t\teth0, eth1(ケーブル接続の場合)\n"
-"\t\tippp+(ISDN接続の場合)\n"
-
-#: standalone/drakgw:230
+#: standalone/drakgw:237
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "インタフェース %s(モジュール %s を使用)"
 
-#: standalone/drakgw:231
+#: standalone/drakgw:238
 #, c-format
 msgid "Interface %s"
 msgstr "インタフェース %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 ""
-"システムにイーサネットアダプタがありません。\n"
-"ハードウェア設定ツールを実行してください。"
+msgid "No network adapter on your system!"
+msgstr "ネットワークアダプタがありません"
 
-#: standalone/drakgw:247
+#: standalone/drakgw:254
 #, c-format
 msgid "Network interface"
 msgstr "ネットワークインタフェース"
 
-#: standalone/drakgw:248
+#: standalone/drakgw:255
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -19182,19 +19401,19 @@ msgstr ""
 "\n"
 "このアダプタでLANを設定します。"
 
-#: standalone/drakgw:255
+#: standalone/drakgw:262
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "LANに接続するネットワークアダプタを選んでください。"
 
-#: standalone/drakgw:283
+#: standalone/drakgw:291
 #, c-format
 msgid "Network interface already configured"
 msgstr "ネットワークインタフェースは設定済みです"
 
-#: standalone/drakgw:284
+#: standalone/drakgw:292
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -19209,27 +19428,27 @@ msgstr ""
 "\n"
 "手動で行うこともできますが、設定には知識が必要です。"
 
-#: standalone/drakgw:289
+#: standalone/drakgw:297
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "自動的に再設定"
 
-#: standalone/drakgw:289
+#: standalone/drakgw:297
 #, c-format
 msgid "No (experts only)"
 msgstr "いいえ(上級者用)"
 
-#: standalone/drakgw:290
+#: standalone/drakgw:298
 #, c-format
 msgid "Show current interface configuration"
 msgstr "現在のインタフェースの設定を表示"
 
-#: standalone/drakgw:291
+#: standalone/drakgw:299
 #, c-format
 msgid "Current interface configuration"
 msgstr "現在のインタフェースの設定"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:300
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -19246,7 +19465,7 @@ msgstr ""
 "IP属性: %s\n"
 "ドライバ: %s"
 
-#: standalone/drakgw:305
+#: standalone/drakgw:313
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -19272,13 +19491,13 @@ msgstr ""
 "for you.\n"
 "\n"
 
-#: standalone/drakgw:312
+#: standalone/drakgw:320
 #, c-format
 msgid "Local Network adress"
 msgstr "ローカルネットワークのアドレス"
 
-#: standalone/drakgw:316
-#, fuzzy, c-format
+#: standalone/drakgw:324
+#, c-format
 msgid ""
 "DHCP Server Configuration.\n"
 "\n"
@@ -19287,77 +19506,76 @@ msgid ""
 msgstr ""
 "DHCPサーバの設定\n"
 "\n"
-"ここでDHCPサーバの設定についていくつか異なるオプションを設定できます。\n"
-"オプションの意味が分からない場合はそのままにしてください。\n"
-"\n"
+"ここでDHCPサーバのオプションを設定できます。\n"
+"オプションの意味が分からない場合はそのままにしてください。"
 
-#: standalone/drakgw:320
+#: standalone/drakgw:328
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "(この)DHCPサーバのIP"
 
-#: standalone/drakgw:321
+#: standalone/drakgw:329
 #, c-format
 msgid "The DNS Server IP"
 msgstr "DHCPサーバのIP"
 
-#: standalone/drakgw:322
+#: standalone/drakgw:330
 #, c-format
 msgid "The internal domain name"
 msgstr "内部ドメイン名"
 
-#: standalone/drakgw:323
+#: standalone/drakgw:331
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCPのスタートレンジ"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:332
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCPのエンドレンジ"
 
-#: standalone/drakgw:325
+#: standalone/drakgw:333
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "標準lease(秒単位)"
 
-#: standalone/drakgw:326
+#: standalone/drakgw:334
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "最大lease(単位: 秒)"
 
-#: standalone/drakgw:327
+#: standalone/drakgw:335
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "インタフェースとDHCPサーバを再設定"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:342
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr "ローカルネットワークが'.0'で終わっていません。中断します。"
 
-#: standalone/drakgw:344
+#: standalone/drakgw:352
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "現在の %s の設定ではLANアドレスが競合するかもしれません。\n"
 
-#: standalone/drakgw:354
+#: standalone/drakgw:362
 #, c-format
 msgid "Configuring..."
 msgstr "設定.."
 
-#: standalone/drakgw:355
+#: standalone/drakgw:363
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "スクリプトを設定、ソフトウェアをインストール、サーバを起動"
 
-#: 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 "パッケージ %s のインストールで問題が発生"
 
-#: standalone/drakgw:584
-#, fuzzy, c-format
+#: standalone/drakgw:595
+#, c-format
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
@@ -19365,11 +19583,11 @@ msgid ""
 " a Transparent Proxy Cache server (SQUID)."
 msgstr ""
 "設定が完了しました。\n"
-"自動ネットワーク設定(dhcp)を使って、LANの他のマシンと\n"
-"インターネット接続を共有できます。"
+"自動ネットワーク設定(DHCP)とTransparent Proxy Cache server(SQUID)を\n"
+"使って、LANの他のマシンとインターネット接続を共有できます。"
 
 #: standalone/drakhelp:17
-#, fuzzy, c-format
+#, c-format
 msgid ""
 " drakhelp 0.1\n"
 "Copyright (C) 2003-2004 MandrakeSoft.\n"
@@ -19379,7 +19597,7 @@ msgid ""
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003 MandrakeSoft.\n"
+"Copyright (C) 2003-2004 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -19395,6 +19613,7 @@ msgstr " --help                - このヘルプを表示     \n"
 msgid ""
 " --id <id_label>       - load the html help page which refers to id_label\n"
 msgstr ""
+" --id <id_label>       - load the html help page which refers to id_label\n"
 
 #: standalone/drakhelp:24
 #, c-format
@@ -19402,6 +19621,8 @@ msgid ""
 " --doc <link>          - link to another web page ( for WM welcome "
 "frontend)\n"
 msgstr ""
+" --doc <link>          - link to another web page ( for WM welcome "
+"frontend)\n"
 
 #: standalone/drakhelp:35
 #, c-format
@@ -19441,7 +19662,7 @@ msgstr "カスタム＆システム設定"
 msgid "Editable"
 msgstr "編集可"
 
-#: standalone/drakperm:48 standalone/drakperm:315
+#: standalone/drakperm:48 standalone/drakperm:314
 #, c-format
 msgid "Path"
 msgstr "パス"
@@ -19456,28 +19677,28 @@ msgstr "ユーザ名"
 msgid "Group"
 msgstr "グループ"
 
-#: standalone/drakperm:48 standalone/drakperm:327
+#: standalone/drakperm:48 standalone/drakperm:326
 #, c-format
 msgid "Permissions"
 msgstr "権限"
 
 #: standalone/drakperm:107
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Here you can see files to use in order to fix permissions, owners, and "
 "groups via msec.\n"
 "You can also edit your own rules which will owerwrite the default rules."
 msgstr ""
-"Drakpermは、権限/所有者/グループ をmsec経由で設定します。\n"
+"権限/所有者/グループ をmsec経由で設定します。\n"
 "標準設定を上書きして自分のルールを編集することもできます。"
 
 #: standalone/drakperm:110
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The current security level is %s.\n"
 "Select permissions to see/edit"
 msgstr ""
-"現在のセキュリティレベルは%sです。\n"
+"現在のセキュリティレベルは %s です。\n"
 "閲覧/編集する権限を選んでください"
 
 #: standalone/drakperm:121
@@ -19515,7 +19736,8 @@ msgstr "新しいルールを末尾に追加"
 msgid "Delete selected rule"
 msgstr "選んだルールを削除"
 
-#: 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"
@@ -19615,12 +19837,12 @@ msgstr "現在のユーザ"
 msgid "When checked, owner and group won't be changed"
 msgstr "チェックすると、所有者とグループを変更しません"
 
-#: standalone/drakperm:301
+#: standalone/drakperm:300
 #, c-format
 msgid "Path selection"
 msgstr "パスを選択"
 
-#: standalone/drakperm:321
+#: standalone/drakperm:320
 #, c-format
 msgid "Property"
 msgstr "プロパティ"
@@ -19756,7 +19978,7 @@ msgstr "全て"
 msgid "LOCAL"
 msgstr "ローカル"
 
-#: standalone/draksec:44
+#: standalone/draksec:44 standalone/drakvpn:1144
 #, c-format
 msgid "default"
 msgstr "デフォルト"
@@ -19776,7 +19998,7 @@ msgstr "いいえ"
 msgid "yes"
 msgstr "はい"
 
-#: standalone/draksec:70
+#: standalone/draksec:81
 #, c-format
 msgid ""
 "Here, you can setup the security level and administrator of your machine.\n"
@@ -19874,32 +20096,32 @@ msgstr ""
 "level, but the system is entirely closed and security features are at their\n"
 "maximum"
 
-#: standalone/draksec:118
+#: standalone/draksec:129
 #, c-format
 msgid "(default value: %s)"
 msgstr "(デフォルトの設定: %s)"
 
-#: standalone/draksec:159
+#: standalone/draksec:170
 #, c-format
 msgid "Security Level:"
 msgstr "セキュリティレベル:"
 
-#: standalone/draksec:162
+#: standalone/draksec:173
 #, c-format
 msgid "Security Alerts:"
 msgstr "セキュリティ警告:"
 
-#: standalone/draksec:166
+#: standalone/draksec:177
 #, c-format
 msgid "Security Administrator:"
 msgstr "セキュリティ管理者:"
 
-#: standalone/draksec:168
+#: standalone/draksec:179
 #, c-format
 msgid "Basic options"
 msgstr "基本"
 
-#: standalone/draksec:181
+#: standalone/draksec:192
 #, c-format
 msgid ""
 "The following options can be set to customize your\n"
@@ -19908,27 +20130,27 @@ msgstr ""
 "以下のオプションでシステムのセキュリティをカスタマイズします。\n"
 "説明が必要でしたらヘルプツールチップをご覧ください。\n"
 
-#: standalone/draksec:183
+#: standalone/draksec:194
 #, c-format
 msgid "Network Options"
 msgstr "ネットワーク"
 
-#: standalone/draksec:183
+#: standalone/draksec:194
 #, c-format
 msgid "System Options"
 msgstr "システム"
 
-#: standalone/draksec:229
+#: standalone/draksec:240
 #, c-format
 msgid "Periodic Checks"
 msgstr "定期的な確認"
 
-#: standalone/draksec:247
+#: standalone/draksec:258
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "お待ちください。セキュリティレベルを設定中.."
 
-#: standalone/draksec:253
+#: standalone/draksec:264
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "お待ちください。セキュリティのオプションを設定中.."
@@ -19960,7 +20182,7 @@ msgstr ""
 "http://www.linux-mandrake.com/en/hardware.php3"
 
 #: standalone/draksound:55
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -19971,8 +20193,8 @@ msgstr ""
 "\n"
 "\n"
 "\n"
-"注意: ISA PnPサウンドカードをお持ちの場合は、sndconfigを使ってください。\n"
-"コンソールに sndconfig と入力するだけです。"
+"注意: ISA PnPサウンドカードをお持ちの場合は、alsaconf か sndconfig を使ってく"
+"ださい。コンソールに alsaconf もしくは sndconfig と入力するだけです。"
 
 #: standalone/draksplash:21
 #, c-format
@@ -19983,167 +20205,330 @@ msgstr ""
 "設定を完了するにはImageMagickが必要です。\n"
 "OKをクリックするとImageMagickをインストールします。キャンセルで中止します。"
 
-#: standalone/draksplash:67
+#: standalone/draksplash:68
 #, c-format
 msgid "first step creation"
 msgstr "first stepの作成"
 
-#: standalone/draksplash:70
+#: standalone/draksplash:71
 #, c-format
 msgid "final resolution"
 msgstr "最終的な解像度"
 
-#: standalone/draksplash:71 standalone/draksplash:165
+#: standalone/draksplash:72
 #, c-format
 msgid "choose image file"
 msgstr "画像ファイルを選択"
 
-#: standalone/draksplash:72
+#: standalone/draksplash:73
 #, c-format
 msgid "Theme name"
 msgstr "テーマ名"
 
-#: standalone/draksplash:77
+#: standalone/draksplash:78
 #, c-format
 msgid "Browse"
 msgstr "ブラウズ"
 
-#: standalone/draksplash:87 standalone/draksplash:153
+#: standalone/draksplash:93 standalone/draksplash:158
 #, c-format
 msgid "Configure bootsplash picture"
 msgstr "起動スプラッシュの画像を設定"
 
-#: standalone/draksplash:90
+#: standalone/draksplash:96
 #, c-format
 msgid ""
 "x coordinate of text box\n"
 "in number of characters"
 msgstr "テキストボックスのx座標を文字数で"
 
-#: standalone/draksplash:91
+#: standalone/draksplash:97
 #, c-format
 msgid ""
 "y coordinate of text box\n"
 "in number of characters"
 msgstr "テキストボックスのy座標を文字数で"
 
-#: standalone/draksplash:92
+#: standalone/draksplash:98
 #, c-format
 msgid "text width"
 msgstr "テキストの幅"
 
-#: standalone/draksplash:93
+#: standalone/draksplash:99
 #, c-format
 msgid "text box height"
 msgstr "テキストボックスの高さ"
 
-#: standalone/draksplash:94
+#: standalone/draksplash:100
 #, c-format
 msgid ""
 "the progress bar x coordinate\n"
 "of its upper left corner"
 msgstr "進行バー左上隅のx座標"
 
-#: standalone/draksplash:95
+#: standalone/draksplash:101
 #, c-format
 msgid ""
 "the progress bar y coordinate\n"
 "of its upper left corner"
 msgstr "進行バー左上隅のy座標"
 
-#: standalone/draksplash:96
+#: standalone/draksplash:102
 #, c-format
 msgid "the width of the progress bar"
 msgstr "進行バーの幅"
 
-#: standalone/draksplash:97
+#: standalone/draksplash:103
 #, c-format
 msgid "the height of the progress bar"
 msgstr "進行バーの高さ"
 
-#: standalone/draksplash:98
+#: standalone/draksplash:104
 #, c-format
 msgid "the color of the progress bar"
 msgstr "進行バーの色"
 
-#: standalone/draksplash:113
+#: standalone/draksplash:119
 #, c-format
 msgid "Preview"
 msgstr "プレビュー"
 
-#: standalone/draksplash:115
+#: standalone/draksplash:121
 #, c-format
 msgid "Save theme"
 msgstr "テーマを保存"
 
-#: standalone/draksplash:116
+#: standalone/draksplash:122
 #, c-format
 msgid "Choose color"
 msgstr "色を選んでください"
 
-#: standalone/draksplash:119
+#: standalone/draksplash:125
 #, c-format
 msgid "Display logo on Console"
 msgstr "コンソールにロゴを表示"
 
-#: standalone/draksplash:120
+#: standalone/draksplash:126
 #, c-format
 msgid "Make kernel message quiet by default"
 msgstr "カーネルメッセージをデフォルトでは少なくする"
 
-#: standalone/draksplash:156 standalone/draksplash:320
-#: standalone/draksplash:448
+#: standalone/draksplash:161 standalone/draksplash:319
+#: standalone/draksplash:462
 #, c-format
 msgid "Notice"
 msgstr "注意"
 
-#: 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 "このテーマはまだ %s に起動スプラッシュがありません"
 
-#: standalone/draksplash:162
+#: standalone/draksplash:167
 #, c-format
 msgid "choose image"
 msgstr "画像を選択"
 
-#: standalone/draksplash:204
+#: standalone/draksplash:209
 #, c-format
 msgid "saving Bootsplash theme..."
 msgstr "起動スプラッシュのテーマを保存中.."
 
-#: standalone/draksplash:428
+#: standalone/draksplash:443
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "進行バーの色を選ぶ"
 
-#: standalone/draksplash:448
+#: standalone/draksplash:462
 #, c-format
 msgid "You must choose an image file first!"
 msgstr "まず画像ファイルを選んでください"
 
-#: standalone/draksplash:453
+#: standalone/draksplash:467
 #, c-format
 msgid "Generating preview ..."
 msgstr "プレビューを生成中.."
 
-#: standalone/draksplash:499
+#: standalone/draksplash:512
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr "%s 起動スプラッシュ(%s)のプレビュー"
 
-#: standalone/drakvpn:71
+#: standalone/drakups:63
+#, c-format
+msgid "Connected through a serial port or an usb cable"
+msgstr ""
+
+#: standalone/drakups:69
+#, fuzzy, c-format
+msgid "Add an UPS device"
+msgstr "アイテムを追加"
+
+#: standalone/drakups:72
+#, fuzzy, c-format
+msgid ""
+"Welcome to the UPS configuration utility.\n"
+"\n"
+"Here, you'll be add a new UPS to your system.\n"
+msgstr ""
+"メール設定ユーティリティへようこそ\n"
+"\n"
+"ここでは警告システムを設定します。\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 ""
+
+#: standalone/drakups:82
+#, fuzzy, c-format
+msgid "Autodetection"
+msgstr "自動検出"
+
+#: standalone/drakups:90 standalone/harddrake2:134
+#, c-format
+msgid "Detection in progress"
+msgstr "検出中です"
+
+#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479
+#: standalone/logdrake:485
+#, c-format
+msgid "Congratulations"
+msgstr "おめでとうございます"
+
+#: standalone/drakups:109
+#, fuzzy, c-format
+msgid "The wizard successfully added the following UPS devices:"
+msgstr "メール警告を無効にしました。"
+
+#: standalone/drakups:111
+#, fuzzy, c-format
+msgid "No new UPS devices was found"
+msgstr "デバイスがありません"
+
+#: standalone/drakups:116 standalone/drakups:128
+#, fuzzy, c-format
+msgid "UPS driver configuration"
+msgstr "CUPSプリンタの設定"
+
+#: standalone/drakups:116
+#, fuzzy, c-format
+msgid "Please select your UPS model."
+msgstr "マウスをテストしてください:"
+
+#: standalone/drakups:117
+#, fuzzy, c-format
+msgid "Manufacturer / Model:"
+msgstr "プリンタのメーカー/機種"
+
+#: 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 ""
+
+#: standalone/drakups:133
+#, c-format
+msgid "Name:"
+msgstr "名前:"
+
+#: standalone/drakups:133
+#, fuzzy, c-format
+msgid "The name of your ups"
+msgstr "CPUの名前"
+
+#: standalone/drakups:134
+#, c-format
+msgid "The driver that manage your ups"
+msgstr ""
+
+#: standalone/drakups:135
+#, fuzzy, c-format
+msgid "Port:"
+msgstr "ポート"
+
+#: standalone/drakups:137
+#, fuzzy, c-format
+msgid "The port on which is connected your ups"
+msgstr "マウスを接続しているバスの種類"
+
+#: standalone/drakups:144
+#, fuzzy, c-format
+msgid "The wizard successfully configured the new \"%s\" UPS device."
+msgstr "メール警告を設定しました。"
+
+#: standalone/drakups:232
+#, fuzzy, c-format
+msgid "UPS devices"
+msgstr "サービス"
+
+#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266
+#: standalone/harddrake2:63
+#, c-format
+msgid "Name"
+msgstr "名前"
+
+#: standalone/drakups:250
+#, fuzzy, c-format
+msgid "UPS users"
+msgstr "ユーザ名"
+
+#: standalone/drakups:265
+#, fuzzy, c-format
+msgid "Access Control Lists"
+msgstr "ネットワークツールへのアクセス"
+
+#: standalone/drakups:266
+#, c-format
+msgid "IP mask"
+msgstr ""
+
+#: standalone/drakups:277
+#, fuzzy, c-format
+msgid "Rules"
+msgstr "ルータ:"
+
+#: standalone/drakups:278
+#, fuzzy, c-format
+msgid "Action"
+msgstr "/アクション(_A)"
+
+#: standalone/drakups:278 standalone/drakvpn:1144 standalone/harddrake2:57
+#, c-format
+msgid "Level"
+msgstr "レベル"
+
+#: standalone/drakups:278
 #, fuzzy, c-format
+msgid "ACL name"
+msgstr "LVMの名前を入力"
+
+#: standalone/drakups:297 standalone/drakups:301 standalone/drakups:310
+#, fuzzy, c-format
+msgid "DrakUPS"
+msgstr "DrakVPN"
+
+#: standalone/drakups:307
+#, fuzzy, c-format
+msgid "Welcome to the UPS configuration tools"
+msgstr "設定をテストする"
+
+#: standalone/drakvpn:71
+#, c-format
 msgid "DrakVPN"
-msgstr "Dvorak(US)"
+msgstr "DrakVPN"
 
 #: standalone/drakvpn:93
-#, fuzzy, c-format
+#, c-format
 msgid "The VPN connection is enabled."
-msgstr "インターネット接続の共有が有効になりました。"
+msgstr "VPN接続を有効にしました。"
 
 #: standalone/drakvpn:94
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The setup of a VPN connection has already been done.\n"
 "\n"
@@ -20151,28 +20536,29 @@ msgid ""
 "\n"
 "What would you like to do ?"
 msgstr ""
-"インターネット接続を共有するセットアップは既に完了しています。\n"
+"VPN接続のセットアップは完了しています。\n"
+"\n"
 "現在は有効になっています。\n"
 "\n"
 "どうしますか？"
 
 #: standalone/drakvpn:103
-#, fuzzy, c-format
+#, c-format
 msgid "Disabling VPN..."
-msgstr "サーバを停止しています.."
+msgstr "VPNを無効に.."
 
 #: standalone/drakvpn:112
-#, fuzzy, c-format
+#, c-format
 msgid "The VPN connection is now disabled."
-msgstr "インターネット接続の共有を停止しました。"
+msgstr "VPN接続を無効にしました。"
 
 #: standalone/drakvpn:119
-#, fuzzy, c-format
+#, c-format
 msgid "VPN connection currently disabled"
-msgstr "インターネット接続の共有は現在停止しています"
+msgstr "VPN接続は現在無効になっています。"
 
 #: standalone/drakvpn:120
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The setup of a VPN connection has already been done.\n"
 "\n"
@@ -20180,25 +20566,26 @@ msgid ""
 "\n"
 "What would you like to do ?"
 msgstr ""
-"インターネット接続の共有のセットアップは既に完了しています。\n"
-"現在は停止しています。\n"
+"VPN接続のセットアップは完了しています。\n"
+"\n"
+"現在は無効にしています。\n"
 "\n"
 "どうしますか？"
 
 #: standalone/drakvpn:133
-#, fuzzy, c-format
+#, c-format
 msgid "Enabling VPN..."
-msgstr "サーバを有効にしています.."
+msgstr "VPNを有効に.."
 
 #: standalone/drakvpn:139
-#, fuzzy, c-format
+#, c-format
 msgid "The VPN connection is now enabled."
-msgstr "インターネット接続の共有が有効になりました。"
+msgstr "VPN接続を有効にしました。"
 
-#: standalone/drakvpn:153 standalone/drakvpn:179
+#: standalone/drakvpn:153 standalone/drakvpn:181
 #, c-format
 msgid "Simple VPN setup."
-msgstr ""
+msgstr "シンプルなVPNセットアップ"
 
 #: standalone/drakvpn:154
 #, c-format
@@ -20215,8 +20602,19 @@ msgid ""
 "Make sure you have configured your Network/Internet access using\n"
 "drakconnect before going any further."
 msgstr ""
+"VPN接続を使ってコンピュータを設定しようとしています。\n"
+"\n"
+"With this feature, computers on your local private network and computers\n"
+"on some other remote private networks, can share resources, through\n"
+"their respective firewalls, over the Internet, in a secure manner. \n"
+"\n"
+"The communication over the Internet is encrypted. The local and remote\n"
+"computers look as if they were on the same network.\n"
+"\n"
+"Make sure you have configured your Network/Internet access using\n"
+"drakconnect before going any further."
 
-#: standalone/drakvpn:180
+#: standalone/drakvpn:182
 #, c-format
 msgid ""
 "VPN connection.\n"
@@ -20231,13 +20629,24 @@ msgid ""
 "Please read AT LEAST the ipsec-howto docs\n"
 "before going any further."
 msgstr ""
+"VPN接続\n"
+"\n"
+"This program is based on the following projects:\n"
+" - FreeSwan: \t\t\thttp://www.freeswan.org/\n"
+" - Super-FreeSwan: \t\thttp://www.freeswan.ca/\n"
+" - ipsec-tools: \t\t\thttp://ipsec-tools.sourceforge.net/\n"
+" - ipsec-howto: \t\thttp://www.ipsec-howto.org\n"
+" - the docs and man pages coming with the %s package\n"
+"\n"
+"Please read AT LEAST the ipsec-howto docs\n"
+"before going any further."
 
-#: standalone/drakvpn:192
-#, fuzzy, c-format
+#: standalone/drakvpn:194
+#, c-format
 msgid "Kernel module."
-msgstr "モジュールを削除"
+msgstr "カーネルモジュール"
 
-#: standalone/drakvpn:193
+#: standalone/drakvpn:195
 #, c-format
 msgid ""
 "The kernel need to have ipsec support.\n"
@@ -20246,23 +20655,28 @@ msgid ""
 "\n"
 "This kernel has '%s' support."
 msgstr ""
+"カーネルには ipsecサポートが必要です。\n"
+"\n"
+"現在バージョン %s のカーネルを実行しています。\n"
+"\n"
+"このカーネルは '%s' をサポートしています。"
 
-#: standalone/drakvpn:288
-#, fuzzy, c-format
+#: standalone/drakvpn:290
+#, c-format
 msgid "Security Policies"
-msgstr "セキュリティ警告:"
+msgstr "セキュリティポリシー"
 
-#: standalone/drakvpn:288
+#: standalone/drakvpn:290
 #, c-format
 msgid "IKE daemon racoon"
-msgstr ""
+msgstr "IKE daemon racoon"
 
-#: standalone/drakvpn:291 standalone/drakvpn:302
-#, fuzzy, c-format
+#: standalone/drakvpn:293 standalone/drakvpn:304
+#, c-format
 msgid "Configuration file"
-msgstr "設定"
+msgstr "ファイルを設定"
 
-#: standalone/drakvpn:292
+#: standalone/drakvpn:294
 #, c-format
 msgid ""
 "Configuration step !\n"
@@ -20273,8 +20687,15 @@ msgid ""
 "\n"
 "What would you like to configure ?\n"
 msgstr ""
+"設定\n"
+"\n"
+"セキュリティポリシーを設定したのち\n"
+"automatic key exchange (IKE)デーモンを設定する必要が\n"
+"あります。このKAME IKEデーモンを'racoon'と呼びます。\n"
+"\n"
+"何を設定しますか？\n"
 
-#: standalone/drakvpn:303
+#: standalone/drakvpn:305
 #, c-format
 msgid ""
 "Next, we will configure the %s file.\n"
@@ -20282,13 +20703,17 @@ msgid ""
 "\n"
 "Simply click on Next.\n"
 msgstr ""
+"次に %s ファイルを設定します。\n"
+"\n"
+"\n"
+"'次'をクリックしてください。\n"
 
-#: standalone/drakvpn:321 standalone/drakvpn:681
-#, fuzzy, c-format
+#: standalone/drakvpn:323 standalone/drakvpn:683
+#, c-format
 msgid "%s entries"
-msgstr ", %s セクタ"
+msgstr "%s 個の項目"
 
-#: standalone/drakvpn:322
+#: standalone/drakvpn:324
 #, c-format
 msgid ""
 "The %s file contents\n"
@@ -20302,23 +20727,27 @@ msgid ""
 "What would you like to do ?\n"
 msgstr ""
 
-#: standalone/drakvpn:329 standalone/drakvpn:690
-#, fuzzy, c-format
-msgid "Display"
-msgstr "毎日"
+#: standalone/drakvpn:331 standalone/drakvpn:692
+#, c-format
+msgid ""
+"_:display here is a verb\n"
+"Display"
+msgstr "表示"
 
-#: standalone/drakvpn:329 standalone/drakvpn:690
-#, fuzzy, c-format
+#: standalone/drakvpn:331 standalone/drakvpn:692
+#, c-format
 msgid "Commit"
-msgstr "コンパクト"
+msgstr "コミット"
 
-#: standalone/drakvpn:343 standalone/drakvpn:347 standalone/drakvpn:705
-#: standalone/drakvpn:709
-#, fuzzy, c-format
-msgid "Display configuration"
-msgstr "LANの設定"
+#: standalone/drakvpn:345 standalone/drakvpn:349 standalone/drakvpn:707
+#: standalone/drakvpn:711
+#, c-format
+msgid ""
+"_:display here is a verb\n"
+"Display configuration"
+msgstr "設定を表示"
 
-#: standalone/drakvpn:348
+#: standalone/drakvpn:350
 #, c-format
 msgid ""
 "The %s file does not exist.\n"
@@ -20327,13 +20756,18 @@ msgid ""
 "\n"
 "You'll have to go back and choose 'add'.\n"
 msgstr ""
+"%s ファイルはありません。\n"
+"\n"
+"新規設定を行ってください。\n"
+"\n"
+"前に戻って'追加'をクリックしてください\n"
 
-#: standalone/drakvpn:364
+#: standalone/drakvpn:366
 #, c-format
 msgid "ipsec.conf entries"
-msgstr ""
+msgstr "ipsec.conf の項目"
 
-#: standalone/drakvpn:365
+#: standalone/drakvpn:367
 #, c-format
 msgid ""
 "The %s file contains different sections.\n"
@@ -20348,27 +20782,27 @@ msgid ""
 "Choose the section you would like to add.\n"
 msgstr ""
 
-#: standalone/drakvpn:372
-#, fuzzy, c-format
+#: standalone/drakvpn:374
+#, c-format
 msgid "config setup"
-msgstr "再設定"
+msgstr "セットアップを設定"
 
-#: standalone/drakvpn:372
-#, fuzzy, c-format
+#: standalone/drakvpn:374
+#, c-format
 msgid "conn %default"
-msgstr "デフォルト"
+msgstr "conn %default"
 
-#: standalone/drakvpn:372
-#, fuzzy, c-format
+#: standalone/drakvpn:374
+#, c-format
 msgid "normal conn"
-msgstr "ノーマルモード"
+msgstr "ノーマル conn"
 
-#: standalone/drakvpn:378 standalone/drakvpn:419 standalone/drakvpn:506
-#, fuzzy, c-format
+#: standalone/drakvpn:380 standalone/drakvpn:421 standalone/drakvpn:508
+#, c-format
 msgid "Exists !"
-msgstr "終了"
+msgstr "存在します"
 
-#: standalone/drakvpn:379 standalone/drakvpn:420
+#: standalone/drakvpn:381 standalone/drakvpn:422
 #, c-format
 msgid ""
 "A section with this name already exists.\n"
@@ -20377,8 +20811,13 @@ msgid ""
 "You'll have to go back and add another section\n"
 "or change its name.\n"
 msgstr ""
+"この名前のセクションは既にあります。\n"
+"独自のセクション名を付けてください。\n"
+"\n"
+"前に戻って別のセクションを追加するか、名前を\n"
+"変更してください。\n"
 
-#: standalone/drakvpn:396
+#: standalone/drakvpn:398
 #, c-format
 msgid ""
 "This section has to be on top of your\n"
@@ -20390,37 +20829,37 @@ msgid ""
 "Choose continue or previous when you are done.\n"
 msgstr ""
 
-#: standalone/drakvpn:401
-#, fuzzy, c-format
+#: standalone/drakvpn:403
+#, c-format
 msgid "interfaces"
 msgstr "インタフェース"
 
-#: standalone/drakvpn:402
+#: standalone/drakvpn:404
 #, c-format
 msgid "klipsdebug"
-msgstr ""
+msgstr "klipsdebug"
 
-#: standalone/drakvpn:403
+#: standalone/drakvpn:405
 #, c-format
 msgid "plutodebug"
-msgstr ""
+msgstr "plutodebug"
 
-#: standalone/drakvpn:404
+#: standalone/drakvpn:406
 #, c-format
 msgid "plutoload"
-msgstr ""
+msgstr "plutoload"
 
-#: standalone/drakvpn:405
+#: standalone/drakvpn:407
 #, c-format
 msgid "plutostart"
-msgstr ""
+msgstr "plutostart"
 
-#: standalone/drakvpn:406
+#: standalone/drakvpn:408
 #, c-format
 msgid "uniqueids"
-msgstr ""
+msgstr "uniqueids"
 
-#: standalone/drakvpn:440
+#: standalone/drakvpn:442
 #, c-format
 msgid ""
 "This is the first section after the config\n"
@@ -20433,52 +20872,52 @@ msgid ""
 "section.\n"
 msgstr ""
 
-#: standalone/drakvpn:447
+#: standalone/drakvpn:449
 #, c-format
-msgid "pfs"
-msgstr ""
+msgid "PFS"
+msgstr "PFS"
 
-#: standalone/drakvpn:448
+#: standalone/drakvpn:450
 #, c-format
 msgid "keyingtries"
-msgstr ""
+msgstr "keyingtries"
 
-#: standalone/drakvpn:449
+#: standalone/drakvpn:451
 #, c-format
 msgid "compress"
-msgstr ""
+msgstr "圧縮"
 
-#: standalone/drakvpn:450
+#: standalone/drakvpn:452
 #, c-format
 msgid "disablearrivalcheck"
-msgstr ""
+msgstr "disablearrivalcheck"
 
-#: standalone/drakvpn:451 standalone/drakvpn:490
-#, fuzzy, c-format
+#: standalone/drakvpn:453 standalone/drakvpn:492
+#, c-format
 msgid "left"
-msgstr "削除"
+msgstr "左"
 
-#: standalone/drakvpn:452 standalone/drakvpn:491
+#: standalone/drakvpn:454 standalone/drakvpn:493
 #, c-format
 msgid "leftcert"
-msgstr ""
+msgstr "leftcert"
 
-#: standalone/drakvpn:453 standalone/drakvpn:492
+#: standalone/drakvpn:455 standalone/drakvpn:494
 #, c-format
 msgid "leftrsasigkey"
-msgstr ""
+msgstr "leftrsasigkey"
 
-#: standalone/drakvpn:454 standalone/drakvpn:493
+#: standalone/drakvpn:456 standalone/drakvpn:495
 #, c-format
 msgid "leftsubnet"
-msgstr ""
+msgstr "leftsubnet"
 
-#: standalone/drakvpn:455 standalone/drakvpn:494
+#: standalone/drakvpn:457 standalone/drakvpn:496
 #, c-format
 msgid "leftnexthop"
-msgstr ""
+msgstr "leftnexthop"
 
-#: standalone/drakvpn:484
+#: standalone/drakvpn:486
 #, c-format
 msgid ""
 "Your %s file has several sections, or connections.\n"
@@ -20487,47 +20926,47 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:487
-#, fuzzy, c-format
+#: standalone/drakvpn:489
+#, c-format
 msgid "section name"
-msgstr "接続名"
+msgstr "セクション名"
 
-#: standalone/drakvpn:488
-#, fuzzy, c-format
+#: standalone/drakvpn:490
+#, c-format
 msgid "authby"
-msgstr "パス"
+msgstr "authby"
 
-#: standalone/drakvpn:489
-#, fuzzy, c-format
+#: standalone/drakvpn:491
+#, c-format
 msgid "auto"
-msgstr "作者: "
+msgstr "自動"
 
-#: standalone/drakvpn:495
-#, fuzzy, c-format
+#: standalone/drakvpn:497
+#, c-format
 msgid "right"
-msgstr "高い"
+msgstr "右"
 
-#: standalone/drakvpn:496
-#, fuzzy, c-format
+#: standalone/drakvpn:498
+#, c-format
 msgid "rightcert"
-msgstr "かなり高い"
+msgstr "rightcert"
 
-#: standalone/drakvpn:497
+#: standalone/drakvpn:499
 #, c-format
 msgid "rightrsasigkey"
-msgstr ""
+msgstr "rightrsasigkey"
 
-#: standalone/drakvpn:498
+#: standalone/drakvpn:500
 #, c-format
 msgid "rightsubnet"
-msgstr ""
+msgstr "rightsubnet"
 
-#: standalone/drakvpn:499
+#: standalone/drakvpn:501
 #, c-format
 msgid "rightnexthop"
-msgstr ""
+msgstr "rightnexthop"
 
-#: standalone/drakvpn:507
+#: standalone/drakvpn:509
 #, c-format
 msgid ""
 "A section with this name already exists.\n"
@@ -20536,8 +20975,13 @@ msgid ""
 "You'll have to go back and add another section\n"
 "or change the name of the section.\n"
 msgstr ""
+"この名前のセクションは既にあります。\n"
+"独自のセクション名を付けてください。\n"
+"\n"
+"前に戻って別のセクションを追加するか、名前を\n"
+"変更してください。\n"
 
-#: standalone/drakvpn:539
+#: standalone/drakvpn:541
 #, c-format
 msgid ""
 "Add a Security Policy.\n"
@@ -20546,13 +20990,18 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"セキュリティポリシーを追加\n"
+"\n"
+"セキュリティポリシーを追加できます。\n"
+"\n"
+"データを書き込む準備ができたら'続ける'を選択\n"
 
-#: standalone/drakvpn:572 standalone/drakvpn:822
-#, fuzzy, c-format
+#: standalone/drakvpn:574 standalone/drakvpn:824
+#, c-format
 msgid "Edit section"
-msgstr "パスを選択"
+msgstr "セクションを編集"
 
-#: standalone/drakvpn:573
+#: standalone/drakvpn:575
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -20561,18 +21010,18 @@ msgid ""
 "and then click on next.\n"
 msgstr ""
 
-#: standalone/drakvpn:576 standalone/drakvpn:656 standalone/drakvpn:827
-#: standalone/drakvpn:873
-#, fuzzy, c-format
+#: standalone/drakvpn:578 standalone/drakvpn:658 standalone/drakvpn:829
+#: standalone/drakvpn:875
+#, c-format
 msgid "Section names"
-msgstr "接続名"
+msgstr "セクション名"
 
-#: standalone/drakvpn:586
-#, fuzzy, c-format
+#: standalone/drakvpn:588
+#, c-format
 msgid "Can't edit !"
-msgstr "%s を開けません"
+msgstr "編集できません"
 
-#: standalone/drakvpn:587
+#: standalone/drakvpn:589
 #, c-format
 msgid ""
 "You cannot edit this section.\n"
@@ -20582,8 +21031,14 @@ msgid ""
 "of the %s file, and eventually, disable or\n"
 "enable the oportunistic encryption.\n"
 msgstr ""
+"このセッションを編集できません。\n"
+"\n"
+"This section is mandatory for Freswan 2.X.\n"
+"One has to specify version 2.0 on the top\n"
+"of the %s file, and eventually, disable or\n"
+"enable the oportunistic encryption.\n"
 
-#: standalone/drakvpn:596
+#: standalone/drakvpn:598
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -20592,7 +21047,7 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:607
+#: standalone/drakvpn:609
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -20601,7 +21056,7 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:620
+#: standalone/drakvpn:622
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -20611,7 +21066,7 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:641
+#: standalone/drakvpn:643
 #, c-format
 msgid ""
 "Edit a Security Policy.\n"
@@ -20620,13 +21075,18 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"セキュリティポリシーを編集\n"
+"\n"
+"セキュリティポリシーを追加できます。\n"
+"\n"
+"データを書き込む準備ができたら'続ける'を選択\n"
 
-#: standalone/drakvpn:652 standalone/drakvpn:869
-#, fuzzy, c-format
+#: standalone/drakvpn:654 standalone/drakvpn:871
+#, c-format
 msgid "Remove section"
-msgstr "フォントを削除"
+msgstr "セクションを削除"
 
-#: standalone/drakvpn:653 standalone/drakvpn:870
+#: standalone/drakvpn:655 standalone/drakvpn:872
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -20635,7 +21095,7 @@ msgid ""
 "and then click on next.\n"
 msgstr ""
 
-#: standalone/drakvpn:682
+#: standalone/drakvpn:684
 #, c-format
 msgid ""
 "The racoon.conf file configuration.\n"
@@ -20649,7 +21109,7 @@ msgid ""
 "  - commit \t\t (writes the changes to the real file)"
 msgstr ""
 
-#: standalone/drakvpn:710
+#: standalone/drakvpn:712
 #, c-format
 msgid ""
 "The %s file does not exist\n"
@@ -20659,12 +21119,12 @@ msgid ""
 "You'll have to go back and choose configure.\n"
 msgstr ""
 
-#: standalone/drakvpn:724
+#: standalone/drakvpn:726
 #, c-format
 msgid "racoonf.conf entries"
-msgstr ""
+msgstr "racoonf.conf の項目"
 
-#: standalone/drakvpn:725
+#: standalone/drakvpn:727
 #, c-format
 msgid ""
 "The 'add' sections step.\n"
@@ -20677,22 +21137,22 @@ msgid ""
 "Choose the section you would like to add.\n"
 msgstr ""
 
-#: standalone/drakvpn:731
-#, fuzzy, c-format
+#: standalone/drakvpn:733
+#, c-format
 msgid "path"
 msgstr "パス"
 
-#: standalone/drakvpn:731
-#, fuzzy, c-format
+#: standalone/drakvpn:733
+#, c-format
 msgid "remote"
-msgstr "削除"
+msgstr "リモート"
 
-#: standalone/drakvpn:731
-#, fuzzy, c-format
+#: standalone/drakvpn:733
+#, c-format
 msgid "sainfo"
-msgstr "Espanol"
+msgstr "sainfo"
 
-#: standalone/drakvpn:739
+#: standalone/drakvpn:741
 #, c-format
 msgid ""
 "The 'add path' section step.\n"
@@ -20702,12 +21162,12 @@ msgid ""
 "Put your mouse over the certificate entry to obtain online help."
 msgstr ""
 
-#: standalone/drakvpn:742
-#, fuzzy, c-format
+#: standalone/drakvpn:744
+#, c-format
 msgid "path type"
-msgstr "種類を変更"
+msgstr "パスの種類"
 
-#: standalone/drakvpn:746
+#: standalone/drakvpn:748
 #, c-format
 msgid ""
 "path include path : specifies a path to include\n"
@@ -20731,12 +21191,12 @@ msgid ""
 "Pre-shared key authentication method in phase 1."
 msgstr ""
 
-#: standalone/drakvpn:766
+#: standalone/drakvpn:768 standalone/drakvpn:861
 #, fuzzy, c-format
 msgid "real file"
 msgstr "ファイルを選択"
 
-#: standalone/drakvpn:789
+#: standalone/drakvpn:791
 #, c-format
 msgid ""
 "Make sure you already have the path sections\n"
@@ -20746,7 +21206,7 @@ msgid ""
 "Choose continue or previous when you are done.\n"
 msgstr ""
 
-#: standalone/drakvpn:806
+#: standalone/drakvpn:808
 #, c-format
 msgid ""
 "Make sure you already have the path sections\n"
@@ -20756,7 +21216,7 @@ msgid ""
 "Choose continue or previous when you are done.\n"
 msgstr ""
 
-#: standalone/drakvpn:823
+#: standalone/drakvpn:825
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -20765,7 +21225,7 @@ msgid ""
 "to edit and then click on next.\n"
 msgstr ""
 
-#: standalone/drakvpn:834
+#: standalone/drakvpn:836
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -20776,7 +21236,7 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:843
+#: standalone/drakvpn:845
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -20786,7 +21246,7 @@ msgid ""
 "Choose continue when you are done to write the data."
 msgstr ""
 
-#: standalone/drakvpn:851
+#: standalone/drakvpn:853
 #, c-format
 msgid ""
 "This section has to be on top of your\n"
@@ -20800,17 +21260,12 @@ msgid ""
 "Choose continue or previous when you are done.\n"
 msgstr ""
 
-#: standalone/drakvpn:858
+#: standalone/drakvpn:860
 #, c-format
 msgid "path_type"
-msgstr ""
+msgstr "path_type"
 
-#: standalone/drakvpn:859
-#, fuzzy, c-format
-msgid "real_file"
-msgstr "ファイルを選択"
-
-#: standalone/drakvpn:899
+#: standalone/drakvpn:901
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -20821,13 +21276,19 @@ msgid ""
 "You should make sure that that the tunnels shorewall\n"
 "section is configured."
 msgstr ""
+"全て設定しました。\n"
+"\n"
+"インターネット(VPN接続)を通してリソースを共有できます。\n"
+"\n"
+"You should make sure that that the tunnels shorewall\n"
+"section is configured."
 
-#: standalone/drakvpn:919
+#: standalone/drakvpn:921
 #, c-format
 msgid "Sainfo source address"
-msgstr ""
+msgstr "Sainfoのソースアドレス"
 
-#: standalone/drakvpn:920
+#: standalone/drakvpn:922
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -20850,12 +21311,12 @@ msgid ""
 "\t172.16.1.0/24 is the source address"
 msgstr ""
 
-#: standalone/drakvpn:937
-#, fuzzy, c-format
+#: standalone/drakvpn:939
+#, c-format
 msgid "Sainfo source protocol"
-msgstr "ヨーロッパのプロトコル"
+msgstr "Sainfoのソースプロトコル"
 
-#: standalone/drakvpn:938
+#: standalone/drakvpn:940
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -20875,12 +21336,12 @@ msgid ""
 "\tthe first 'any' allows any protocol for the source"
 msgstr ""
 
-#: standalone/drakvpn:952
+#: standalone/drakvpn:954
 #, c-format
 msgid "Sainfo destination address"
-msgstr ""
+msgstr "Sainfoの対象アドレス"
 
-#: standalone/drakvpn:953
+#: standalone/drakvpn:955
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -20903,12 +21364,12 @@ msgid ""
 "\t172.16.2.0/24 is the destination address"
 msgstr ""
 
-#: standalone/drakvpn:970
-#, fuzzy, c-format
+#: standalone/drakvpn:972
+#, c-format
 msgid "Sainfo destination protocol"
-msgstr "Windows移行ツール"
+msgstr "Sainfoの対象プロトコル"
 
-#: standalone/drakvpn:971
+#: standalone/drakvpn:973
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -20928,12 +21389,12 @@ msgid ""
 "\tthe last 'any' allows any protocol for the destination"
 msgstr ""
 
-#: standalone/drakvpn:985
+#: standalone/drakvpn:987
 #, c-format
 msgid "PFS group"
-msgstr ""
+msgstr "PFSグループ"
 
-#: standalone/drakvpn:987
+#: standalone/drakvpn:989
 #, c-format
 msgid ""
 "define the group of Diffie-Hellman exponentiations.\n"
@@ -20943,12 +21404,12 @@ msgid ""
 "Or you can define 1, 2, or 5 as the DH group number."
 msgstr ""
 
-#: standalone/drakvpn:992
+#: standalone/drakvpn:994
 #, fuzzy, c-format
 msgid "Lifetime number"
 msgstr "番号"
 
-#: standalone/drakvpn:993
+#: standalone/drakvpn:995
 #, c-format
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
@@ -20969,12 +21430,12 @@ msgid ""
 "So, here, the lifetime numbers are 1, 1, 30, 30, 60 and 12.\n"
 msgstr ""
 
-#: standalone/drakvpn:1009
+#: standalone/drakvpn:1011
 #, c-format
 msgid "Lifetime unit"
 msgstr ""
 
-#: standalone/drakvpn:1011
+#: standalone/drakvpn:1013
 #, c-format
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
@@ -20996,27 +21457,32 @@ msgid ""
 "'hour'.\n"
 msgstr ""
 
-#: standalone/drakvpn:1027 standalone/drakvpn:1112
-#, fuzzy, c-format
+#: standalone/drakvpn:1029 standalone/drakvpn:1114
+#, c-format
 msgid "Encryption algorithm"
-msgstr "認証"
+msgstr "暗号化アルゴリズム"
 
-#: standalone/drakvpn:1029
-#, fuzzy, c-format
+#: standalone/drakvpn:1031
+#, c-format
 msgid "Authentication algorithm"
-msgstr "認証"
+msgstr "認証アルゴリズム"
 
-#: standalone/drakvpn:1031
+#: standalone/drakvpn:1033
 #, c-format
 msgid "Compression algorithm"
-msgstr ""
+msgstr "圧縮アルゴリズム"
 
-#: standalone/drakvpn:1039
+#: standalone/drakvpn:1034
 #, fuzzy, c-format
+msgid "deflate"
+msgstr "デフォルト"
+
+#: standalone/drakvpn:1041
+#, c-format
 msgid "Remote"
-msgstr "削除"
+msgstr "リモート"
 
-#: standalone/drakvpn:1040
+#: standalone/drakvpn:1042
 #, c-format
 msgid ""
 "remote (address | anonymous) [[port]] { statements }\n"
@@ -21031,12 +21497,12 @@ msgid ""
 "remote ::1 [8000]"
 msgstr ""
 
-#: standalone/drakvpn:1048
-#, fuzzy, c-format
+#: standalone/drakvpn:1050
+#, c-format
 msgid "Exchange mode"
-msgstr "ダイアルモード"
+msgstr "エクスチェンジモード"
 
-#: standalone/drakvpn:1050
+#: standalone/drakvpn:1052
 #, c-format
 msgid ""
 "defines the exchange mode for phase 1 when racoon is the\n"
@@ -21047,12 +21513,22 @@ msgid ""
 "racoon uses when it is the initiator.\n"
 msgstr ""
 
-#: standalone/drakvpn:1056
-#, fuzzy, c-format
+#: standalone/drakvpn:1058
+#, c-format
 msgid "Generate policy"
-msgstr "セキュリティ"
+msgstr "ポリシーを生成"
 
-#: standalone/drakvpn:1058
+#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#, c-format
+msgid "off"
+msgstr ""
+
+#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#, fuzzy, c-format
+msgid "on"
+msgstr "下へ"
+
+#: standalone/drakvpn:1060
 #, c-format
 msgid ""
 "This directive is for the responder.  Therefore you\n"
@@ -21071,12 +21547,12 @@ msgid ""
 "the initiator case.  The default value is off."
 msgstr ""
 
-#: standalone/drakvpn:1072
-#, fuzzy, c-format
+#: standalone/drakvpn:1074
+#, c-format
 msgid "Passive"
-msgstr "パレスティナ"
+msgstr "Passive"
 
-#: standalone/drakvpn:1074
+#: standalone/drakvpn:1076
 #, c-format
 msgid ""
 "If you do not want to initiate the negotiation, set this\n"
@@ -21084,59 +21560,59 @@ msgid ""
 "server."
 msgstr ""
 
-#: standalone/drakvpn:1077
+#: standalone/drakvpn:1079
 #, c-format
 msgid "Certificate type"
 msgstr ""
 
-#: standalone/drakvpn:1079
+#: standalone/drakvpn:1081
 #, fuzzy, c-format
 msgid "My certfile"
 msgstr "ファイルを選択"
 
-#: standalone/drakvpn:1080
+#: standalone/drakvpn:1082
 #, fuzzy, c-format
 msgid "Name of the certificate"
 msgstr "プリンタの名前"
 
-#: standalone/drakvpn:1081
+#: standalone/drakvpn:1083
 #, c-format
 msgid "My private key"
-msgstr ""
+msgstr "プライベートキー"
 
-#: standalone/drakvpn:1082
-#, fuzzy, c-format
+#: standalone/drakvpn:1084
+#, c-format
 msgid "Name of the private key"
-msgstr "プリンタの名前"
+msgstr "プライベートキーの名前"
 
-#: standalone/drakvpn:1083
+#: standalone/drakvpn:1085
 #, fuzzy, c-format
 msgid "Peers certfile"
 msgstr "ファイルを選択"
 
-#: standalone/drakvpn:1084
+#: standalone/drakvpn:1086
 #, c-format
 msgid "Name of the peers certificate"
 msgstr ""
 
-#: standalone/drakvpn:1085
+#: standalone/drakvpn:1087
 #, fuzzy, c-format
 msgid "Verify cert"
 msgstr "優秀"
 
-#: 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 ""
 
-#: standalone/drakvpn:1089
+#: standalone/drakvpn:1091
 #, c-format
 msgid "My identifier"
-msgstr ""
+msgstr "自分のID"
 
-#: standalone/drakvpn:1090
+#: standalone/drakvpn:1092
 #, c-format
 msgid ""
 "specifies the identifier sent to the remote host and the\n"
@@ -21163,17 +21639,17 @@ msgid ""
 "my_identifier user_fqdn \"myemail@mydomain.com\""
 msgstr ""
 
-#: standalone/drakvpn:1110
+#: standalone/drakvpn:1112
 #, fuzzy, c-format
 msgid "Peers identifier"
 msgstr "Printer"
 
-#: standalone/drakvpn:1111
+#: standalone/drakvpn:1113
 #, fuzzy, c-format
 msgid "Proposal"
 msgstr "プロトコル"
 
-#: standalone/drakvpn:1113
+#: standalone/drakvpn:1115
 #, c-format
 msgid ""
 "specify the encryption algorithm used for the\n"
@@ -21185,70 +21661,105 @@ msgid ""
 "For other transforms, this statement should not be used."
 msgstr ""
 
-#: standalone/drakvpn:1120
+#: standalone/drakvpn:1122
 #, c-format
 msgid "Hash algorithm"
-msgstr ""
+msgstr "ハッシュアルゴリズム"
 
-#: standalone/drakvpn:1121
-#, fuzzy, c-format
+#: standalone/drakvpn:1123
+#, c-format
 msgid "Authentication method"
-msgstr "認証"
+msgstr "認証方法"
 
-#: standalone/drakvpn:1122
-#, fuzzy, c-format
+#: standalone/drakvpn:1124
+#, c-format
 msgid "DH group"
-msgstr "グループ"
+msgstr "DHグループ"
 
-#: standalone/drakvpn:1129
-#, fuzzy, c-format
+#: standalone/drakvpn:1131
+#, c-format
 msgid "Command"
-msgstr "コマンドライン"
+msgstr "コマンド"
 
-#: standalone/drakvpn:1130
+#: standalone/drakvpn:1132
 #, c-format
 msgid "Source IP range"
-msgstr ""
+msgstr "ソースIPの範囲"
 
-#: standalone/drakvpn:1131
+#: standalone/drakvpn:1133
 #, c-format
 msgid "Destination IP range"
-msgstr ""
+msgstr "対象IPの範囲"
 
-#: standalone/drakvpn:1132
+#: standalone/drakvpn:1134
 #, fuzzy, c-format
 msgid "Upper-layer protocol"
 msgstr "ヨーロッパのプロトコル"
 
-#: standalone/drakvpn:1133
+#: standalone/drakvpn:1134 standalone/drakvpn:1141
 #, fuzzy, c-format
+msgid "any"
+msgstr "日"
+
+#: standalone/drakvpn:1136
+#, c-format
 msgid "Flag"
 msgstr "フラグ"
 
-#: standalone/drakvpn:1134
+#: standalone/drakvpn:1137
 #, fuzzy, c-format
 msgid "Direction"
 msgstr "説明"
 
-#: standalone/drakvpn:1135
+#: standalone/drakvpn:1138
 #, c-format
 msgid "IPsec policy"
-msgstr ""
+msgstr "IPsecのポリシー"
 
-#: standalone/drakvpn:1137
+#: standalone/drakvpn:1138
 #, fuzzy, c-format
-msgid "Mode"
-msgstr "モデル"
+msgid "ipsec"
+msgstr "Msec"
 
 #: standalone/drakvpn:1138
 #, fuzzy, c-format
+msgid "discard"
+msgstr "無効化"
+
+#: standalone/drakvpn:1141
+#, c-format
+msgid "Mode"
+msgstr "モード"
+
+#: standalone/drakvpn:1141
+#, fuzzy, c-format
+msgid "tunnel"
+msgstr "チャンネル"
+
+#: standalone/drakvpn:1141
+#, fuzzy, c-format
+msgid "transport"
+msgstr "送信しました"
+
+#: standalone/drakvpn:1143
+#, c-format
 msgid "Source/destination"
-msgstr "ワークステーション"
+msgstr "ソース/対象"
 
-#: standalone/drakvpn:1139 standalone/harddrake2:57
+#: standalone/drakvpn:1144
 #, c-format
-msgid "Level"
-msgstr "レベル"
+msgid "require"
+msgstr ""
+
+#: standalone/drakvpn:1144
+#, fuzzy, c-format
+msgid "use"
+msgstr "マウス"
+
+#: standalone/drakvpn:1144
+#, fuzzy, c-format
+msgid "unique"
+msgstr "uniqueids"
 
 #: standalone/drakxtv:46
 #, c-format
@@ -21679,11 +22190,6 @@ msgstr "マウスボタンの数"
 
 #: standalone/harddrake2:63
 #, c-format
-msgid "Name"
-msgstr "名前"
-
-#: standalone/harddrake2:63
-#, c-format
 msgid "the name of the CPU"
 msgstr "CPUの名前"
 
@@ -21740,13 +22246,13 @@ msgid ""
 "accesses to user memory (aka this is a bug guard)"
 msgstr ""
 
-#: 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 "/オプション(_O)"
 
-#: 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
@@ -21794,11 +22300,6 @@ msgstr ""
 
 #: standalone/harddrake2:115
 #, c-format
-msgid "Select a device !"
-msgstr "デバイスを選んでください"
-
-#: standalone/harddrake2:115
-#, c-format
 msgid ""
 "Once you've selected a device, you'll be able to see the device information "
 "in fields displayed on the right frame (\"Information\")"
@@ -21836,63 +22337,58 @@ msgstr ""
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 
-#: standalone/harddrake2:133
-#, c-format
-msgid "Detection in progress"
-msgstr "検出中です"
-
-#: standalone/harddrake2:140
+#: standalone/harddrake2:141
 #, c-format
 msgid "Harddrake2 version %s"
 msgstr "Harddrake2 version %s"
 
-#: standalone/harddrake2:156
+#: standalone/harddrake2:157
 #, c-format
 msgid "Detected hardware"
 msgstr "検出したハードウェア"
 
-#: standalone/harddrake2:161
+#: standalone/harddrake2:162
 #, c-format
 msgid "Configure module"
 msgstr "モジュールを設定"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:169
 #, c-format
 msgid "Run config tool"
 msgstr "設定ツールを実行"
 
-#: standalone/harddrake2:215
+#: standalone/harddrake2:216
 #, c-format
 msgid "unknown"
 msgstr "不明"
 
-#: standalone/harddrake2:216
+#: standalone/harddrake2:217
 #, c-format
 msgid "Unknown"
 msgstr "不明"
 
-#: 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 "情報を表示するには左のデバイスをクリックしてください。"
 
-#: standalone/harddrake2:282
+#: standalone/harddrake2:286
 #, c-format
 msgid "secondary"
 msgstr "２次"
 
-#: standalone/harddrake2:282
+#: standalone/harddrake2:286
 #, c-format
 msgid "primary"
 msgstr "１次"
 
-#: standalone/harddrake2:290
+#: standalone/harddrake2:294
 #, c-format
 msgid "burner"
 msgstr "ライタ"
 
-#: standalone/harddrake2:290
+#: standalone/harddrake2:294
 #, c-format
 msgid "DVD"
 msgstr "DVD"
@@ -21912,210 +22408,210 @@ msgstr "BackSpaceキーがコンソールでDeleteの働きをするようにし
 msgid "The change is done, but to be effective you must logout"
 msgstr "変更は完了しました。有効にするにはログアウトしてください。"
 
-#: standalone/logdrake:50
+#: standalone/logdrake:51
 #, c-format
-msgid "Mandrake Tools Explanation"
-msgstr "Mandrakeツールの説明"
+msgid "Mandrake Tools Logs"
+msgstr "Mandrakeツールのログ"
 
-#: standalone/logdrake:51
-#, fuzzy, c-format
+#: standalone/logdrake:52
+#, c-format
 msgid "Logdrake"
-msgstr "logdrake"
+msgstr "Logdrake"
 
-#: standalone/logdrake:64
+#: standalone/logdrake:65
 #, c-format
 msgid "Show only for the selected day"
 msgstr "選んだ日の分だけ表示"
 
-#: standalone/logdrake:71
+#: standalone/logdrake:72
 #, c-format
 msgid "/File/_New"
 msgstr "/ファイル(F)/新規(_N)"
 
-#: 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 "/ファイル(F)/開く(_O)"
 
-#: 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 "/ファイル(F)/保存(_S)"
 
-#: 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 "/ファイル(F)/名前をつけて保存(_A)"
 
-#: standalone/logdrake:75
+#: standalone/logdrake:76
 #, c-format
 msgid "/File/-"
 msgstr "/ファイル(F)/-"
 
-#: standalone/logdrake:78
+#: standalone/logdrake:79
 #, c-format
 msgid "/Options/Test"
 msgstr "/オプション(O)/テスト"
 
-#: standalone/logdrake:80
+#: standalone/logdrake:81
 #, c-format
 msgid "/Help/_About..."
 msgstr "/ヘルプ(H)/情報(_A)"
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
-msgstr ""
+msgstr "Authentication"
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
-msgstr ""
+msgstr "User"
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
-msgstr ""
+msgstr "Messages"
 
-#: standalone/logdrake:114
+#: standalone/logdrake:113
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
-msgstr ""
+msgstr "Syslog"
 
-#: standalone/logdrake:118
+#: standalone/logdrake:117
 #, c-format
 msgid "search"
 msgstr "検索"
 
-#: standalone/logdrake:130
+#: standalone/logdrake:129
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "ログを監視するツール"
 
-#: standalone/logdrake:131 standalone/net_monitor:85
+#: standalone/logdrake:130 standalone/net_monitor:85
 #, c-format
 msgid "Settings"
 msgstr "設定"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "Matching"
 msgstr "一致するもの"
 
-#: standalone/logdrake:137
+#: standalone/logdrake:136
 #, c-format
 msgid "but not matching"
 msgstr "一致しないもの"
 
-#: standalone/logdrake:141
+#: standalone/logdrake:140
 #, c-format
 msgid "Choose file"
 msgstr "ファイルを選択"
 
-#: standalone/logdrake:150
+#: standalone/logdrake:149
 #, c-format
 msgid "Calendar"
 msgstr "カレンダー"
 
-#: standalone/logdrake:160
+#: standalone/logdrake:159
 #, c-format
 msgid "Content of the file"
 msgstr "ファイルの内容"
 
-#: standalone/logdrake:164 standalone/logdrake:377
+#: standalone/logdrake:163 standalone/logdrake:429
 #, c-format
 msgid "Mail alert"
 msgstr "メール警告"
 
-#: standalone/logdrake:171
+#: standalone/logdrake:170
 #, c-format
 msgid "The alert wizard had unexpectly failled:"
-msgstr ""
+msgstr "警告ウィザードは失敗しました:"
 
-#: standalone/logdrake:219
+#: standalone/logdrake:221
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr "お待ちください。ファイル %s を探しています。"
 
-#: standalone/logdrake:355
+#: standalone/logdrake:406
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Apache WWWサーバ"
 
-#: standalone/logdrake:356
+#: standalone/logdrake:407
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "ドメイン名の解決"
 
-#: standalone/logdrake:357
+#: standalone/logdrake:408
 #, c-format
 msgid "Ftp Server"
 msgstr "ftpサーバ"
 
-#: standalone/logdrake:358
+#: standalone/logdrake:409
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Postfixメールサーバ"
 
-#: standalone/logdrake:359
+#: standalone/logdrake:410
 #, c-format
 msgid "Samba Server"
 msgstr "sambaサーバ"
 
-#: standalone/logdrake:360
+#: standalone/logdrake:411
 #, c-format
 msgid "SSH Server"
 msgstr "SSHサーバ"
 
-#: standalone/logdrake:361
+#: standalone/logdrake:412
 #, c-format
 msgid "Webmin Service"
 msgstr "Webminサービス"
 
-#: standalone/logdrake:362
+#: standalone/logdrake:413
 #, c-format
 msgid "Xinetd Service"
 msgstr "Xinetdサービス"
 
-#: standalone/logdrake:372
-#, fuzzy, c-format
+#: standalone/logdrake:424
+#, c-format
 msgid "Configure the mail alert system"
-msgstr "CUPS印刷システムを設定"
+msgstr "メール警告システムを設定"
 
-#: standalone/logdrake:373
+#: standalone/logdrake:425
 #, c-format
 msgid "Stop the mail alert system"
-msgstr ""
+msgstr "メール警告システムを停止"
 
-#: standalone/logdrake:380
+#: standalone/logdrake:432
 #, c-format
 msgid "Mail alert configuration"
 msgstr "メール警告を設定"
 
-#: standalone/logdrake:381
+#: standalone/logdrake:433
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -22126,71 +22622,66 @@ msgstr ""
 "\n"
 "ここでは警告システムを設定します。\n"
 
-#: standalone/logdrake:384
-#, fuzzy, c-format
+#: standalone/logdrake:436
+#, c-format
 msgid "What do you want to do?"
-msgstr "%s をどこにマウントしますか？"
+msgstr "何をしますか？"
 
-#: standalone/logdrake:391
-#, fuzzy, c-format
+#: standalone/logdrake:443
+#, c-format
 msgid "Services settings"
 msgstr "サービスの設定"
 
-#: 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 "選択したサービスが動いていないときに警報を送ります。"
 
-#: standalone/logdrake:399
+#: standalone/logdrake:451
 #, c-format
 msgid "Load setting"
 msgstr "負荷の設定"
 
-#: standalone/logdrake:400
+#: standalone/logdrake:452
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "負荷がこの値より大きくなると警告します"
 
-#: standalone/logdrake:401
+#: standalone/logdrake:453
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "ロード"
 
-#: standalone/logdrake:406
-#, fuzzy, c-format
+#: standalone/logdrake:458
+#, c-format
 msgid "Alert configuration"
 msgstr "警告の設定"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:459
 #, c-format
 msgid "Please enter your email address below "
 msgstr "メールアドレスを入力してください"
 
-#: standalone/logdrake:408
-#, fuzzy, c-format
+#: standalone/logdrake:460
+#, c-format
 msgid "and enter the name (or the IP) of the SMTP server you whish to use"
-msgstr "使用するプリンタのホストのIPアドレスとポートを入力"
+msgstr "/使用するSMTPサーバの名前(か IP)を入力"
 
-#: standalone/logdrake:427 standalone/logdrake:433
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "おめでとうございます。"
-
-#: standalone/logdrake:427
+#: standalone/logdrake:479
 #, c-format
 msgid "The wizard successfully configured the mail alert."
-msgstr ""
+msgstr "メール警告を設定しました。"
 
-#: standalone/logdrake:433
+#: standalone/logdrake:485
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
-msgstr ""
+msgstr "メール警告を無効にしました。"
 
-#: standalone/logdrake:492
+#: standalone/logdrake:544
 #, c-format
 msgid "Save as.."
 msgstr "名前をつけて保存"
@@ -22228,33 +22719,39 @@ msgstr "全体の統計"
 #: standalone/net_monitor:94
 #, c-format
 msgid "Instantaneous"
-msgstr ""
+msgstr "即時"
 
 #: standalone/net_monitor:94
-#, fuzzy, c-format
+#, c-format
 msgid "Average"
 msgstr "平均"
 
 #: standalone/net_monitor:95
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sending\n"
 "speed:"
-msgstr "送信速度:"
+msgstr ""
+"送信\n"
+"速度:"
 
 #: standalone/net_monitor:96
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Receiving\n"
 "speed:"
-msgstr "受信速度:"
+msgstr ""
+"受信\n"
+"速度:"
 
 #: standalone/net_monitor:99
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Connection\n"
 "time: "
-msgstr "接続時間: "
+msgstr ""
+"接続\n"
+"時間: "
 
 #: standalone/net_monitor:121
 #, c-format
@@ -22350,9 +22847,9 @@ msgid "Connect %s"
 msgstr "%s に接続"
 
 #: standalone/net_monitor:422
-#, fuzzy, c-format
+#, c-format
 msgid "No internet connection configured"
-msgstr "インターネット接続の設定"
+msgstr "インターネット接続を設定していません"
 
 #: standalone/printerdrake:70
 #, c-format
@@ -22365,9 +22862,9 @@ msgid "Reading data of installed printers..."
 msgstr "インストールしたプリンタのデータを読み込み中.."
 
 #: standalone/printerdrake:129
-#, fuzzy, c-format
+#, c-format
 msgid "%s Printer Management Tool"
-msgstr "プリンタの管理 \n"
+msgstr "%s プリンタの管理ツール"
 
 #: standalone/printerdrake:143 standalone/printerdrake:144
 #: standalone/printerdrake:145 standalone/printerdrake:153
@@ -22501,216 +22998,229 @@ msgstr "作者: "
 msgid "Printer Management \n"
 msgstr "プリンタの管理 \n"
 
-#: standalone/scannerdrake:53
+#: standalone/scannerdrake:50
+#, fuzzy, c-format
+msgid ""
+"SANE packages need to be installed to use scanners.\n"
+"\n"
+"Do you want to install the SANE packages?"
+msgstr "パッケージ %s が必要です。インストールしますか？"
+
+#: standalone/scannerdrake:54
+#, fuzzy, c-format
+msgid "Aborting Scannerdrake."
+msgstr "Scannerdrake"
+
+#: standalone/scannerdrake:59
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr ""
 "Scannerdrakeでスキャナを設定するのに必要なファイルをインストールできません"
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:60
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr "Scannerdrakeは起動しません。"
 
-#: standalone/scannerdrake:60 standalone/scannerdrake:452
+#: standalone/scannerdrake:66 standalone/scannerdrake:459
 #, c-format
 msgid "Searching for configured scanners ..."
 msgstr "設定したスキャナを検索中.."
 
-#: standalone/scannerdrake:64 standalone/scannerdrake:456
+#: standalone/scannerdrake:70 standalone/scannerdrake:463
 #, c-format
 msgid "Searching for new scanners ..."
 msgstr "新しいスキャナを検索中.."
 
-#: standalone/scannerdrake:72 standalone/scannerdrake:478
+#: standalone/scannerdrake:78 standalone/scannerdrake:485
 #, c-format
 msgid "Re-generating list of configured scanners ..."
 msgstr "設定したスキャナのリストを再生成中.."
 
-#: standalone/scannerdrake:94 standalone/scannerdrake:135
-#: standalone/scannerdrake:149
-#, fuzzy, c-format
+#: standalone/scannerdrake:100 standalone/scannerdrake:141
+#: standalone/scannerdrake:155
+#, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "%s はこのバージョンのMandrake Linuxではサポートしていません"
+msgstr "%s はこのバージョンの %s ではサポートしていません"
 
-#: standalone/scannerdrake:97
+#: standalone/scannerdrake:103
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "%s が %s で見つかりました。自動的に設定しますか?"
 
-#: standalone/scannerdrake:109
+#: standalone/scannerdrake:115
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr "%s はスキャナのデータベースにありません。手動で設定しますか?"
 
-#: standalone/scannerdrake:124
+#: standalone/scannerdrake:130
 #, c-format
 msgid "Select a scanner model"
 msgstr "スキャナの機種を選んでください"
 
-#: standalone/scannerdrake:125
+#: standalone/scannerdrake:131
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:126
+#: standalone/scannerdrake:132
 #, c-format
 msgid "Detected model: %s"
 msgstr "検出した機種: %s"
 
-#: standalone/scannerdrake:128
+#: standalone/scannerdrake:134
 #, c-format
 msgid ", "
 msgstr ", "
 
-#: standalone/scannerdrake:129
+#: standalone/scannerdrake:135
 #, c-format
 msgid "Port: %s"
 msgstr "ポート: %s"
 
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:161
 #, c-format
 msgid "The %s is not known by this version of Scannerdrake."
 msgstr "%s はこのバージョンのScannerdrakeでは判別できません。"
 
-#: standalone/scannerdrake:163 standalone/scannerdrake:177
+#: standalone/scannerdrake:169 standalone/scannerdrake:183
 #, c-format
 msgid "Do not install firmware file"
-msgstr ""
+msgstr "ファームウェアファイルをインストールしない"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "
 "can be installed."
 msgstr ""
 
-#: 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 "
 "manufacturer's home page, or on your Windows partition."
 msgstr ""
 
-#: standalone/scannerdrake:172 standalone/scannerdrake:231
+#: standalone/scannerdrake:178 standalone/scannerdrake:237
 #, c-format
 msgid "Install firmware file from"
-msgstr ""
+msgstr "以下からファームウェアをインストール"
 
-#: standalone/scannerdrake:192
-#, fuzzy, c-format
+#: standalone/scannerdrake:198
+#, c-format
 msgid "Select firmware file"
-msgstr "ファイルを選択"
+msgstr "ファームウェアファイルを選択"
 
-#: 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 ""
+msgstr "ファームウェアファイル %s は存在しないか読めません"
 
-#: standalone/scannerdrake:218
+#: standalone/scannerdrake:224
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
 "everytime when they are turned on."
 msgstr ""
 
-#: 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 "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:225
+#: standalone/scannerdrake:231
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
 "firmware here by supplying the new firmware file."
 msgstr ""
 
-#: standalone/scannerdrake:227
+#: standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware for the"
-msgstr ""
+msgstr "以下からファームウェアをインストール"
 
-#: standalone/scannerdrake:250
-#, fuzzy, c-format
+#: standalone/scannerdrake:256
+#, c-format
 msgid "Select firmware file for the %s"
-msgstr "ファイルを選択"
+msgstr "%s のファームウェアファイルを選択"
 
-#: standalone/scannerdrake:276
+#: standalone/scannerdrake:282
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
-msgstr ""
+msgstr "%s のファームウェアファイルをインストールしました"
 
-#: standalone/scannerdrake:286
+#: standalone/scannerdrake:292
 #, c-format
 msgid "The %s is unsupported"
 msgstr "%s はサポートしていません"
 
-#: standalone/scannerdrake:291
-#, fuzzy, c-format
+#: standalone/scannerdrake:297
+#, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
 "You can launch printerdrake from the %s Control Center in Hardware section."
 msgstr ""
 "%s はprinterdrakeで設定してください。\n"
-"printerdrakeはMandrakeコントロールセンタのハードウェア欄で起動できます。"
+"printerdrakeは %s コントロールセンタのハードウェア欄で起動できます。"
 
-#: 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 "利用可能なポートを自動的に検出"
 
-#: 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 "%s を接続しているデバイスを選んでください"
 
-#: standalone/scannerdrake:298
+#: standalone/scannerdrake:304
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr ""
 " \n"
 "(注意: パラレルポートは自動検出されません)"
 
-#: standalone/scannerdrake:300 standalone/scannerdrake:345
+#: standalone/scannerdrake:306 standalone/scannerdrake:351
 #, c-format
 msgid "choose device"
 msgstr "デバイスを選択"
 
-#: standalone/scannerdrake:334
+#: standalone/scannerdrake:340
 #, c-format
 msgid "Searching for scanners ..."
 msgstr "スキャナを検索中.."
 
-#: standalone/scannerdrake:368
-#, c-format
+#: standalone/scannerdrake:375
+#, fuzzy, 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 ""
 "%s を設定しました。\n"
 "アプリケーションメニューの マルチメディア ->\n"
 "グラフィックス にある\n"
 "Xsaneを使って文書をスキャンできます。"
 
-#: standalone/scannerdrake:392
+#: standalone/scannerdrake:399
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -22723,7 +23233,7 @@ msgstr ""
 "%s\n"
 "をシステムで利用できます。\n"
 
-#: standalone/scannerdrake:393
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -22736,51 +23246,51 @@ msgstr ""
 "%s\n"
 "をシステムで利用できます。\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 "お使いのシステムには利用可能なスキャナがありません。\n"
 
-#: standalone/scannerdrake:413
+#: standalone/scannerdrake:420
 #, c-format
 msgid "Search for new scanners"
 msgstr "新しいスキャナを検索"
 
-#: standalone/scannerdrake:419
+#: standalone/scannerdrake:426
 #, c-format
 msgid "Add a scanner manually"
 msgstr "手動でスキャナを追加"
 
-#: standalone/scannerdrake:426
-#, fuzzy, c-format
+#: standalone/scannerdrake:433
+#, c-format
 msgid "Install/Update firmware files"
-msgstr "ファイルを選択"
+msgstr "ファームウェアファイルをインストール/更新"
 
-#: standalone/scannerdrake:432
+#: standalone/scannerdrake:439
 #, c-format
 msgid "Scanner sharing"
 msgstr "スキャナを共有"
 
-#: standalone/scannerdrake:491 standalone/scannerdrake:656
+#: standalone/scannerdrake:498 standalone/scannerdrake:663
 #, c-format
 msgid "All remote machines"
 msgstr "全てのリモートマシンで"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:806
+#: standalone/scannerdrake:510 standalone/scannerdrake:813
 #, c-format
 msgid "This machine"
 msgstr "このマシン"
 
-#: 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 ""
 "このマシンのスキャナにリモートマシンからアクセスできるよう\n"
 "設定することができます。"
 
-#: standalone/scannerdrake:544
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
@@ -22790,88 +23300,100 @@ msgstr ""
 "このマシンからリモートマシンのスキャナにアクセスするよう\n"
 "設定することも可能です。"
 
-#: standalone/scannerdrake:547
+#: standalone/scannerdrake:554
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr "このマシンのスキャナをリモートマシンで利用する"
 
-#: standalone/scannerdrake:549
+#: standalone/scannerdrake:556
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "このホストにスキャナを共有させる: "
 
-#: standalone/scannerdrake:563
+#: standalone/scannerdrake:570
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "リモートマシンのスキャナをこのマシンで利用する"
 
-#: standalone/scannerdrake:566
+#: standalone/scannerdrake:573
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "このホストのスキャナを共有する: "
 
-#: 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 "ローカルスキャナを共有"
 
-#: standalone/scannerdrake:594
+#: standalone/scannerdrake:601
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
 "available:"
 msgstr "このマシンのスキャナを利用するリモートマシン:"
 
-#: standalone/scannerdrake:605 standalone/scannerdrake:755
+#: standalone/scannerdrake:612 standalone/scannerdrake:762
 #, c-format
 msgid "Add host"
 msgstr "ホストを追加"
 
-#: standalone/scannerdrake:611 standalone/scannerdrake:761
+#: standalone/scannerdrake:618 standalone/scannerdrake:768
 #, c-format
 msgid "Edit selected host"
 msgstr "選んだホストを編集"
 
-#: standalone/scannerdrake:620 standalone/scannerdrake:770
+#: standalone/scannerdrake:627 standalone/scannerdrake:777
 #, c-format
 msgid "Remove selected host"
 msgstr "選んだホストを削除"
 
-#: 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 "ホストの名前/IPアドレス:"
 
-#: 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 "スキャナを利用するホストを選んでください:"
 
-#: 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 "ホスト名かIPアドレスを入力してください。\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 "このホストは既にリストにあります。重複することはできません。\n"
 
-#: standalone/scannerdrake:743
+#: standalone/scannerdrake:750
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "リモートスキャナの使用"
 
-#: standalone/scannerdrake:744
+#: standalone/scannerdrake:751
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr "このマシンが利用するスキャナを接続しているリモートマシン:"
 
-#: standalone/scannerdrake:904
+#: standalone/scannerdrake:908
+#, fuzzy, 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 ""
+"ネットワークタイムプロトコルを有効にするには、\n"
+"ntpパッケージが必要です。\n"
+"\n"
+"ntpをインストールしますか？"
+
+#: standalone/scannerdrake:912 standalone/scannerdrake:916
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr "お使いのスキャナはネットワークで使用できません"
@@ -22882,11 +23404,11 @@ msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "%s ハードウェアクラスのデバイスの一部を削除しました:\n"
 
 #: standalone/service_harddrake:53
-#, fuzzy, c-format
+#, c-format
 msgid "Some devices were added: %s\n"
-msgstr "いくつかのデバイスを追加しました:\n"
+msgstr "いくつかのデバイスを追加しました: %s\n"
 
-#: standalone/service_harddrake:94
+#: standalone/service_harddrake:98
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "ハードウェアを検出中"
@@ -22981,22 +23503,22 @@ msgstr "システムを更新"
 msgid "Exit install"
 msgstr "インストール終了"
 
-#: ugtk2.pm:1047
+#: ugtk2.pm:1075
 #, c-format
 msgid "Is this correct?"
 msgstr "正しいですか？"
 
-#: ugtk2.pm:1175
+#: ugtk2.pm:1203
 #, c-format
 msgid "Expand Tree"
 msgstr "ツリーを展開する"
 
-#: ugtk2.pm:1176
+#: ugtk2.pm:1204
 #, c-format
 msgid "Collapse Tree"
 msgstr "ツリーを縮める"
 
-#: ugtk2.pm:1177
+#: ugtk2.pm:1205
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "フラットとグループ別表示を切り替える"
@@ -23007,275 +23529,288 @@ msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
+"%s をインストールしていません\n"
+"'次'を押してインストールするか、'キャンセル'で終了"
 
 #: wizards.pm:99
-#, fuzzy, c-format
+#, c-format
 msgid "Installation failed"
-msgstr "テーマのインストールに失敗"
+msgstr "インストール失敗"
 
-#~ msgid "Configuration of a remote printer"
-#~ msgstr "リモートプリンタの設定"
+#: ../../share/compssUsers:999
+msgid "Office Workstation"
+msgstr "オフィスワークステーション"
 
-#, fuzzy
-#~ msgid "configure %s"
-#~ msgstr "再設定"
-
-#, fuzzy
-#~ msgid "protocol = "
-#~ msgstr "プロトコル"
-
-#, fuzzy
-#~ msgid "level = "
-#~ msgstr "レベル"
-
-#~ msgid "Office Workstation"
-#~ msgstr "オフィスワークステーション"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "オフィスソフト: ワープロ(kword,abiword),表計算(kspread,gnumeric),\n"
-#~ "pdfビューアなど"
-
-#~ msgid "Game station"
-#~ msgstr "ゲームステーション"
+#: ../../share/compssUsers:999
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"オフィスソフト: ワープロ(kword,abiword),表計算(kspread,gnumeric),\n"
+"pdfビューアなど"
 
-#~ msgid "Amusement programs: arcade, boards, strategy, etc"
-#~ msgstr "ゲームプログラム: アーケードゲーム/ボードゲーム/戦略ゲームなど"
+#: ../../share/compssUsers:999
+msgid "Game station"
+msgstr "ゲームステーション"
 
-#~ msgid "Multimedia station"
-#~ msgstr "マルチメディアステーション"
+#: ../../share/compssUsers:999
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "ゲームプログラム: アーケードゲーム/ボードゲーム/戦略ゲームなど"
 
-#~ msgid "Sound and video playing/editing programs"
-#~ msgstr "サウンドと動画の再生/編集ソフト"
+#: ../../share/compssUsers:999
+msgid "Multimedia station"
+msgstr "マルチメディアステーション"
 
-#~ msgid "Internet station"
-#~ msgstr "インターネットステーション"
+#: ../../share/compssUsers:999
+msgid "Sound and video playing/editing programs"
+msgstr "サウンドと動画の再生/編集ソフト"
 
-#~ msgid ""
-#~ "Set of tools to read and send mail and news (mutt, tin..) and to browse "
-#~ "the Web"
-#~ msgstr ""
-#~ "メールとニュースの送受信用ツール(mutt,tin..)とウェブブラウズ用ツール"
+#: ../../share/compssUsers:999
+msgid "Internet station"
+msgstr "インターネットステーション"
 
-#~ msgid "Network Computer (client)"
-#~ msgstr "ネットワーク(クライアント)"
+#: ../../share/compssUsers:999
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr "メールとニュースの送受信用ツール(mutt,tin..)とウェブブラウズ用ツール"
 
-#~ msgid "Clients for different protocols including ssh"
-#~ msgstr "sshなどの各種プロトコル用クライアント"
+#: ../../share/compssUsers:999
+msgid "Network Computer (client)"
+msgstr "ネットワーク(クライアント)"
 
-#~ msgid "Configuration"
-#~ msgstr "設定"
+#: ../../share/compssUsers:999
+msgid "Clients for different protocols including ssh"
+msgstr "sshなどの各種プロトコル用クライアント"
 
-#~ msgid "Tools to ease the configuration of your computer"
-#~ msgstr "お使いのコンピュータを簡単に設定するツール"
+#: ../../share/compssUsers:999
+msgid "Configuration"
+msgstr "設定"
 
-#~ msgid "Scientific Workstation"
-#~ msgstr "科学ワークステーション"
+#: ../../share/compssUsers:999
+msgid "Tools to ease the configuration of your computer"
+msgstr "お使いのコンピュータを簡単に設定するツール"
 
-#~ msgid "Scientific applications such as gnuplot"
-#~ msgstr "gnuplotのような科学用アプリケーション"
+#: ../../share/compssUsers:999
+msgid "Console Tools"
+msgstr "コンソールツール"
 
-#~ msgid "Console Tools"
-#~ msgstr "コンソールツール"
+#: ../../share/compssUsers:999
+msgid "Editors, shells, file tools, terminals"
+msgstr "エディタ/シェル/ファイル関連ツール/ターミナル"
 
-#~ msgid "Editors, shells, file tools, terminals"
-#~ msgstr "エディタ/シェル/ファイル関連ツール/ターミナル"
+#: ../../share/compssUsers:999
+msgid "KDE Workstation"
+msgstr "KDEワークステーション"
 
-#~ msgid "KDE Workstation"
-#~ msgstr "KDEワークステーション"
+#: ../../share/compssUsers:999
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "KDE - さまざまなツールを含む定番グラフィカル環境"
 
-#~ msgid ""
-#~ "The K Desktop Environment, the basic graphical environment with a "
-#~ "collection of accompanying tools"
-#~ msgstr "KDE - さまざまなツールを含む定番グラフィカル環境"
+#: ../../share/compssUsers:999
+msgid "GNOME Workstation"
+msgstr "GNOMEワークステーション"
 
-#~ msgid "Gnome Workstation"
-#~ msgstr "Gnomeワークステーション"
+#: ../../share/compssUsers:999
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "使いやすいアプリケーションとデスクトップツールを含むグラフィカル環境"
 
-#~ msgid ""
-#~ "A graphical environment with user-friendly set of applications and "
-#~ "desktop tools"
-#~ msgstr ""
-#~ "使いやすいアプリケーションとデスクトップツールを含むグラフィカル環境"
+#: ../../share/compssUsers:999
+msgid "Other Graphical Desktops"
+msgstr "その他のグラフィカルデスクトップ"
 
-#~ msgid "Other Graphical Desktops"
-#~ msgstr "その他のグラフィカルデスクトップ"
+#: ../../share/compssUsers:999
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwmなど"
 
-#~ msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-#~ msgstr "Icewm, Window Maker, Enlightenment, Fvwmなど"
+#: ../../share/compssUsers:999
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C/C++の開発ライブラリ,プログラム,includeファイル"
 
-#~ msgid "C and C++ development libraries, programs and include files"
-#~ msgstr "C/C++の開発ライブラリ,プログラム,includeファイル"
+#: ../../share/compssUsers:999
+msgid "Documentation"
+msgstr "ドキュメンテーション"
 
-#~ msgid "Documentation"
-#~ msgstr "ドキュメンテーション"
+#: ../../share/compssUsers:999
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linux/フリーソフト関連の文書とHowto"
 
-#~ msgid "Books and Howto's on Linux and Free Software"
-#~ msgstr "Linux/フリーソフト関連の文書とHowto"
+#: ../../share/compssUsers:999
+msgid "LSB"
+msgstr "LSB"
 
-#~ msgid "LSB"
-#~ msgstr "LSB"
+#: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base,サードパーティのアプリケーションをサポート"
 
-#~ msgid "Linux Standard Base. Third party applications support"
-#~ msgstr "Linux Standard Base,サードパーティのアプリケーションをサポート"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
-#~ msgid "Web/FTP"
-#~ msgstr "Web/FTP"
+#: ../../share/compssUsers:999
+msgid "Apache, Pro-ftpd"
+msgstr "Apache,Pro-ftpd"
 
-#~ msgid "Apache, Pro-ftpd"
-#~ msgstr "Apache,Pro-ftpd"
+#: ../../share/compssUsers:999
+msgid "Mail"
+msgstr "メール"
 
-#~ msgid "Mail"
-#~ msgstr "メール"
+#: ../../share/compssUsers:999
+msgid "Postfix mail server"
+msgstr "Postfixメールサーバ"
 
-#~ msgid "Postfix mail server"
-#~ msgstr "Postfixメールサーバ"
+#: ../../share/compssUsers:999
+msgid "Database"
+msgstr "データベース"
 
-#~ msgid "Database"
-#~ msgstr "データベース"
+#: ../../share/compssUsers:999
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL/MySQL データベースサーバ"
 
-#~ msgid "PostgreSQL or MySQL database server"
-#~ msgstr "PostgreSQL/MySQL データベースサーバ"
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "ファイアウォール/ルータ"
 
-#~ msgid "Firewall/Router"
-#~ msgstr "ファイアウォール/ルータ"
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "インターネットゲートウェイ"
 
-#~ msgid "Internet gateway"
-#~ msgstr "インターネットゲートウェイ"
+#: ../../share/compssUsers:999
+msgid "Network Computer server"
+msgstr "ネットワークコンピュータサーバ"
 
-#~ msgid "DNS/NIS "
-#~ msgstr "DNS/NIS "
+#: ../../share/compssUsers:999
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFSサーバ,SMBサーバ,プロクシサーバ,SSHサーバ"
 
-#~ msgid "Domain Name and Network Information Server"
-#~ msgstr "ドメイン名サーバ(DNS)とネットワーク情報サーバ(NIS)"
+#: ../../share/compssUsers:999
+msgid "Set of tools to read and send mail and news and to browse the Web"
+msgstr "メールとニュースの閲覧/送信ツールと、ウェブブラウズ用ツール"
 
-#~ msgid "Network Computer server"
-#~ msgstr "ネットワークコンピュータサーバ"
+#~ msgid "Provider dns 1 (optional)"
+#~ msgstr "プロバイダのdns 1(オプション)"
 
-#~ msgid "NFS server, SMB server, Proxy server, ssh server"
-#~ msgstr "NFSサーバ,SMBサーバ,プロクシサーバ,SSHサーバ"
+#~ msgid "Provider dns 2 (optional)"
+#~ msgstr "プロバイダのdns 2(オプション)"
 
-#~ msgid "Set of tools to read and send mail and news and to browse the Web"
-#~ msgstr "メールとニュースの閲覧/送信ツールと、ウェブブラウズ用ツール"
+#~ msgid "Ethernet Card"
+#~ msgstr "イーサネットカード"
 
-#, fuzzy
-#~ msgid "add"
-#~ msgstr "追加"
+#~ msgid "DHCP Client"
+#~ msgstr "DHCPクライアント"
 
-#, fuzzy
-#~ msgid "edit"
-#~ msgstr "編集"
+#~ msgid "Display"
+#~ msgstr "表示"
 
-#, fuzzy
-#~ msgid "remove"
-#~ msgstr "削除"
+#~ msgid "Display configuration"
+#~ msgstr "設定を表示"
 
-#, fuzzy
-#~ msgid "Add an UPS device"
-#~ msgstr "アイテムを追加"
+#~ msgid "Use tar and bzip2 (rather than tar and gzip)"
+#~ msgstr "tarとbzip2を使う(tarとgzipではなく)"
 
-#, fuzzy
 #~ msgid ""
-#~ "Welcome to the UPS configuration utility.\n"
-#~ "\n"
-#~ "Here, you'll be add a new UPS to your system.\n"
+#~ "Change\n"
+#~ "Restore Path"
 #~ msgstr ""
-#~ "メール設定ユーティリティへようこそ\n"
-#~ "\n"
-#~ "ここでは警告システムを設定します。\n"
-
-#, fuzzy
-#~ msgid "Autodetection"
-#~ msgstr "自動検出"
-
-#, fuzzy
-#~ msgid "No new UPS devices was found"
-#~ msgstr "デバイスがありません"
+#~ "復元パスを\n"
+#~ "変更"
 
-#, fuzzy
-#~ msgid "UPS driver configuration"
-#~ msgstr "CUPSプリンタの設定"
+#~ msgid "European protocol"
+#~ msgstr "ヨーロッパのプロトコル"
 
-#, fuzzy
-#~ msgid "Please select your UPS model."
-#~ msgstr "マウスをテストしてください:"
+#~ msgid "Found \"%s\" interface do you want to use it ?"
+#~ msgstr "%s インタフェースが見つかりました。使用しますか?"
 
-#, fuzzy
-#~ msgid "Manufacturer / Model:"
-#~ msgstr "プリンタのメーカー/機種"
+#~ msgid "Bewan USB modem"
+#~ msgstr "Bewan USB modem"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "名前: "
+#~ msgid "What kind is your ISDN connection?"
+#~ msgstr "お使いのISDN接続を選んでください。"
 
-#, fuzzy
-#~ msgid "The name of your ups"
-#~ msgstr "CPUの名前"
+#~ msgid "Do you want to start a new configuration ?"
+#~ msgstr "新しい設定を開始しますか？"
 
-#, fuzzy
-#~ msgid "Port:"
-#~ msgstr "ポート"
+#~ msgid ""
+#~ "I have detected an ISDN PCI card, but I don't know its type. Please "
+#~ "select a PCI card on the next screen."
+#~ msgstr ""
+#~ "ISDNカードを検出しましたが、種類が分かりません。次の画面からPCIカードを\n"
+#~ "選んでください。"
 
-#, fuzzy
-#~ msgid "The port on which is connected your ups"
-#~ msgstr "マウスを接続しているバスの種類"
+#~ msgid "No ISDN PCI card found. Please select one on the next screen."
+#~ msgstr "ISDN PCIカードは見つかりませんでした。下記の中から選んでください"
 
-#, fuzzy
-#~ msgid "UPS devices"
-#~ msgstr "サービス"
+#~ msgid "DrakTermServ"
+#~ msgstr "DrakTermServ"
 
-#, fuzzy
-#~ msgid "UPS users"
-#~ msgstr "ユーザ名"
+#~ msgid "Under Devel ... please wait."
+#~ msgstr "開発中です。お待ちください。"
 
-#, fuzzy
-#~ msgid "Access Control Lists"
-#~ msgstr "ネットワークツールへのアクセス"
+#~ msgid "Windows (FAT32)"
+#~ msgstr "Windows(FAT32)"
 
-#, fuzzy
-#~ msgid "Rules"
-#~ msgstr "ルータ:"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "ネット接続のインタフェースを入力してくださ"
+#~ "い。                                          \n"
+#~ "                \n"
+#~ "例:\n"
+#~ "                ppp+(モデム/DSL接続の場合)\n"
+#~ "                eth0, eth1(ケーブル接続の場合)\n"
+#~ "                ippp+(ISDN接続の場合)\n"
 
-#, fuzzy
-#~ msgid "Action"
-#~ msgstr "/アクション(_A)"
+#~ msgid ""
+#~ "Enter your CD Writer device name\n"
+#~ " ex: 0,1,0"
+#~ msgstr ""
+#~ "CDライタのデバイス名を入力してください\n"
+#~ "例: 0,1,0"
 
-#, fuzzy
-#~ msgid "ACL name"
-#~ msgstr "LVMの名前を入力"
+#~ msgid "Tone dialing"
+#~ msgstr "トーンダイアル"
 
-#, fuzzy
-#~ msgid "Welcome to the UPS configuration tools"
-#~ msgstr "設定をテストする"
+#~ msgid "Pulse dialing"
+#~ msgstr "パルスダイアル"
 
-#~ msgid "Running \"%s\" ..."
-#~ msgstr "%s を実行中.."
+#~ msgid "Scientific Workstation"
+#~ msgstr "科学ワークステーション"
 
-#~ msgid "utopia 25"
-#~ msgstr "utopia 25"
+#~ msgid "Scientific applications such as gnuplot"
+#~ msgstr "gnuplotのような科学用アプリケーション"
 
-#~ msgid "On Hard Drive"
-#~ msgstr "ハードドライブへ"
+#~ msgid "DNS/NIS "
+#~ msgstr "DNS/NIS "
 
-#~ msgid "Messages"
-#~ msgstr "メッセージ"
+#~ msgid "Domain Name and Network Information Server"
+#~ msgstr "ドメイン名サーバ(DNS)とネットワーク情報サーバ(NIS)"
 
-#~ msgid "Syslog"
-#~ msgstr "Syslog"
+#~ msgid ""
+#~ "If you plan to use aboot, be carefull to leave a free space (2048 sectors "
+#~ "is enough)\n"
+#~ "at the beginning of the disk"
+#~ msgstr ""
+#~ "abootを使う場合はディスクの先頭に空き領域(2048セクタほど)\n"
+#~ "を残してください"
 
-#~ msgid "Compact"
-#~ msgstr "コンパクト"
+#~ msgid "I can't add any more partition"
+#~ msgstr "これ以上パーティションを追加できません"
 
-#, fuzzy
-#~ msgid "Next ->"
-#~ msgstr "次へ"
+#~ msgid "No wireless network adapter on your system!"
+#~ msgstr "ワイヤレスネットワークアダプタがありません"
 
-#, fuzzy
-#~ msgid "<- Previous"
-#~ msgstr "戻る"
+#~ msgid "Can't create log file!"
+#~ msgstr "ログファイルを作成できません"
 
-#, fuzzy
-#~ msgid "Next->"
-#~ msgstr "次へ"
+#~ msgid "dhcp"
+#~ msgstr "dhcp"
diff --git a/perl-install/share/po/mk.po b/perl-install/share/po/mk.po
index 8db70b047..b8b0490bd 100644
--- a/perl-install/share/po/mk.po
+++ b/perl-install/share/po/mk.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2004-02-19 18:02+0100\n"
+"POT-Creation-Date: 2004-03-19 14:32+0100\n"
 "PO-Revision-Date: 2003-09-25 11:35+0200\n"
 "Last-Translator: Danko Ilik <danko@on.net.mk>\n"
 "Language-Team: Macedonian\n"
@@ -79,7 +79,7 @@ msgid ""
 "plug the key again, and launch Mandrake Move again."
 msgstr ""
 
-#: ../move/move.pm:402 help.pm:418 install_steps_interactive.pm:1310
+#: ../move/move.pm:402 help.pm:418 install_steps_interactive.pm:1319
 #, fuzzy, c-format
 msgid "Reboot"
 msgstr "Рестарт"
@@ -128,44 +128,51 @@ msgstr "Ве молиме почекајте, се сетира сигурнос
 #: 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"
@@ -403,15 +410,16 @@ msgstr ""
 msgid "Xpmac (installation display driver)"
 msgstr "Xpmac (installation display driver)"
 
-#: 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 "По избор"
 
 #: 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 "Излез"
@@ -438,11 +446,11 @@ msgstr "Тест"
 
 #: 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 "Опции"
@@ -475,7 +483,7 @@ msgstr "Plug'n Play"
 msgid "Generic"
 msgstr "Општ"
 
-#: 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"
@@ -562,52 +570,51 @@ msgid "Graphics card: %s"
 msgstr "Графичка карта: %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 "Во ред"
 
-#: 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 "Откажи"
 
 #: 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 "Помош"
@@ -751,19 +758,20 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "Која норма ја користи вашиот телевизор?"
 
-#: 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 "Ве молиме, почекајте"
 
-#: any.pm:98
+#: any.pm:103
 #, fuzzy, c-format
 msgid "Bootloader installation in progress"
 msgstr "Инсталацијата на подигачот е во тек"
 
-#: any.pm:137
+#: any.pm:142
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -778,269 +786,269 @@ msgstr ""
 "\n"
 "На кој диск подигате?"
 
-#: 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 "Првиот сектор на дискот (MBR)"
 
-#: any.pm:161
+#: any.pm:166
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Првиот сектор на root партицијата"
 
-#: any.pm:163
+#: any.pm:168
 #, c-format
 msgid "On Floppy"
 msgstr "На дискета"
 
-#: 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 "Прескокни"
 
-#: any.pm:170
+#: any.pm:175
 #, c-format
 msgid "SILO Installation"
 msgstr "Инсталација на SILO"
 
-#: any.pm:170
+#: any.pm:175
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "Инсталација на LILO/grub"
 
-#: any.pm:171
+#: any.pm:176
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "Каде сакате да го инсталирате подигачот?"
 
-#: any.pm:192
+#: any.pm:197
 #, c-format
 msgid "First sector of boot partition"
 msgstr "Првиот сектор на boot партицијата"
 
-#: any.pm:204 any.pm:239
-#, c-format
-msgid "Bootloader main options"
-msgstr "Главни опции за подигачот"
-
-#: any.pm:205
+#: any.pm:208
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Конфигурација на стил на подигање"
 
-#: any.pm:209
+#: any.pm:210 any.pm:244
+#, c-format
+msgid "Bootloader main options"
+msgstr "Главни опции за подигачот"
+
+#: any.pm:214
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "Количество РАМ во МБ"
 
-#: any.pm:211
+#: any.pm:216
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "Опцијата \"Рестрикција на командна линија\" е бесполезна без лозинка"
 
-#: 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 "Лозинките не се совпаѓаат"
 
-#: 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 "Обидете се повторно"
 
-#: 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 "Подигач кој ќе се користи"
 
-#: any.pm:219
+#: any.pm:224
 #, c-format
 msgid "Bootloader installation"
 msgstr "Инсталација на подигач"
 
-#: any.pm:221 any.pm:244 help.pm:768
+#: any.pm:226 any.pm:249 help.pm:768
 #, c-format
 msgid "Boot device"
 msgstr "Уред за подигачот"
 
-#: any.pm:223
+#: any.pm:228
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Пауза пред подигање на првиот"
 
-#: any.pm:224 help.pm:768
+#: any.pm:229 help.pm:768
 #, fuzzy, c-format
 msgid "Enable ACPI"
 msgstr "Овозможи ACPI"
 
-#: any.pm:225
+#: any.pm:230
 #, c-format
 msgid "Force No APIC"
 msgstr "Изврши No APIC"
 
-#: 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 "Лозинка"
 
-#: 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 "Лозинка (повторно)"
 
-#: any.pm:229
+#: any.pm:234
 #, c-format
 msgid "Restrict command line options"
 msgstr "Рестрикција на командна линија"
 
-#: any.pm:229
+#: any.pm:234
 #, c-format
 msgid "restrict"
 msgstr "рестрикција"
 
-#: any.pm:231
+#: any.pm:236
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "Чистење на /tmp при секое подигање"
 
-#: any.pm:232
+#: any.pm:237
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Точното количество РАМ, ако е потребно (пронајдени се %d МБ) "
 
-#: any.pm:234
+#: any.pm:239
 #, c-format
 msgid "Enable multiple profiles"
 msgstr "Овозможи повеќе профили"
 
-#: any.pm:243
+#: any.pm:248
 #, c-format
 msgid "Init Message"
 msgstr "Init порака"
 
-#: any.pm:245
+#: any.pm:250
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "Open Firmware пауза"
 
-#: any.pm:246
+#: any.pm:251
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Пауза пред подигање на кернел"
 
-#: any.pm:247
+#: any.pm:252
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "Овозможи подигање од CD?"
 
-#: any.pm:248
+#: any.pm:253
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "Овозможи OF подигање?"
 
-#: any.pm:249
+#: any.pm:254
 #, c-format
 msgid "Default OS?"
 msgstr "Прв OS?"
 
-#: any.pm:290
+#: any.pm:295
 #, c-format
 msgid "Image"
 msgstr "Image"
 
-#: any.pm:291 any.pm:300
+#: any.pm:296 any.pm:305
 #, c-format
 msgid "Root"
 msgstr "Root"
 
-#: any.pm:292 any.pm:313
+#: any.pm:297 any.pm:318
 #, c-format
 msgid "Append"
 msgstr "Припои"
 
-#: any.pm:294
+#: any.pm:299
 #, c-format
 msgid "Video mode"
 msgstr "Видео режим"
 
-#: 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 "Ознака"
 
-#: 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 "Прво"
 
-#: any.pm:314
+#: any.pm:319
 #, c-format
 msgid "Initrd-size"
 msgstr "Initrd-големина"
 
-#: 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 "Не се дозволени празни ознаки"
 
-#: any.pm:328
+#: any.pm:333
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Мора да наведете кернелски имиџ"
 
-#: any.pm:328
+#: any.pm:333
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Мора да наведете root партиција"
 
-#: any.pm:329
+#: any.pm:334
 #, c-format
 msgid "This label is already used"
 msgstr "Оваа ознака е веќе искористена"
 
-#: any.pm:342
+#: any.pm:347
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Каков тип на ставка сакате да додадете?"
 
-#: any.pm:343 standalone/drakbackup:1904
+#: any.pm:348
 #, c-format
 msgid "Linux"
 msgstr "Линукс"
 
-#: any.pm:343
+#: any.pm:348
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "Друг OS (SunOS...)"
 
-#: any.pm:344
+#: any.pm:349
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "Друг OS (MacOS...)"
 
-#: any.pm:344
+#: any.pm:349
 #, c-format
 msgid "Other OS (windows...)"
 msgstr "Друг OS (windows...)"
 
-#: any.pm:372
+#: any.pm:377
 #, fuzzy, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1049,52 +1057,52 @@ msgstr ""
 "Ова се досегашните ставки во Вашето мени на подигање.\n"
 "Можете да додадете уште или да ги промените постоечките."
 
-#: any.pm:504
+#: any.pm:509
 #, c-format
 msgid "access to X programs"
 msgstr "пристап до X програми"
 
-#: any.pm:505
+#: any.pm:510
 #, c-format
 msgid "access to rpm tools"
 msgstr "пристап до rpm алатки"
 
-#: any.pm:506
+#: any.pm:511
 #, c-format
 msgid "allow \"su\""
 msgstr "дозволен \"su\""
 
-#: any.pm:507
+#: any.pm:512
 #, c-format
 msgid "access to administrative files"
 msgstr "пристап до административни датотеки"
 
-#: any.pm:508
+#: any.pm:513
 #, c-format
 msgid "access to network tools"
 msgstr "пристап до мрежни алатки"
 
-#: any.pm:509
+#: any.pm:514
 #, c-format
 msgid "access to compilation tools"
 msgstr "пристап до компајлерски алатки"
 
-#: any.pm:515
+#: any.pm:520
 #, c-format
 msgid "(already added %s)"
 msgstr "(веќе е додаден %s)"
 
-#: any.pm:520
+#: any.pm:525
 #, c-format
 msgid "This password is too simple"
 msgstr "Лозинката е преедноставна"
 
-#: any.pm:521
+#: any.pm:526
 #, c-format
 msgid "Please give a user name"
 msgstr "Внесете корисничко име"
 
-#: any.pm:522
+#: any.pm:527
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
@@ -1102,22 +1110,22 @@ msgstr ""
 "Корисничкото има мора да се состои само од мали латински букви, цифри, `-' и "
 "`_'"
 
-#: any.pm:523
+#: any.pm:528
 #, c-format
 msgid "The user name is too long"
 msgstr "Корисничкото име е предолго"
 
-#: any.pm:524
+#: any.pm:529
 #, c-format
 msgid "This user name has already been added"
 msgstr "Ова корисничко име веќе е додадено"
 
-#: any.pm:528
+#: any.pm:533
 #, c-format
 msgid "Add user"
 msgstr "Додај корисник"
 
-#: any.pm:529
+#: any.pm:534
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1126,77 +1134,77 @@ msgstr ""
 "Внесете корисник\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 "Завршено"
 
-#: any.pm:533 help.pm:52
+#: any.pm:538 help.pm:52
 #, c-format
 msgid "Accept user"
 msgstr "Прифати корисник"
 
-#: any.pm:544
+#: any.pm:549
 #, c-format
 msgid "Real name"
 msgstr "Вистинско име"
 
-#: 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 "Корисничко име"
 
-#: any.pm:548
+#: any.pm:553
 #, c-format
 msgid "Shell"
 msgstr "Школка"
 
-#: any.pm:550
+#: any.pm:555
 #, c-format
 msgid "Icon"
 msgstr "Икона"
 
-#: any.pm:591 security/l10n.pm:14
+#: any.pm:596 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Авто-најавување"
 
-#: any.pm:592
+#: any.pm:597
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr ""
 "Можам да го подесам вашиот компјутер автоматски да логира еден корисник."
 
-#: any.pm:593 help.pm:52
+#: any.pm:598 help.pm:52
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Дали сакате да ja користите оваа опција?"
 
-#: any.pm:594
+#: any.pm:599
 #, c-format
 msgid "Choose the default user:"
 msgstr "Изберете го корисникот:"
 
-#: any.pm:595
+#: any.pm:600
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Изберете прозор-менаџер:"
 
-#: any.pm:607
+#: any.pm:612
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Изберете јазик."
 
-#: 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 ""
@@ -1205,48 +1213,48 @@ msgstr ""
 "достапни кога инсталацијата ќе заврши и ќе го \n"
 "рестартирате системот."
 
-#: any.pm:646 help.pm:660
+#: any.pm:651 help.pm:660
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Користи Unicode по правило"
 
-#: any.pm:647 help.pm:660
+#: any.pm:652 help.pm:660
 #, c-format
 msgid "All languages"
 msgstr "Сите јазици"
 
-#: 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 "Земја / Регион"
 
-#: any.pm:684
+#: any.pm:689
 #, c-format
 msgid "Please choose your country."
 msgstr "Ве молам изберете ја вашата земја."
 
-#: any.pm:686
+#: any.pm:691
 #, fuzzy, c-format
 msgid "Here is the full list of available countries"
 msgstr "Ова е целосна листа на достапни распореди"
 
-#: 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 "Повеќе"
 
-#: any.pm:818
+#: any.pm:823
 #, c-format
 msgid "No sharing"
 msgstr "Без споделување (sharing)"
 
-#: any.pm:818
+#: any.pm:823
 #, c-format
 msgid "Allow all users"
 msgstr "Дозволи за сите"
 
-#: any.pm:822
+#: any.pm:827
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1261,24 +1269,24 @@ msgstr ""
 "\n"
 "\"По избор\" поодделни ги третира корисниците.\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 ""
 "Можете да извезувате со NFS или со Samba. Изберете што сакате да користите."
 
-#: any.pm:846
+#: any.pm:851
 #, fuzzy, c-format
 msgid "The package %s is going to be removed."
 msgstr "Следниве пакети ќе бидат отстранети"
 
-#: any.pm:858
+#: any.pm:863
 #, c-format
 msgid "Launch userdrake"
 msgstr "Лансирај userdrake"
 
-#: any.pm:860
+#: any.pm:865
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1386,7 +1394,7 @@ msgid "Can't use broadcast with no NIS domain"
 msgstr "Неможам да извршам пренос без NIS домеин"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:542
+#: bootloader.pm:533
 #, fuzzy, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1401,56 +1409,56 @@ msgstr ""
 "pochekajte %d sekundi za voobichaeno podiganje.\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 со графичко мени"
 
-#: bootloader.pm:677 help.pm:768
+#: bootloader.pm:670 help.pm:768
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO со текстуално мени"
 
-#: 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"
 
-#: bootloader.pm:1178
+#: bootloader.pm:1175
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "Не може да инсталирате подигач на %s партиција\n"
 
-#: bootloader.pm:1218
+#: bootloader.pm:1219
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr ""
 
-#: 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 ""
 
-#: bootloader.pm:1226
+#: bootloader.pm:1227
 #, fuzzy, c-format
 msgid "Re-install Boot Loader"
 msgstr "Инсталирај"
@@ -1490,90 +1498,91 @@ msgstr "1 минута"
 msgid "%d seconds"
 msgstr "%d секунди"
 
-#: common.pm:196
+#: common.pm:197
 #, c-format
 msgid "Can't make screenshots before partitioning"
 msgstr "Не можат да се прават снимки на екран пред партицирање"
 
-#: common.pm:203
+#: common.pm:204
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Екранските снимки ќе бидат достапни по инсталацијата во %s"
 
-#: common.pm:268
+#: common.pm:269
 #, c-format
 msgid "kdesu missing"
 msgstr "недостига kdesu"
 
-#: common.pm:271
+#: common.pm:272
 #, c-format
 msgid "consolehelper missing"
 msgstr "недостига consolehelper"
 
-#: 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 "Франција"
 
-#: crypto.pm:15 lang.pm:207
+#: crypto.pm:15 lang.pm:212
 #, c-format
 msgid "Costa Rica"
 msgstr "Костарика"
 
-#: 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 "Белгија"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:212
+#: crypto.pm:17 crypto.pm:30 lang.pm:217
 #, c-format
 msgid "Czech Republic"
 msgstr "Чешка Република"
 
-#: 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 "Германија"
 
-#: crypto.pm:19 crypto.pm:32 lang.pm:244
+#: crypto.pm:19 crypto.pm:32 lang.pm:249
 #, c-format
 msgid "Greece"
 msgstr "Грција"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:317
+#: crypto.pm:20 crypto.pm:33 lang.pm:322
 #, c-format
 msgid "Norway"
 msgstr "Норвешка"
 
-#: 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 "Шведска"
 
-#: 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 "Холандија"
 
-#: 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 "Италија"
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:172
+#: crypto.pm:24 crypto.pm:38 lang.pm:177
 #, c-format
 msgid "Austria"
 msgstr "Австрија"
 
-#: 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 "САД"
@@ -1658,7 +1667,7 @@ msgstr "Ве молиме прво да направите бекап на Ва
 #: 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 ""
@@ -1692,6 +1701,7 @@ msgid "Please click on a partition"
 msgstr "Кликнете на партиција"
 
 #: 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 "Детали"
@@ -1732,7 +1742,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 "Друго"
@@ -1853,7 +1863,7 @@ msgstr "Сите примарни партиции се искористени"
 
 #: diskdrake/interactive.pm:330
 #, c-format
-msgid "I can't add any more partition"
+msgid "I can't add any more partitions"
 msgstr "Повеќе не може да се додадат партиции"
 
 #: diskdrake/interactive.pm:331
@@ -1904,13 +1914,19 @@ msgstr ""
 "Партициската табела за бекап не е со иста големина\n"
 "Да Продолжиме?"
 
-#: 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 "Внимание"
@@ -2477,8 +2493,8 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Криптирачките клучеви не се совпаѓаат"
 
-#: 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 "Криптирачки клуч"
@@ -2519,7 +2535,7 @@ msgid ""
 "Please enter your username, password and domain name to access this host."
 msgstr "Внесете го Вашето корисничко име, лозинка и име на домен за пристап."
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3874
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3591
 #, c-format
 msgid "Username"
 msgstr "Корисничко име"
@@ -2549,17 +2565,17 @@ msgstr "Треба да се инсталира пакетот %s. Дали са
 msgid "Mandatory package %s is missing"
 msgstr "Неопходниот пакет %s недостига"
 
-#: do_pkgs.pm:136
+#: do_pkgs.pm:143
 #, c-format
 msgid "Installing packages..."
 msgstr "Инсталирање на пакетите..."
 
-#: do_pkgs.pm:210
+#: do_pkgs.pm:217
 #, fuzzy, c-format
 msgid "Removing packages..."
 msgstr "Отстранување на %s ..."
 
-#: fs.pm:399
+#: fs.pm:409
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
@@ -2569,7 +2585,7 @@ msgstr ""
 "(на пр. за побрз пристап на новостите паралелно за да се забрзат серверите "
 "за дискусионите групи)."
 
-#: fs.pm:402
+#: fs.pm:412
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
@@ -2578,14 +2594,14 @@ msgstr ""
 "Може да се монтира само експлицитно (на пр.,\n"
 "опцијата -а нема да предизвика фајл системот да биде монтиран)."
 
-#: fs.pm:405
+#: fs.pm:415
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 "Не ги интерпретирај карактерите или специјалните блок уреди на датотечниот "
 "систем."
 
-#: fs.pm:407
+#: fs.pm:417
 #, fuzzy, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2596,7 +2612,7 @@ msgstr ""
 "фајл ситем. Оваа опција можеби е корисна за сервер чиј што фајл системи\n"
 "содржат binaries за архитектури поинакви од неговата."
 
-#: fs.pm:411
+#: fs.pm:421
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2607,17 +2623,17 @@ msgstr ""
 "подеси-групен-идентификатор да се применат. (Ова изгледа сигурно, но\n"
 "всушност не е сигурно ако имате инсталирано suidperl(1))"
 
-#: fs.pm:415
+#: fs.pm:425
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "Монтирањето на системската датотека е само за читање."
 
-#: fs.pm:417
+#: fs.pm:427
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr "Сите I/O од системските датотеки треба да бидат синхрнизирани."
 
-#: fs.pm:421
+#: fs.pm:431
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2633,52 +2649,57 @@ msgstr ""
 "(освен ако се преоптоварени од подсеквенцијалните опции, како во\n"
 "опционата линија user,exec,dev,suid )."
 
-#: fs.pm:429
+#: fs.pm:439
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr ""
 
-#: 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 ""
+
+#: 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 форматирање на %s не успеа"
 
-#: fs.pm:628
+#: fs.pm:647
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "Не знам како да го форматирам %s во тип %s"
 
-#: fs.pm:635 fs.pm:642
+#: fs.pm:654 fs.pm:661
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Форматирање на партицијата %s"
 
-#: fs.pm:639
+#: fs.pm:658
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Создавање и форматирање на датотеката %s"
 
-#: fs.pm:705 fs.pm:758
+#: fs.pm:718 fs.pm:771
 #, c-format
 msgid "Mounting partition %s"
 msgstr "Монтирање на партицијата %s"
 
-#: fs.pm:706 fs.pm:759
+#: fs.pm:719 fs.pm:772
 #, c-format
 msgid "mounting partition %s in directory %s failed"
 msgstr "монтирањето на партицијата %s во директориум %s не успеа"
 
-#: fs.pm:726 fs.pm:734
+#: fs.pm:739 fs.pm:747
 #, c-format
 msgid "Checking %s"
 msgstr "Проверка %s"
 
-#: fs.pm:775 partition_table.pm:636
+#: fs.pm:788 partition_table.pm:638
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "грешка при одмонтирање на %s: %s"
 
-#: fs.pm:807
+#: fs.pm:820
 #, c-format
 msgid "Enabling swap partition %s"
 msgstr "Вклучување на swap партицијата %s"
@@ -2717,32 +2738,32 @@ msgstr ""
 "\n"
 "Дали се сложувате да ги изгубите сите партиции?\n"
 
-#: fsedit.pm:514
+#: fsedit.pm:513
 #, c-format
 msgid "You can't use JFS for partitions smaller than 16MB"
 msgstr "Не можете да користите JFS за партиции помали од 16MB"
 
-#: fsedit.pm:515
+#: fsedit.pm:514
 #, c-format
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr "Не можете да користите ReiserFS за партиции помали од 32MB"
 
-#: fsedit.pm:534
+#: fsedit.pm:533
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Точките на монтирање мора да почнуваат со префикс /"
 
-#: fsedit.pm:535
+#: fsedit.pm:534
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "Точките на монтирање треба да содржат само алфанумерички карактери"
 
-#: fsedit.pm:536
+#: fsedit.pm:535
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Веќе постои партиција со точка на монтирање %s\n"
 
-#: fsedit.pm:538
+#: fsedit.pm:537
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2753,25 +2774,36 @@ msgstr ""
 "Ниту еден подигач не може да се справи со ова без /boot партиција.\n"
 "Ве молиме бидете сигурни да додадете /boot партиција"
 
-#: fsedit.pm:541
+#: fsedit.pm:540
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr ""
 "Не можете да користите LVM логички волумен за точкатата на монтирање %s"
 
-#: fsedit.pm:543
+#: fsedit.pm:542
+#, fuzzy, 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 ""
+"Избравте софтверска RAID партиција како root-партиција (/).\n"
+"Ниту еден подигач не може да се справи со ова без /boot партиција.\n"
+"Ве молиме бидете сигурни да додадете /boot партиција"
+
+#: fsedit.pm:545
 #, c-format
 msgid ""
 "You may not be able to install lilo (since lilo doesn't handle a LV on "
 "multiple PVs)"
 msgstr ""
 
-#: fsedit.pm:546 fsedit.pm:548
+#: fsedit.pm:548 fsedit.pm:550
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "Овој директориум би требало да остане во root-фајлсистемот"
 
-#: fsedit.pm:550
+#: fsedit.pm:552
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
@@ -2780,22 +2812,22 @@ msgstr ""
 "Потребен ви е вистински фајлсистем (ext2/ext3, reiserfs, xfs, или jfs) за "
 "оваа точка на монтирање\n"
 
-#: fsedit.pm:552
+#: fsedit.pm:554
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr "Не може да користите криптиран фајлсистем за точката на монтирање %s"
 
-#: fsedit.pm:613
+#: fsedit.pm:615
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "Нема доволно слободен простор за авто-алоцирање"
 
-#: fsedit.pm:615
+#: fsedit.pm:617
 #, c-format
 msgid "Nothing to do"
 msgstr "Не прави ништо"
 
-#: fsedit.pm:711
+#: fsedit.pm:713
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Грешка при отворање на %s за пишување: %s"
@@ -2830,7 +2862,7 @@ msgstr "CD/DVD режачи"
 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 "Лента"
@@ -2870,36 +2902,41 @@ msgstr "Процесори"
 msgid "ISDN adapters"
 msgstr "ISDN картичка"
 
-#: harddrake/data.pm:71
+#: harddrake/data.pm:70
 #, c-format
 msgid "Ethernetcard"
 msgstr "Мрежна картичка"
 
-#: 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 "Модем"
 
-#: harddrake/data.pm:80
+#: harddrake/data.pm:79
 #, c-format
 msgid "ADSL adapters"
 msgstr ""
 
+#: harddrake/data.pm:81
+#, fuzzy, c-format
+msgid "AGP controllers"
+msgstr "7USB контролери"
+
 #: harddrake/data.pm:82
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "Мостови и систем контролери"
 
 #: 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 "Принтер"
 
-#: 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 "Глушец"
@@ -2914,52 +2951,52 @@ msgstr "Џојстик"
 msgid "(E)IDE/ATA controllers"
 msgstr "(E)IDE/ATA контролери"
 
-#: harddrake/data.pm:93
+#: harddrake/data.pm:94
 #, c-format
 msgid "Firewire controllers"
 msgstr "Firewire контролери"
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:95
 #, c-format
 msgid "SCSI controllers"
 msgstr "SCSI контролери"
 
-#: harddrake/data.pm:95
+#: harddrake/data.pm:96
 #, c-format
 msgid "USB controllers"
 msgstr "7USB контролери"
 
-#: harddrake/data.pm:96
+#: harddrake/data.pm:97
 #, c-format
 msgid "SMBus controllers"
 msgstr "SMBus контролери"
 
-#: harddrake/data.pm:97
+#: harddrake/data.pm:98
 #, c-format
 msgid "Scanner"
 msgstr "Скенер"
 
-#: harddrake/data.pm:99 standalone/harddrake2:315
+#: harddrake/data.pm:100 standalone/harddrake2:319
 #, c-format
 msgid "Unknown/Others"
 msgstr "Непознато/Други"
 
-#: 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 "Почекајте... Примена на конфигурацијата"
 
-#: harddrake/sound.pm:182
+#: harddrake/sound.pm:186
 #, c-format
 msgid "No alternative driver"
 msgstr "Нема алтернативен драјвер"
 
-#: 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 "
@@ -2968,12 +3005,12 @@ msgstr ""
 "Не постои познат OSS/ALSA алтернативен драјвер за Вашата звучна картичка (%"
 "s) која моментално го користи \"%s\""
 
-#: harddrake/sound.pm:189
+#: harddrake/sound.pm:193
 #, c-format
 msgid "Sound configuration"
 msgstr "Конфигурација на звук"
 
-#: harddrake/sound.pm:191
+#: harddrake/sound.pm:195
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -2982,7 +3019,7 @@ msgstr ""
 "Овде може да изберете алтернативен драјвер (или OSS или ALSA) за Вашата "
 "звучна картичка (%s)."
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:197
 #, c-format
 msgid ""
 "\n"
@@ -2995,7 +3032,7 @@ msgstr ""
 "Вашата картичка моментално го користи драјверот %s\"%s\" (подразбираниот "
 "драјвер за Вашата картичка е \"%s\")"
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:199
 #, fuzzy, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -3028,17 +3065,17 @@ msgstr ""
 "- старото API компатибилно со OSS - новото ALSA API кое нуди многу напредни "
 "можности, но бара користење на ALSA библиотеката.\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 "Драјвер:"
 
-#: harddrake/sound.pm:214
+#: harddrake/sound.pm:218
 #, c-format
 msgid "Trouble shooting"
 msgstr "Решавање Проблеми"
 
-#: harddrake/sound.pm:222
+#: harddrake/sound.pm:226
 #, fuzzy, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
@@ -3053,12 +3090,12 @@ msgstr ""
 "\n"
 "The new \"%s\" driver'll only be used on next bootstrap."
 
-#: harddrake/sound.pm:230
+#: harddrake/sound.pm:234
 #, c-format
 msgid "No open source driver"
 msgstr "Нема познат драјвер со отворен код"
 
-#: harddrake/sound.pm:231
+#: harddrake/sound.pm:235
 #, fuzzy, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
@@ -3067,32 +3104,32 @@ msgstr ""
 "Не постои познат OSS/ALSA алтернативен драјвер за Вашата звучна картичка (%"
 "s) која моментално го користи \"%s\""
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:238
 #, c-format
 msgid "No known driver"
 msgstr "Нема познат драјвер"
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:239
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "Нема познат драјвер за Вашата звучна (%s)"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:243
 #, fuzzy, c-format
 msgid "Unknown driver"
 msgstr "Непознат драјвер"
 
-#: harddrake/sound.pm:240
+#: harddrake/sound.pm:244
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "Грешка: \"%s\" драјверот за вашата звучна картичка не во листата"
 
-#: harddrake/sound.pm:253
+#: harddrake/sound.pm:257
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Отстранување на проблемот за звукот"
 
-#: harddrake/sound.pm:254
+#: harddrake/sound.pm:258
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3139,17 +3176,17 @@ msgstr ""
 "- \"/sbin/fuser -v /dev/dsp\" ќе ви каже кој програм ја користи звучната "
 "картичка.\n"
 
-#: harddrake/sound.pm:280
+#: harddrake/sound.pm:284
 #, c-format
 msgid "Let me pick any driver"
 msgstr "Дозволи ми да изберам било кој уред"
 
-#: harddrake/sound.pm:283
+#: harddrake/sound.pm:287
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "Избирање на произволен драјвер"
 
-#: 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 "
@@ -3236,7 +3273,7 @@ msgstr "овозможи радио поддршка"
 #, fuzzy, 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 ""
@@ -3248,7 +3285,7 @@ msgstr ""
 "копчето \"Прифати\"."
 
 #: 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 "Прифати"
@@ -3347,10 +3384,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 "Следно"
@@ -3430,7 +3466,7 @@ msgstr ""
 #: help.pm:86
 #, fuzzy, 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 ""
@@ -3442,12 +3478,12 @@ msgstr ""
 #, fuzzy, 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"
@@ -3490,7 +3526,7 @@ msgid ""
 "updating an existing system."
 msgstr ""
 "Сега е време да изберете програми што ќе се инсталираат на Вашиот систем.\n"
-"Постојат илјадници пакети за Mandrake Linux, и од Вас не се очекува да\n"
+"Постојат илјадници пакети за Mandrakelinux, и од Вас не се очекува да\n"
 "ги препознете напамет.\n"
 "\n"
 "Ако вршите стандардна инсталација од CD, прво ќе бидете запрашани за тоа\n"
@@ -3592,10 +3628,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"
@@ -3660,17 +3696,17 @@ msgstr ""
 "претходниот\n"
 "чекор за тоа како да направите таква дискета."
 
-#: 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 "Не"
 
-#: 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 "Да"
@@ -3685,7 +3721,7 @@ msgstr "Автоматски зависности"
 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"
@@ -3700,7 +3736,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"
@@ -3751,8 +3787,8 @@ msgstr ""
 "е сличен со оној кој се користи во текот на инсталацијата."
 
 #: 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 "Конфигурирај"
@@ -3831,7 +3867,7 @@ msgstr ""
 "да\n"
 "се користи од други машини на Вашата локална мрежа."
 
-#: 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 "Хардверски часовник наместен според GMT"
@@ -3869,7 +3905,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"
@@ -4039,7 +4075,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"
@@ -4066,7 +4102,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"
@@ -4075,7 +4111,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"
@@ -4093,7 +4129,7 @@ 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 ""
-"Сега треба да изберете каде на Вашиот диск да се инсталира Mandrake Linux\n"
+"Сега треба да изберете каде на Вашиот диск да се инсталира Mandrakelinux\n"
 "оперативниот систем. Ако Вашиот диск е празен или ако веќе некој оперативен\n"
 "систем го користи целокупниот простор, ќе треба да го партицирате. \n"
 "Партицирањето се состои од логичко делење за да се создаде простор за\n"
@@ -4129,7 +4165,7 @@ msgstr ""
 "Менувањето на големина може да се изведе без губиток на податоци,\n"
 "под услов претходно да сте ја дефрагментирале Windows партицијата. Не би "
 "било лошо ни да направите бекап на Вашите податоци.\n"
-"Оваа солуција се пропорачува ако сакате да ги користите и Mandrake Linux и\n"
+"Оваа солуција се пропорачува ако сакате да ги користите и Mandrakelinux и\n"
 "Microsoft Windows на истиот компјутер.\n"
 "\n"
 "   Пред избирање на оваа опција треба да знаете дека по ова Microsoft "
@@ -4265,17 +4301,17 @@ msgstr ""
 msgid "Generate auto-install floppy"
 msgstr "генерирање дискета за авто-инсталација"
 
-#: help.pm:418 install_steps_interactive.pm:1320
+#: help.pm:418 install_steps_interactive.pm:1329
 #, c-format
 msgid "Replay"
 msgstr "Реприза"
 
-#: help.pm:418 install_steps_interactive.pm:1320
+#: help.pm:418 install_steps_interactive.pm:1329
 #, c-format
 msgid "Automated"
 msgstr "Автоматска"
 
-#: help.pm:418 install_steps_interactive.pm:1323
+#: help.pm:418 install_steps_interactive.pm:1332
 #, c-format
 msgid "Save packages selection"
 msgstr "Зачувување на селекцијата пакети"
@@ -4303,7 +4339,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."
@@ -4336,12 +4372,12 @@ msgstr ""
 "содржат физички лоши блокови."
 
 #: 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 "Претходно"
@@ -4349,7 +4385,7 @@ msgstr "Претходно"
 #: help.pm:447
 #, fuzzy, 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"
@@ -4375,7 +4411,7 @@ msgstr ""
 "\"Откажи\" за да се откажете."
 
 #: 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 "Инсталирај"
@@ -4419,7 +4455,7 @@ msgstr "Безбедност:"
 #, fuzzy, 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"
@@ -4577,7 +4613,7 @@ msgstr "Префрлање помеѓу нормален/експертски р
 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"
@@ -4655,7 +4691,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"
@@ -4663,13 +4699,13 @@ 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 ""
 "Оваа постапка се активира само ако на Вашиот компјутер се најде некоја стара "
 "GNU/Linux партиција.\n"
@@ -4684,13 +4720,13 @@ msgstr ""
 "\n"
 " * \"%s\": Ова ви овозможува да ги надградите пакетите кои веќе се "
 "инсталирани на Вашиот систем\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"
-"�����``Upgrade'' ����should work fine on Mandrake Linux systems\n"
+"�����``Upgrade'' ����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."
 
 #: help.pm:605
 #, fuzzy, c-format
@@ -4746,7 +4782,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"
@@ -4943,7 +4979,7 @@ msgid "authentication"
 msgstr "автентикација"
 
 #. -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 "Без лозинка"
@@ -4978,7 +5014,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"
@@ -5078,8 +5114,9 @@ msgstr ""
 "ќе Ви биде потребна дискета за да ги подигнете тие други оперативни системи!"
 
 #: 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 "Додај"
@@ -5090,7 +5127,8 @@ msgid "Modify"
 msgstr "Промени"
 
 #: 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
 #, fuzzy, c-format
 msgid "Remove"
 msgstr "Отстрани"
@@ -5131,7 +5169,7 @@ msgstr ""
 #, fuzzy, 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"
@@ -5190,7 +5228,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"
@@ -5425,8 +5463,8 @@ msgstr ""
 "изберете\n"
 "друг драјвер."
 
-#: 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 "Звучна картичка"
@@ -5497,12 +5535,12 @@ msgid ""
 msgstr ""
 
 #: 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 "Тастатура"
 
-#: help.pm:991 install_steps_interactive.pm:921
+#: help.pm:991 install_steps_interactive.pm:926
 #, c-format
 msgid "Timezone"
 msgstr "Часовна зона"
@@ -5512,7 +5550,7 @@ msgstr "Часовна зона"
 msgid "Graphical Interface"
 msgstr "Графички интерфејс"
 
-#: help.pm:991 install_steps_interactive.pm:995
+#: help.pm:991 install_steps_interactive.pm:1000
 #, c-format
 msgid "TV card"
 msgstr "ТВ картичка"
@@ -5522,27 +5560,27 @@ msgstr "ТВ картичка"
 msgid "ISDN card"
 msgstr "ISDN картичка"
 
-#: 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 "Мрежа"
 
-#: help.pm:991 install_steps_interactive.pm:1039
+#: help.pm:991 install_steps_interactive.pm:1044
 #, fuzzy, c-format
 msgid "Security Level"
 msgstr "Ниво на сигурност"
 
-#: help.pm:991 install_steps_interactive.pm:1053
+#: help.pm:991 install_steps_interactive.pm:1058
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: help.pm:991 install_steps_interactive.pm:1067
+#: help.pm:991 install_steps_interactive.pm:1072
 #, c-format
 msgid "Bootloader"
 msgstr "Подигач"
 
-#: 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 "Сервиси"
@@ -5551,7 +5589,7 @@ msgstr "Сервиси"
 #, fuzzy, 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 ""
 "Изберете го дискот што сакат да го избришете за да ја инсталирате новата\n"
@@ -5594,7 +5632,7 @@ msgstr ""
 msgid "You must also format %s"
 msgstr "Мора да го форматирате и %s"
 
-#: install_any.pm:413
+#: install_any.pm:411
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -5616,7 +5654,7 @@ msgstr ""
 "\n"
 "Дали навистина сакате да ги инсталирате овие сервери?\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"
@@ -5630,17 +5668,17 @@ msgstr ""
 "\n"
 "Дали навистина сакате да се избришат овие пакети?\n"
 
-#: install_any.pm:812
+#: install_any.pm:827
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Внесете FAT-форматирана дискета во %s"
 
-#: install_any.pm:816
+#: install_any.pm:831
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "Оваа дискета не е форматирана со FAT"
 
-#: install_any.pm:828
+#: install_any.pm:843
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
@@ -5649,12 +5687,12 @@ msgstr ""
 "За да ја искористите зачуванава селекција пакети, подигнете ја инсталацијата "
 "со ``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 "Грешка при читање на датотеката %s"
 
-#: install_any.pm:973
+#: install_any.pm:995
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5780,7 +5818,7 @@ msgstr "Користи го празниот простор на Windows пар
 #, 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 ""
 "Вашата Windows партиција е премногу фрагментирана. Рестартирајте го "
@@ -5894,17 +5932,17 @@ msgid "Bringing down the network"
 msgstr "Спуштање на мрежата"
 
 #: install_messages.pm:9
-#, c-format
+#, fuzzy, c-format
 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"
@@ -5958,7 +5996,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"
@@ -5995,7 +6033,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"
@@ -6095,7 +6133,7 @@ msgstr ""
 "програми. MandrakeSoft S.A. го задржува правото да ги модифицира или \n"
 "адаптира софтверските производи, како целина или во делови, на било кој\n"
 "начин и за било која цел.\n"
-"\"Mandrake\", \"Mandrake Linux\" и придружените логотипи се заштитени знаци\n"
+"\"Mandrake\", \"Mandrakelinux\" и придружените логотипи се заштитени знаци\n"
 "на MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -6187,14 +6225,14 @@ msgstr ""
 "софтверски програми.\n"
 
 #: install_messages.pm:128
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of Mandrake "
-"Linux,\n"
+"For information on fixes which are available for this release of "
+"Mandrakelinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6202,7 +6240,7 @@ 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 ""
 "Инсталацијата е завршена. Ви честитаме!\n"
 "Извадете ги инсталационите медиуми и притиснете Ентер за рестартирање.\n"
@@ -6228,7 +6266,7 @@ msgstr "http://www.mandrakelinux.com/en/100errata.php3"
 msgid "Duplicate mount point %s"
 msgstr "Дупликат точка на монтирање: %s"
 
-#: install_steps.pm:410
+#: install_steps.pm:406
 #, c-format
 msgid ""
 "Some important packages didn't get installed properly.\n"
@@ -6241,7 +6279,7 @@ msgstr ""
 "Проверете ги цедеата на инсталиран компјутер користејќи\n"
 "\"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
 
-#: install_steps.pm:541
+#: install_steps.pm:535
 #, c-format
 msgid "No floppy drive available"
 msgstr "Нема достапен дискетен уред"
@@ -6255,7 +6293,7 @@ msgstr "Премин на чекор \"%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 ""
@@ -6464,8 +6502,8 @@ msgstr "Да продолжиме?"
 msgid "There was an error installing packages:"
 msgstr "Се случи грешка во инсталирањето на пакетите:"
 
-#: 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 "не е конфигурирано"
@@ -6560,7 +6598,7 @@ msgstr "IDE"
 msgid "Configuring IDE"
 msgstr "Конфигурирање на IDE"
 
-#: 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 "Нема достапна партиција"
@@ -6784,179 +6822,178 @@ 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 ""
 "Контактирање со веб сајтот на Мандрак Линукс за добивање на листата на "
 "огледала..."
 
-#: install_steps_interactive.pm:786
+#: install_steps_interactive.pm:787
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Изберете огледало од кое да се преземат пакетите"
 
-#: install_steps_interactive.pm:800
+#: install_steps_interactive.pm:801
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "Контактирање со огледалото за добивање листа на достапни пакети..."
 
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:805
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Не можеше да контактира со другиот %s"
 
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:805
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Дали сакате да пробате пак?"
 
-#: install_steps_interactive.pm:830 standalone/drakclock:42
+#: install_steps_interactive.pm:831 standalone/drakclock:42
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Кој е Вашата временска зона?"
 
-#: install_steps_interactive.pm:835
+#: install_steps_interactive.pm:836
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Автоматска синхронизација на време (преку NTP)"
 
-#: install_steps_interactive.pm:843
+#: install_steps_interactive.pm:844
 #, c-format
 msgid "NTP Server"
 msgstr "NTP сервер"
 
-#: install_steps_interactive.pm:885 steps.pm:30
+#: install_steps_interactive.pm:886 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Резултати"
 
-#: 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 "Систем"
 
-#: 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 "Хардвер(машински дел)"
 
-#: 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 сервер"
 
-#: install_steps_interactive.pm:940
+#: install_steps_interactive.pm:945
 #, c-format
 msgid "No printer"
 msgstr "Нема принтер"
 
-#: install_steps_interactive.pm:982
+#: install_steps_interactive.pm:987
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Дали имате ISA звучна картичка?"
 
-#: install_steps_interactive.pm:984
+#: install_steps_interactive.pm:989
 #, c-format
 msgid "Run \"sndconfig\" after installation to configure your sound card"
 msgstr ""
 "За да ја конфигурирате картичката, по инсталацијата извршете \"sndconfig\" "
 
-#: install_steps_interactive.pm:986
+#: install_steps_interactive.pm:991
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Не е детектирана звучна картичка. Обидете се со \"harddrake\" по "
 "инсталацијата"
 
-#: install_steps_interactive.pm:1006
+#: install_steps_interactive.pm:1011
 #, c-format
 msgid "Graphical interface"
 msgstr "Графички интерфејс"
 
-#: install_steps_interactive.pm:1012 install_steps_interactive.pm:1027
+#: install_steps_interactive.pm:1017 install_steps_interactive.pm:1032
 #, fuzzy, c-format
 msgid "Network & Internet"
 msgstr "Мрежа & Интернет"
 
-#: install_steps_interactive.pm:1028
+#: install_steps_interactive.pm:1033
 #, fuzzy, c-format
 msgid "Proxies"
 msgstr "Профил "
 
-#: install_steps_interactive.pm:1029
+#: install_steps_interactive.pm:1034
 #, fuzzy, c-format
 msgid "configured"
 msgstr "реконфигурирај"
 
-#: 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 "Безбедност"
 
-#: install_steps_interactive.pm:1057
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "activated"
 msgstr "активиран"
 
-#: install_steps_interactive.pm:1057
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "disabled"
 msgstr "оневозможено"
 
-#: install_steps_interactive.pm:1066
+#: install_steps_interactive.pm:1071
 #, fuzzy, c-format
 msgid "Boot"
 msgstr "Root"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1070
+#: install_steps_interactive.pm:1075
 #, fuzzy, c-format
 msgid "%s on %s"
 msgstr "Вклучено 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 "Сервисите: %d активирани за %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 "Се уште го ш конфигурирано Х. Дали навистина сакаш да го направиш ова?"
 
-#: install_steps_interactive.pm:1149
+#: install_steps_interactive.pm:1154
 #, fuzzy, c-format
 msgid "Set root password and network authentication methods"
 msgstr "Користи лозинка за логирање корисници"
 
-#: install_steps_interactive.pm:1150
+#: install_steps_interactive.pm:1155
 #, c-format
 msgid "Set root password"
 msgstr "Поставка на лозинка за root"
 
-#: 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 "Оваа лозинка е прекратка (мора да има должина од барем %d знаци)"
 
-#: 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 "Автентикација"
 
-#: install_steps_interactive.pm:1196
+#: install_steps_interactive.pm:1201
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Подговтвување на подигачот..."
 
-#: install_steps_interactive.pm:1206
+#: install_steps_interactive.pm:1211
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -6969,12 +7006,12 @@ msgstr ""
 "Инсталацијата ќе продолжи, но ќе треба да користите\n"
 " BootX или некои други средства за да ја подигнете Вашата машина"
 
-#: install_steps_interactive.pm:1212
+#: install_steps_interactive.pm:1217
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "Дали сакате да го користите aboot?"
 
-#: install_steps_interactive.pm:1215
+#: install_steps_interactive.pm:1220
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -6983,17 +7020,17 @@ msgstr ""
 "Грешка при инсталирање aboot. \n"
 "Да се обидеме со сила, иако тоа може да ја уништи првата партиција?"
 
-#: install_steps_interactive.pm:1226
+#: install_steps_interactive.pm:1231
 #, c-format
 msgid "Installing bootloader"
 msgstr "Инсталирање на подигачот"
 
-#: install_steps_interactive.pm:1233
+#: install_steps_interactive.pm:1238
 #, c-format
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Инсталирањето на подигач не успеа. Се случи следнава грешка:"
 
-#: 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"
@@ -7011,24 +7048,29 @@ msgstr ""
 " Потоа внесете: shut-down\n"
 "При следновот подигање би требало да го видите промптот за подигање."
 
-#: 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 ""
 
-#: 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 "Внесете празна дискета во %s"
 
-#: install_steps_interactive.pm:1287
+#: install_steps_interactive.pm:1293
+#, fuzzy, c-format
+msgid "Please insert another floppy for drivers disk"
+msgstr "Внесете ја boot-дискетата во %s"
+
+#: install_steps_interactive.pm:1295
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Создавање дискета за авто-инсталација..."
 
-#: install_steps_interactive.pm:1298
+#: install_steps_interactive.pm:1307
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7039,12 +7081,12 @@ msgstr ""
 "\n"
 "Дали навистина сакате сега да напуштите?"
 
-#: install_steps_interactive.pm:1313
+#: install_steps_interactive.pm:1322
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Генерирање дискета за авто-инсталација"
 
-#: install_steps_interactive.pm:1315
+#: install_steps_interactive.pm:1324
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7061,8 +7103,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrake Linux Installation %s"
-msgstr "Mandrake Linux Инсталација %s"
+msgid "Mandrakelinux Installation %s"
+msgstr "Mandrakelinux Инсталација %s"
 
 #: install_steps_newt.pm:33
 #, c-format
@@ -7081,7 +7123,7 @@ msgstr "Изберете датотека"
 msgid "Basic"
 msgstr "Основно"
 
-#: 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 "Заврши"
@@ -7195,7 +7237,7 @@ msgstr "Фински"
 msgid "French"
 msgstr "Француска"
 
-#: keyboard.pm:143 keyboard.pm:217
+#: keyboard.pm:143 keyboard.pm:220
 #, c-format
 msgid "Norwegian"
 msgstr "Норвешка"
@@ -7205,22 +7247,22 @@ msgstr "Норвешка"
 msgid "Polish"
 msgstr "Полска"
 
-#: keyboard.pm:145 keyboard.pm:226
+#: keyboard.pm:145 keyboard.pm:229
 #, c-format
 msgid "Russian"
 msgstr "Руска"
 
-#: keyboard.pm:147 keyboard.pm:230
+#: keyboard.pm:147 keyboard.pm:233
 #, c-format
 msgid "Swedish"
 msgstr "Шведска"
 
-#: keyboard.pm:148 keyboard.pm:249
+#: keyboard.pm:148 keyboard.pm:252
 #, c-format
 msgid "UK keyboard"
 msgstr "UK тастатура"
 
-#: keyboard.pm:149 keyboard.pm:250
+#: keyboard.pm:149 keyboard.pm:253
 #, c-format
 msgid "US keyboard"
 msgstr "US тастатура"
@@ -7415,312 +7457,312 @@ msgstr "Италијански"
 msgid "Inuktitut"
 msgstr "Инуктитут"
 
-#: keyboard.pm:197
+#: keyboard.pm:200
 #, c-format
 msgid "Japanese 106 keys"
 msgstr "Јапонска со 106 копчиња"
 
-#: keyboard.pm:198
+#: keyboard.pm:201
 #, c-format
 msgid "Kannada"
 msgstr "Канада"
 
-#: keyboard.pm:201
+#: keyboard.pm:204
 #, c-format
 msgid "Korean keyboard"
 msgstr "Корејска тастатура"
 
-#: keyboard.pm:202
+#: keyboard.pm:205
 #, c-format
 msgid "Latin American"
 msgstr "Латино-американски"
 
-#: keyboard.pm:203
+#: keyboard.pm:206
 #, c-format
 msgid "Laotian"
 msgstr "Лаотска"
 
-#: keyboard.pm:204
+#: keyboard.pm:207
 #, c-format
 msgid "Lithuanian AZERTY (old)"
 msgstr "Литванска AZERTY (стара)"
 
-#: keyboard.pm:206
+#: keyboard.pm:209
 #, c-format
 msgid "Lithuanian AZERTY (new)"
 msgstr "Литвански AZERTY (нова)"
 
-#: keyboard.pm:207
+#: keyboard.pm:210
 #, c-format
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Литванска QWERTY \"бројки\""
 
-#: keyboard.pm:208
+#: keyboard.pm:211
 #, c-format
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Литванска QWERTY \"фонетска\""
 
-#: keyboard.pm:209
+#: keyboard.pm:212
 #, c-format
 msgid "Latvian"
 msgstr "Латвиски"
 
-#: keyboard.pm:210
+#: keyboard.pm:213
 #, c-format
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: keyboard.pm:211
+#: keyboard.pm:214
 #, c-format
 msgid "Macedonian"
 msgstr "Македонска"
 
-#: keyboard.pm:212
+#: keyboard.pm:215
 #, c-format
 msgid "Myanmar (Burmese)"
 msgstr "Бурманска (Мјанмар)"
 
-#: keyboard.pm:213
+#: keyboard.pm:216
 #, c-format
 msgid "Mongolian (cyrillic)"
 msgstr "Монглоска (кирилична)"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
 msgid "Maltese (UK)"
 msgstr "Малтешка (UK)"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
 msgid "Maltese (US)"
 msgstr "Малтешка (US)"
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
 msgid "Dutch"
 msgstr "Холандски"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
 msgid "Oriya"
 msgstr ""
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
 msgid "Polish (qwerty layout)"
 msgstr "Полска (qwerty распоред)"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
 msgid "Polish (qwertz layout)"
 msgstr "Полска (qwertz распоред)"
 
-#: keyboard.pm:221
+#: keyboard.pm:224
 #, c-format
 msgid "Portuguese"
 msgstr "Португалска"
 
-#: keyboard.pm:222
+#: keyboard.pm:225
 #, c-format
 msgid "Canadian (Quebec)"
 msgstr "Канадска (Квебек)"
 
-#: keyboard.pm:224
+#: keyboard.pm:227
 #, c-format
 msgid "Romanian (qwertz)"
 msgstr "Романска (qwertz)"
 
-#: keyboard.pm:225
+#: keyboard.pm:228
 #, c-format
 msgid "Romanian (qwerty)"
 msgstr "Романска (qwerty)"
 
-#: keyboard.pm:227
+#: keyboard.pm:230
 #, c-format
 msgid "Russian (Phonetic)"
 msgstr "Руски (Фонетски)"
 
-#: keyboard.pm:228
+#: keyboard.pm:231
 #, fuzzy, c-format
 msgid "Saami (norwegian)"
 msgstr "Сами (Норвешка)"
 
-#: keyboard.pm:229
+#: keyboard.pm:232
 #, fuzzy, c-format
 msgid "Saami (swedish/finnish)"
 msgstr "Saami (шведски/фински)"
 
-#: keyboard.pm:231
+#: keyboard.pm:234
 #, c-format
 msgid "Slovenian"
 msgstr "Словенски"
 
-#: keyboard.pm:232
+#: keyboard.pm:235
 #, c-format
 msgid "Slovakian (QWERTZ)"
 msgstr "Словачки (QWERTZ)"
 
-#: keyboard.pm:233
+#: keyboard.pm:236
 #, c-format
 msgid "Slovakian (QWERTY)"
 msgstr "Словачка (QWERTY)"
 
-#: keyboard.pm:235
+#: keyboard.pm:238
 #, c-format
 msgid "Serbian (cyrillic)"
 msgstr "Српска (кирилица)"
 
-#: keyboard.pm:236
+#: keyboard.pm:239
 #, c-format
 msgid "Syriac"
 msgstr "Сирија"
 
-#: keyboard.pm:237
+#: keyboard.pm:240
 #, c-format
 msgid "Syriac (phonetic)"
 msgstr "Сириски (фонетски)"
 
-#: keyboard.pm:238
+#: keyboard.pm:241
 #, c-format
 msgid "Telugu"
 msgstr "Телуџи"
 
-#: keyboard.pm:240
+#: keyboard.pm:243
 #, fuzzy, c-format
 msgid "Tamil (ISCII-layout)"
 msgstr "Тамилска (TSCII)"
 
-#: keyboard.pm:241
+#: keyboard.pm:244
 #, fuzzy, c-format
 msgid "Tamil (Typewriter-layout)"
 msgstr "Ерменска (машина)"
 
-#: keyboard.pm:242
+#: keyboard.pm:245
 #, c-format
 msgid "Thai keyboard"
 msgstr "Таи"
 
-#: keyboard.pm:244
+#: keyboard.pm:247
 #, c-format
 msgid "Tajik keyboard"
 msgstr "Таџикистанска"
 
-#: keyboard.pm:245
+#: keyboard.pm:248
 #, c-format
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Турска (традиционална \"F\")"
 
-#: keyboard.pm:246
+#: keyboard.pm:249
 #, c-format
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Турска (модерен \"Q\" модел)"
 
-#: keyboard.pm:248
+#: keyboard.pm:251
 #, c-format
 msgid "Ukrainian"
 msgstr "Украинска"
 
-#: keyboard.pm:251
+#: keyboard.pm:254
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US (интернационална)"
 
-#: keyboard.pm:252
+#: keyboard.pm:255
 #, c-format
 msgid "Uzbek (cyrillic)"
 msgstr "Узбекистан (кирилица)"
 
-#: keyboard.pm:253
+#: keyboard.pm:256
 #, c-format
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Виетнамска QWERTY \"бројки\""
 
-#: keyboard.pm:254
+#: keyboard.pm:257
 #, c-format
 msgid "Yugoslavian (latin)"
 msgstr "Југословенска (латиница)"
 
-#: keyboard.pm:261
+#: keyboard.pm:264
 #, c-format
 msgid "Right Alt key"
 msgstr "Десното Alt копче"
 
-#: keyboard.pm:262
+#: keyboard.pm:265
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Двете Shift копчиња истовремено"
 
-#: keyboard.pm:263
+#: keyboard.pm:266
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control и Shift истовремено"
 
-#: keyboard.pm:264
+#: keyboard.pm:267
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock копче"
 
-#: keyboard.pm:265
+#: keyboard.pm:268
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl и Alt истовремено"
 
-#: keyboard.pm:266
+#: keyboard.pm:269
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt и Shift истовремено"
 
-#: keyboard.pm:267
+#: keyboard.pm:270
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Мени\"-копчето"
 
-#: keyboard.pm:268
+#: keyboard.pm:271
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Левото \"Windows\"-копче"
 
-#: keyboard.pm:269
+#: keyboard.pm:272
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Десното \"Windows\"-копче"
 
-#: keyboard.pm:270
+#: keyboard.pm:273
 #, fuzzy, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Двете Shift копчиња истовремено"
 
-#: keyboard.pm:271
+#: keyboard.pm:274
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Двете Alt копчиња истовремено"
 
-#: keyboard.pm:272
+#: keyboard.pm:275
 #, fuzzy, c-format
 msgid "Left Shift key"
 msgstr "Левото Shift копче"
 
-#: keyboard.pm:273
+#: keyboard.pm:276
 #, c-format
 msgid "Right Shift key"
 msgstr "Десното Shift копче"
 
-#: keyboard.pm:274
+#: keyboard.pm:277
 #, fuzzy, c-format
 msgid "Left Alt key"
 msgstr "Лево Alt копче"
 
-#: keyboard.pm:275
+#: keyboard.pm:278
 #, fuzzy, c-format
 msgid "Left Control key"
 msgstr "Лево Контрол кошче"
 
-#: keyboard.pm:276
+#: keyboard.pm:279
 #, c-format
 msgid "Right Control key"
 msgstr "Десното Ctrl копче"
 
-#: keyboard.pm:307
+#: keyboard.pm:310
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -7731,7 +7773,7 @@ msgstr ""
 "за префрлување од еден во друг распоред на тастатура\n"
 "(на пример: латиница и кирилица)"
 
-#: keyboard.pm:312
+#: keyboard.pm:315
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -7739,1144 +7781,1144 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: lang.pm:144
-#, fuzzy, c-format
+#: lang.pm:149
+#, c-format
 msgid "default:LTR"
-msgstr "вообичаено:LTR"
+msgstr "default:LTR"
 
-#: lang.pm:160
+#: lang.pm:165
 #, c-format
 msgid "Afghanistan"
 msgstr "Авганистански"
 
-#: lang.pm:161
+#: lang.pm:166
 #, c-format
 msgid "Andorra"
 msgstr "Андора"
 
-#: lang.pm:162
+#: lang.pm:167
 #, fuzzy, c-format
 msgid "United Arab Emirates"
 msgstr "Обединете Арапски Емирати"
 
-#: lang.pm:163
+#: lang.pm:168
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Антигва и Барбуда"
 
-#: lang.pm:164
+#: lang.pm:169
 #, c-format
 msgid "Anguilla"
 msgstr "Ангуила"
 
-#: lang.pm:165
+#: lang.pm:170
 #, fuzzy, c-format
 msgid "Albania"
 msgstr "Албанска"
 
-#: lang.pm:166
+#: lang.pm:171
 #, c-format
 msgid "Armenia"
 msgstr "Ерменија"
 
-#: lang.pm:167
+#: lang.pm:172
 #, fuzzy, c-format
 msgid "Netherlands Antilles"
 msgstr "Холандија"
 
-#: lang.pm:168
+#: lang.pm:173
 #, c-format
 msgid "Angola"
 msgstr "Ангола"
 
-#: lang.pm:169
+#: lang.pm:174
 #, c-format
 msgid "Antarctica"
 msgstr "Антартик"
 
-#: lang.pm:170 standalone/drakxtv:51
+#: lang.pm:175 standalone/drakxtv:51
 #, c-format
 msgid "Argentina"
 msgstr "Аргентина"
 
-#: lang.pm:171
+#: lang.pm:176
 #, c-format
 msgid "American Samoa"
 msgstr "Американска Самоа"
 
-#: lang.pm:173 standalone/drakxtv:49
+#: lang.pm:178 network/adsl_consts.pm:20 standalone/drakxtv:49
 #, fuzzy, c-format
 msgid "Australia"
 msgstr "Австралија"
 
-#: lang.pm:174
+#: lang.pm:179
 #, c-format
 msgid "Aruba"
 msgstr "Аруба"
 
-#: lang.pm:175
+#: lang.pm:180
 #, fuzzy, c-format
 msgid "Azerbaijan"
 msgstr "Азербејџанска (латиница)"
 
-#: lang.pm:176
+#: lang.pm:181
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Босна и Херцеговина"
 
-#: lang.pm:177
+#: lang.pm:182
 #, c-format
 msgid "Barbados"
 msgstr "Барбодас"
 
-#: lang.pm:178
+#: lang.pm:183
 #, c-format
 msgid "Bangladesh"
 msgstr "Бангладеш"
 
-#: lang.pm:180
+#: lang.pm:185
 #, c-format
 msgid "Burkina Faso"
 msgstr "Буркима фасо"
 
-#: lang.pm:181
+#: lang.pm:186
 #, c-format
 msgid "Bulgaria"
 msgstr "Бугарија"
 
-#: lang.pm:182
+#: lang.pm:187
 #, c-format
 msgid "Bahrain"
 msgstr ""
 
-#: lang.pm:183
+#: lang.pm:188
 #, c-format
 msgid "Burundi"
 msgstr "Бурунди"
 
-#: lang.pm:184
+#: lang.pm:189
 #, c-format
 msgid "Benin"
 msgstr "Бенин"
 
-#: lang.pm:185
+#: lang.pm:190
 #, fuzzy, c-format
 msgid "Bermuda"
 msgstr "Бермуди"
 
-#: lang.pm:186
+#: lang.pm:191
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "Брунеи Дарусалам"
 
-#: lang.pm:187
+#: lang.pm:192
 #, c-format
 msgid "Bolivia"
 msgstr "Боливија"
 
-#: lang.pm:188
+#: lang.pm:193
 #, c-format
 msgid "Brazil"
 msgstr "Бразил"
 
-#: lang.pm:189
+#: lang.pm:194
 #, c-format
 msgid "Bahamas"
 msgstr "Бахами"
 
-#: lang.pm:190
+#: lang.pm:195
 #, c-format
 msgid "Bhutan"
 msgstr "��"
 
-#: lang.pm:191
+#: lang.pm:196
 #, c-format
 msgid "Bouvet Island"
 msgstr ""
 
-#: lang.pm:192
+#: lang.pm:197
 #, fuzzy, c-format
 msgid "Botswana"
 msgstr "Босанска"
 
-#: lang.pm:193
+#: lang.pm:198
 #, c-format
 msgid "Belarus"
 msgstr "Белорусија"
 
-#: lang.pm:194
+#: lang.pm:199
 #, fuzzy, c-format
 msgid "Belize"
 msgstr "Големина"
 
-#: lang.pm:195
+#: lang.pm:200
 #, c-format
 msgid "Canada"
 msgstr "Канада"
 
-#: lang.pm:196
+#: lang.pm:201
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "Кокосови (Килингови) Острови"
 
-#: lang.pm:197
+#: lang.pm:202
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "Конго(Киншаса)"
 
-#: lang.pm:198
+#: lang.pm:203
 #, c-format
 msgid "Central African Republic"
 msgstr "Централно Афричка Република"
 
-#: lang.pm:199
+#: lang.pm:204
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "Конго(Бразавил)"
 
-#: lang.pm:200
+#: lang.pm:205
 #, c-format
 msgid "Switzerland"
 msgstr "Швајцарија"
 
-#: lang.pm:201
+#: lang.pm:206
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr ""
 
-#: lang.pm:202
+#: lang.pm:207
 #, c-format
 msgid "Cook Islands"
 msgstr "Островите Кук"
 
-#: lang.pm:203
+#: lang.pm:208
 #, fuzzy, c-format
 msgid "Chile"
 msgstr "Чиле"
 
-#: lang.pm:204
+#: lang.pm:209
 #, c-format
 msgid "Cameroon"
 msgstr "Камерун"
 
-#: lang.pm:205
+#: lang.pm:210
 #, c-format
 msgid "China"
 msgstr "Кина"
 
-#: lang.pm:206
+#: lang.pm:211
 #, c-format
 msgid "Colombia"
 msgstr "Колумбија"
 
-#: lang.pm:208
+#: lang.pm:213
 #, c-format
 msgid "Cuba"
 msgstr "Куба"
 
-#: lang.pm:209
+#: lang.pm:214
 #, c-format
 msgid "Cape Verde"
 msgstr "Cape Verde"
 
-#: lang.pm:210
+#: lang.pm:215
 #, c-format
 msgid "Christmas Island"
 msgstr "Божиќни Острови"
 
-#: lang.pm:211
+#: lang.pm:216
 #, c-format
 msgid "Cyprus"
 msgstr "Кипар"
 
-#: lang.pm:214
+#: lang.pm:219
 #, c-format
 msgid "Djibouti"
 msgstr ""
 
-#: lang.pm:215
+#: lang.pm:220
 #, c-format
 msgid "Denmark"
 msgstr "Данска"
 
-#: lang.pm:216
+#: lang.pm:221
 #, fuzzy, c-format
 msgid "Dominica"
 msgstr "Домен"
 
-#: lang.pm:217
+#: lang.pm:222
 #, c-format
 msgid "Dominican Republic"
 msgstr "Доминиканска Република"
 
-#: lang.pm:218
+#: lang.pm:223
 #, fuzzy, c-format
 msgid "Algeria"
 msgstr "Алжир"
 
-#: lang.pm:219
+#: lang.pm:224
 #, c-format
 msgid "Ecuador"
 msgstr "Еквадор"
 
-#: lang.pm:220
+#: lang.pm:225
 #, fuzzy, c-format
 msgid "Estonia"
 msgstr "Естонска"
 
-#: lang.pm:221
+#: lang.pm:226
 #, c-format
 msgid "Egypt"
 msgstr "Египет"
 
-#: lang.pm:222
+#: lang.pm:227
 #, c-format
 msgid "Western Sahara"
 msgstr "Западна Сахара"
 
-#: lang.pm:223
+#: lang.pm:228
 #, fuzzy, c-format
 msgid "Eritrea"
 msgstr "Еритреа"
 
-#: 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 "Шпанија"
 
-#: lang.pm:225
+#: lang.pm:230
 #, c-format
 msgid "Ethiopia"
 msgstr "Етиопија"
 
-#: lang.pm:226 network/adsl_consts.pm:119
+#: lang.pm:231 network/adsl_consts.pm:127
 #, c-format
 msgid "Finland"
 msgstr "Финска"
 
-#: lang.pm:227
+#: lang.pm:232
 #, c-format
 msgid "Fiji"
 msgstr "Фуџи"
 
-#: lang.pm:228
+#: lang.pm:233
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "Фолкленд Острови"
 
-#: lang.pm:229
+#: lang.pm:234
 #, c-format
 msgid "Micronesia"
 msgstr "Микронезија"
 
-#: lang.pm:230
+#: lang.pm:235
 #, c-format
 msgid "Faroe Islands"
 msgstr "Фарски Острови"
 
-#: lang.pm:232
+#: lang.pm:237
 #, c-format
 msgid "Gabon"
 msgstr "Габон"
 
-#: 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 "Велика Британија"
 
-#: lang.pm:234
+#: lang.pm:239
 #, c-format
 msgid "Grenada"
 msgstr "Гренада"
 
-#: lang.pm:235
+#: lang.pm:240
 #, fuzzy, c-format
 msgid "Georgia"
 msgstr "Џорџија"
 
-#: lang.pm:236
+#: lang.pm:241
 #, fuzzy, c-format
 msgid "French Guiana"
 msgstr "Француска Гвајана"
 
-#: lang.pm:237
+#: lang.pm:242
 #, c-format
 msgid "Ghana"
 msgstr "Гана"
 
-#: lang.pm:238
+#: lang.pm:243
 #, c-format
 msgid "Gibraltar"
 msgstr "Гибралтар"
 
-#: lang.pm:239
+#: lang.pm:244
 #, c-format
 msgid "Greenland"
 msgstr "Гренланд"
 
-#: lang.pm:240
+#: lang.pm:245
 #, c-format
 msgid "Gambia"
 msgstr "Гамбија"
 
-#: lang.pm:241
+#: lang.pm:246
 #, fuzzy, c-format
 msgid "Guinea"
 msgstr "Општо"
 
-#: lang.pm:242
+#: lang.pm:247
 #, c-format
 msgid "Guadeloupe"
 msgstr "Гвадалупе"
 
-#: lang.pm:243
+#: lang.pm:248
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Екваторска Гвинеја"
 
-#: lang.pm:245
+#: lang.pm:250
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Северна Џорџија"
 
-#: lang.pm:246
+#: lang.pm:251
 #, c-format
 msgid "Guatemala"
 msgstr "Гватемала"
 
-#: lang.pm:247
+#: lang.pm:252
 #, c-format
 msgid "Guam"
 msgstr "Гуам"
 
-#: lang.pm:248
+#: lang.pm:253
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "Гвинеја-Бисао"
 
-#: lang.pm:249
+#: lang.pm:254
 #, c-format
 msgid "Guyana"
 msgstr "Гвајана"
 
-#: lang.pm:250
+#: lang.pm:255
 #, fuzzy, c-format
 msgid "China (Hong Kong)"
 msgstr "Хонг Конг"
 
-#: lang.pm:251
+#: lang.pm:256
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "МекДоналд Острови"
 
-#: lang.pm:252
+#: lang.pm:257
 #, c-format
 msgid "Honduras"
 msgstr "Хондурас"
 
-#: lang.pm:253
+#: lang.pm:258
 #, fuzzy, c-format
 msgid "Croatia"
 msgstr "Хрватска"
 
-#: lang.pm:254
+#: lang.pm:259
 #, c-format
 msgid "Haiti"
 msgstr "Хаити"
 
-#: lang.pm:255 network/adsl_consts.pm:144
+#: lang.pm:260 network/adsl_consts.pm:152
 #, fuzzy, c-format
 msgid "Hungary"
 msgstr "Унгарска"
 
-#: lang.pm:256
+#: lang.pm:261
 #, c-format
 msgid "Indonesia"
 msgstr "Идонезија"
 
-#: lang.pm:257 standalone/drakxtv:48
+#: lang.pm:262 standalone/drakxtv:48
 #, c-format
 msgid "Ireland"
 msgstr "Ирска"
 
-#: lang.pm:258
+#: lang.pm:263
 #, fuzzy, c-format
 msgid "Israel"
 msgstr "Израелска"
 
-#: lang.pm:259
+#: lang.pm:264
 #, c-format
 msgid "India"
 msgstr "Индија"
 
-#: lang.pm:260
+#: lang.pm:265
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "Британска територија во Индискиот Океан"
 
-#: lang.pm:261
+#: lang.pm:266
 #, c-format
 msgid "Iraq"
 msgstr "Ирак"
 
-#: lang.pm:262
+#: lang.pm:267
 #, c-format
 msgid "Iran"
 msgstr "Иран"
 
-#: lang.pm:263
+#: lang.pm:268
 #, fuzzy, c-format
 msgid "Iceland"
 msgstr "Исландска"
 
-#: lang.pm:265
+#: lang.pm:270
 #, c-format
 msgid "Jamaica"
 msgstr "Јамајка"
 
-#: lang.pm:266
+#: lang.pm:271
 #, c-format
 msgid "Jordan"
 msgstr "Јордан"
 
-#: lang.pm:267
+#: lang.pm:272
 #, c-format
 msgid "Japan"
 msgstr "Јапонија"
 
-#: lang.pm:268
+#: lang.pm:273
 #, fuzzy, c-format
 msgid "Kenya"
 msgstr "Кенија"
 
-#: lang.pm:269
+#: lang.pm:274
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Киргистан"
 
-#: lang.pm:270
+#: lang.pm:275
 #, c-format
 msgid "Cambodia"
 msgstr "Камбоџа"
 
-#: lang.pm:271
+#: lang.pm:276
 #, c-format
 msgid "Kiribati"
 msgstr "����"
 
-#: lang.pm:272
+#: lang.pm:277
 #, c-format
 msgid "Comoros"
 msgstr ""
 
-#: lang.pm:273
+#: lang.pm:278
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr ""
 
-#: lang.pm:274
+#: lang.pm:279
 #, c-format
 msgid "Korea (North)"
 msgstr "Северна Кореа"
 
-#: lang.pm:275
+#: lang.pm:280
 #, c-format
 msgid "Korea"
 msgstr "Кореа"
 
-#: lang.pm:276
+#: lang.pm:281
 #, c-format
 msgid "Kuwait"
 msgstr "Кувајт"
 
-#: lang.pm:277
+#: lang.pm:282
 #, c-format
 msgid "Cayman Islands"
 msgstr "Кајмански Острови"
 
-#: lang.pm:278
+#: lang.pm:283
 #, c-format
 msgid "Kazakhstan"
 msgstr "Казахстан"
 
-#: lang.pm:279
+#: lang.pm:284
 #, c-format
 msgid "Laos"
 msgstr "Лаос"
 
-#: lang.pm:280
+#: lang.pm:285
 #, c-format
 msgid "Lebanon"
 msgstr "Либан"
 
-#: lang.pm:281
+#: lang.pm:286
 #, c-format
 msgid "Saint Lucia"
 msgstr "Света Луција"
 
-#: lang.pm:282
+#: lang.pm:287
 #, c-format
 msgid "Liechtenstein"
 msgstr "Лихтенштајн"
 
-#: lang.pm:283
+#: lang.pm:288
 #, c-format
 msgid "Sri Lanka"
 msgstr "Шри Ланка"
 
-#: lang.pm:284
+#: lang.pm:289
 #, fuzzy, c-format
 msgid "Liberia"
 msgstr "Либерија"
 
-#: lang.pm:285
+#: lang.pm:290
 #, c-format
 msgid "Lesotho"
 msgstr ""
 
-#: lang.pm:286
+#: lang.pm:291
 #, c-format
 msgid "Lithuania"
 msgstr "Литванија"
 
-#: lang.pm:287
+#: lang.pm:292
 #, c-format
 msgid "Luxembourg"
 msgstr "Луксембург"
 
-#: lang.pm:288
+#: lang.pm:293
 #, c-format
 msgid "Latvia"
 msgstr "Латвија"
 
-#: lang.pm:289
+#: lang.pm:294
 #, c-format
 msgid "Libya"
 msgstr "Либија"
 
-#: lang.pm:290
+#: lang.pm:295
 #, c-format
 msgid "Morocco"
 msgstr "Мароко"
 
-#: lang.pm:291
+#: lang.pm:296
 #, c-format
 msgid "Monaco"
 msgstr "Монако"
 
-#: lang.pm:292
+#: lang.pm:297
 #, c-format
 msgid "Moldova"
 msgstr "Молдавија"
 
-#: lang.pm:293
+#: lang.pm:298
 #, c-format
 msgid "Madagascar"
 msgstr "Магадаскар"
 
-#: lang.pm:294
+#: lang.pm:299
 #, c-format
 msgid "Marshall Islands"
 msgstr "Маршалски Острови"
 
-#: lang.pm:295
+#: lang.pm:300
 #, c-format
 msgid "Macedonia"
 msgstr "Македонија"
 
-#: lang.pm:296
+#: lang.pm:301
 #, c-format
 msgid "Mali"
 msgstr "Мали"
 
-#: lang.pm:297
+#: lang.pm:302
 #, c-format
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: lang.pm:298
+#: lang.pm:303
 #, c-format
 msgid "Mongolia"
 msgstr "Монголија"
 
-#: lang.pm:299
+#: lang.pm:304
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "Западно Маријански Острови"
 
-#: lang.pm:300
+#: lang.pm:305
 #, c-format
 msgid "Martinique"
 msgstr "Мартиник"
 
-#: lang.pm:301
+#: lang.pm:306
 #, c-format
 msgid "Mauritania"
 msgstr "Мауританија"
 
-#: lang.pm:302
+#: lang.pm:307
 #, c-format
 msgid "Montserrat"
 msgstr "Монсерат"
 
-#: lang.pm:303
+#: lang.pm:308
 #, c-format
 msgid "Malta"
 msgstr "Малта"
 
-#: lang.pm:304
+#: lang.pm:309
 #, c-format
 msgid "Mauritius"
 msgstr "Маурициус"
 
-#: lang.pm:305
+#: lang.pm:310
 #, c-format
 msgid "Maldives"
 msgstr ""
 
-#: lang.pm:306
+#: lang.pm:311
 #, c-format
 msgid "Malawi"
 msgstr "Малави"
 
-#: lang.pm:307
+#: lang.pm:312
 #, c-format
 msgid "Mexico"
 msgstr "Мексико"
 
-#: lang.pm:308
+#: lang.pm:313
 #, c-format
 msgid "Malaysia"
 msgstr "Малезија"
 
-#: lang.pm:309
+#: lang.pm:314
 #, c-format
 msgid "Mozambique"
 msgstr "Мозамбик"
 
-#: lang.pm:310
+#: lang.pm:315
 #, c-format
 msgid "Namibia"
 msgstr "Намбиа"
 
-#: lang.pm:311
+#: lang.pm:316
 #, c-format
 msgid "New Caledonia"
 msgstr "Нова Каледонија"
 
-#: lang.pm:312
+#: lang.pm:317
 #, fuzzy, c-format
 msgid "Niger"
 msgstr "Нигерија"
 
-#: lang.pm:313
+#: lang.pm:318
 #, c-format
 msgid "Norfolk Island"
 msgstr "Норфолк Остров"
 
-#: lang.pm:314
+#: lang.pm:319
 #, c-format
 msgid "Nigeria"
 msgstr "Нигериа"
 
-#: lang.pm:315
+#: lang.pm:320
 #, c-format
 msgid "Nicaragua"
 msgstr "Никарагва"
 
-#: lang.pm:318
+#: lang.pm:323
 #, c-format
 msgid "Nepal"
 msgstr "непал"
 
-#: lang.pm:319
+#: lang.pm:324
 #, c-format
 msgid "Nauru"
 msgstr "Науру"
 
-#: lang.pm:320
+#: lang.pm:325
 #, c-format
 msgid "Niue"
 msgstr ""
 
-#: lang.pm:321
+#: lang.pm:326
 #, fuzzy, c-format
 msgid "New Zealand"
 msgstr "Нов Зеланд"
 
-#: lang.pm:322
+#: lang.pm:327
 #, c-format
 msgid "Oman"
 msgstr "Оман"
 
-#: lang.pm:323
+#: lang.pm:328
 #, c-format
 msgid "Panama"
 msgstr "Панама"
 
-#: lang.pm:324
+#: lang.pm:329
 #, c-format
 msgid "Peru"
 msgstr "Перу"
 
-#: lang.pm:325
+#: lang.pm:330
 #, c-format
 msgid "French Polynesia"
 msgstr "Француска Полинезија"
 
-#: lang.pm:326
+#: lang.pm:331
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Папа Нова Гвинеја"
 
-#: lang.pm:327
+#: lang.pm:332
 #, c-format
 msgid "Philippines"
 msgstr "Филипини"
 
-#: lang.pm:328
+#: lang.pm:333
 #, c-format
 msgid "Pakistan"
 msgstr "Пакистан"
 
-#: lang.pm:329 network/adsl_consts.pm:177
+#: lang.pm:334 network/adsl_consts.pm:186
 #, c-format
 msgid "Poland"
 msgstr "Полска"
 
-#: lang.pm:330
+#: lang.pm:335
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "Свети Петар и Микелон"
 
-#: lang.pm:331
+#: lang.pm:336
 #, c-format
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: lang.pm:332
+#: lang.pm:337
 #, fuzzy, c-format
 msgid "Puerto Rico"
 msgstr "Порто Рико"
 
-#: lang.pm:333
+#: lang.pm:338
 #, c-format
 msgid "Palestine"
 msgstr "Палестина"
 
-#: lang.pm:334 network/adsl_consts.pm:187
+#: lang.pm:339 network/adsl_consts.pm:196
 #, fuzzy, c-format
 msgid "Portugal"
 msgstr "Португалија"
 
-#: lang.pm:335
+#: lang.pm:340
 #, c-format
 msgid "Paraguay"
 msgstr "Парагвај"
 
-#: lang.pm:336
+#: lang.pm:341
 #, c-format
 msgid "Palau"
 msgstr "Палау"
 
-#: lang.pm:337
+#: lang.pm:342
 #, c-format
 msgid "Qatar"
 msgstr "Катар"
 
-#: lang.pm:338
+#: lang.pm:343
 #, c-format
 msgid "Reunion"
 msgstr "Ресоединување"
 
-#: lang.pm:339
+#: lang.pm:344
 #, c-format
 msgid "Romania"
 msgstr "Романија"
 
-#: lang.pm:340
+#: lang.pm:345
 #, fuzzy, c-format
 msgid "Russia"
 msgstr "Руска"
 
-#: lang.pm:341
+#: lang.pm:346
 #, c-format
 msgid "Rwanda"
 msgstr "Руанда"
 
-#: lang.pm:342
+#: lang.pm:347
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Саудиска Арабија"
 
-#: lang.pm:343
+#: lang.pm:348
 #, c-format
 msgid "Solomon Islands"
 msgstr "Соломонски Острови"
 
-#: lang.pm:344
+#: lang.pm:349
 #, c-format
 msgid "Seychelles"
 msgstr "Сејшели"
 
-#: lang.pm:345
+#: lang.pm:350
 #, fuzzy, c-format
 msgid "Sudan"
 msgstr "Судан"
 
-#: lang.pm:347
+#: lang.pm:352
 #, c-format
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: lang.pm:348
+#: lang.pm:353
 #, fuzzy, c-format
 msgid "Saint Helena"
 msgstr "Света Елена"
 
-#: lang.pm:349
+#: lang.pm:354
 #, c-format
 msgid "Slovenia"
 msgstr "Словенија"
 
-#: lang.pm:350
+#: lang.pm:355
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Свалбандски и Јан Мајенски Острови"
 
-#: lang.pm:351
+#: lang.pm:356
 #, c-format
 msgid "Slovakia"
 msgstr "Словачка"
 
-#: lang.pm:352
+#: lang.pm:357
 #, c-format
 msgid "Sierra Leone"
 msgstr "Сиера Леоне"
 
-#: lang.pm:353
+#: lang.pm:358
 #, c-format
 msgid "San Marino"
 msgstr "Сан Марино"
 
-#: lang.pm:354
+#: lang.pm:359
 #, c-format
 msgid "Senegal"
 msgstr "Сенегал"
 
-#: lang.pm:355
+#: lang.pm:360
 #, c-format
 msgid "Somalia"
 msgstr "Сомалија"
 
-#: lang.pm:356
+#: lang.pm:361
 #, fuzzy, c-format
 msgid "Suriname"
 msgstr "Сурнинам"
 
-#: lang.pm:357
+#: lang.pm:362
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "Sao Tome and Principe"
 
-#: lang.pm:358
+#: lang.pm:363
 #, c-format
 msgid "El Salvador"
 msgstr "Ел Салвадор"
 
-#: lang.pm:359
+#: lang.pm:364
 #, c-format
 msgid "Syria"
 msgstr "Сирија"
 
-#: lang.pm:360
+#: lang.pm:365
 #, c-format
 msgid "Swaziland"
 msgstr "Свазиленд"
 
-#: lang.pm:361
+#: lang.pm:366
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr ""
 
-#: lang.pm:362
+#: lang.pm:367
 #, c-format
 msgid "Chad"
 msgstr "Чад"
 
-#: lang.pm:363
+#: lang.pm:368
 #, c-format
 msgid "French Southern Territories"
 msgstr "Југоисточни Француски Територии"
 
-#: lang.pm:364
+#: lang.pm:369
 #, c-format
 msgid "Togo"
 msgstr "Того"
 
-#: lang.pm:365
+#: lang.pm:370
 #, c-format
 msgid "Thailand"
 msgstr "Тајланд"
 
-#: lang.pm:366
+#: lang.pm:371
 #, c-format
 msgid "Tajikistan"
 msgstr "Таџикистан"
 
-#: lang.pm:367
+#: lang.pm:372
 #, c-format
 msgid "Tokelau"
 msgstr "Толекау"
 
-#: lang.pm:368
+#: lang.pm:373
 #, c-format
 msgid "East Timor"
 msgstr "Источен Тимор"
 
-#: lang.pm:369
+#: lang.pm:374
 #, c-format
 msgid "Turkmenistan"
 msgstr "Туркменистан"
 
-#: lang.pm:370
+#: lang.pm:375
 #, c-format
 msgid "Tunisia"
 msgstr "���"
 
-#: lang.pm:371
+#: lang.pm:376
 #, c-format
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:372
+#: lang.pm:377
 #, c-format
 msgid "Turkey"
 msgstr "Турција"
 
-#: lang.pm:373
+#: lang.pm:378
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Тринидад и Тобаго"
 
-#: lang.pm:374
+#: lang.pm:379
 #, c-format
 msgid "Tuvalu"
 msgstr "Тувалу"
 
-#: lang.pm:375
+#: lang.pm:380
 #, c-format
 msgid "Taiwan"
 msgstr "Тајван"
 
-#: lang.pm:376
+#: lang.pm:381
 #, c-format
 msgid "Tanzania"
 msgstr "Танзанија"
 
-#: lang.pm:377
+#: lang.pm:382
 #, c-format
 msgid "Ukraine"
 msgstr "Украина"
 
-#: lang.pm:378
+#: lang.pm:383
 #, fuzzy, c-format
 msgid "Uganda"
 msgstr "Уганда"
 
-#: lang.pm:379
+#: lang.pm:384
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: lang.pm:381
+#: lang.pm:386
 #, c-format
 msgid "Uruguay"
 msgstr "Уругвај"
 
-#: lang.pm:382
+#: lang.pm:387
 #, c-format
 msgid "Uzbekistan"
 msgstr "Узбекистан"
 
-#: lang.pm:383
+#: lang.pm:388
 #, fuzzy, c-format
 msgid "Vatican"
 msgstr "Лаотска"
 
-#: lang.pm:384
+#: lang.pm:389
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "Свети Винсент"
 
-#: lang.pm:385
+#: lang.pm:390
 #, c-format
 msgid "Venezuela"
 msgstr "Венецуела"
 
-#: lang.pm:386
+#: lang.pm:391
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Девствени Острови"
 
-#: lang.pm:387
+#: lang.pm:392
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr ""
 
-#: lang.pm:388
+#: lang.pm:393
 #, c-format
 msgid "Vietnam"
 msgstr "Виетнам"
 
-#: lang.pm:389
+#: lang.pm:394
 #, c-format
 msgid "Vanuatu"
 msgstr "Вануту"
 
-#: lang.pm:390
+#: lang.pm:395
 #, c-format
 msgid "Wallis and Futuna"
 msgstr ""
 
-#: lang.pm:391
+#: lang.pm:396
 #, c-format
 msgid "Samoa"
 msgstr "Самоа"
 
-#: lang.pm:392
+#: lang.pm:397
 #, c-format
 msgid "Yemen"
 msgstr "Јемен"
 
-#: lang.pm:393
+#: lang.pm:398
 #, c-format
 msgid "Mayotte"
 msgstr "Мајот"
 
-#: lang.pm:394
+#: lang.pm:399
 #, c-format
 msgid "Serbia & Montenegro"
 msgstr ""
 
-#: lang.pm:395 standalone/drakxtv:50
+#: lang.pm:400 standalone/drakxtv:50
 #, c-format
 msgid "South Africa"
 msgstr "Јужна Африка"
 
-#: lang.pm:396
+#: lang.pm:401
 #, c-format
 msgid "Zambia"
 msgstr "Замбија"
 
-#: lang.pm:397
+#: lang.pm:402
 #, c-format
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
-#: lang.pm:966
+#: lang.pm:983
 #, c-format
 msgid "Welcome to %s"
 msgstr "Добредојдовте во %s"
@@ -8891,7 +8933,7 @@ msgstr "Циркуларни монтирања %s\n"
 msgid "Remove the logical volumes first\n"
 msgstr "Отстрани ги прво логичките партиции\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:962
+#: modules/interactive.pm:21 standalone/drakconnect:959
 #, c-format
 msgid "Parameters"
 msgstr "Параметри"
@@ -9060,12 +9102,11 @@ msgstr "Општ PS2 глушец со тркалце"
 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
 #, fuzzy, c-format
 msgid "Automatic"
 msgstr "Автоматска IP"
@@ -9210,7 +9251,7 @@ msgstr "Пост деинсталација"
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: mouse.pm:92
+#: mouse.pm:92 standalone/drakvpn:1138
 #, c-format
 msgid "none"
 msgstr "ниту еден"
@@ -9270,12 +9311,12 @@ msgstr "Sagem (користи pppoa) usb"
 msgid "Sagem (using dhcp) usb"
 msgstr "Sagem (користи pppoa) 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 "Поврзи се на Интернет"
 
-#: network/adsl.pm:36 network/netconnect.pm:680
+#: network/adsl.pm:36 network/netconnect.pm:755
 #, fuzzy, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
@@ -9286,7 +9327,7 @@ msgstr ""
 "Некои конекции користат и pptp, а само неко dhcp.\n"
 "Ако не знаете, изберете \"користи pppoe\""
 
-#: network/adsl.pm:41 network/netconnect.pm:684
+#: network/adsl.pm:41 network/netconnect.pm:759
 #, fuzzy, c-format
 msgid "ADSL connection type :"
 msgstr "ADSL конекција"
@@ -9351,7 +9392,7 @@ msgstr "Нема мрежна картичка"
 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 ""
@@ -9383,11 +9424,11 @@ msgstr "На кои сервиси треба да може да се поврз
 #, 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 ""
 "Можете да внесете разни порти.\n"
-"На пример: 139/tcp 139/udp.\n"
+"На пример: 139/tcp 139/udp 600:610/tcp 600:610/udp.\n"
 "Видете ја /etc/services за повеќе информации."
 
 #: network/drakfirewall.pm:176
@@ -9413,324 +9454,272 @@ msgstr "Сите (нема firewall)"
 msgid "Other ports"
 msgstr "Други порти"
 
-#: 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"
-
-#: network/isdn.pm:127
-#, c-format
-msgid ""
-"Select your provider.\n"
-"If it isn't listed, choose Unlisted."
-msgstr ""
-"Изберете го Вашиот провајдер.\n"
-"Ако не е во листете, изберете Неизлистан."
-
-#: network/isdn.pm:140 standalone/drakconnect:503
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Европски протокол (EDSS1)"
-
-#: network/isdn.pm:140
-#, fuzzy, c-format
-msgid "European protocol"
-msgstr "Европски протокол"
-
-#: network/isdn.pm:142 standalone/drakconnect:504
+#: network/isdn.pm:113 network/netconnect.pm:424
 #, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
+msgid "Unlisted - edit manually"
 msgstr ""
-"Протокол за остатокот на Светот\n"
-"Без D-канал (закупени линии)"
 
-#: network/isdn.pm:142
-#, c-format
-msgid "Protocol for the rest of the world"
-msgstr "Протокол за остатокот на Светот"
-
-#: network/isdn.pm:146
-#, c-format
-msgid "Which protocol do you want to use?"
-msgstr "Кој протокол сакате да го користите?"
-
-#: network/isdn.pm:157
-#, c-format
-msgid "Found \"%s\" interface do you want to use it ?"
-msgstr "Најден е \"%s\" интерфејс. Дали сакате да го користите?"
-
-#: network/isdn.pm:164
-#, c-format
-msgid "What kind of card do you have?"
-msgstr "Каков вид на картичка имате?"
-
-#: 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 "Не знам"
+
+#: 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
 #, fuzzy, c-format
 msgid "USB"
 msgstr "LSB"
 
-#: network/isdn.pm:165
-#, c-format
-msgid "I don't know"
-msgstr "Не знам"
-
-#: 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"
-"Ако имате ISA картичка, вредностите на следниот екран би требало да се\n"
-"точни.\n"
-"\n"
-"Ако имате PCMCIA картичка, ќе мора да ги знаете \"irq\" и \"io\" "
-"вредностите\n"
-"за Вашата картичка.\n"
+#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
+#: network/netconnect.pm:579 network/netconnect.pm:596
+#: network/netconnect.pm:612
+#, fuzzy, c-format
+msgid "Manual"
+msgstr "рачно"
 
-#: network/isdn.pm:178
-#, c-format
-msgid "Continue"
-msgstr "Продолжи"
+#: network/netconnect.pm:88 network/netconnect.pm:453
+#: network/netconnect.pm:463 network/netconnect.pm:822
+#: network/netconnect.pm:827
+#, fuzzy, c-format
+msgid "Manual choice"
+msgstr "рачно"
 
-#: network/isdn.pm:178
+#: network/netconnect.pm:88
 #, c-format
-msgid "Abort"
-msgstr "Прекини"
-
-#: network/isdn.pm:184
-#, fuzzy, c-format
-msgid "Which of the following is your ISDN card?"
-msgstr "Која е Вашата ISDN картичка?"
+msgid "Internal ISDN card"
+msgstr "Интерна ISDN картичка"
 
-#: network/netconnect.pm:95
+#: network/netconnect.pm:97
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: network/netconnect.pm:96
+#: network/netconnect.pm:98
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "��"
 
-#: network/netconnect.pm:97
+#: network/netconnect.pm:99
 #, fuzzy, c-format
 msgid "Master"
 msgstr "Мајот"
 
-#: network/netconnect.pm:98
+#: network/netconnect.pm:100
 #, fuzzy, c-format
 msgid "Repeater"
 msgstr "Поврати"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:101
 #, fuzzy, c-format
 msgid "Secondary"
 msgstr "секундарен"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:102
 #, fuzzy, c-format
 msgid "Auto"
 msgstr "За"
 
-#: network/netconnect.pm:103 printer/printerdrake.pm:1118
+#: network/netconnect.pm:105 printer/printerdrake.pm:1133
+#: standalone/drakups:64
 #, fuzzy, c-format
 msgid "Manual configuration"
 msgstr "Рачна конфигурација"
 
-#: network/netconnect.pm:104
+#: network/netconnect.pm:106
 #, fuzzy, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "Автоматска IP"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:108
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr ""
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:111
+#, c-format
+msgid "Protocol for the rest of the world"
+msgstr "Протокол за остатокот на Светот"
+
+#: network/netconnect.pm:113 standalone/drakconnect:528
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Европски протокол (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 ""
+"Протокол за остатокот на Светот\n"
+"Без D-канал (закупени линии)"
+
+#: network/netconnect.pm:146
 #, fuzzy, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Alcatel speedtouch usb"
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:147
 #, fuzzy, c-format
 msgid "Sagem USB modem"
 msgstr "Системски режим"
 
-#: network/netconnect.pm:158
-#, c-format
-msgid "Bewan USB modem"
-msgstr ""
-
-#: network/netconnect.pm:159
+#: network/netconnect.pm:148
 #, c-format
-msgid "Bewan PCI modem"
+msgid "Bewan modem"
 msgstr ""
 
-#: network/netconnect.pm:160
+#: network/netconnect.pm:149
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr ""
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:153
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr ""
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:154
 #, fuzzy, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "Рачна конфигурација"
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:155
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr ""
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:156
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr ""
 
-#: network/netconnect.pm:168
+#: network/netconnect.pm:157
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr ""
 
-#: network/netconnect.pm:172
+#: network/netconnect.pm:161
 #, fuzzy, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Мрежна картичка"
 
-#: network/netconnect.pm:173
+#: network/netconnect.pm:162
 #, fuzzy, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Мрежна картичка"
 
-#: network/netconnect.pm:174
+#: network/netconnect.pm:163
 #, c-format
 msgid "Routed IP LLC"
 msgstr ""
 
-#: network/netconnect.pm:175
+#: network/netconnect.pm:164
 #, c-format
 msgid "Routed IP VC"
 msgstr ""
 
-#: network/netconnect.pm:176
+#: network/netconnect.pm:165
 #, c-format
 msgid "PPPOA LLC"
 msgstr ""
 
-#: network/netconnect.pm:177
+#: network/netconnect.pm:166
 #, c-format
 msgid "PPPOA VC"
 msgstr ""
 
-#: network/netconnect.pm:181 standalone/drakconnect:443
-#: standalone/drakconnect:917
+#: network/netconnect.pm:170 standalone/drakconnect:466
 #, c-format
 msgid "Script-based"
 msgstr "Со скрипта"
 
-#: 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 "Со терминал"
 
-#: 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
 #, fuzzy, c-format
 msgid "PAP/CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:199 standalone/drakconnect:54
+#: network/netconnect.pm:219 standalone/drakconnect:55
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
 msgstr "Конфигурација на мрежа"
 
-#: network/netconnect.pm:205
+#: network/netconnect.pm:225
 #, fuzzy, c-format
 msgid "(detected on port %s)"
 msgstr "детектирано на порта %s"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:207
+#: network/netconnect.pm:227
 #, fuzzy, c-format
 msgid "(detected %s)"
 msgstr "детектирано %s"
 
-#: network/netconnect.pm:207
+#: network/netconnect.pm:227
 #, fuzzy, c-format
 msgid "(detected)"
 msgstr "откриено"
 
-#: network/netconnect.pm:209
+#: network/netconnect.pm:229
 #, fuzzy, c-format
 msgid "Modem connection"
 msgstr "Конекција со winmodem"
 
-#: network/netconnect.pm:210
+#: network/netconnect.pm:230
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN Конекција"
 
-#: network/netconnect.pm:211
+#: network/netconnect.pm:231
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL конекција"
 
-#: network/netconnect.pm:212
+#: network/netconnect.pm:232
 #, c-format
 msgid "Cable connection"
 msgstr "Врска со кабел"
 
-#: network/netconnect.pm:213
+#: network/netconnect.pm:233
 #, c-format
 msgid "LAN connection"
 msgstr "Локална мрежна (LAN) конекција"
 
-#: network/netconnect.pm:214 network/netconnect.pm:228
+#: network/netconnect.pm:234 network/netconnect.pm:248
 #, fuzzy, c-format
 msgid "Wireless connection"
 msgstr "Врска со кабел"
 
-#: network/netconnect.pm:224
+#: network/netconnect.pm:244
 #, fuzzy, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Избери ја конекцијата која сакате да ја конфигурирате"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:261
 #, fuzzy, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -9743,139 +9732,194 @@ msgstr ""
 "\n"
 "Притиснете на Во ред за да продолжиме."
 
-#: network/netconnect.pm:249 network/netconnect.pm:710
+#: network/netconnect.pm:269 network/netconnect.pm:781
 #, fuzzy, c-format
 msgid "Connection Configuration"
 msgstr "Конфигурација на Врска"
 
-#: network/netconnect.pm:250 network/netconnect.pm:711
+#: network/netconnect.pm:270 network/netconnect.pm:782
 #, fuzzy, c-format
 msgid "Please fill or check the field below"
 msgstr "или"
 
-#: network/netconnect.pm:256 standalone/drakconnect:494
-#: standalone/drakconnect:899
+#: network/netconnect.pm:277 standalone/drakconnect:519
 #, c-format
 msgid "Card IRQ"
 msgstr "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 "Мемориска картичка (DMA)"
 
-#: network/netconnect.pm:258 standalone/drakconnect:496
-#: standalone/drakconnect:901
+#: network/netconnect.pm:279 standalone/drakconnect:521
 #, c-format
 msgid "Card IO"
 msgstr "Велзно/Озлезна (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 "Картичка IO_0"
 
-#: network/netconnect.pm:260 standalone/drakconnect:903
+#: network/netconnect.pm:281
 #, c-format
 msgid "Card IO_1"
 msgstr "Картичка IO_1"
 
-#: network/netconnect.pm:261 standalone/drakconnect:904
+#: network/netconnect.pm:282
 #, c-format
 msgid "Your personal phone number"
 msgstr "Вашиот телефонски број"
 
-#: 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 "Име на провајдерот (пр. provajder.net)"
 
-#: network/netconnect.pm:263 standalone/drakconnect:440
-#: standalone/drakconnect:906
+#: network/netconnect.pm:284 standalone/drakconnect:463
 #, c-format
 msgid "Provider phone number"
 msgstr "Телефонски број на Провајдерот"
 
-#: network/netconnect.pm:264
+#: network/netconnect.pm:285
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "Провајдер dns 1 (опција)"
 
-#: network/netconnect.pm:265
+#: network/netconnect.pm:286
 #, fuzzy, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "dns Провајдер 2 (опционо)"
 
-#: 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 "Режим на бирање"
 
-#: 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 "Брзина на поврзување"
 
-#: network/netconnect.pm:268 standalone/drakconnect:406
-#: standalone/drakconnect:924
+#: network/netconnect.pm:289 standalone/drakconnect:429
 #, fuzzy, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Врска во"
 
-#: 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 "Акаунт Пријава (корисничко име)"
 
-#: 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 "Лозинка на акаунтот"
 
-#: network/netconnect.pm:300
-#, c-format
-msgid "What kind is your ISDN connection?"
-msgstr "Од каков вид е Вашата ISDN конекција?"
+#: network/netconnect.pm:323 network/netconnect.pm:637
+#: network/netconnect.pm:820
+#, fuzzy, c-format
+msgid "Select the network interface to configure:"
+msgstr "Изберете го мрежниот интерфејс"
 
-#: network/netconnect.pm:301
-#, c-format
-msgid "Internal ISDN card"
-msgstr "Интерна ISDN картичка"
+#: network/netconnect.pm:323 network/netconnect.pm:457
+#: network/netconnect.pm:641 standalone/drakgw:113 standalone/drakvpn:49
+#, fuzzy, c-format
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "Жалам, ние подржуваме само 2.4 јадра."
 
-#: 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
+#, fuzzy, c-format
+msgid "Net Device"
+msgstr "Мрежни Уреди"
+
+#: network/netconnect.pm:326 network/netconnect.pm:334
 #, c-format
 msgid "External ISDN modem"
 msgstr "Надворешен ISDN модем"
 
-#: network/netconnect.pm:332
+#: network/netconnect.pm:365 standalone/harddrake2:115
+#, c-format
+msgid "Select a device !"
+msgstr "Избери уред!"
+
+#: network/netconnect.pm:374 network/netconnect.pm:384
+#: network/netconnect.pm:394 network/netconnect.pm:410
+#: network/netconnect.pm:421
 #, c-format
-msgid "Do you want to start a new configuration ?"
-msgstr "Дали сакате да ја започнете нова конфигурацијата?"
+msgid "ISDN Configuration"
+msgstr "Конфигурација на ISDN"
 
-#: network/netconnect.pm:335
+#: network/netconnect.pm:375
+#, c-format
+msgid "What kind of card do you have?"
+msgstr "Каков вид на картичка имате?"
+
+#: network/netconnect.pm:385
 #, 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."
+"\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 ""
-"Открив ISDN PCI картичка, но не го знам нејзиниот тип. Ве молам изберете "
-"една PCI картичка на следниот екран."
+"\n"
+"Ако имате ISA картичка, вредностите на следниот екран би требало да се\n"
+"точни.\n"
+"\n"
+"Ако имате PCMCIA картичка, ќе мора да ги знаете \"irq\" и \"io\" "
+"вредностите\n"
+"за Вашата картичка.\n"
+
+#: network/netconnect.pm:389
+#, c-format
+msgid "Continue"
+msgstr "Продолжи"
+
+#: network/netconnect.pm:389
+#, c-format
+msgid "Abort"
+msgstr "Прекини"
+
+#: network/netconnect.pm:395
+#, fuzzy, c-format
+msgid "Which of the following is your ISDN card?"
+msgstr "Која е Вашата ISDN картичка?"
 
-#: network/netconnect.pm:344
+#: network/netconnect.pm:410
 #, c-format
-msgid "No ISDN PCI card found. Please select one on the next screen."
+msgid "Which protocol do you want to use?"
+msgstr "Кој протокол сакате да го користите?"
+
+#: network/netconnect.pm:412 standalone/drakconnect:116
+#: standalone/drakconnect:527 standalone/drakvpn:1140
+#, fuzzy, c-format
+msgid "Protocol"
+msgstr "Протокол"
+
+#: network/netconnect.pm:421
+#, c-format
+msgid ""
+"Select your provider.\n"
+"If it isn't listed, choose Unlisted."
 msgstr ""
-"Не е најдена ISDN PCI картичка. Ве молам изберете една  на следниот екран."
+"Изберете го Вашиот провајдер.\n"
+"Ако не е во листете, изберете Неизлистан."
+
+#: network/netconnect.pm:423 network/netconnect.pm:529
+#: network/netconnect.pm:675
+#, fuzzy, c-format
+msgid "Provider:"
+msgstr "Профил: "
 
-#: network/netconnect.pm:353
+#: network/netconnect.pm:438
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -9884,140 +9928,117 @@ msgstr ""
 "Вашиот модем не е поддржан од системот.\n"
 "Проверете на http://www.linmodems.org"
 
-#: network/netconnect.pm:364
+#: network/netconnect.pm:450
 #, fuzzy, c-format
 msgid "Select the modem to configure:"
 msgstr "Изберете го мрежниот интерфејс"
 
-#: network/netconnect.pm:403
+#: network/netconnect.pm:498
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Изберете на која сериска порта е поврзан Вашиот модем."
 
-#: network/netconnect.pm:427
+#: network/netconnect.pm:527
 #, fuzzy, c-format
 msgid "Select your provider:"
 msgstr "Избор Печатач"
 
-#: network/netconnect.pm:429 network/netconnect.pm:599
-#, fuzzy, c-format
-msgid "Provider:"
-msgstr "Профил: "
-
-#: network/netconnect.pm:481 network/netconnect.pm:482
-#: network/netconnect.pm:483 network/netconnect.pm:508
-#: network/netconnect.pm:525 network/netconnect.pm:541
-#, fuzzy, c-format
-msgid "Manual"
-msgstr "рачно"
-
-#: network/netconnect.pm:485
+#: network/netconnect.pm:556
 #, fuzzy, c-format
 msgid "Dialup: account options"
 msgstr "Опции за бирање број"
 
-#: network/netconnect.pm:488 standalone/drakconnect:913
+#: network/netconnect.pm:559
 #, c-format
 msgid "Connection name"
 msgstr "Име на врска"
 
-#: network/netconnect.pm:489 standalone/drakconnect:914
+#: network/netconnect.pm:560
 #, c-format
 msgid "Phone number"
 msgstr "Телефонски број"
 
-#: network/netconnect.pm:490 standalone/drakconnect:915
+#: network/netconnect.pm:561
 #, c-format
 msgid "Login ID"
 msgstr "Логин идент."
 
-#: network/netconnect.pm:505 network/netconnect.pm:538
+#: network/netconnect.pm:576 network/netconnect.pm:609
 #, fuzzy, c-format
 msgid "Dialup: IP parameters"
 msgstr "Параметри"
 
-#: network/netconnect.pm:508
+#: network/netconnect.pm:579
 #, fuzzy, c-format
 msgid "IP parameters"
 msgstr "Параметри"
 
-#: 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 адреса"
 
-#: network/netconnect.pm:510
+#: network/netconnect.pm:581
 #, fuzzy, c-format
 msgid "Subnet mask"
 msgstr "Subnet Mask:"
 
-#: network/netconnect.pm:522
+#: network/netconnect.pm:593
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr ""
 
-#: network/netconnect.pm:525
+#: network/netconnect.pm:596
 #, fuzzy, c-format
 msgid "DNS"
 msgstr "NIS"
 
-#: network/netconnect.pm:526 standalone/drakconnect:918
+#: network/netconnect.pm:597
 #, c-format
 msgid "Domain name"
 msgstr "Име на домен"
 
-#: 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 "Прв DNS Сервер (ако треба)"
 
-#: 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 "Втор DNS Сервер (ако треба)"
 
-#: network/netconnect.pm:529
+#: network/netconnect.pm:600
 #, fuzzy, c-format
 msgid "Set hostname from IP"
 msgstr "Хост на Печатач или IP"
 
-#: network/netconnect.pm:541 standalone/drakconnect:317
-#: standalone/drakconnect:912
+#: network/netconnect.pm:612 standalone/drakconnect:336
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
-#: network/netconnect.pm:542
+#: network/netconnect.pm:613
 #, fuzzy, c-format
 msgid "Gateway IP address"
 msgstr "IP адреса"
 
-#: network/netconnect.pm:567
+#: network/netconnect.pm:637
 #, fuzzy, c-format
 msgid "ADSL configuration"
 msgstr "LAN конфигурација"
 
-#: network/netconnect.pm:567 network/netconnect.pm:746
-#, fuzzy, c-format
-msgid "Select the network interface to configure:"
-msgstr "Изберете го мрежниот интерфејс"
-
-#: network/netconnect.pm:568 network/netconnect.pm:748 network/shorewall.pm:77
-#: standalone/drakconnect:602 standalone/drakgw:218 standalone/drakvpn:217
-#, fuzzy, c-format
-msgid "Net Device"
-msgstr "Мрежни Уреди"
-
-#: network/netconnect.pm:597
+#: network/netconnect.pm:673
 #, fuzzy, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Ве молам изберете ја вашата земја."
 
-#: network/netconnect.pm:616
+#: network/netconnect.pm:691
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10028,32 +10049,32 @@ msgstr ""
 "Можете да го доставите сега, преку дискета или диск,\n"
 "или можете да прескокнете и тоа да го направите подоцна."
 
-#: network/netconnect.pm:620 network/netconnect.pm:625
+#: network/netconnect.pm:695 network/netconnect.pm:700
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "Зачувај на дискета"
 
-#: network/netconnect.pm:620 network/netconnect.pm:629
+#: network/netconnect.pm:695 network/netconnect.pm:704
 #, fuzzy, c-format
 msgid "Use my Windows partition"
 msgstr "Зголемување/намалување на Windows партиција"
 
-#: network/netconnect.pm:620 network/netconnect.pm:633
+#: network/netconnect.pm:695 network/netconnect.pm:708
 #, c-format
 msgid "Do it later"
 msgstr ""
 
-#: network/netconnect.pm:640
+#: network/netconnect.pm:715
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr ""
 
-#: network/netconnect.pm:647
+#: network/netconnect.pm:722
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr ""
 
-#: network/netconnect.pm:662
+#: network/netconnect.pm:737
 #, fuzzy, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10066,22 +10087,22 @@ msgstr ""
 "http://www.speedtouchdsl.com/dvrreg_lx.htm\n"
 "и ископирајте ја mgmt.o во /usr/share/speedtouch"
 
-#: network/netconnect.pm:719
+#: network/netconnect.pm:790
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr ""
 
-#: network/netconnect.pm:720
+#: network/netconnect.pm:791
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr ""
 
-#: network/netconnect.pm:721
+#: network/netconnect.pm:793
 #, fuzzy, c-format
 msgid "Encapsulation :"
 msgstr "Криптирачки клуч"
 
-#: network/netconnect.pm:736
+#: network/netconnect.pm:810
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10090,17 +10111,7 @@ msgid ""
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
 
-#: network/netconnect.pm:753
-#, fuzzy, c-format
-msgid "No wireless network adapter on your system!"
-msgstr "Нема мрежен адаптер на Вашиот систем!"
-
-#: network/netconnect.pm:754 standalone/drakgw:240 standalone/drakpxe:137
-#, fuzzy, c-format
-msgid "No network adapter on your system!"
-msgstr "Нема мрежен адаптер на Вашиот систем!"
-
-#: network/netconnect.pm:766
+#: network/netconnect.pm:837
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
@@ -10112,24 +10123,33 @@ msgstr ""
 "Едноставно прифатете да го задржите овој уред конфигуриран.\n"
 "Со изменување на полињата долу ќе ја пребришете оваа конфигурација."
 
-#: 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 ""
+"Честитки, мрежната и интернет конфигурацијата е завршена.\n"
+"\n"
+
+#: network/netconnect.pm:864
 #, fuzzy, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconf Име на хост"
 
-#: network/netconnect.pm:785 network/netconnect.pm:816
+#: network/netconnect.pm:865 network/netconnect.pm:899
 #, fuzzy, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "Конфигурација на мрежниот уред %s"
 
-#: network/netconnect.pm:786
+#: network/netconnect.pm:866
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
 "Please choose the one you want to use"
 msgstr ""
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:900
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10140,89 +10160,89 @@ msgstr ""
 "Секој елемент треба да е внесен како IP адреса во точкасто-децимално\n"
 "означување (на пример, 1.2.3.4)."
 
-#: network/netconnect.pm:824
+#: network/netconnect.pm:907
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Додели име на хостот преку DHCP адреса"
 
-#: network/netconnect.pm:825
+#: network/netconnect.pm:908
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP име на хостот"
 
-#: 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 "НЕТМаска"
 
-#: network/netconnect.pm:832 standalone/drakconnect:389
+#: network/netconnect.pm:915 standalone/drakconnect:412
 #, fuzzy, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr "Песна идентификација"
 
-#: network/netconnect.pm:833 standalone/drakconnect:390
+#: network/netconnect.pm:916 standalone/drakconnect:413
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Мрежен Hotplugging"
 
-#: network/netconnect.pm:834 standalone/drakconnect:384
+#: network/netconnect.pm:917 standalone/drakconnect:407
 #, c-format
 msgid "Start at boot"
 msgstr "Стартувај на подигање"
 
-#: network/netconnect.pm:836 standalone/drakconnect:768
+#: network/netconnect.pm:919 standalone/drakconnect:810
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP Клиент"
 
-#: network/netconnect.pm:846 printer/printerdrake.pm:1349
-#: standalone/drakconnect:569
+#: network/netconnect.pm:929 printer/printerdrake.pm:1383
+#: standalone/drakconnect:608
 #, fuzzy, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP адресата треба да биде во следната форма 1.2.3.4"
 
-#: network/netconnect.pm:849
+#: network/netconnect.pm:932
 #, c-format
 msgid "Warning : IP address %s is usually reserved !"
 msgstr "Внимание : IP адресата %s вообичаено е резервирана !"
 
-#: 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 ""
 
-#: network/netconnect.pm:882 standalone/drakconnect:355
+#: network/netconnect.pm:965 standalone/drakconnect:378
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "Експертски режим"
 
-#: network/netconnect.pm:884 standalone/drakconnect:356
+#: network/netconnect.pm:967 standalone/drakconnect:379
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: network/netconnect.pm:885 standalone/drakconnect:357
+#: network/netconnect.pm:968 standalone/drakconnect:380
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Мрежа"
 
-#: network/netconnect.pm:886 standalone/drakconnect:358
+#: network/netconnect.pm:969 standalone/drakconnect:381
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: network/netconnect.pm:887 standalone/drakconnect:359
+#: network/netconnect.pm:970 standalone/drakconnect:382
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: network/netconnect.pm:888 standalone/drakconnect:360
+#: network/netconnect.pm:971 standalone/drakconnect:383
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: network/netconnect.pm:894
+#: network/netconnect.pm:977
 #, fuzzy, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -10231,19 +10251,19 @@ msgstr ""
 "Фреквенцијата треба да има суфикс к, M или G(на пр. \"2.46G\" за 2.46 GHz) "
 "или додадете доволно 0(нули)."
 
-#: network/netconnect.pm:898
+#: network/netconnect.pm:981
 #, fuzzy, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr "M или или."
 
-#: network/netconnect.pm:911 standalone/drakconnect:371
+#: network/netconnect.pm:994 standalone/drakconnect:394
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: network/netconnect.pm:912
+#: network/netconnect.pm:995
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10257,17 +10277,17 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:919 standalone/drakconnect:372
+#: network/netconnect.pm:1002 standalone/drakconnect:395
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Игри"
 
-#: network/netconnect.pm:920 standalone/drakconnect:373
+#: network/netconnect.pm:1003 standalone/drakconnect:396
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:921
+#: network/netconnect.pm:1004
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -10278,12 +10298,12 @@ msgid ""
 msgstr ""
 
 #. -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 ""
 
-#: 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"
@@ -10295,12 +10315,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:937 standalone/drakconnect:375
+#: network/netconnect.pm:1020 standalone/drakconnect:398
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:938
+#: network/netconnect.pm:1021
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10318,7 +10338,7 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:965
+#: network/netconnect.pm:1048
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system.\n"
@@ -10327,18 +10347,18 @@ msgstr ""
 "На Вашиот систем не е детектиран мрежен етернет адаптер.\n"
 "Не моќам да го поставам овој вид на конекција."
 
-#: 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 "Изберете го мрежниот интерфејс"
 
-#: 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 "Изберете мрежен адаптер за поврзување на Интернет"
 
-#: network/netconnect.pm:991
+#: network/netconnect.pm:1074
 #, fuzzy, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10351,84 +10371,84 @@ msgstr ""
 "kancelarija.firma.com\n"
 "Исто така можете да внесете и IP адреса на gateway ако имате"
 
-#: 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 ""
 
-#: network/netconnect.pm:997
+#: network/netconnect.pm:1080 standalone/drakconnect:923
 #, fuzzy, c-format
 msgid "Host name (optional)"
 msgstr "Прв DNS Сервер (ако треба)"
 
-#: network/netconnect.pm:997
+#: network/netconnect.pm:1080
 #, c-format
 msgid "Host name"
 msgstr "Име на хост"
 
-#: network/netconnect.pm:998
+#: network/netconnect.pm:1082
 #, fuzzy, c-format
 msgid "DNS server 1"
 msgstr "DNS сервер"
 
-#: network/netconnect.pm:999
+#: network/netconnect.pm:1083
 #, fuzzy, c-format
 msgid "DNS server 2"
 msgstr "DNS сервер"
 
-#: network/netconnect.pm:1000
+#: network/netconnect.pm:1084
 #, fuzzy, c-format
 msgid "DNS server 3"
 msgstr "DNS сервер"
 
-#: network/netconnect.pm:1001
+#: network/netconnect.pm:1085
 #, fuzzy, c-format
 msgid "Search domain"
 msgstr "NIS Домен"
 
-#: 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 ""
 
-#: network/netconnect.pm:1003
+#: network/netconnect.pm:1087
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Gateway (на пр. %s)"
 
-#: network/netconnect.pm:1005
+#: network/netconnect.pm:1089
 #, c-format
 msgid "Gateway device"
 msgstr "Gateway уред"
 
-#: network/netconnect.pm:1014
+#: network/netconnect.pm:1098
 #, fuzzy, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Адресата на DNS серверот треба да биде во облик 1.2.3.4"
 
-#: network/netconnect.pm:1019 standalone/drakconnect:571
+#: network/netconnect.pm:1103 standalone/drakconnect:611
 #, fuzzy, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "Gateway адресата треба да биде во следната форма 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 "
 "back to other machines on the network:"
 msgstr ""
 
-#: network/netconnect.pm:1031
+#: network/netconnect.pm:1115
 #, fuzzy, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf Име на хост"
 
-#: network/netconnect.pm:1034
+#: network/netconnect.pm:1118
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr ""
 
-#: network/netconnect.pm:1044
+#: network/netconnect.pm:1128
 #, fuzzy, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10438,32 +10458,32 @@ msgstr ""
 "Конфигуриравте  повеќе начини за поврзување на Интернет. \n"
 "Одберете еден кој ќе го користете. \n"
 
-#: network/netconnect.pm:1046
+#: network/netconnect.pm:1130
 #, c-format
 msgid "Internet connection"
 msgstr "Интернет врска"
 
-#: network/netconnect.pm:1054
+#: network/netconnect.pm:1144
 #, c-format
 msgid "Configuration is complete, do you want to apply settings ?"
 msgstr "Конфигурацијата е завршена, дали саката да ги примените подесувањата?"
 
-#: network/netconnect.pm:1070
+#: network/netconnect.pm:1154
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "Дали сакате да ја вклучите конекцијата при подигањето?"
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1166
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it ?"
 msgstr "Мрежата треба да биде рестартирана. Дали сакате да ја рестартирате?"
 
-#: network/netconnect.pm:1100 network/netconnect.pm:1165
+#: network/netconnect.pm:1173 network/netconnect.pm:1238
 #, c-format
 msgid "Network Configuration"
 msgstr "Конфигурација на мрежа"
 
-#: network/netconnect.pm:1101
+#: network/netconnect.pm:1174
 #, c-format
 msgid ""
 "A problem occured while restarting the network: \n"
@@ -10474,27 +10494,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 "Дали сакаш да пробаш да се поврзеш на Интернет сега?"
 
-#: network/netconnect.pm:1118 standalone/drakconnect:958
+#: network/netconnect.pm:1190 standalone/drakconnect:955
 #, c-format
 msgid "Testing your connection..."
 msgstr "Тестирање на вашата конеција."
 
-#: network/netconnect.pm:1134
+#: network/netconnect.pm:1206
 #, fuzzy, c-format
 msgid "The system is now connected to the Internet."
 msgstr "Системот сега е поврзан на Интернет"
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1207
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "Поради безбедносни причини, сега ќе се дисконектира."
 
-#: network/netconnect.pm:1136
+#: network/netconnect.pm:1208
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -10503,16 +10523,7 @@ msgstr ""
 "Системот изгледа дека не е поврзан на Интернет.\n"
 "Пробај да ја реконфигурираш твојата конекција."
 
-#: network/netconnect.pm:1150
-#, c-format
-msgid ""
-"Congratulations, the network and Internet configuration is finished.\n"
-"\n"
-msgstr ""
-"Честитки, мрежната и интернет конфигурацијата е завршена.\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 "
@@ -10521,7 +10532,7 @@ msgstr ""
 "Откако ова ќе заврши, препорачуваме да ја рестартираш Х околината за да "
 "избегнеш секакви хост-ориентирани проблеми."
 
-#: network/netconnect.pm:1154
+#: network/netconnect.pm:1226
 #, c-format
 msgid ""
 "Problems occured during configuration.\n"
@@ -10533,7 +10544,7 @@ msgstr ""
 "конекција не работи, можеби ќе сакате повторно да го отпочнете "
 "конфигурирањето."
 
-#: network/netconnect.pm:1166
+#: network/netconnect.pm:1239
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10545,37 +10556,44 @@ msgstr ""
 "Притиснете на Во ред за да ја задржите моменталната конфигурација, или\n"
 "Откажи за да ја реконфигурирате Вашата Интернет и мрежна врска.\n"
 
-#: network/network.pm:314
+#: network/netconnect.pm:1327
+#, c-format
+msgid ""
+"An unexpected error has happened:\n"
+"%s"
+msgstr ""
+
+#: network/network.pm:315
 #, c-format
 msgid "Proxies configuration"
 msgstr "Конфигурација на proxy северите"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP прокси"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP прокси"
 
-#: network/network.pm:319
+#: network/network.pm:320
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "Проксито треба да биде од облик http://...."
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "Url треба да започнува со ftp:' или 'http:'"
 
-#: network/shorewall.pm:26
+#: network/shorewall.pm:28
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "Детектирана е конфигурација на огнен ѕид"
 
-#: network/shorewall.pm:27
+#: network/shorewall.pm:29
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
@@ -10584,16 +10602,15 @@ msgstr ""
 "Предупредување! Откриена е постоечка конфигурација на огнен ѕид. Можеби "
 "треба нешто рачно да поправите по инсталацијата."
 
-#: network/shorewall.pm:70
-#, fuzzy, c-format
+#: 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 ""
 "Ве молиме внесете го името на интерфејсот за поврзување на Интернет\n"
 "\n"
@@ -10602,34 +10619,34 @@ msgstr ""
 "\t\teth0, или eth1 за кабелска конекција, \n"
 "\t\tippp+ за ISDN конекција. \n"
 
-#: network/tools.pm:207
+#: network/tools.pm:205
 #, c-format
 msgid "Insert floppy"
 msgstr "Внесете дискета"
 
-#: network/tools.pm:208
+#: network/tools.pm:206
 #, fuzzy, c-format
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
 "press %s"
 msgstr "Внесете FAT-форматирана дискета во %s"
 
-#: network/tools.pm:209
+#: network/tools.pm:207
 #, fuzzy, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "Каде сакате да го монтирате уредот %s?"
 
-#: partition_table.pm:642
+#: partition_table.pm:644
 #, c-format
 msgid "mount failed: "
 msgstr "монтирањето неуспешно:"
 
-#: partition_table.pm:747
+#: partition_table.pm:749
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "Продолжената партиција не е подржана на оваа платформа"
 
-#: partition_table.pm:765
+#: partition_table.pm:767
 #, fuzzy, c-format
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
@@ -10640,22 +10657,22 @@ msgstr ""
 " Единствено решение е да ја поместите примарната партиција за да ја имам "
 "цела следна проширена партиција."
 
-#: partition_table.pm:852
+#: partition_table.pm:854
 #, fuzzy, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "s"
 
-#: partition_table.pm:854
+#: partition_table.pm:856
 #, c-format
 msgid "Bad backup file"
 msgstr "Лоша бекап датотека"
 
-#: partition_table.pm:874
+#: partition_table.pm:876
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Грешка при запишувањето во датотеката %s"
 
-#: partition_table/raw.pm:181
+#: partition_table/raw.pm:187
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -10693,70 +10710,70 @@ msgstr "убаво"
 msgid "maybe"
 msgstr "можеи"
 
-#: printer/cups.pm:87
+#: printer/cups.pm:103
 #, c-format
 msgid "(on %s)"
 msgstr "(вклучено %s)"
 
-#: printer/cups.pm:87
+#: printer/cups.pm:103
 #, fuzzy, c-format
 msgid "(on this machine)"
 msgstr "(на овој компјутер)"
 
-#: printer/cups.pm:99 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:197
 #, fuzzy, c-format
 msgid "Configured on other machines"
 msgstr "Конфигурирај ги сервисите"
 
-#: printer/cups.pm:101
+#: printer/cups.pm:117
 #, c-format
 msgid "On CUPS server \"%s\""
 msgstr "На CUPS сервер \"%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
 #, fuzzy, c-format
 msgid " (Default)"
 msgstr "Предефинирано"
 
-#: printer/data.pm:21
+#: printer/data.pm:22
 #, c-format
 msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - Print, Don't Queue"
 
-#: 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 "LPD - Line Printer Daemon"
 
-#: printer/data.pm:34
+#: printer/data.pm:35
 #, c-format
 msgid "LPD"
 msgstr "LPD"
 
-#: printer/data.pm:55
+#: printer/data.pm:56
 #, fuzzy, c-format
 msgid "LPRng - LPR New Generation"
 msgstr "LPRng - LPR Нова Генерација"
 
-#: printer/data.pm:56
+#: printer/data.pm:57
 #, c-format
 msgid "LPRng"
 msgstr "LPRng"
 
-#: printer/data.pm:81
+#: printer/data.pm:82
 #, fuzzy, c-format
 msgid "CUPS - Common Unix Printing System"
 msgstr "CUPS - Common Unix Систем за Печатење"
 
 #: 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 "Непознат Модел"
@@ -10776,7 +10793,7 @@ msgstr "Оддалечен принтер"
 msgid "Printer on remote CUPS server"
 msgstr "Печатач на оддалечен CUPS сервер"
 
-#: printer/main.pm:31 printer/printerdrake.pm:1372
+#: printer/main.pm:31 printer/printerdrake.pm:1406
 #, fuzzy, c-format
 msgid "Printer on remote lpd server"
 msgstr "Печатач од локален lpd сервер"
@@ -10796,7 +10813,7 @@ msgstr "Печатач на SMB/Windows 95/98/NT сервер"
 msgid "Printer on NetWare server"
 msgstr "Печатач Вклучено"
 
-#: 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 "Поврзете го принтерот"
@@ -10807,8 +10824,8 @@ msgid "Pipe job into a command"
 msgstr ""
 
 #: 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
 #, fuzzy, c-format
 msgid "Unknown model"
 msgstr "Непознат модел"
@@ -10818,12 +10835,12 @@ msgstr "Непознат модел"
 msgid "Configured on this machine"
 msgstr "(на овој компјутер)"
 
-#: printer/main.pm:337 printer/printerdrake.pm:948
+#: printer/main.pm:337 printer/printerdrake.pm:963
 #, fuzzy, c-format
 msgid " on parallel port #%s"
 msgstr "на паралелна порта #%s"
 
-#: printer/main.pm:340 printer/printerdrake.pm:950
+#: printer/main.pm:340 printer/printerdrake.pm:965
 #, fuzzy, c-format
 msgid ", USB printer #%s"
 msgstr "USB"
@@ -10893,8 +10910,8 @@ msgstr ", користи команда %s"
 msgid "Parallel port #%s"
 msgstr "на паралелна порта #%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 принтер #%s"
@@ -10964,8 +10981,8 @@ msgstr ", користи команда %s"
 msgid "URI: %s"
 msgstr ""
 
-#: printer/main.pm:571 printer/printerdrake.pm:725
-#: printer/printerdrake.pm:2331
+#: printer/main.pm:571 printer/printerdrake.pm:732
+#: printer/printerdrake.pm:2463
 #, fuzzy, c-format
 msgid "Raw printer (No driver)"
 msgstr "Нема драјвер за принтерот"
@@ -11017,7 +11034,7 @@ msgstr "CUPS принтерска конфигурација"
 #, 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 ""
 "Овде можете да изберете дали принтерите поврзани на оваа машина можат да "
 "бидат достапни од оддалечени машини и тоа од кои оддалечени машини."
@@ -11051,8 +11068,8 @@ msgstr "Спуштање на мрежата"
 msgid "Custom configuration"
 msgstr "Автоматски"
 
-#: printer/printerdrake.pm:78 standalone/scannerdrake:554
-#: standalone/scannerdrake:571
+#: printer/printerdrake.pm:78 standalone/scannerdrake:561
+#: standalone/scannerdrake:578
 #, fuzzy, c-format
 msgid "No remote machines"
 msgstr "Нема локални компјутери"
@@ -11265,7 +11282,7 @@ msgstr "IP адреса на Сервер недостига!"
 msgid "The entered IP is not correct.\n"
 msgstr "Внесената IP не е точна.\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 "Пората треба да биде во integer!"
@@ -11275,36 +11292,37 @@ msgstr "Пората треба да биде во integer!"
 msgid "This server is already in the list, it cannot be added again.\n"
 msgstr "Овој сервер веќе е во листата, не може да се додаде пак.\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
 #, fuzzy, c-format
 msgid "Port"
 msgstr "Порт"
 
 #: 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"
@@ -11334,7 +11352,7 @@ msgstr ""
 "\n"
 " Печатачи Вклучено на."
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:3807
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
 #, c-format
 msgid ""
 "\n"
@@ -11343,8 +11361,9 @@ msgid ""
 msgstr ""
 
 #: printer/printerdrake.pm:515
-#, c-format
-msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
+#, fuzzy, c-format
+msgid ""
+"Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
 msgstr "Принтерска авто-детекција (Локален, TCP/Socket, и SMB принтери)"
 
 #: printer/printerdrake.pm:545
@@ -11352,19 +11371,19 @@ msgstr "Принтерска авто-детекција (Локален, TCP/So
 msgid "Checking your system..."
 msgstr "Вашиот систем се проверува..."
 
-#: printer/printerdrake.pm:560
+#: printer/printerdrake.pm:561
 #, c-format
 msgid "and one unknown printer"
 msgstr "и еден непознат принтер"
 
-#: printer/printerdrake.pm:562
+#: printer/printerdrake.pm:563
 #, fuzzy, c-format
 msgid "and %d unknown printers"
 msgstr ""
 "�%d непознати принтери\n"
 " и непознато "
 
-#: printer/printerdrake.pm:566
+#: printer/printerdrake.pm:567
 #, fuzzy, c-format
 msgid ""
 "The following printers\n"
@@ -11375,7 +11394,7 @@ msgstr ""
 "\n"
 " непознато на"
 
-#: printer/printerdrake.pm:568
+#: printer/printerdrake.pm:569
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11388,7 +11407,7 @@ msgstr ""
 "%s%s\n"
 "се директно поврзани на твојот систем"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:570
 #, fuzzy, c-format
 msgid ""
 "The following printer\n"
@@ -11399,7 +11418,7 @@ msgstr ""
 "\n"
 " непознато на"
 
-#: printer/printerdrake.pm:573
+#: printer/printerdrake.pm:574
 #, c-format
 msgid ""
 "\n"
@@ -11408,7 +11427,7 @@ msgstr ""
 "\n"
 "Има еден непознат принтер директно поврзан на твојот систем"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:575
 #, c-format
 msgid ""
 "\n"
@@ -11417,18 +11436,18 @@ msgstr ""
 "\n"
 " Има %d непознати принтери дирекно поврзани со Вашиот систем"
 
-#: printer/printerdrake.pm:577
+#: printer/printerdrake.pm:578
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr "Не се пронајдени принтери кои се директно поврзани со вашата машина"
 
-#: printer/printerdrake.pm:580
+#: printer/printerdrake.pm:581
 #, fuzzy, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr "(Бидете сигурни дека сите принтери се поврзани и уклучени)."
 
-#: printer/printerdrake.pm:593
+#: printer/printerdrake.pm:594
 #, c-format
 msgid ""
 "Do you want to enable printing on the printers mentioned above or on "
@@ -11437,23 +11456,23 @@ msgstr ""
 "Дали сакате да овозможите печатење на принтерите споменати погоре или на "
 "принтерите во локалната мрежа?\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 "Дали сакате да овозможите печатење на принтери во локалната мрежа?\n"
 
-#: printer/printerdrake.pm:596
+#: printer/printerdrake.pm:597
 #, fuzzy, c-format
 msgid "Do you want to enable printing on the printers mentioned above?\n"
 msgstr "Дали сакате да биде овозможено печатење на принтерите ?"
 
-#: printer/printerdrake.pm:597
+#: printer/printerdrake.pm:598
 #, fuzzy, c-format
 msgid "Are you sure that you want to set up printing on this machine?\n"
 msgstr ""
 "Дали сте сигурни дека сакате да го сетирате печатењето на овој компјутер?\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 "
@@ -11462,48 +11481,48 @@ msgstr ""
 "ЗАБЕЛЕШКА: Во зависност од моделот на принтерот и на принтерскиот систем, ќе "
 "биде инсталиран дополнителен софтвер до %d MB."
 
-#: printer/printerdrake.pm:622
+#: printer/printerdrake.pm:629
 #, fuzzy, c-format
 msgid "Searching for new printers..."
 msgstr "Барање на нови принтери..."
 
-#: printer/printerdrake.pm:706
+#: printer/printerdrake.pm:713
 #, fuzzy, c-format
 msgid "Configuring printer ..."
 msgstr "Конфигурирање на принтер..."
 
-#: 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 "Конфигурање на принтерот \"%s\"..."
 
-#: 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 " Вклучено "
 
-#: 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
 #, fuzzy, c-format
 msgid "Printer model selection"
 msgstr "Печатач"
 
-#: 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 "Кој модел на принтер го имате?"
 
-#: printer/printerdrake.pm:736
+#: printer/printerdrake.pm:743
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -11516,7 +11535,7 @@ msgstr ""
 "Printerdrake не може да го препознае моделот на Вашиот принтер. Ве молиме "
 "изберете го моделот од листата."
 
-#: 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 "
@@ -11525,21 +11544,21 @@ msgstr ""
 "ако твојот принтер не е во листата, изберете сличен(видете во упатството на "
 "принтерот)"
 
-#: 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 "Конфигурирање на апликации..."
 
-#: 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
 #, fuzzy, c-format
 msgid "Add a new printer"
 msgstr "Додај"
 
-#: printer/printerdrake.pm:825
+#: printer/printerdrake.pm:832
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -11559,7 +11578,7 @@ msgstr ""
 "\n"
 " на и на достапен и."
 
-#: printer/printerdrake.pm:838
+#: printer/printerdrake.pm:845
 #, c-format
 msgid ""
 "\n"
@@ -11604,7 +11623,7 @@ msgstr ""
 "Кликнете на \"Следно\" кога сте спремни, и на \"Откажи\" ако не сакате сега "
 "да правите подесување на печатарот(рите)."
 
-#: printer/printerdrake.pm:847
+#: printer/printerdrake.pm:854
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -11630,7 +11649,7 @@ msgstr ""
 " Клинете на \"Следно\" кога сте подготвени или \"Откажи\" ако не сакате сега "
 "да го/и поставите Вашиот/те принтер/и."
 
-#: printer/printerdrake.pm:855
+#: printer/printerdrake.pm:862
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -11661,7 +11680,7 @@ msgstr ""
 "\n"
 " Вклучено Следно и Вклучено Откажи на s."
 
-#: printer/printerdrake.pm:864
+#: printer/printerdrake.pm:871
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -11687,24 +11706,24 @@ msgstr ""
 " Клинете на \"Следно\" кога сте подготвени или \"Откажи\" ако не сакате сега "
 "да го/и поставите Вашиот/те принтер/и."
 
-#: printer/printerdrake.pm:873
+#: printer/printerdrake.pm:880
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "Авто-откривање на принтери поврзани со оваа машина"
 
-#: printer/printerdrake.pm:876
+#: printer/printerdrake.pm:883
 #, fuzzy, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "Автоматско детектирање на принтери, конектирани на локална мрежа"
 
-#: printer/printerdrake.pm:879
+#: printer/printerdrake.pm:886
 #, fuzzy, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 "Автоматски детектирај ги принтерите кои се поврзани на кошмјутери со "
 "Microsoft Windows оперативни системи."
 
-#: printer/printerdrake.pm:895
+#: printer/printerdrake.pm:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -11727,54 +11746,70 @@ msgstr ""
 "ги промените неговите опцииодберете \"Печатач\" во \"Хардвер\" секцијата на "
 "section of the Mandrake Control Центарот."
 
-#: 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
+#, fuzzy, c-format
+msgid "Could not install the %s packages!"
+msgstr "Инсталирање на пакетот %s"
+
+#: printer/printerdrake.pm:939
+#, c-format
+msgid "Skipping Windows/SMB server auto-detection"
+msgstr ""
+
+#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
 #, fuzzy, c-format
 msgid "Printer auto-detection"
 msgstr "Автоматска детрекција на принтер"
 
-#: printer/printerdrake.pm:930
+#: printer/printerdrake.pm:945
 #, c-format
 msgid "Detecting devices..."
 msgstr "Детектирање уреди..."
 
-#: printer/printerdrake.pm:952
+#: printer/printerdrake.pm:967
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", мрежен принтер \"%s\",порт %s"
 
-#: printer/printerdrake.pm:954
+#: printer/printerdrake.pm:969
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", принтер \"%s\" на SMB/Windows сервер \"%s\""
 
-#: printer/printerdrake.pm:958
+#: printer/printerdrake.pm:973
 #, c-format
 msgid "Detected %s"
 msgstr "Откриено %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 "Печатач на паралелна порта #%s"
 
-#: printer/printerdrake.pm:966
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Мрежен принтер \"%s\", порт %s"
 
-#: printer/printerdrake.pm:968
+#: printer/printerdrake.pm:983
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "Принтер \"%s\" на SMB/Windows сервер \"%s\""
 
-#: printer/printerdrake.pm:1047
+#: printer/printerdrake.pm:1062
 #, c-format
 msgid "Local Printer"
 msgstr "Локален Печатач"
 
-#: printer/printerdrake.pm:1048
+#: printer/printerdrake.pm:1063
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -11787,39 +11822,39 @@ msgstr ""
 "dev/lp1, ..., е исто како и LPT1:, LPT2:, ..., 1-ви USB принтер: /dev/usb/"
 "lp0, 2-ри USB принтер: /dev/usb/lp1, ...)."
 
-#: printer/printerdrake.pm:1052
+#: printer/printerdrake.pm:1067
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "Мора да внесете име на уредот или име на датотеката!"
 
-#: printer/printerdrake.pm:1061
+#: printer/printerdrake.pm:1076
 #, fuzzy, c-format
 msgid "No printer found!"
 msgstr "Нема пронајдено принтер!"
 
-#: printer/printerdrake.pm:1069
+#: printer/printerdrake.pm:1084
 #, c-format
 msgid "Local Printers"
 msgstr "Локалени Притнери"
 
-#: printer/printerdrake.pm:1070
+#: printer/printerdrake.pm:1085
 #, c-format
 msgid "Available printers"
 msgstr "Пристапни принтери"
 
-#: 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 "Принтерот е автоматски детектиран."
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1091
 #, fuzzy, c-format
 msgid ""
 "If it is not the one you want to configure, enter a device name/file name in "
 "the input line"
 msgstr "на име име во"
 
-#: printer/printerdrake.pm:1077
+#: printer/printerdrake.pm:1092
 #, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
@@ -11827,19 +11862,19 @@ msgstr ""
 "Алтернативно, може да одредите име на уредот/име на датотека во влезната "
 "линија"
 
-#: 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 "Ова е листа на автоматски детектирани принтери"
 
-#: printer/printerdrake.pm:1080
+#: printer/printerdrake.pm:1095
 #, fuzzy, c-format
 msgid ""
 "Please choose the printer you want to set up or enter a device name/file "
 "name in the input line"
 msgstr "на или име име во"
 
-#: 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 "
@@ -11848,7 +11883,7 @@ msgstr ""
 "Ве молиме изберете го принтерот на кој што треба да се зададат принтерските "
 "задачи или внесете име на уредот/име на датотеката во влезната линија"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1100
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -11859,12 +11894,12 @@ msgstr ""
 "принтер не беше препознаен исправно или ако сакаш рачна конфигурација, "
 "вклучи \"Рачна конфигурација\"."
 
-#: printer/printerdrake.pm:1086
+#: printer/printerdrake.pm:1101
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "Моментално, ниедна друга можност не е достапна"
 
-#: printer/printerdrake.pm:1089
+#: printer/printerdrake.pm:1104
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -11877,12 +11912,12 @@ msgstr ""
 "пронајден или пак преферирате сопствена конфигурација на принтерот, вклучете"
 "\"Рачна конфигурација\"."
 
-#: printer/printerdrake.pm:1090
+#: printer/printerdrake.pm:1105
 #, fuzzy, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "Ве молиме одберет принтер со кој ќе работите"
 
-#: 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 "
@@ -11891,95 +11926,103 @@ msgstr ""
 "Ве молиме изберете порта на која е приклучен вашиот принтер или внесете име "
 "на уред/име на датотека во линијата за внес"
 
-#: printer/printerdrake.pm:1093
+#: printer/printerdrake.pm:1108
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "Ве молиме изберете го портот на кој е поврзан вашиот принтер."
 
-#: printer/printerdrake.pm:1095
+#: printer/printerdrake.pm:1110
 #, fuzzy, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
 "1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
 msgstr "Паралелен на 1-ви USB 2-ри USB."
 
-#: printer/printerdrake.pm:1099
+#: printer/printerdrake.pm:1114
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "Мора да изберете/внесете принтер/уред!"
 
-#: 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
+#, fuzzy, c-format
+msgid "Aborting"
+msgstr "Прекини"
+
+#: printer/printerdrake.pm:1189
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "Опции за Нелокален lpd Печатач"
 
-#: printer/printerdrake.pm:1169
+#: printer/printerdrake.pm:1190
 #, fuzzy, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
 "server and the printer name on that server."
 msgstr "До на и име Вклучено."
 
-#: printer/printerdrake.pm:1170
+#: printer/printerdrake.pm:1191
 #, fuzzy, c-format
 msgid "Remote host name"
 msgstr "Локален хост"
 
-#: printer/printerdrake.pm:1171
+#: printer/printerdrake.pm:1192
 #, fuzzy, c-format
 msgid "Remote printer name"
 msgstr "Нелокален"
 
-#: printer/printerdrake.pm:1174
+#: printer/printerdrake.pm:1195
 #, c-format
 msgid "Remote host name missing!"
 msgstr "Недостасува името на локалениот хост!"
 
-#: printer/printerdrake.pm:1178
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "Недостига име на оддалечен принтер!"
 
-#: 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 "Информации"
 
-#: printer/printerdrake.pm:1200 printer/printerdrake.pm:1714
+#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
 #, fuzzy, c-format
 msgid "Detected model: %s %s"
 msgstr "Детектиран модел: %s %s"
 
-#: printer/printerdrake.pm:1276 printer/printerdrake.pm:1516
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
 #, c-format
 msgid "Scanning network..."
 msgstr "Скенирам мрежа..."
 
-#: 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 ", принтер \"%s\" на сервер \"%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 "Принтер \"%s\" на сервер \"%s\""
 
-#: printer/printerdrake.pm:1332
+#: printer/printerdrake.pm:1366
 #, fuzzy, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT Опции за Печатач"
 
-#: printer/printerdrake.pm:1333
+#: printer/printerdrake.pm:1367
 #, fuzzy, c-format
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -11988,7 +12031,7 @@ msgid ""
 "access and any applicable user name, password, and workgroup information."
 msgstr "До на на име Забелешка IP и IP име на и име и."
 
-#: printer/printerdrake.pm:1334
+#: printer/printerdrake.pm:1368
 #, fuzzy, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -11998,47 +12041,47 @@ msgstr ""
 "додадете корисничко име, лозинка и/или група на корисници, ако е тоа "
 "потребно."
 
-#: printer/printerdrake.pm:1336
+#: printer/printerdrake.pm:1370
 #, c-format
 msgid "SMB server host"
 msgstr "SMB компјутерски сервер"
 
-#: printer/printerdrake.pm:1337
+#: printer/printerdrake.pm:1371
 #, c-format
 msgid "SMB server IP"
 msgstr "IP на SBM сервер"
 
-#: printer/printerdrake.pm:1338
+#: printer/printerdrake.pm:1372
 #, c-format
 msgid "Share name"
 msgstr "Заедничко име"
 
-#: printer/printerdrake.pm:1341
+#: printer/printerdrake.pm:1375
 #, fuzzy, c-format
 msgid "Workgroup"
 msgstr "Работна група"
 
-#: printer/printerdrake.pm:1343
+#: printer/printerdrake.pm:1377
 #, c-format
 msgid "Auto-detected"
 msgstr "Автоматски-детектирано"
 
-#: printer/printerdrake.pm:1353
+#: printer/printerdrake.pm:1387
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "Или Името на серверот или неговата IP мора да бидат дадени!"
 
-#: printer/printerdrake.pm:1357
+#: printer/printerdrake.pm:1391
 #, fuzzy, c-format
 msgid "Samba share name missing!"
 msgstr "Samba име!"
 
-#: printer/printerdrake.pm:1363
+#: printer/printerdrake.pm:1397
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "СИГУРНОСНО ВНИМАНИЕ!"
 
-#: printer/printerdrake.pm:1364
+#: printer/printerdrake.pm:1398
 #, fuzzy, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -12069,7 +12112,7 @@ msgstr ""
 "\n"
 " Прозорци на достапен s тип во\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 "
@@ -12082,7 +12125,7 @@ msgstr ""
 "конекција во Printerdrake.\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) "
@@ -12096,12 +12139,12 @@ msgstr ""
 "\n"
 "Дали навистина сакаш да продолжиш да го подесиш принтерот како што е сега?"
 
-#: printer/printerdrake.pm:1449
+#: printer/printerdrake.pm:1489
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "NetWare Опции за Печатач"
 
-#: 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 "
@@ -12114,42 +12157,42 @@ msgstr ""
 "име!) како и името на задачата за печатење за печатарот до кој сакате да "
 "имате пристап и било кое корисничко име и лозинка."
 
-#: printer/printerdrake.pm:1451
+#: printer/printerdrake.pm:1491
 #, fuzzy, c-format
 msgid "Printer Server"
 msgstr "Сервер Печатач"
 
-#: printer/printerdrake.pm:1452
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Print Queue Name"
 msgstr "Печати ги имињата во Редицата"
 
-#: printer/printerdrake.pm:1457
+#: printer/printerdrake.pm:1497
 #, c-format
 msgid "NCP server name missing!"
 msgstr "Недостасува името на NCP сервер!"
 
-#: printer/printerdrake.pm:1461
+#: printer/printerdrake.pm:1501
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "Недостига името на NCP редицата!"
 
-#: printer/printerdrake.pm:1527 printer/printerdrake.pm:1547
+#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", хост \"%s\", порта %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 "Компјутер \"%s\", порт %s"
 
-#: printer/printerdrake.pm:1571
+#: printer/printerdrake.pm:1618
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "TCP/Socket Принтерски Опции"
 
-#: printer/printerdrake.pm:1573
+#: printer/printerdrake.pm:1620
 #, fuzzy, c-format
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
@@ -12158,7 +12201,7 @@ msgstr ""
 "Избери  една од авто-детектираните принтери од листата или внесете го "
 "хостотили IP адресата и портата (дефаулт е 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 "
@@ -12172,22 +12215,27 @@ msgstr ""
 "9100, на други сервери бројот може да бидепроменлив. Видете во прирачникот "
 "за вашиот хардвер."
 
-#: printer/printerdrake.pm:1578
+#: printer/printerdrake.pm:1625
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "Име на принтерки хост или IP недостасуваат!"
 
-#: printer/printerdrake.pm:1601
+#: printer/printerdrake.pm:1648
 #, fuzzy, c-format
 msgid "Printer host name or IP"
 msgstr "Хост на Печатач или IP"
 
-#: printer/printerdrake.pm:1649 printer/printerdrake.pm:1651
+#: printer/printerdrake.pm:1704
+#, fuzzy, c-format
+msgid "Refreshing Device URI list..."
+msgstr "податок."
+
+#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
 #, c-format
 msgid "Printer Device URI"
 msgstr "Уред за Печатење 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 "
@@ -12198,17 +12246,17 @@ msgstr ""
 "задоволува спецификациите на CUPS или на Foomatic. Забележете дека не сите "
 "видови на URI се подржани од сите спулери."
 
-#: printer/printerdrake.pm:1668
+#: printer/printerdrake.pm:1731
 #, fuzzy, c-format
 msgid "A valid URI must be entered!"
 msgstr "Мора да се внесе валиедн URI!"
 
-#: printer/printerdrake.pm:1749
+#: printer/printerdrake.pm:1834
 #, c-format
 msgid "Pipe into command"
 msgstr "Смести во команда"
 
-#: 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 "
@@ -12217,17 +12265,17 @@ msgstr ""
 "Овде можете да специфицирате било каква своеволна командна линија во која "
 "што работата ќе биде сместена наместо директно да се праќа на принтерот."
 
-#: printer/printerdrake.pm:1751
+#: printer/printerdrake.pm:1836
 #, c-format
 msgid "Command line"
 msgstr "Командна линија"
 
-#: printer/printerdrake.pm:1755
+#: printer/printerdrake.pm:1840
 #, fuzzy, c-format
 msgid "A command line must be entered!"
 msgstr "Мора да внесете команда!"
 
-#: printer/printerdrake.pm:1788
+#: printer/printerdrake.pm:1873
 #, fuzzy, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -12238,58 +12286,73 @@ msgstr ""
 "LaserJet 1100/1200/1220/3200/3300 со скенер, Sony IJP-V100),  HP PhotoSmart "
 "или HP LaserJet 2200?"
 
-#: printer/printerdrake.pm:1801
+#: printer/printerdrake.pm:1887
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "Инсталирање на HPOJ пакет..."
 
-#: printer/printerdrake.pm:1809 printer/printerdrake.pm:1893
+#: printer/printerdrake.pm:1894
+#, c-format
+msgid "Only printing will be possible on the %s."
+msgstr ""
+
+#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
 #, c-format
 msgid "Checking device and configuring HPOJ..."
 msgstr "Го проверува уредот и конфигурирање на  HPOJ..."
 
-#: printer/printerdrake.pm:1831
+#: printer/printerdrake.pm:1946
 #, fuzzy, c-format
 msgid "Installing SANE packages..."
 msgstr "Инсталирање."
 
-#: printer/printerdrake.pm:1858
+#: printer/printerdrake.pm:1956
+#, c-format
+msgid "Scanning on the %s will not be possible."
+msgstr ""
+
+#: printer/printerdrake.pm:1983
 #, fuzzy, c-format
 msgid "Installing mtools packages..."
 msgstr "Инсталирање на mtools пакетите..."
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1990
+#, fuzzy, c-format
+msgid "Photo memory card access on the %s will not be possible."
+msgstr "Пристап до апартските мемориски картички на HP повеќе-функциски уред"
+
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "Се скенира твојот НР повеќе-функциски уред"
 
-#: printer/printerdrake.pm:1881
+#: printer/printerdrake.pm:2013
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr "Пристап до апартските мемориски картички на HP повеќе-функциски уред"
 
-#: printer/printerdrake.pm:1930
+#: printer/printerdrake.pm:2062
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "Правам печатарската порта да биде достапна за CUPS..."
 
-#: 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 "Читање на базата на принтерот..."
 
-#: printer/printerdrake.pm:2149
+#: printer/printerdrake.pm:2281
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "Внесете го името на принтерот и коментар"
 
-#: printer/printerdrake.pm:2153 printer/printerdrake.pm:3241
+#: printer/printerdrake.pm:2285 printer/printerdrake.pm:3421
 #, fuzzy, c-format
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr "Име на принтерот треба да содржи само букви и бројки"
 
-#: printer/printerdrake.pm:2159 printer/printerdrake.pm:3246
+#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3426
 #, fuzzy, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
@@ -12298,7 +12361,7 @@ msgstr ""
 "Печатачот \"%s\" веќе постои\n"
 " дали сакате да ја препишете конфигурацијата?"
 
-#: printer/printerdrake.pm:2168
+#: printer/printerdrake.pm:2300
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -12307,35 +12370,35 @@ msgstr ""
 "На секој принтер му е потребно име (на пример \"принтер\"). Полињата за "
 "Описот и Локацијата не мора да се пополнети. Тоа се коментари за корисниците."
 
-#: printer/printerdrake.pm:2169
+#: printer/printerdrake.pm:2301
 #, fuzzy, c-format
 msgid "Name of printer"
 msgstr "Име на принтерот"
 
-#: 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 "Опис"
 
-#: printer/printerdrake.pm:2171 standalone/printerdrake:212
+#: printer/printerdrake.pm:2303 standalone/printerdrake:212
 #: standalone/printerdrake:219
 #, c-format
 msgid "Location"
 msgstr "Локација"
 
-#: printer/printerdrake.pm:2188
+#: printer/printerdrake.pm:2320
 #, c-format
 msgid "Preparing printer database..."
 msgstr "Подготовка на базата на податоци за принтерот..."
 
-#: printer/printerdrake.pm:2306
+#: printer/printerdrake.pm:2438
 #, c-format
 msgid "Your printer model"
 msgstr "Моделот на Вашиот печатч"
 
-#: printer/printerdrake.pm:2307
+#: printer/printerdrake.pm:2439
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -12361,18 +12424,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 "Моделот е точен"
 
-#: printer/printerdrake.pm:2313 printer/printerdrake.pm:2314
-#: printer/printerdrake.pm:2317
+#: printer/printerdrake.pm:2445 printer/printerdrake.pm:2446
+#: printer/printerdrake.pm:2449
 #, fuzzy, c-format
 msgid "Select model manually"
 msgstr "Избери го моделот рачно"
 
-#: printer/printerdrake.pm:2340
+#: printer/printerdrake.pm:2472
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12385,38 +12448,38 @@ msgstr ""
 "\n"
 " Пребарај во Вклучено или Вклучено."
 
-#: printer/printerdrake.pm:2359
+#: printer/printerdrake.pm:2491
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr ""
 
-#: printer/printerdrake.pm:2390
+#: printer/printerdrake.pm:2522
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
 "printer's options and features."
 msgstr ""
 
-#: 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 "
 "delivered with the printer."
 msgstr ""
 
-#: 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 ""
 
-#: 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 "
 "your Windows partition, too."
 msgstr ""
 
-#: 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 "
@@ -12424,65 +12487,65 @@ msgid ""
 "printer's hardware"
 msgstr ""
 
-#: 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 "
 "then be used for the setup of your printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2397
+#: printer/printerdrake.pm:2529
 #, fuzzy, c-format
 msgid "Install PPD file from"
 msgstr "Инсталирај rpm"
 
-#: 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
 #, fuzzy, c-format
 msgid "CD-ROM"
 msgstr "CDROM"
 
-#: 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
 #, fuzzy, c-format
 msgid "Floppy Disk"
 msgstr "Floppy"
 
-#: 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
 #, fuzzy, c-format
 msgid "Other place"
 msgstr "Други порти"
 
-#: printer/printerdrake.pm:2416
+#: printer/printerdrake.pm:2548
 #, fuzzy, c-format
 msgid "Select PPD file"
 msgstr "Избор на датотека"
 
-#: printer/printerdrake.pm:2420
+#: printer/printerdrake.pm:2552
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr ""
 
-#: printer/printerdrake.pm:2426
+#: printer/printerdrake.pm:2558
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr ""
 
-#: printer/printerdrake.pm:2437
+#: printer/printerdrake.pm:2569
 #, fuzzy, c-format
 msgid "Installing PPD file..."
 msgstr "Се инсталира %s ..."
 
-#: printer/printerdrake.pm:2539
+#: printer/printerdrake.pm:2682
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "OKI принтер конфигурација"
 
-#: printer/printerdrake.pm:2540
+#: printer/printerdrake.pm:2683
 #, fuzzy, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -12495,12 +12558,12 @@ msgstr ""
 "\n"
 " и на на или на на тип игнориран."
 
-#: printer/printerdrake.pm:2564 printer/printerdrake.pm:2593
+#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Конфигурација на Lexmark inkjet"
 
-#: printer/printerdrake.pm:2565
+#: printer/printerdrake.pm:2708
 #, fuzzy, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -12514,7 +12577,7 @@ msgstr ""
 "поврзување на локални порти или конфигурирајте го за компјутерот каде тој е "
 "приклучен. "
 
-#: printer/printerdrake.pm:2594
+#: printer/printerdrake.pm:2737
 #, fuzzy, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -12527,12 +12590,31 @@ msgid ""
 "adjust the head alignment settings with this program."
 msgstr "До на иhttp://www.lexmark. Вклучено линк и Linux или на Откажи и."
 
-#: printer/printerdrake.pm:2597
+#: printer/printerdrake.pm:2746
+#, fuzzy, c-format
+msgid "Lexmark X125 configuration"
+msgstr "Конфигурација на Lexmark inkjet"
+
+#: printer/printerdrake.pm:2747
+#, fuzzy, 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 ""
+"не Вклучено или на или Вклучено на.Драјверите на Инкџет принтерите од "
+"Lexmark поддржуваат само локални принтери, не и принтери од локални "
+"компјутери или од сервери. Ве молиме сетирајте го Вашиот принтер за "
+"поврзување на локални порти или конфигурирајте го за компјутерот каде тој е "
+"приклучен. "
+
+#: printer/printerdrake.pm:2765
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr ""
 
-#: printer/printerdrake.pm:2710
+#: printer/printerdrake.pm:2878
 #, fuzzy, c-format
 msgid ""
 "Printer default settings\n"
@@ -12546,27 +12628,27 @@ msgstr ""
 "\n"
 " и тип достапен и Забелешка."
 
-#: printer/printerdrake.pm:2835
+#: printer/printerdrake.pm:3003
 #, c-format
 msgid "Printer default settings"
 msgstr "Стандардни Подесувања на Печатачот"
 
-#: printer/printerdrake.pm:2842
+#: printer/printerdrake.pm:3010
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "Опцијата %s мора да биде цел број!"
 
-#: printer/printerdrake.pm:2846
+#: printer/printerdrake.pm:3014
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "Опцијата %s мора да е број!"
 
-#: printer/printerdrake.pm:2850
+#: printer/printerdrake.pm:3018
 #, fuzzy, c-format
 msgid "Option %s out of range!"
 msgstr "Option %s надвор од ранг!"
 
-#: printer/printerdrake.pm:2901
+#: printer/printerdrake.pm:3069
 #, fuzzy, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -12575,12 +12657,12 @@ msgstr ""
 "Дали сакате овој принтер (\"%s\")\n"
 "да го поставите за стандарден?"
 
-#: printer/printerdrake.pm:2916
+#: printer/printerdrake.pm:3084
 #, c-format
 msgid "Test pages"
 msgstr "Тест страни"
 
-#: printer/printerdrake.pm:2917
+#: printer/printerdrake.pm:3085
 #, fuzzy, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -12592,47 +12674,57 @@ msgstr ""
 " Забелешка, сликите ќе земат повеќе  време за печатање Во многу случаеви "
 "доволно е дасе печати стандардната страна за тестирање."
 
-#: printer/printerdrake.pm:2921
+#: printer/printerdrake.pm:3089
 #, fuzzy, c-format
 msgid "No test pages"
 msgstr "Без страница за тестирање"
 
-#: printer/printerdrake.pm:2922
+#: printer/printerdrake.pm:3090
 #, c-format
 msgid "Print"
 msgstr "Печати"
 
-#: printer/printerdrake.pm:2947
+#: printer/printerdrake.pm:3115
 #, c-format
 msgid "Standard test page"
 msgstr "Стандардна Тест Страница"
 
-#: printer/printerdrake.pm:2950
+#: printer/printerdrake.pm:3118
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Алтернативна Тест Страна (Писмо)"
 
-#: printer/printerdrake.pm:2953
+#: printer/printerdrake.pm:3121
 #, fuzzy, c-format
 msgid "Alternative test page (A4)"
 msgstr "Алтернативна A4 тест страница"
 
-#: printer/printerdrake.pm:2955
+#: printer/printerdrake.pm:3123
 #, fuzzy, c-format
 msgid "Photo test page"
 msgstr "Фотографија"
 
-#: printer/printerdrake.pm:2959
+#: printer/printerdrake.pm:3127
 #, c-format
 msgid "Do not print any test page"
 msgstr "Не печати никаква тест страна."
 
-#: printer/printerdrake.pm:2967 printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "Печатење на тест страна(и)..."
 
-#: printer/printerdrake.pm:2992
+#: printer/printerdrake.pm:3150
+#, fuzzy, c-format
+msgid "Could not install the %s package!"
+msgstr "Инсталирање на пакетот %s"
+
+#: printer/printerdrake.pm:3152
+#, fuzzy, c-format
+msgid "Skipping photo test page."
+msgstr "Фотографија"
+
+#: printer/printerdrake.pm:3169
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -12647,7 +12739,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:2996
+#: printer/printerdrake.pm:3173
 #, fuzzy, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -12656,17 +12748,17 @@ msgstr ""
 "Тест страницата е испратена до принтерот.\n"
 " Ќе помине малку време додека принтерот стартува."
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3180
 #, c-format
 msgid "Did it work properly?"
 msgstr "Дали работи како што треба?"
 
-#: printer/printerdrake.pm:3024 printer/printerdrake.pm:4192
+#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
 #, fuzzy, c-format
 msgid "Raw printer"
 msgstr "Гол принтер"
 
-#: printer/printerdrake.pm:3054
+#: printer/printerdrake.pm:3231
 #, fuzzy, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -12680,7 +12772,7 @@ msgstr ""
 "Графичките алатки Ви овозможуваат да го одберете принтерот и лесно да ги "
 "модифицирате поставките за него.\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 "
@@ -12692,8 +12784,8 @@ msgstr ""
 "името на датоката бидејќи датотеката за печатење е обезбедена од "
 "апликацијата.\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
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12704,7 +12796,7 @@ msgstr ""
 "\n"
 " s на на s<file> "
 
-#: 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 "
@@ -12715,14 +12807,14 @@ msgstr ""
 "прикажана подоле или кликнете на копчето \"Печати опциона листа\".%s%s%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3066
+#: printer/printerdrake.pm:3243
 #, fuzzy, c-format
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
 "\n"
 msgstr "Ова е листата на достапни опции за овој принтер:\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 "
@@ -12731,8 +12823,8 @@ msgstr ""
 "За да печатиш датотека од командната линија(терминален прозор) користи ја "
 "командата \"%s<file>\".\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
 #, fuzzy, c-format
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
@@ -12740,7 +12832,7 @@ msgid ""
 "because the file to print is provided by the application.\n"
 msgstr "во Печатење име на"
 
-#: 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 "
@@ -12749,7 +12841,7 @@ msgstr ""
 "За да ја добитете листата на опции достапни за тековниот принтер кликнете на "
 "копчето \"Испечати листа на опции\"."
 
-#: 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 "
@@ -12758,7 +12850,7 @@ msgstr ""
 "Да изпечатите датотека преку командната линија (терминален прозорец) "
 "користете ја командата \"%s <file>\" или \"%s <file>\".\n"
 
-#: printer/printerdrake.pm:3095
+#: printer/printerdrake.pm:3272
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -12775,7 +12867,7 @@ msgstr ""
 "печатење веднаш одкога ќе го кликнете. Ова на пример е корисно кога "
 "хартијата ќе заглави.\n"
 
-#: printer/printerdrake.pm:3099
+#: printer/printerdrake.pm:3276
 #, c-format
 msgid ""
 "\n"
@@ -12788,42 +12880,42 @@ msgstr ""
 "за одредена печатарска работа. Едноставно додадете ги посакуваните "
 "подесувања во командната линија, пр.\"%s<file>\".\n"
 
-#: printer/printerdrake.pm:3109
+#: printer/printerdrake.pm:3286
 #, fuzzy, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "Печатење Скенирање Фотографија Карти Вклучено s"
 
-#: printer/printerdrake.pm:3110
+#: printer/printerdrake.pm:3287
 #, fuzzy, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "Печатење Скенирање Вклучено s"
 
-#: printer/printerdrake.pm:3112
+#: printer/printerdrake.pm:3289
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Печатачка/Фотографска Пристап-картичка  на \"%s\""
 
-#: printer/printerdrake.pm:3113
+#: printer/printerdrake.pm:3290
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "Печатење на принтерот \"%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
 #, fuzzy, c-format
 msgid "Close"
 msgstr "Затвори"
 
-#: printer/printerdrake.pm:3119
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Print option list"
 msgstr "Печати листа со опции"
 
-#: printer/printerdrake.pm:3140
+#: printer/printerdrake.pm:3317
 #, fuzzy, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -12844,7 +12936,7 @@ msgstr ""
 "информации користете  \"man scanimage\". \n"
 "Не го користете \"scannerdrake\" за овој уред!"
 
-#: printer/printerdrake.pm:3163
+#: printer/printerdrake.pm:3343
 #, fuzzy, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -12860,18 +12952,18 @@ msgstr ""
 "на на Сега Мени Апликации Датотека Датотека Менаџер или Вклучено s или "
 "помеѓу."
 
-#: printer/printerdrake.pm:3185 printer/printerdrake.pm:3575
+#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
 #, c-format
 msgid "Reading printer data..."
 msgstr "Читање принтерските податоци..."
 
-#: 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 "Префрлување на конфигурација за принтер"
 
-#: printer/printerdrake.pm:3206
+#: printer/printerdrake.pm:3386
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -12886,7 +12978,7 @@ msgstr ""
 "подесување) се презафатени, но работите нема да бидат преместени.\n"
 "Не сите редици на чекање можат да се преместат поради следниве причини:\n"
 
-#: printer/printerdrake.pm:3209
+#: printer/printerdrake.pm:3389
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
@@ -12895,7 +12987,7 @@ msgstr ""
 "CUPS не поддржува принтери на Novell сервери или принтер што ги испраќаат "
 "податоците во команда од слободен облик.\n"
 
-#: printer/printerdrake.pm:3211
+#: printer/printerdrake.pm:3391
 #, fuzzy, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -12904,19 +12996,19 @@ msgstr ""
 "PDQ подржава само локални принтери, локални LPD принтери и Socket/TCP "
 "принтери"
 
-#: printer/printerdrake.pm:3213
+#: printer/printerdrake.pm:3393
 #, fuzzy, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPD и LPRng не подржуваат IPP принтери.\n"
 
-#: printer/printerdrake.pm:3215
+#: printer/printerdrake.pm:3395
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
 msgstr ""
 
-#: printer/printerdrake.pm:3216
+#: printer/printerdrake.pm:3396
 #, c-format
 msgid ""
 "\n"
@@ -12927,7 +13019,7 @@ msgstr ""
 "Исто така печатарите конфигурирани со PPD датотеки обезбедени од нивните "
 "призведувачи или со оригиналните CUPS драјвери не можат да се преместат."
 
-#: printer/printerdrake.pm:3217
+#: printer/printerdrake.pm:3397
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12938,17 +13030,17 @@ msgstr ""
 " Одбележете го принтерот кој сакате да го префрлите и кликнете\n"
 "\"Трансфер\"."
 
-#: printer/printerdrake.pm:3220
+#: printer/printerdrake.pm:3400
 #, c-format
 msgid "Do not transfer printers"
 msgstr "Не го префрлај принтерот"
 
-#: printer/printerdrake.pm:3221 printer/printerdrake.pm:3237
+#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
 #, c-format
 msgid "Transfer"
 msgstr "Пренос"
 
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3413
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -12960,17 +13052,17 @@ msgstr ""
 "Исто така, можете и да внесете ново име или да го прескокнете\n"
 "овој принтер."
 
-#: printer/printerdrake.pm:3254
+#: printer/printerdrake.pm:3434
 #, c-format
 msgid "New printer name"
 msgstr "Ново име на принтерот"
 
-#: printer/printerdrake.pm:3257
+#: printer/printerdrake.pm:3437
 #, fuzzy, c-format
 msgid "Transferring %s..."
 msgstr "Префрлување %s..."
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3448
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -12979,28 +13071,28 @@ msgstr ""
 "Сте го преместиле вашиот поранешен стандарден принтер (\"%s\"), дали да биде "
 "исто така стандарден принтер и под новиот печатарски систем %s?"
 
-#: printer/printerdrake.pm:3278
+#: printer/printerdrake.pm:3458
 #, fuzzy, c-format
 msgid "Refreshing printer data..."
 msgstr "податок."
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3467
 #, c-format
 msgid "Starting network..."
 msgstr "Стартување на мрежата..."
 
-#: printer/printerdrake.pm:3328 printer/printerdrake.pm:3332
-#: printer/printerdrake.pm:3334
+#: printer/printerdrake.pm:3508 printer/printerdrake.pm:3512
+#: printer/printerdrake.pm:3514
 #, fuzzy, c-format
 msgid "Configure the network now"
 msgstr "Конфигурирај"
 
-#: printer/printerdrake.pm:3329
+#: printer/printerdrake.pm:3509
 #, c-format
 msgid "Network functionality not configured"
 msgstr "Мрежната функционалност не е подесена"
 
-#: printer/printerdrake.pm:3330
+#: printer/printerdrake.pm:3510
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -13013,16 +13105,16 @@ msgstr ""
 "мрежна конфигурација, нема да можете да го користите принтерот кој што го "
 "конфигурирате. Како сакате да продолжите?"
 
-#: printer/printerdrake.pm:3333
+#: printer/printerdrake.pm:3513
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Продолжи без конфигурација на мрежа"
 
-#: printer/printerdrake.pm:3367
+#: printer/printerdrake.pm:3547
 #, fuzzy, 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\""
@@ -13034,7 +13126,7 @@ msgstr ""
 "потоа подесете гопринтерот, исто така со Мандрак Контролниот Центар, секција "
 "\"Хардвер\"/\"Принтер\""
 
-#: printer/printerdrake.pm:3368
+#: printer/printerdrake.pm:3548
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -13045,34 +13137,34 @@ msgstr ""
 "Вашата конфигурација и Вашиот хардвер. Потоа пробајте повторно да го "
 "конфигурирате вашиот далечински принтер."
 
-#: printer/printerdrake.pm:3378
+#: printer/printerdrake.pm:3558
 #, c-format
 msgid "Restarting printing system..."
 msgstr "Рестартирање на печатечкиот систем..."
 
-#: printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3597
 #, c-format
 msgid "high"
 msgstr "високо"
 
-#: printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3597
 #, c-format
 msgid "paranoid"
 msgstr "параноидна"
 
-#: printer/printerdrake.pm:3418
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "Инсталирање принтерки систем во %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"
@@ -13089,12 +13181,12 @@ msgstr ""
 "\n"
 "Дали навистина сакаш да го конфигурираш принтерскиот систем на оваа машина?"
 
-#: printer/printerdrake.pm:3453
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "Вклучување на принтерскиот систем при подигањето"
 
-#: printer/printerdrake.pm:3454
+#: printer/printerdrake.pm:3634
 #, fuzzy, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -13113,47 +13205,67 @@ msgstr ""
 "\n"
 " на Вклучено?"
 
-#: printer/printerdrake.pm:3475 printer/printerdrake.pm:3690
+#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
 #, c-format
 msgid "Checking installed software..."
 msgstr "Проверка на инсталиран софтвер..."
 
-#: printer/printerdrake.pm:3481
+#: printer/printerdrake.pm:3661
 #, c-format
 msgid "Removing %s ..."
 msgstr "Отстранување на %s ..."
 
-#: printer/printerdrake.pm:3488
+#: printer/printerdrake.pm:3665
+#, fuzzy, c-format
+msgid "Could not remove the %s printing system!"
+msgstr "Промени го системот за печатење"
+
+#: printer/printerdrake.pm:3674
 #, c-format
 msgid "Installing %s ..."
 msgstr "Се инсталира %s ..."
 
-#: printer/printerdrake.pm:3535
+#: printer/printerdrake.pm:3678
+#, fuzzy, c-format
+msgid "Could not install the %s printing system!"
+msgstr "Промени го системот за печатење"
+
+#: printer/printerdrake.pm:3727
 #, fuzzy, c-format
 msgid "Setting Default Printer..."
 msgstr "Позтавување на Стандарден Печатач"
 
-#: printer/printerdrake.pm:3555
+#: printer/printerdrake.pm:3747
 #, fuzzy, c-format
 msgid "Select Printer Spooler"
 msgstr "Избор Печатач"
 
-#: printer/printerdrake.pm:3556
+#: printer/printerdrake.pm:3748
 #, fuzzy, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Кој систем за печатење сакате да го користете?"
 
-#: printer/printerdrake.pm:3607
+#: printer/printerdrake.pm:3799
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "Не успеа да го конфигурира принтерот \"%s\"!"
 
-#: printer/printerdrake.pm:3620
+#: printer/printerdrake.pm:3812
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Инсталирање на Foomatic..."
 
-#: printer/printerdrake.pm:3806
+#: printer/printerdrake.pm:3818
+#, c-format
+msgid "Could not install %s packages, %s cannot be started!"
+msgstr ""
+
+#: printer/printerdrake.pm:3910
+#, c-format
+msgid "Could not install necessary packages, %s cannot be started!"
+msgstr ""
+
+#: printer/printerdrake.pm:4011
 #, fuzzy, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -13164,49 +13276,49 @@ msgstr ""
 "неговите поставки; да го направите стандарден принтер; или да ги видите "
 "информациите за него."
 
-#: printer/printerdrake.pm:3834
+#: printer/printerdrake.pm:4039
 #, fuzzy, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "Прикажи ги сите достапни локални CUPS принтери"
 
-#: printer/printerdrake.pm:3835
+#: printer/printerdrake.pm:4040
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
 "Освежи ја листата на принтери (да се прикажат сите достапни CUPS принтери)"
 
-#: printer/printerdrake.pm:3845
+#: printer/printerdrake.pm:4050
 #, c-format
 msgid "CUPS configuration"
 msgstr "CUPS конфигурација"
 
-#: printer/printerdrake.pm:3857
+#: printer/printerdrake.pm:4062
 #, fuzzy, c-format
 msgid "Change the printing system"
 msgstr "Промени го системот за печатење"
 
-#: printer/printerdrake.pm:3866
+#: printer/printerdrake.pm:4071
 #, fuzzy, c-format
 msgid "Normal Mode"
 msgstr "Нормално"
 
-#: printer/printerdrake.pm:3867
+#: printer/printerdrake.pm:4072
 #, c-format
 msgid "Expert Mode"
 msgstr "Експертски режим"
 
-#: 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
 #, fuzzy, c-format
 msgid "Printer options"
 msgstr "Печатач"
 
-#: printer/printerdrake.pm:4174
+#: printer/printerdrake.pm:4379
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Измени ја принтерската конфигурација"
 
-#: printer/printerdrake.pm:4176
+#: printer/printerdrake.pm:4381
 #, fuzzy, c-format
 msgid ""
 "Printer %s\n"
@@ -13215,90 +13327,90 @@ msgstr ""
 "Печатач s\n"
 " на Вклучено?"
 
-#: printer/printerdrake.pm:4180
+#: printer/printerdrake.pm:4385
 #, fuzzy, c-format
 msgid "Do it!"
 msgstr "Стори го тоа!"
 
-#: printer/printerdrake.pm:4185 printer/printerdrake.pm:4243
+#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
 #, fuzzy, c-format
 msgid "Printer connection type"
 msgstr "Тип на поврзување на принтер"
 
-#: printer/printerdrake.pm:4186 printer/printerdrake.pm:4247
+#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
 #, c-format
 msgid "Printer name, description, location"
 msgstr "Име на принтерот, опис, локација"
 
-#: printer/printerdrake.pm:4188 printer/printerdrake.pm:4266
+#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
 #, fuzzy, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "Печатач, модел, драјвер"
 
-#: printer/printerdrake.pm:4189 printer/printerdrake.pm:4267
+#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "Производител на принтерот, модел"
 
-#: 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 "Подеси го овој принтер како стандарден"
 
-#: printer/printerdrake.pm:4197 printer/printerdrake.pm:4285
+#: printer/printerdrake.pm:4402 printer/printerdrake.pm:4490
 #, fuzzy, c-format
 msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
 msgstr "Додај го принтерот на Star Office/OpenOffice.org/GIMP"
 
-#: 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 "Отстрани го овој принтер од Star Office/OpenOffice.org/GIMP"
 
-#: printer/printerdrake.pm:4199 printer/printerdrake.pm:4295
+#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
 #, fuzzy, c-format
 msgid "Print test pages"
 msgstr "Печати ја пробната страна"
 
-#: printer/printerdrake.pm:4200 printer/printerdrake.pm:4297
+#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4502
 #, fuzzy, c-format
 msgid "Learn how to use this printer"
 msgstr "Научите како да го користете овој принтер"
 
-#: printer/printerdrake.pm:4201 printer/printerdrake.pm:4299
+#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
 #, c-format
 msgid "Remove printer"
 msgstr "Отстрани принтер"
 
-#: printer/printerdrake.pm:4255
+#: printer/printerdrake.pm:4460
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Отстранување на стариот принтер \"%s\"..."
 
-#: printer/printerdrake.pm:4286
+#: printer/printerdrake.pm:4491
 #, c-format
 msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
 msgstr "Додавање принтер на Star Office/OpenOffice.org/GIMP"
 
-#: printer/printerdrake.pm:4288
+#: printer/printerdrake.pm:4493
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
 msgstr ""
 "Печатачот \"%s\" беше успешно додаден на Star Office/OpenOffice.org/GIMP."
 
-#: printer/printerdrake.pm:4289
+#: printer/printerdrake.pm:4494
 #, c-format
 msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
 msgstr ""
 "Неуспешно додавање на принтерот \"%s\" во to Star Office/OpenOffice.org/GIMP."
 
-#: printer/printerdrake.pm:4291
+#: printer/printerdrake.pm:4496
 #, fuzzy, c-format
 msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
 msgstr "Бришење на принтерот од Star Office/OpenOffice.org/GIMP"
 
-#: printer/printerdrake.pm:4293
+#: printer/printerdrake.pm:4498
 #, fuzzy, c-format
 msgid ""
 "The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
@@ -13306,7 +13418,7 @@ msgid ""
 msgstr ""
 "Пачатачот \"%s\" успешно е избришан од Star Office/OpenOffice.org/GIMP."
 
-#: printer/printerdrake.pm:4294
+#: printer/printerdrake.pm:4499
 #, c-format
 msgid ""
 "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
@@ -13314,22 +13426,22 @@ msgstr ""
 "Неуспешно отстранување на принтерот \"%s\" од Star Office/OpenOffice.org/"
 "GIMP."
 
-#: printer/printerdrake.pm:4338
+#: printer/printerdrake.pm:4543
 #, fuzzy, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Дали навистина сакате да го избришете принтерот \"%s\"?"
 
-#: printer/printerdrake.pm:4342
+#: printer/printerdrake.pm:4547
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Отстранување на принтер \"%s\"..."
 
-#: printer/printerdrake.pm:4366
+#: printer/printerdrake.pm:4571
 #, fuzzy, c-format
 msgid "Default printer"
 msgstr "Прв принтер"
 
-#: printer/printerdrake.pm:4367
+#: printer/printerdrake.pm:4572
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "Печатачот \"%s\" е поставен за стандарден."
@@ -13359,31 +13471,36 @@ msgstr "Нема доволно партиции за RAID ниво %d\n"
 msgid "Could not create directory /usr/share/sane/firmware!"
 msgstr ""
 
-#: scanner.pm:102
+#: scanner.pm:107
+#, c-format
+msgid "Could not create link /usr/share/sane/%s!"
+msgstr ""
+
+#: scanner.pm:114
 #, c-format
 msgid "Could not copy firmware file %s to /usr/share/sane/firmware!"
 msgstr ""
 
-#: scanner.pm:109
+#: scanner.pm:121
 #, c-format
 msgid "Could not set permissions of firmware file %s!"
 msgstr ""
 
-#: 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
 #, fuzzy, 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 ""
 
-#: scanner.pm:190
+#: scanner.pm:202
 #, c-format
 msgid "Your scanner(s) will not be available for non-root users."
 msgstr ""
@@ -14521,7 +14638,7 @@ msgstr ""
 "Нема дополнителни информации\n"
 "за овој сервис. Жалиме!"
 
-#: services.pm:226 ugtk2.pm:1139
+#: services.pm:226 ugtk2.pm:1167
 #, c-format
 msgid "Info"
 msgstr "Информации"
@@ -14549,7 +14666,7 @@ msgstr "Стоп"
 #: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13
 #: share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
 #, fuzzy, c-format
-msgid "<b>Congratulations for choosing Mandrake Linux!</b>"
+msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
 msgstr "Ви благодариме што корисете Linux"
 
 #: share/advertising/dis-01.pl:15 share/advertising/dwd-01.pl:15
@@ -14561,9 +14678,9 @@ msgstr "Добредојдовте во светот на Open Source."
 #: 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 ""
 
 #: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
@@ -14778,7 +14895,7 @@ 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
 #, fuzzy, c-format
-msgid "\t- Voting for software to put in Mandrake Linux"
+msgid "\t- Voting for software to put in Mandrakelinux"
 msgstr "Ви благодариме што корисете Linux"
 
 #: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
@@ -14823,15 +14940,15 @@ 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 ""
 
 #: share/advertising/dwd-02.pl:13
 #, c-format
-msgid "<b>Join the Mandrake Linux community!</b>"
+msgid "<b>Join the Mandrakelinux community!</b>"
 msgstr ""
 
 #: share/advertising/dwd-02.pl:15
@@ -14850,28 +14967,28 @@ msgstr ""
 
 #: share/advertising/dwd-03.pl:13
 #, c-format
-msgid "<b>What is Mandrake Linux?</b>"
+msgid "<b>What is Mandrakelinux?</b>"
 msgstr ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
@@ -14882,7 +14999,7 @@ msgstr ""
 
 #: share/advertising/dwd-04.pl:16
 #, c-format
-msgid "\t- Find out Mandrake Linux on a bootable CD with <b>MandrakeMove</b>"
+msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
 msgstr ""
 
 #: share/advertising/dwd-04.pl:17
@@ -14931,7 +15048,7 @@ 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 ""
 
@@ -14975,7 +15092,7 @@ msgstr ""
 
 #: 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 ""
 
 #: share/advertising/dwd-09.pl:20
@@ -14989,9 +15106,9 @@ 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 ""
 
 #: share/advertising/ppp-02.pl:13
@@ -15010,7 +15127,7 @@ 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 ""
 
 #: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
@@ -15021,7 +15138,7 @@ msgstr "Изберете го клучот за криптирање на фај
 #: 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 ""
@@ -15029,7 +15146,7 @@ msgstr ""
 #: 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 ""
 
@@ -15176,8 +15293,8 @@ msgstr ""
 #: 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 ""
 
@@ -15205,7 +15322,7 @@ msgstr ""
 #: 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 ""
 
@@ -15494,17 +15611,17 @@ msgstr "Одлогирајте се и тогаш натиснете Ctrl-Alt-Ba
 msgid "You need to log out and back in again for changes to take effect"
 msgstr ""
 
-#: standalone/drakTermServ:71
+#: standalone/drakTermServ:77
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "Најупотребуван без Terminal Сервер "
 
-#: 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"
 
-#: standalone/drakTermServ:121
+#: standalone/drakTermServ:134
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -15513,78 +15630,78 @@ msgstr ""
 "%s: %s бара име на компјутерот, MAC адреса, IP, nbi-слика, 0/1 за "
 "THIN_CLIENT, 0/1 за Local Config...\n"
 
-#: standalone/drakTermServ:128
+#: standalone/drakTermServ:141
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s:%s бара име на хост...\n"
 
-#: standalone/drakTermServ:140
+#: standalone/drakTermServ:153
 #, c-format
 msgid "You must be root to read configuration file. \n"
 msgstr "Мора да си root за да го читаш конфигурациониот фајл. \n"
 
-#: standalone/drakTermServ:219 standalone/drakTermServ:488
-#: standalone/drakfont:572
+#: standalone/drakTermServ:238 standalone/drakTermServ:511
+#: standalone/drakfont:575
 #, c-format
 msgid "OK"
 msgstr "Во ред"
 
-#: standalone/drakTermServ:235
+#: standalone/drakTermServ:249 standalone/drakTermServ:252
 #, fuzzy, c-format
 msgid "Terminal Server Configuration"
-msgstr "Mandrakе Конфигурација на Терминал Сервер"
+msgstr "Mandrake Конфигурација на Терминал Сервер"
 
-#: standalone/drakTermServ:240
-#, c-format
-msgid "DrakTermServ"
-msgstr "DrakTermServ"
-
-#: standalone/drakTermServ:264
+#: standalone/drakTermServ:267
 #, c-format
 msgid "Enable Server"
 msgstr "Овозможи Сервер"
 
-#: standalone/drakTermServ:270
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Disable Server"
 msgstr "Оневозможи Сервер"
 
-#: standalone/drakTermServ:278
+#: standalone/drakTermServ:281
 #, fuzzy, c-format
 msgid "Start Server"
 msgstr "Стартувај го серверот"
 
-#: standalone/drakTermServ:284
+#: standalone/drakTermServ:287
 #, c-format
 msgid "Stop Server"
 msgstr "Стопирај го серверот"
 
-#: standalone/drakTermServ:292
+#: standalone/drakTermServ:295
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Локален подигач Дискета/ISO"
 
-#: standalone/drakTermServ:296
+#: standalone/drakTermServ:299
 #, c-format
 msgid "Net Boot Images"
 msgstr "Мрежно подигачки слики"
 
-#: standalone/drakTermServ:302
+#: standalone/drakTermServ:305
 #, fuzzy, c-format
 msgid "Add/Del Users"
 msgstr "Додај/Избриши Корисници"
 
-#: standalone/drakTermServ:306
+#: standalone/drakTermServ:309
 #, c-format
 msgid "Add/Del Clients"
 msgstr "Додај/Избриши Клиенти"
 
-#: standalone/drakTermServ:317 standalone/drakbug:54
+#: standalone/drakTermServ:320 standalone/drakbug:54
 #, c-format
 msgid "First Time Wizard"
 msgstr "Вошебник за Прв Пат"
 
-#: standalone/drakTermServ:342
+#: standalone/drakTermServ:351 standalone/drakTermServ:352
+#, c-format
+msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
+msgstr ""
+
+#: standalone/drakTermServ:358
 #, c-format
 msgid ""
 "\n"
@@ -15607,64 +15724,69 @@ msgid ""
 "    f) If it's thin clients, ask if you want to restart KDM.\n"
 msgstr ""
 
-#: standalone/drakTermServ:387
+#: standalone/drakTermServ:403
 #, fuzzy, c-format
 msgid "Cancel Wizard"
 msgstr "Лансирај го волшебникот"
 
-#: standalone/drakTermServ:399
+#: standalone/drakTermServ:415
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr ""
 
-#: standalone/drakTermServ:427
+#: standalone/drakTermServ:443
+#, fuzzy, c-format
+msgid "Use thin clients."
+msgstr "Дозволи Тенок Клиент"
+
+#: 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."
 msgstr ""
 
-#: standalone/drakTermServ:433
-#, fuzzy, c-format
-msgid "Allow thin clients."
-msgstr "Дозволи Тенок Клиент"
+#: standalone/drakTermServ:457 standalone/drakTermServ:1071
+#, c-format
+msgid "Sync client X keyboard settings with server."
+msgstr ""
 
-#: standalone/drakTermServ:441
+#: standalone/drakTermServ:464
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr ""
 
-#: 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 "Ова ќе потрае неколку минути."
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:466
+#: standalone/drakTermServ:469 standalone/drakTermServ:489
 #, fuzzy, c-format
 msgid "Done!"
 msgstr "Завршено"
 
-#: standalone/drakTermServ:452
+#: standalone/drakTermServ:475
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 
-#: standalone/drakTermServ:472
+#: standalone/drakTermServ:495
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
 "be restarted. Restart now?"
 msgstr ""
 
-#: standalone/drakTermServ:507
-#, c-format
-msgid "drakTermServ Overview"
-msgstr ""
+#: standalone/drakTermServ:530
+#, fuzzy, c-format
+msgid "Terminal Server Overview"
+msgstr "Mandrake Конфигурација на Терминал Сервер"
 
-#: standalone/drakTermServ:508
+#: standalone/drakTermServ:531
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -15680,7 +15802,7 @@ msgid ""
 "one full kernel."
 msgstr ""
 
-#: standalone/drakTermServ:514
+#: standalone/drakTermServ:537
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -15700,7 +15822,7 @@ msgid ""
 "like:"
 msgstr ""
 
-#: standalone/drakTermServ:532
+#: standalone/drakTermServ:555
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -15739,7 +15861,7 @@ msgid ""
 "clients."
 msgstr ""
 
-#: standalone/drakTermServ:552
+#: standalone/drakTermServ:575
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -15757,7 +15879,7 @@ msgid ""
 "        \tWith SUBNET/MASK being defined for your network."
 msgstr ""
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:587
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -15768,7 +15890,7 @@ msgid ""
 "file."
 msgstr ""
 
-#: standalone/drakTermServ:568
+#: standalone/drakTermServ:591
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -15779,7 +15901,7 @@ msgid ""
 "        \tdrakTermServ will help create these files."
 msgstr ""
 
-#: standalone/drakTermServ:573
+#: standalone/drakTermServ:596
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -15799,7 +15921,7 @@ msgid ""
 "machine is configured."
 msgstr ""
 
-#: standalone/drakTermServ:582
+#: standalone/drakTermServ:605
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -15829,7 +15951,7 @@ msgid ""
 "        \tputs its images."
 msgstr ""
 
-#: standalone/drakTermServ:603
+#: standalone/drakTermServ:626
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
@@ -15847,57 +15969,62 @@ msgid ""
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 msgstr ""
 
-#: standalone/drakTermServ:638
+#: standalone/drakTermServ:661
 #, c-format
 msgid "Boot Floppy"
 msgstr "Boot Floppy"
 
-#: standalone/drakTermServ:640
+#: standalone/drakTermServ:663
 #, c-format
 msgid "Boot ISO"
 msgstr "Boot ISO"
 
-#: standalone/drakTermServ:642
+#: standalone/drakTermServ:665
 #, fuzzy, c-format
 msgid "PXE Image"
 msgstr "Image"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:734
+#, fuzzy, c-format
+msgid "Default kernel version"
+msgstr "верзија на јадрото"
+
+#: standalone/drakTermServ:761
 #, fuzzy, c-format
 msgid "Build Whole Kernel -->"
 msgstr "Кернел"
 
-#: standalone/drakTermServ:730
+#: standalone/drakTermServ:768
 #, fuzzy, c-format
 msgid "No kernel selected!"
 msgstr "Нема селектирано Кернел!"
 
-#: standalone/drakTermServ:733
+#: standalone/drakTermServ:771
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "Изгради Еден NIC -->"
 
-#: standalone/drakTermServ:737
+#: standalone/drakTermServ:775
 #, c-format
 msgid "No NIC selected!"
 msgstr "Не не е избран NIC!"
 
-#: standalone/drakTermServ:740
+#: standalone/drakTermServ:778
 #, fuzzy, c-format
 msgid "Build All Kernels -->"
 msgstr "Сите Кернели"
 
-#: standalone/drakTermServ:747
+#: standalone/drakTermServ:786
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Избриши"
 
-#: standalone/drakTermServ:754
+#: standalone/drakTermServ:793
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Избриши ги Сите NBls"
 
-#: standalone/drakTermServ:841
+#: standalone/drakTermServ:880
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -15910,27 +16037,27 @@ msgstr ""
 " Избриши/повторно-додади го корисникот во Терминалниот Сервер за да "
 "овозможиш логирање."
 
-#: standalone/drakTermServ:846
+#: standalone/drakTermServ:885
 #, fuzzy, c-format
 msgid "Add User -->"
 msgstr "Додај Корисник -->"
 
-#: standalone/drakTermServ:852
+#: standalone/drakTermServ:891
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- Избриши Корисник"
 
-#: standalone/drakTermServ:888
+#: standalone/drakTermServ:927
 #, fuzzy, c-format
 msgid "type: %s"
 msgstr "тип: %s"
 
-#: standalone/drakTermServ:892
+#: standalone/drakTermServ:931
 #, c-format
 msgid "local config: %s"
 msgstr "локална конфигурција: %s"
 
-#: standalone/drakTermServ:922
+#: standalone/drakTermServ:961
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -15939,124 +16066,134 @@ msgstr ""
 "Дозволи конфигурација\n"
 "на ликален хардвер"
 
-#: standalone/drakTermServ:931
+#: standalone/drakTermServ:970
 #, fuzzy, c-format
 msgid "No net boot images created!"
 msgstr "Не!"
 
-#: standalone/drakTermServ:949
+#: standalone/drakTermServ:988
 #, fuzzy, c-format
 msgid "Thin Client"
 msgstr "Тенок клиент"
 
-#: standalone/drakTermServ:953
+#: standalone/drakTermServ:992
 #, fuzzy, c-format
 msgid "Allow Thin Clients"
 msgstr "Дозволи Тенок Клиент"
 
-#: standalone/drakTermServ:954
+#: standalone/drakTermServ:993
 #, c-format
 msgid "Add Client -->"
 msgstr "Додај Клиент -->"
 
-#: standalone/drakTermServ:968
+#: standalone/drakTermServ:1007
 #, fuzzy, c-format
 msgid "type: fat"
 msgstr "тип: фат"
 
-#: standalone/drakTermServ:969
+#: standalone/drakTermServ:1008
 #, c-format
 msgid "type: thin"
 msgstr "тип: тенок"
 
-#: standalone/drakTermServ:976
+#: standalone/drakTermServ:1015
 #, c-format
 msgid "local config: false"
 msgstr "Локална конфигурација: погрешна"
 
-#: standalone/drakTermServ:977
+#: standalone/drakTermServ:1016
 #, c-format
 msgid "local config: true"
 msgstr "локален конфиг: вистинито"
 
-#: standalone/drakTermServ:985
+#: standalone/drakTermServ:1024
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Уреди Клиент"
 
-#: standalone/drakTermServ:1011
+#: standalone/drakTermServ:1050
 #, c-format
 msgid "Disable Local Config"
 msgstr "Исклучен Локален Конфиг"
 
-#: standalone/drakTermServ:1018
+#: standalone/drakTermServ:1057
 #, fuzzy, c-format
 msgid "Delete Client"
 msgstr "Избриши го Клиентот"
 
-#: standalone/drakTermServ:1027
+#: standalone/drakTermServ:1066
 #, c-format
 msgid "dhcpd Config..."
 msgstr "dhcpd Конфигурирање..."
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1082
 #, fuzzy, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
 "(service dm restart - at the console)"
 msgstr "на Прикажи Менаџер на\n"
 
-#: standalone/drakTermServ:1084
+#: standalone/drakTermServ:1122
+#, c-format
+msgid "Thin clients won't work with autologin. Disable autologin?"
+msgstr ""
+
+#: standalone/drakTermServ:1138
+#, c-format
+msgid "All clients will use %s"
+msgstr ""
+
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Subnet:"
 msgstr "Subnet:"
 
-#: standalone/drakTermServ:1091
+#: standalone/drakTermServ:1175
 #, c-format
 msgid "Netmask:"
 msgstr "Netmask:"
 
-#: standalone/drakTermServ:1098
+#: standalone/drakTermServ:1182
 #, fuzzy, c-format
 msgid "Routers:"
 msgstr "Рутери:"
 
-#: standalone/drakTermServ:1105
+#: standalone/drakTermServ:1189
 #, c-format
 msgid "Subnet Mask:"
 msgstr "Subnet Mask:"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1196
 #, fuzzy, c-format
 msgid "Broadcast Address:"
 msgstr "Пренеси Адреса:"
 
-#: standalone/drakTermServ:1119
+#: standalone/drakTermServ:1203
 #, c-format
 msgid "Domain Name:"
 msgstr "Име на доменот:"
 
-#: standalone/drakTermServ:1127
+#: standalone/drakTermServ:1211
 #, c-format
 msgid "Name Servers:"
 msgstr "Name сервери:"
 
-#: standalone/drakTermServ:1138
+#: standalone/drakTermServ:1222
 #, c-format
 msgid "IP Range Start:"
 msgstr "IP Старт на Опсегот:"
 
-#: standalone/drakTermServ:1139
+#: standalone/drakTermServ:1223
 #, c-format
 msgid "IP Range End:"
 msgstr "IP Опсег Крај:"
 
-#: standalone/drakTermServ:1191
+#: standalone/drakTermServ:1275
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "Конфигурација на dhcpd серверот"
 
-#: standalone/drakTermServ:1192
+#: standalone/drakTermServ:1276
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -16067,133 +16204,133 @@ msgstr ""
 "од вашиот подигнат систем.\n"
 "Можете да ги промените по потреба."
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1279
 #, fuzzy, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr "IP Адреса:"
 
-#: standalone/drakTermServ:1208
+#: standalone/drakTermServ:1292
 #, c-format
 msgid "Write Config"
 msgstr "Конфигурација на Записот"
 
-#: standalone/drakTermServ:1326
+#: standalone/drakTermServ:1411
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Ве молиме внесете floppy дискета:"
 
-#: standalone/drakTermServ:1330
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr "Не може да пристапи до floppy-то!"
 
-#: standalone/drakTermServ:1332
+#: standalone/drakTermServ:1417
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "Дискетата сега може да се отстрани"
 
-#: standalone/drakTermServ:1335
+#: standalone/drakTermServ:1420
 #, c-format
 msgid "No floppy drive available!"
 msgstr "Не е достапен floppy уред!"
 
-#: standalone/drakTermServ:1340
+#: standalone/drakTermServ:1425
 #, fuzzy, c-format
 msgid "PXE image is %s/%s"
 msgstr "Etherboot ISO image is %s"
 
-#: standalone/drakTermServ:1342
+#: standalone/drakTermServ:1427
 #, fuzzy, c-format
 msgid "Error writing %s/%s"
 msgstr "Грешка при запишувањето во датотеката %s"
 
-#: standalone/drakTermServ:1351
+#: standalone/drakTermServ:1436
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "Etherboot ISO image is %s"
 
-#: standalone/drakTermServ:1353
+#: standalone/drakTermServ:1438
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "Нешто тргна наопаку! - Дали е mkisofs инсталирано?"
 
-#: standalone/drakTermServ:1372
+#: standalone/drakTermServ:1458
 #, fuzzy, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "Прво треба да се креира /etc/dhcpd.conf!"
 
-#: standalone/drakTermServ:1533
+#: standalone/drakTermServ:1619
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr ""
 
-#: standalone/drakTermServ:1551
+#: standalone/drakTermServ:1637
 #, fuzzy, c-format
 msgid "%s is not a user..\n"
 msgstr "%s не е најдено...\n"
 
-#: standalone/drakTermServ:1552
+#: standalone/drakTermServ:1638
 #, fuzzy, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "%s веќе се користи\n"
 
-#: standalone/drakTermServ:1554
+#: standalone/drakTermServ:1640
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr ""
 
-#: standalone/drakTermServ:1556
+#: standalone/drakTermServ:1642
 #, fuzzy, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "Најупотребуван без Terminal Сервер "
 
-#: standalone/drakTermServ:1608
+#: standalone/drakTermServ:1694
 #, fuzzy, c-format
 msgid "Deleted %s...\n"
 msgstr "Откриено %s"
 
-#: standalone/drakTermServ:1610 standalone/drakTermServ:1687
+#: standalone/drakTermServ:1696 standalone/drakTermServ:1773
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s не е најдено...\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 веќе се користи\n"
 
-#: standalone/drakTermServ:1658
+#: standalone/drakTermServ:1744
 #, fuzzy, c-format
 msgid "Can't open %s!"
 msgstr "Не може да се отвори %s!"
 
-#: standalone/drakTermServ:1715
+#: standalone/drakTermServ:1801
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr "/etc/hosts.allow и /etc/hosts.deny се веќе подесени - неизменети"
 
-#: standalone/drakTermServ:1872
+#: standalone/drakTermServ:1958
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "Конфигурацијата е сменета- рестартирај clusternfs/dhcpd?"
 
-#: standalone/drakautoinst:37
+#: standalone/drakautoinst:38
 #, fuzzy, c-format
 msgid "Error!"
 msgstr "Грешка!"
 
-#: standalone/drakautoinst:38
+#: standalone/drakautoinst:39
 #, fuzzy, c-format
 msgid "I can't find needed image file `%s'."
 msgstr "Не можам да ја пронајдам потребната датотека `%s'."
 
-#: standalone/drakautoinst:40
+#: standalone/drakautoinst:41
 #, fuzzy, c-format
 msgid "Auto Install Configurator"
 msgstr "Автоматски Инсталирај Конфигуратор"
 
-#: standalone/drakautoinst:41
+#: standalone/drakautoinst:42
 #, fuzzy, c-format
 msgid ""
 "You are about to configure an Auto Install floppy. This feature is somewhat "
@@ -16221,22 +16358,22 @@ msgstr ""
 "\n"
 "Дали сакате да продолжите?"
 
-#: standalone/drakautoinst:59
+#: standalone/drakautoinst:60
 #, c-format
 msgid "replay"
 msgstr "повторно"
 
-#: standalone/drakautoinst:59 standalone/drakautoinst:68
+#: standalone/drakautoinst:60 standalone/drakautoinst:69
 #, c-format
 msgid "manual"
 msgstr "рачно"
 
-#: standalone/drakautoinst:63
+#: standalone/drakautoinst:64
 #, c-format
 msgid "Automatic Steps Configuration"
 msgstr "Конфигурација со Автоматски Чекори"
 
-#: standalone/drakautoinst:64
+#: standalone/drakautoinst:65
 #, c-format
 msgid ""
 "Please choose for each step whether it will replay like your install, or it "
@@ -16245,12 +16382,23 @@ msgstr ""
 "Ве молиме изберете за дали секој чекор ќе се повторува вашата инсталација "
 "или ќе биде рачно"
 
-#: standalone/drakautoinst:76 standalone/drakautoinst:77
+#: standalone/drakautoinst:77 standalone/drakautoinst:78
+#: standalone/drakautoinst:92
 #, c-format
 msgid "Creating auto install floppy"
 msgstr "Создавам аудио инсталациона дискета"
 
-#: standalone/drakautoinst:141
+#: standalone/drakautoinst:90
+#, fuzzy, c-format
+msgid "Insert another blank floppy in drive %s (for drivers disk)"
+msgstr "Внесете празна дискета во %s"
+
+#: standalone/drakautoinst:91
+#, fuzzy, c-format
+msgid "Creating auto install floppy (drivers disk)"
+msgstr "Создавам аудио инсталациона дискета"
+
+#: standalone/drakautoinst:158
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -16263,13 +16411,13 @@ msgstr ""
 "\n"
 " Параметрите на авто-инсталацијата се достапни во левата секција."
 
-#: standalone/drakautoinst:235 standalone/drakgw:583 standalone/drakvpn:898
-#: standalone/scannerdrake:367
+#: standalone/drakautoinst:252 standalone/drakgw:594 standalone/drakvpn:900
+#: standalone/scannerdrake:374
 #, fuzzy, c-format
 msgid "Congratulations!"
 msgstr "Честитки!"
 
-#: standalone/drakautoinst:236
+#: standalone/drakautoinst:253
 #, c-format
 msgid ""
 "The floppy has been successfully generated.\n"
@@ -16278,77 +16426,70 @@ msgstr ""
 "Дискетата е успешно генерирана.\n"
 "Сега можете повторно да ја извршите инсталацијата."
 
-#: standalone/drakautoinst:272
+#: standalone/drakautoinst:289
 #, c-format
 msgid "Auto Install"
 msgstr "Автоматска Инсталација"
 
-#: standalone/drakautoinst:341
+#: standalone/drakautoinst:358
 #, fuzzy, c-format
 msgid "Add an item"
 msgstr "Додај"
 
-#: standalone/drakautoinst:348
+#: standalone/drakautoinst:365
 #, fuzzy, c-format
 msgid "Remove the last item"
 msgstr "Отстрани го последниот"
 
-#: standalone/drakbackup:87
+#: standalone/drakbackup:88
 #, fuzzy, c-format
 msgid "hd"
 msgstr "Чад"
 
-#: standalone/drakbackup:87
+#: standalone/drakbackup:88
 #, fuzzy, c-format
 msgid "tape"
 msgstr "Лента"
 
-#: standalone/drakbackup:158
+#: standalone/drakbackup:112
 #, fuzzy, c-format
 msgid "No devices found"
 msgstr "Не е пронајдена слика!"
 
-#: standalone/drakbackup:196
+#: standalone/drakbackup:154
 #, c-format
 msgid ""
 "Expect is an extension to the Tcl scripting language that allows interactive "
 "sessions without user intervention."
 msgstr ""
 
-#: standalone/drakbackup:197
+#: standalone/drakbackup:155
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr ""
 
-#: standalone/drakbackup:198
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
 "the cdrw is erased before each backup."
 msgstr ""
 
-#: 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 ""
-
-#: standalone/drakbackup:200
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
 "whether incremental or differential mode is used."
 msgstr ""
 
-#: standalone/drakbackup:201
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
 "last backup."
 msgstr ""
 
-#: standalone/drakbackup:202
+#: standalone/drakbackup:159
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
@@ -16357,21 +16498,21 @@ msgstr ""
 "Диференцијалните бекапи единствено ги зачувуваат датотеките што се променети "
 "или се нови од последниот целосен бекап."
 
-#: standalone/drakbackup:203
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "This should be a local user or email addresse that you want the backup "
 "results sent to. You will need to define a functioning mail server."
 msgstr ""
 
-#: standalone/drakbackup:204
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
 "tree will not be backed up."
 msgstr ""
 
-#: standalone/drakbackup:205
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -16379,7 +16520,7 @@ msgid ""
 "tar files after the backup."
 msgstr ""
 
-#: standalone/drakbackup:206
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -16387,50 +16528,60 @@ msgid ""
 "path."
 msgstr ""
 
-#: standalone/drakbackup:207
+#: standalone/drakbackup:164
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
 "run-parts in /etc/crontab."
 msgstr ""
 
-#: standalone/drakbackup:604
+#: standalone/drakbackup:396
+#, c-format
+msgid "No media selected for cron operation."
+msgstr ""
+
+#: standalone/drakbackup:400
+#, c-format
+msgid "No interval selected for cron operation."
+msgstr ""
+
+#: standalone/drakbackup:447
 #, fuzzy, c-format
 msgid "Interval cron not available as non-root"
 msgstr "Cron сеуште не е достапен за користење како не-root"
 
-#: 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 ""
 
-#: 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 "
 "a complete email address!"
 msgstr ""
 
-#: standalone/drakbackup:728
+#: standalone/drakbackup:545
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr ""
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:547
 #, fuzzy, c-format
 msgid "Old user list:\n"
 msgstr ""
 "\n"
 " Кориснички Датотеки"
 
-#: standalone/drakbackup:732
+#: standalone/drakbackup:549
 #, fuzzy, c-format
 msgid "New user list:\n"
 msgstr ""
 "\n"
 " Кориснички Датотеки"
 
-#: standalone/drakbackup:779
+#: standalone/drakbackup:594
 #, c-format
 msgid ""
 "\n"
@@ -16439,7 +16590,7 @@ msgstr ""
 "\n"
 "                      DrakBackup Извештај \n"
 
-#: standalone/drakbackup:780
+#: standalone/drakbackup:595
 #, c-format
 msgid ""
 "\n"
@@ -16448,7 +16599,7 @@ msgstr ""
 "\n"
 ".................... Извештај на DrakBackup Демонот\n"
 
-#: standalone/drakbackup:786
+#: standalone/drakbackup:601
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -16460,13 +16611,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 "Вкупен прогрес"
 
-#: standalone/drakbackup:865
+#: standalone/drakbackup:678
 #, fuzzy, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -16479,42 +16630,42 @@ msgstr ""
 " Предупредување\n"
 " на Вклучено."
 
-#: standalone/drakbackup:874
+#: standalone/drakbackup:687
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "На ова можеби му е потребно момент за да ги генерира копчињата."
 
-#: standalone/drakbackup:881
+#: standalone/drakbackup:694
 #, fuzzy, c-format
 msgid "Cannot spawn %s."
 msgstr "ГРЕШКА s."
 
-#: standalone/drakbackup:898
+#: standalone/drakbackup:711
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "Немаше прашање за лозинка на %s на порт %s"
 
-#: standalone/drakbackup:899
+#: standalone/drakbackup:712
 #, c-format
 msgid "Bad password on %s"
 msgstr "Лоша лозинка на %s"
 
-#: standalone/drakbackup:900
+#: standalone/drakbackup:713
 #, fuzzy, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "s на"
 
-#: standalone/drakbackup:901
+#: standalone/drakbackup:714
 #, fuzzy, c-format
 msgid "Can't find %s on %s"
 msgstr "Не може да се најде %s на %s"
 
-#: standalone/drakbackup:904
+#: standalone/drakbackup:718
 #, fuzzy, c-format
 msgid "%s not responding"
 msgstr "%s не одговара"
 
-#: standalone/drakbackup:908
+#: standalone/drakbackup:722
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -16531,47 +16682,47 @@ msgstr ""
 "\n"
 "без да бидете прашани за лозинка."
 
-#: standalone/drakbackup:953
+#: standalone/drakbackup:766
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "WebDAV далечинската страна е веќе во sync!"
 
-#: standalone/drakbackup:957
+#: standalone/drakbackup:770
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr "WebDAV трансферот не успеа!"
 
-#: standalone/drakbackup:978
+#: standalone/drakbackup:791
 #, fuzzy, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "Нема CDR/DVD во драјвот!"
 
-#: standalone/drakbackup:982
+#: standalone/drakbackup:795
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "Изгледа дека нема медиум на кој може да се снима!"
 
-#: standalone/drakbackup:986
+#: standalone/drakbackup:799
 #, c-format
 msgid "Not erasable media!"
 msgstr "Нема медиум што може да се брише!"
 
-#: standalone/drakbackup:1027
+#: standalone/drakbackup:840
 #, fuzzy, c-format
 msgid "This may take a moment to erase the media."
 msgstr "Ова ќе потрае за ришење на медијата."
 
-#: standalone/drakbackup:1103
+#: standalone/drakbackup:898
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "Проблем со дозволата за пристап до CD."
 
-#: standalone/drakbackup:1130
+#: standalone/drakbackup:925
 #, fuzzy, c-format
 msgid "No tape in %s!"
 msgstr "Нема  во %s!"
 
-#: standalone/drakbackup:1232
+#: standalone/drakbackup:1025
 #, fuzzy, c-format
 msgid ""
 "Backup quota exceeded!\n"
@@ -16580,37 +16731,37 @@ msgstr ""
 "Премината е бекап квотата!\n"
 "%d Mb искористени vs %d Mb алоцирани."
 
-#: standalone/drakbackup:1251 standalone/drakbackup:1305
+#: standalone/drakbackup:1044 standalone/drakbackup:1077
 #, c-format
 msgid "Backup system files..."
 msgstr "Бекап на системски датотеки..."
 
-#: standalone/drakbackup:1306 standalone/drakbackup:1368
+#: standalone/drakbackup:1078 standalone/drakbackup:1119
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "Сигурносна копија на датотеките на Хард Дискот..."
 
-#: standalone/drakbackup:1367
+#: standalone/drakbackup:1118
 #, c-format
 msgid "Backup User files..."
 msgstr "Бекап на корисничките датотеки..."
 
-#: standalone/drakbackup:1421
+#: standalone/drakbackup:1153
 #, c-format
 msgid "Backup Other files..."
 msgstr "Направи Бекап на Други датотеки..."
 
-#: standalone/drakbackup:1422
+#: standalone/drakbackup:1154
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "Сигурносна копија на диск во тек..."
 
-#: standalone/drakbackup:1427
+#: standalone/drakbackup:1159
 #, c-format
 msgid "No changes to backup!"
 msgstr "Нема промени на бакапот!"
 
-#: standalone/drakbackup:1445 standalone/drakbackup:1469
+#: standalone/drakbackup:1177 standalone/drakbackup:1201
 #, c-format
 msgid ""
 "\n"
@@ -16621,7 +16772,7 @@ msgstr ""
 "Drakbackup активности преку %s\n"
 "\n"
 
-#: standalone/drakbackup:1454
+#: standalone/drakbackup:1186
 #, c-format
 msgid ""
 "\n"
@@ -16632,7 +16783,7 @@ msgstr ""
 "Проблем на FTP конекција: Не беше возможно да се пратат вашите бекап "
 "датотеки со FTP.\n"
 
-#: standalone/drakbackup:1455
+#: standalone/drakbackup:1187
 #, fuzzy, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
@@ -16640,14 +16791,14 @@ msgstr ""
 "Грешка при праќањето на фајлот преку FTP.\n"
 "Поправете ја вашата FTP конфигурација."
 
-#: standalone/drakbackup:1457
+#: standalone/drakbackup:1189
 #, fuzzy, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr ""
 "листата на датотеки е испратена со FTP: %s\n"
 "."
 
-#: standalone/drakbackup:1474
+#: standalone/drakbackup:1206
 #, c-format
 msgid ""
 "\n"
@@ -16658,7 +16809,7 @@ msgstr ""
 "Drakbackup се активира преку CD:\n"
 "\n"
 
-#: standalone/drakbackup:1479
+#: standalone/drakbackup:1211
 #, c-format
 msgid ""
 "\n"
@@ -16669,7 +16820,7 @@ msgstr ""
 "Drakbackup активности преку лента:\n"
 "\n"
 
-#: standalone/drakbackup:1488
+#: standalone/drakbackup:1220
 #, fuzzy, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr ""
@@ -16677,33 +16828,22 @@ msgstr ""
 "  Пораката со известувањето не е испратена.\n"
 "  Ве молиме, конфигурирајте го sendmail"
 
-#: standalone/drakbackup:1489
+#: standalone/drakbackup:1221
 #, fuzzy, c-format
 msgid " Error while sending mail. \n"
 msgstr "Грешка во праќањето на маил"
 
-#: standalone/drakbackup:1518
+#: standalone/drakbackup:1249
 #, c-format
 msgid "Can't create catalog!"
 msgstr "Не можам да креирам каталог"
 
-#: standalone/drakbackup:1639
-#, c-format
-msgid "Can't create log file!"
-msgstr "Не можам да клреирам лог датотеки!"
-
-#: standalone/drakbackup:1656 standalone/drakbackup:1667
-#: standalone/drakfont:584
-#, c-format
-msgid "File Selection"
-msgstr "Избор на датотека"
-
-#: standalone/drakbackup:1695
+#: standalone/drakbackup:1455
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "Избери ги датотеките или директориумите и натисни на 'ОК'"
 
-#: standalone/drakbackup:1723
+#: standalone/drakbackup:1484
 #, c-format
 msgid ""
 "\n"
@@ -16712,7 +16852,7 @@ msgstr ""
 "\n"
 "Ве молиме обележете ги сите опции што ви требаат.\n"
 
-#: standalone/drakbackup:1724
+#: standalone/drakbackup:1485
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
@@ -16720,36 +16860,36 @@ msgstr ""
 "Овие опции можат да ги зачуваат и повратат сите датотеки во твојот /etc "
 "директориум.\n"
 
-#: standalone/drakbackup:1725
+#: standalone/drakbackup:1486
 #, fuzzy, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "Сигурносна копија Систем"
 
-#: 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 ""
 "Користи Инкрементални/Деференцијални Бекапи  (не ги заменувај старите бекапи)"
 
-#: 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 "Користи Инкрементален Бекап"
 
-#: 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 "Користи Ралични Бекапи"
 
-#: standalone/drakbackup:1730
+#: standalone/drakbackup:1491
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "Не ги вклучувај критичните датотеки (passwd, group, fstab)"
 
-#: standalone/drakbackup:1731
+#: standalone/drakbackup:1492
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -16758,198 +16898,184 @@ msgstr ""
 "Со оваа опција ќе можеш да ја повратиш секоја верзија\n"
 " на твојот /etc директориум."
 
-#: standalone/drakbackup:1762
+#: standalone/drakbackup:1523
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr ""
 "Ве молиме одберете ги сите корисници кои сакате да ги вклучите во Вашиот "
 "бекап."
 
-#: standalone/drakbackup:1789
+#: standalone/drakbackup:1550
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "Не вклучувај го кешот на прелистувачот"
 
-#: standalone/drakbackup:1844 standalone/drakfont:650
+#: standalone/drakbackup:1605 standalone/drakfont:656
 #, c-format
 msgid "Remove Selected"
 msgstr "Отстрани ги избраните"
 
-#: standalone/drakbackup:1891 standalone/drakbackup:1895
-#, c-format
-msgid "Under Devel ... please wait."
-msgstr "Во развој ... Ве молиме почекајте."
-
-#: standalone/drakbackup:1909
-#, fuzzy, c-format
-msgid "Windows (FAT32)"
-msgstr "Windows (FAT32)"
-
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1668
 #, c-format
 msgid "Users"
 msgstr "Корисници"
 
-#: standalone/drakbackup:1961
+#: standalone/drakbackup:1688
 #, fuzzy, c-format
 msgid "Use network connection to backup"
 msgstr "Користи ја мрежата за бекап"
 
-#: standalone/drakbackup:1963
+#: standalone/drakbackup:1690
 #, c-format
 msgid "Net Method:"
 msgstr "Мрежен Метод:"
 
-#: standalone/drakbackup:1967
+#: standalone/drakbackup:1694
 #, fuzzy, c-format
 msgid "Use Expect for SSH"
 msgstr "Користи го"
 
-#: standalone/drakbackup:1968
+#: standalone/drakbackup:1695
 #, fuzzy, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr ""
 "Создади/Премести\n"
 "бекап клучеви за SSH"
 
-#: standalone/drakbackup:1970
+#: standalone/drakbackup:1697
 #, fuzzy, c-format
 msgid "Transfer Now"
 msgstr ""
 "  Трансфер  \n"
 "Сега"
 
-#: standalone/drakbackup:1972
+#: standalone/drakbackup:1699
 #, fuzzy, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr ""
 "Други (не на drakbackup)\n"
 "клучеви се веќе на место"
 
-#: standalone/drakbackup:1975
+#: standalone/drakbackup:1702
 #, fuzzy, c-format
 msgid "Host name or IP."
 msgstr "Име на хост"
 
-#: standalone/drakbackup:1980
+#: standalone/drakbackup:1707
 #, fuzzy, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr ""
 "Ве молиме внесете го директориумот (или модулот) каде\n"
 " да се смети бекапот на овој компјутер."
 
-#: standalone/drakbackup:1985
+#: standalone/drakbackup:1712
 #, c-format
 msgid "Login name"
 msgstr ""
 
-#: standalone/drakbackup:1992
+#: standalone/drakbackup:1719
 #, c-format
 msgid "Remember this password"
 msgstr "Запамти ја лозинката"
 
-#: standalone/drakbackup:2004
+#: standalone/drakbackup:1735
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "Се бара име на хост, корисничко име и лозинка!"
 
-#: standalone/drakbackup:2106
+#: standalone/drakbackup:1833
 #, fuzzy, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "Користи го CD на"
 
-#: standalone/drakbackup:2109
+#: standalone/drakbackup:1836
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "Изберете го вашиот CD/DVD уред"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:1841
 #, fuzzy, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "Ве молиме одберете ja вашaтa големина на CD/DVD (Mb)"
 
-#: standalone/drakbackup:2121
+#: standalone/drakbackup:1848
 #, c-format
 msgid "Multisession CD"
 msgstr "CD со повеќе сесии"
 
-#: standalone/drakbackup:2123
+#: standalone/drakbackup:1850
 #, c-format
 msgid "CDRW media"
 msgstr "CDRW медиум"
 
-#: standalone/drakbackup:2128
+#: standalone/drakbackup:1856
 #, fuzzy, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr ""
 "Ве молиме штиклирајте ако сакате да го избришите вашиот RW медиум (1-ва "
 "Сесија)"
 
-#: standalone/drakbackup:2129
+#: standalone/drakbackup:1857
 #, c-format
 msgid " Erase Now "
 msgstr "Избриши Сега"
 
-#: standalone/drakbackup:2136
+#: standalone/drakbackup:1863
 #, fuzzy, c-format
 msgid "DVD+RW media"
 msgstr "CDRW медиум"
 
-#: standalone/drakbackup:2138
+#: standalone/drakbackup:1865
 #, fuzzy, c-format
 msgid "DVD-R media"
 msgstr "CDRW медиум"
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:1867
 #, fuzzy, c-format
 msgid "DVDRAM device"
 msgstr "DVDRAM уред"
 
-#: standalone/drakbackup:2145
-#, fuzzy, c-format
-msgid ""
-"Enter your CD Writer device name\n"
-" ex: 0,1,0"
-msgstr ""
-"Ве молам внесете името на вашиот CD Writer уред\n"
-"пр: 0,1,0"
-
-#: standalone/drakbackup:2177
+#: standalone/drakbackup:1898
 #, c-format
 msgid "No CD device defined!"
 msgstr "Не е дефиниран CD-уред!"
 
-#: standalone/drakbackup:2227
+#: standalone/drakbackup:1945
 #, c-format
 msgid "Use tape to backup"
 msgstr "Користи лента за бекап"
 
-#: standalone/drakbackup:2230
+#: standalone/drakbackup:1948
 #, fuzzy, c-format
 msgid "Device name to use for backup"
 msgstr "име на"
 
-#: standalone/drakbackup:2237
+#: standalone/drakbackup:1954
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr "Не ја премотувај лентата по бекапот"
 
-#: standalone/drakbackup:2243
+#: standalone/drakbackup:1960
 #, c-format
 msgid "Erase tape before backup"
 msgstr "Избриши лента пред бекап"
 
-#: standalone/drakbackup:2249
+#: standalone/drakbackup:1966
 #, fuzzy, c-format
 msgid "Eject tape after the backup"
 msgstr "Користи лента за бекап"
 
-#: standalone/drakbackup:2317
+#: standalone/drakbackup:2033
 #, fuzzy, c-format
 msgid "Enter the directory to save to:"
 msgstr "Внесете директориум за зачувување на:"
 
-#: standalone/drakbackup:2326
+#: standalone/drakbackup:2037
+#, fuzzy, c-format
+msgid "Directory to save to"
+msgstr "Внесете директориум за зачувување на:"
+
+#: standalone/drakbackup:2042
 #, fuzzy, c-format
 msgid ""
 "Maximum size\n"
@@ -16958,191 +17084,191 @@ msgstr ""
 "Внесете ја максималната големина\n"
 " дозволена за Drakbackup (Mb)"
 
-#: standalone/drakbackup:2399
+#: standalone/drakbackup:2106
 #, fuzzy, c-format
 msgid "CD-R / DVD-R"
 msgstr "CDROM / DVDROM"
 
-#: standalone/drakbackup:2404
+#: standalone/drakbackup:2111
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "HardDrive / NFS"
 
-#: standalone/drakbackup:2420 standalone/drakbackup:2425
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2127 standalone/drakbackup:2132
+#: standalone/drakbackup:2137
 #, c-format
 msgid "hourly"
 msgstr "на час"
 
-#: standalone/drakbackup:2421 standalone/drakbackup:2426
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2128 standalone/drakbackup:2133
+#: standalone/drakbackup:2137
 #, c-format
 msgid "daily"
 msgstr "дневно"
 
-#: standalone/drakbackup:2422 standalone/drakbackup:2427
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2129 standalone/drakbackup:2134
+#: standalone/drakbackup:2137
 #, c-format
 msgid "weekly"
 msgstr "неделно"
 
-#: standalone/drakbackup:2423 standalone/drakbackup:2428
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2130 standalone/drakbackup:2135
+#: standalone/drakbackup:2137
 #, c-format
 msgid "monthly"
 msgstr "месечно"
 
-#: standalone/drakbackup:2424 standalone/drakbackup:2429
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2131 standalone/drakbackup:2136
+#: standalone/drakbackup:2137
 #, fuzzy, c-format
 msgid "custom"
 msgstr "По избор"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, fuzzy, c-format
 msgid "January"
 msgstr "рачно"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "February"
 msgstr ""
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, fuzzy, c-format
 msgid "March"
 msgstr "барај"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, fuzzy, c-format
 msgid "April"
 msgstr "Примени"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, fuzzy, c-format
 msgid "May"
 msgstr "Мајот"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, fuzzy, c-format
 msgid "June"
 msgstr "режач"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, fuzzy, c-format
 msgid "July"
 msgstr "на час"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "August"
 msgstr "август"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, fuzzy, c-format
 msgid "September"
 msgstr "Зачувај Тема"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, fuzzy, c-format
 msgid "October"
 msgstr "Друго"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "November"
 msgstr "ноември"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "December"
 msgstr ""
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, fuzzy, c-format
 msgid "Sunday"
 msgstr "Судан"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, fuzzy, c-format
 msgid "Monday"
 msgstr "Монако"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, fuzzy, c-format
 msgid "Tuesday"
 msgstr "Турција"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Wednesday"
 msgstr ""
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Thursday"
 msgstr ""
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, fuzzy, c-format
 msgid "Friday"
 msgstr "примарен"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, fuzzy, c-format
 msgid "Saturday"
 msgstr "Судан"
 
-#: standalone/drakbackup:2478
+#: standalone/drakbackup:2185
 #, fuzzy, c-format
 msgid "Use daemon"
 msgstr "Користи го"
 
-#: standalone/drakbackup:2483
+#: standalone/drakbackup:2190
 #, fuzzy, c-format
 msgid "Please choose the time interval between each backup"
 msgstr ""
 "Ве молиме изберете го временскиот \n"
 "интервал повеѓу секој бекап"
 
-#: standalone/drakbackup:2489
+#: standalone/drakbackup:2196
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr ""
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2201
 #, fuzzy, c-format
 msgid "Minute"
 msgstr "1 минута"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2205
 #, fuzzy, c-format
 msgid "Hour"
 msgstr "Хондурас"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2209
 #, c-format
 msgid "Day"
 msgstr "Ден"
 
-#: standalone/drakbackup:2506
+#: standalone/drakbackup:2213
 #, c-format
 msgid "Month"
 msgstr "Месец"
 
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2217
 #, fuzzy, c-format
 msgid "Weekday"
 msgstr "неделно"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2223
 #, fuzzy, c-format
 msgid "Please choose the media for backup."
 msgstr ""
 "Ве молиме изберете\n"
 "мeдиум за бекап."
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2230
 #, fuzzy, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr ""
@@ -17150,7 +17276,7 @@ msgstr ""
 "\n"
 " Забелешка."
 
-#: standalone/drakbackup:2524
+#: standalone/drakbackup:2231
 #, fuzzy, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr ""
@@ -17158,122 +17284,117 @@ msgstr ""
 "\n"
 " Забелешка."
 
-#: standalone/drakbackup:2571
-#, c-format
-msgid "Use tar and bzip2 (rather than tar and gzip)"
-msgstr ""
+#: standalone/drakbackup:2281
+#, fuzzy, c-format
+msgid "Please choose the compression type"
+msgstr "изберете ја датата на враќање"
 
-#: standalone/drakbackup:2572
+#: standalone/drakbackup:2285
 #, fuzzy, c-format
 msgid "Use .backupignore files"
 msgstr "Користи го."
 
-#: standalone/drakbackup:2574
+#: standalone/drakbackup:2287
 #, fuzzy, c-format
 msgid "Send mail report after each backup to:"
 msgstr "Испрати на:"
 
-#: standalone/drakbackup:2580
+#: standalone/drakbackup:2293
 #, fuzzy, c-format
 msgid "SMTP server for mail:"
 msgstr "SMB компјутерски сервер"
 
-#: standalone/drakbackup:2585
+#: standalone/drakbackup:2298
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr "Избриши ги tar датотеките од Тврдиот Диск после бекап на друг медиум."
 
-#: standalone/drakbackup:2624
+#: standalone/drakbackup:2338
 #, c-format
 msgid "What"
 msgstr "Што"
 
-#: standalone/drakbackup:2629
+#: standalone/drakbackup:2343
 #, c-format
 msgid "Where"
 msgstr "Каде"
 
-#: standalone/drakbackup:2634
+#: standalone/drakbackup:2348
 #, c-format
 msgid "When"
 msgstr "Кога"
 
-#: standalone/drakbackup:2639
+#: standalone/drakbackup:2353
 #, c-format
 msgid "More Options"
 msgstr "Повеќе Опции"
 
-#: standalone/drakbackup:2651
+#: standalone/drakbackup:2366
 #, fuzzy, c-format
 msgid "Backup destination not configured..."
 msgstr "Мрежната функционалност не е подесена"
 
-#: standalone/drakbackup:2667 standalone/drakbackup:4731
+#: standalone/drakbackup:2385 standalone/drakbackup:4413
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Drakbackup Конфогурација"
 
-#: standalone/drakbackup:2684
+#: standalone/drakbackup:2402
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "Ве молиме изберете каде сакате да зачувате"
 
-#: standalone/drakbackup:2686
+#: standalone/drakbackup:2404
 #, fuzzy, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr "Избриши ги tar датотеките од Тврдиот Диск после бекап на друг медиум."
 
-#: standalone/drakbackup:2694
+#: standalone/drakbackup:2412
 #, fuzzy, c-format
 msgid "Across Network"
 msgstr "низ Мрежа"
 
-#: standalone/drakbackup:2702
+#: standalone/drakbackup:2420
 #, fuzzy, c-format
 msgid "On CD-R"
 msgstr "на CDROM"
 
-#: standalone/drakbackup:2710
+#: standalone/drakbackup:2428
 #, fuzzy, c-format
 msgid "On Tape Device"
 msgstr "Вклучено"
 
-#: standalone/drakbackup:2738
-#, c-format
-msgid "Please select media for backup..."
-msgstr "Одберете го медиумот за бекап..."
-
-#: standalone/drakbackup:2760
+#: standalone/drakbackup:2468
 #, fuzzy, c-format
 msgid "Backup Users"
 msgstr "Бекап Корисници"
 
-#: standalone/drakbackup:2761
+#: standalone/drakbackup:2469
 #, fuzzy, c-format
 msgid " (Default is all users)"
 msgstr "Стандарден корисник"
 
-#: standalone/drakbackup:2773
+#: standalone/drakbackup:2481
 #, fuzzy, c-format
 msgid "Please choose what you want to backup"
 msgstr "Ве молиме да одберете на што сакате да направите бекап"
 
-#: standalone/drakbackup:2774
+#: standalone/drakbackup:2482
 #, fuzzy, c-format
 msgid "Backup System"
 msgstr "Бекап систем"
 
-#: standalone/drakbackup:2776
+#: standalone/drakbackup:2484
 #, fuzzy, c-format
 msgid "Select user manually"
 msgstr "Рачен избор на корисник"
 
-#: standalone/drakbackup:2805
+#: standalone/drakbackup:2513
 #, c-format
 msgid "Please select data to backup..."
 msgstr "Ве молиме изберете податоци за бекап..."
 
-#: standalone/drakbackup:2879
+#: standalone/drakbackup:2585
 #, c-format
 msgid ""
 "\n"
@@ -17282,7 +17403,7 @@ msgstr ""
 "\n"
 " Бекап Извори: \n"
 
-#: standalone/drakbackup:2880
+#: standalone/drakbackup:2586
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -17291,7 +17412,7 @@ msgstr ""
 "\n"
 " Систем Датотеки"
 
-#: standalone/drakbackup:2882
+#: standalone/drakbackup:2588
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -17300,7 +17421,7 @@ msgstr ""
 "\n"
 " Кориснички Датотеки"
 
-#: standalone/drakbackup:2884
+#: standalone/drakbackup:2590
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -17309,7 +17430,7 @@ msgstr ""
 "\n"
 " Други Датотеки:\n"
 
-#: standalone/drakbackup:2886
+#: standalone/drakbackup:2592
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -17318,12 +17439,12 @@ msgstr ""
 "\n"
 " Зачувај на Тврдиот диск со патека: %s\n"
 
-#: standalone/drakbackup:2887
+#: standalone/drakbackup:2593
 #, fuzzy, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tОграничена употреба на дисот до %s Mb\n"
 
-#: standalone/drakbackup:2890
+#: standalone/drakbackup:2596
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -17332,17 +17453,17 @@ msgstr ""
 "\n"
 " Избриши ги tar датотеките после бекап.\n"
 
-#: standalone/drakbackup:2894
+#: standalone/drakbackup:2600
 #, fuzzy, c-format
 msgid "NO"
 msgstr "ИНФО"
 
-#: standalone/drakbackup:2895
+#: standalone/drakbackup:2601
 #, c-format
 msgid "YES"
 msgstr ""
 
-#: standalone/drakbackup:2896
+#: standalone/drakbackup:2602
 #, c-format
 msgid ""
 "\n"
@@ -17351,22 +17472,22 @@ msgstr ""
 "\n"
 "- Запипи на CD"
 
-#: standalone/drakbackup:2897
+#: standalone/drakbackup:2603
 #, fuzzy, c-format
 msgid "RW"
 msgstr "RW"
 
-#: standalone/drakbackup:2898
+#: standalone/drakbackup:2604
 #, c-format
 msgid " on device: %s"
 msgstr "на уред: %s"
 
-#: standalone/drakbackup:2899
+#: standalone/drakbackup:2605
 #, c-format
 msgid " (multi-session)"
 msgstr "(мулти-сесија)"
 
-#: standalone/drakbackup:2900
+#: standalone/drakbackup:2606
 #, c-format
 msgid ""
 "\n"
@@ -17375,12 +17496,12 @@ msgstr ""
 "\n"
 "- Зачувај на Лента на уредот: %s"
 
-#: standalone/drakbackup:2901
+#: standalone/drakbackup:2607
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tИзбриши=%s"
 
-#: standalone/drakbackup:2904
+#: standalone/drakbackup:2610
 #, c-format
 msgid ""
 "\n"
@@ -17389,7 +17510,7 @@ msgstr ""
 "\n"
 "- Зачувај преку %s на компјутерот: %s\n"
 
-#: standalone/drakbackup:2905
+#: standalone/drakbackup:2611
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -17398,7 +17519,7 @@ msgstr ""
 "\t\t кориничко име: %s\n"
 "\t\t на патека: %s\n"
 
-#: standalone/drakbackup:2906
+#: standalone/drakbackup:2612
 #, c-format
 msgid ""
 "\n"
@@ -17407,37 +17528,42 @@ msgstr ""
 "\n"
 "- Опции:\n"
 
-#: standalone/drakbackup:2907
+#: standalone/drakbackup:2613
 #, fuzzy, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tНе ги вметнувај Систем Датотеките\n"
 
-#: standalone/drakbackup:2910
+#: standalone/drakbackup:2615
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\tБекапите користат tar и bzip2\n"
 
-#: standalone/drakbackup:2912
+#: standalone/drakbackup:2616
 #, fuzzy, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tЗа бекап корист tar и gzip\n"
 
-#: standalone/drakbackup:2915
+#: standalone/drakbackup:2617
+#, fuzzy, c-format
+msgid "\tBackups use tar only\n"
+msgstr "\tЗа бекап корист tar и gzip\n"
+
+#: standalone/drakbackup:2619
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\tКористење на .backupignore датотеките\n"
 
-#: standalone/drakbackup:2916
+#: standalone/drakbackup:2620
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2621
 #, fuzzy, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "На CUPS сервер \"%s\""
 
-#: standalone/drakbackup:2919
+#: standalone/drakbackup:2623
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -17446,47 +17572,47 @@ msgstr ""
 "\n"
 "- Демонот (%s) вклучув:\n"
 
-#: standalone/drakbackup:2920
+#: standalone/drakbackup:2624
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-Тврд диск.\n"
 
-#: standalone/drakbackup:2921
+#: standalone/drakbackup:2625
 #, fuzzy, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-CDROM.\n"
 
-#: standalone/drakbackup:2922
+#: standalone/drakbackup:2626
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-Лента \n"
 
-#: standalone/drakbackup:2923
+#: standalone/drakbackup:2627
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-Мрежа од  FTP.\n"
 
-#: standalone/drakbackup:2924
+#: standalone/drakbackup:2628
 #, fuzzy, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-Мрежа за SSH.\n"
 
-#: standalone/drakbackup:2925
+#: standalone/drakbackup:2629
 #, fuzzy, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-Мрежа од rsync.\n"
 
-#: standalone/drakbackup:2926
+#: standalone/drakbackup:2630
 #, fuzzy, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-Мрежа од webdav.\n"
 
-#: standalone/drakbackup:2928
+#: standalone/drakbackup:2632
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr "Нема конфигурација, ве молиме кликнете на Волшебник или Напредно.\n"
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2637
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -17495,33 +17621,33 @@ msgstr ""
 "Листа на податоци за повраќање:\n"
 "\n"
 
-#: standalone/drakbackup:2935
+#: standalone/drakbackup:2639
 #, fuzzy, c-format
 msgid "- Restore System Files.\n"
 msgstr ""
 "\n"
 " Систем Датотеки"
 
-#: standalone/drakbackup:2937 standalone/drakbackup:2947
+#: standalone/drakbackup:2641 standalone/drakbackup:2651
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2940
+#: standalone/drakbackup:2644
 #, fuzzy, c-format
 msgid "- Restore User Files: \n"
 msgstr ""
 "\n"
 " Кориснички Датотеки"
 
-#: standalone/drakbackup:2945
+#: standalone/drakbackup:2649
 #, fuzzy, c-format
 msgid "- Restore Other Files: \n"
 msgstr ""
 "\n"
 " Други Датотеки:\n"
 
-#: standalone/drakbackup:3121
+#: standalone/drakbackup:2830
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -17530,159 +17656,160 @@ msgstr ""
 "Листа на оштетени податоци:\n"
 "\n"
 
-#: standalone/drakbackup:3123
+#: standalone/drakbackup:2832
 #, fuzzy, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "Ве молиме исклучете го или избришете го следниот пат."
 
-#: standalone/drakbackup:3133
+#: standalone/drakbackup:2842
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "Бекап датотеките се оштетени"
 
-#: standalone/drakbackup:3154
+#: standalone/drakbackup:2863
 #, fuzzy, c-format
 msgid "          All of your selected data have been          "
 msgstr "Сите податок "
 
-#: standalone/drakbackup:3155
+#: standalone/drakbackup:2864
 #, c-format
 msgid "          Successfuly Restored on %s       "
 msgstr "                Успешно Повратено на %s      "
 
-#: standalone/drakbackup:3270
+#: standalone/drakbackup:2987
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         Врати ја Конфигурацијата           "
 
-#: standalone/drakbackup:3298
+#: standalone/drakbackup:3015
 #, c-format
 msgid "OK to restore the other files."
 msgstr "Во ред е да се повратат другите датотеки."
 
-#: standalone/drakbackup:3316
+#: standalone/drakbackup:3031
 #, fuzzy, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr "Корисник на"
 
-#: standalone/drakbackup:3382
+#: standalone/drakbackup:3098
 #, fuzzy, c-format
 msgid "Please choose the date to restore:"
 msgstr "изберете ја датата на враќање"
 
-#: standalone/drakbackup:3420
+#: standalone/drakbackup:3135
 #, fuzzy, c-format
 msgid "Restore from Hard Disk."
 msgstr "Врати од Тврдиот Диск."
 
-#: standalone/drakbackup:3422
+#: standalone/drakbackup:3137
 #, fuzzy, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "Одберете директориум каде бекапот ќе биде распакуван"
 
-#: standalone/drakbackup:3478
+#: standalone/drakbackup:3141
+#, fuzzy, c-format
+msgid "Directory with backups"
+msgstr "Врати ги сите"
+
+#: standalone/drakbackup:3194
 #, fuzzy, c-format
 msgid "Select another media to restore from"
 msgstr "избери друг медиум за враќање од"
 
-#: standalone/drakbackup:3480
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Other Media"
 msgstr "Друг медиум"
 
-#: standalone/drakbackup:3485
+#: standalone/drakbackup:3201
 #, c-format
 msgid "Restore system"
 msgstr "Врати го системот"
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3202
 #, c-format
 msgid "Restore Users"
 msgstr "Поврати корисници"
 
-#: standalone/drakbackup:3487
+#: standalone/drakbackup:3203
 #, c-format
 msgid "Restore Other"
 msgstr "Поврати друг"
 
-#: standalone/drakbackup:3489
+#: standalone/drakbackup:3205
 #, fuzzy, c-format
-msgid "select path to restore (instead of /)"
+msgid "Select path to restore (instead of /)"
 msgstr "одберете ја патеката на враќање"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3209 standalone/drakbackup:3490
+#, fuzzy, c-format
+msgid "Path To Restore To"
+msgstr "Повратување По Избор"
+
+#: standalone/drakbackup:3212
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr ""
 "Направи нов бекап пред повраќањето на информации (само за инкрементални "
 "бекапи.)"
 
-#: standalone/drakbackup:3495
+#: standalone/drakbackup:3214
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Отстрани ги корисничките директориуми пред повратувањето."
 
-#: standalone/drakbackup:3575
+#: standalone/drakbackup:3298
 #, fuzzy, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr "Име на датотеката која се бара (дозволени се џокери)"
 
-#: standalone/drakbackup:3578
+#: standalone/drakbackup:3301
 #, c-format
 msgid "Search Backups"
 msgstr "Барај бекапи"
 
-#: standalone/drakbackup:3597
+#: standalone/drakbackup:3320
 #, fuzzy, c-format
 msgid "No matches found..."
 msgstr "Не е пронајдена слика!"
 
-#: standalone/drakbackup:3601
+#: standalone/drakbackup:3324
 #, fuzzy, c-format
 msgid "Restore Selected"
 msgstr "Врати\n"
 
-#: standalone/drakbackup:3735
+#: standalone/drakbackup:3458
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
 "Ctrl-Click files to select multiple files."
 msgstr ""
 
-#: standalone/drakbackup:3741
+#: standalone/drakbackup:3464
 #, fuzzy, c-format
 msgid ""
 "Restore Selected\n"
 "Catalog Entry"
 msgstr "Врати\n"
 
-#: standalone/drakbackup:3750
+#: standalone/drakbackup:3473
 #, fuzzy, c-format
 msgid ""
 "Restore Selected\n"
 "Files"
 msgstr "Врати\n"
 
-#: standalone/drakbackup:3766
-#, c-format
-msgid ""
-"Change\n"
-"Restore Path"
-msgstr ""
-"Промени\n"
-"Врати Патека"
-
-#: standalone/drakbackup:3833
+#: standalone/drakbackup:3550
 #, fuzzy, c-format
 msgid "Backup files not found at %s."
 msgstr "Датотеки од Сигурносна копија не се најдено во %s."
 
-#: standalone/drakbackup:3846
+#: standalone/drakbackup:3563
 #, c-format
 msgid "Restore From CD"
 msgstr "Поврати од CD"
 
-#: standalone/drakbackup:3846
+#: standalone/drakbackup:3563
 #, fuzzy, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -17691,17 +17818,17 @@ msgstr ""
 "Вметни CD јачина s\n"
 " во CD"
 
-#: standalone/drakbackup:3848
+#: standalone/drakbackup:3565
 #, fuzzy, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "CD s."
 
-#: standalone/drakbackup:3858
+#: standalone/drakbackup:3575
 #, c-format
 msgid "Restore From Tape"
 msgstr "Врати Од Лента"
 
-#: standalone/drakbackup:3858
+#: standalone/drakbackup:3575
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -17710,213 +17837,218 @@ msgstr ""
 "Внесете ја лентата насловена %s\n"
 " во лентовниот уред %s"
 
-#: standalone/drakbackup:3860
+#: standalone/drakbackup:3577
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "Не точната ознака на лентата. Лентата е означена %s."
 
-#: standalone/drakbackup:3871
+#: standalone/drakbackup:3588
 #, fuzzy, c-format
 msgid "Restore Via Network"
 msgstr "Врати"
 
-#: standalone/drakbackup:3871
+#: standalone/drakbackup:3588
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "Поврати преку мрежен протокол:%s"
 
-#: standalone/drakbackup:3872
+#: standalone/drakbackup:3589
 #, c-format
 msgid "Host Name"
 msgstr "Име на компјутерот"
 
-#: standalone/drakbackup:3873
+#: standalone/drakbackup:3590
 #, fuzzy, c-format
 msgid "Host Path or Module"
 msgstr "Хост Патека или Модул"
 
-#: standalone/drakbackup:3880
+#: standalone/drakbackup:3597
 #, c-format
 msgid "Password required"
 msgstr "Лозинка се бара"
 
-#: standalone/drakbackup:3886
+#: standalone/drakbackup:3603
 #, c-format
 msgid "Username required"
 msgstr "Потреба од корисничко име"
 
-#: standalone/drakbackup:3889
+#: standalone/drakbackup:3606
 #, c-format
 msgid "Hostname required"
 msgstr "Потребно е Име на компјутерот"
 
-#: standalone/drakbackup:3894
+#: standalone/drakbackup:3611
 #, c-format
 msgid "Path or Module required"
 msgstr "Потребно е Патека или Модул"
 
-#: standalone/drakbackup:3907
+#: standalone/drakbackup:3624
 #, c-format
 msgid "Files Restored..."
 msgstr "Повратени датотеки..."
 
-#: standalone/drakbackup:3910
+#: standalone/drakbackup:3627
 #, c-format
 msgid "Restore Failed..."
 msgstr "Враќањето не успеа..."
 
-#: standalone/drakbackup:4015 standalone/drakbackup:4031
+#: standalone/drakbackup:3737 standalone/drakbackup:3754
 #, fuzzy, c-format
 msgid "%s not retrieved..."
 msgstr "%s не е најдено...\n"
 
-#: standalone/drakbackup:4155 standalone/drakbackup:4228
+#: standalone/drakbackup:3880 standalone/drakbackup:3953
 #, c-format
 msgid "Search for files to restore"
 msgstr "Барај кои датотеки да се повратат"
 
-#: standalone/drakbackup:4160
+#: standalone/drakbackup:3885
 #, fuzzy, c-format
 msgid "Restore all backups"
 msgstr "Врати ги сите"
 
-#: standalone/drakbackup:4169
+#: standalone/drakbackup:3894
 #, c-format
 msgid "Custom Restore"
 msgstr "Повратување По Избор"
 
-#: standalone/drakbackup:4174 standalone/drakbackup:4224
+#: standalone/drakbackup:3899 standalone/drakbackup:3949
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Врати Од Каталог"
 
-#: standalone/drakbackup:4196
+#: standalone/drakbackup:3921
 #, fuzzy, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "Ве молиме изберете ги податоците за враќање..."
 
-#: standalone/drakbackup:4197
+#: standalone/drakbackup:3922
 #, fuzzy, c-format
 msgid "Verify that %s is the correct path"
 msgstr "Дали се ова точните подесувања?"
 
-#: standalone/drakbackup:4198
+#: standalone/drakbackup:3923
 #, c-format
 msgid " and the CD is in the drive"
 msgstr ""
 
-#: standalone/drakbackup:4200
+#: standalone/drakbackup:3925
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 
-#: standalone/drakbackup:4216
+#: standalone/drakbackup:3941
 #, fuzzy, c-format
 msgid "CD in place - continue."
 msgstr "CD во."
 
-#: standalone/drakbackup:4221
+#: standalone/drakbackup:3946
 #, fuzzy, c-format
 msgid "Browse to new restore repository."
 msgstr "Разгледај на."
 
-#: standalone/drakbackup:4258
+#: standalone/drakbackup:3947
+#, fuzzy, c-format
+msgid "Directory To Restore From"
+msgstr "Поврати од CD"
+
+#: standalone/drakbackup:3986
 #, fuzzy, c-format
 msgid "Restore Progress"
 msgstr "Врати"
 
-#: standalone/drakbackup:4292 standalone/drakbackup:4404
-#: standalone/logdrake:175
+#: standalone/drakbackup:4016 standalone/drakbackup:4123
+#: standalone/logdrake:174
 #, fuzzy, c-format
 msgid "Save"
 msgstr "Состојба"
 
-#: standalone/drakbackup:4378
+#: standalone/drakbackup:4099
 #, c-format
 msgid "Build Backup"
 msgstr "Направи бекап"
 
-#: standalone/drakbackup:4430 standalone/drakbackup:4829
+#: standalone/drakbackup:4147 standalone/drakbackup:4512
 #, c-format
 msgid "Restore"
 msgstr "Поврати"
 
-#: standalone/drakbackup:4600
+#: standalone/drakbackup:4277
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "Следниве пакети мора да се инсталирани:\n"
 
-#: standalone/drakbackup:4622
+#: standalone/drakbackup:4304
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Ве молиме изберете ги податоците за враќање..."
 
-#: standalone/drakbackup:4662
+#: standalone/drakbackup:4344
 #, c-format
 msgid "Backup system files"
 msgstr "Сигурносна копија на системски датотеки"
 
-#: standalone/drakbackup:4665
+#: standalone/drakbackup:4347
 #, fuzzy, c-format
 msgid "Backup user files"
 msgstr "Сигурносна копија"
 
-#: standalone/drakbackup:4668
+#: standalone/drakbackup:4350
 #, c-format
 msgid "Backup other files"
 msgstr "Бекап на други датотеки"
 
-#: standalone/drakbackup:4671 standalone/drakbackup:4707
+#: standalone/drakbackup:4353 standalone/drakbackup:4389
 #, c-format
 msgid "Total Progress"
 msgstr "Вкупен Напредок"
 
-#: standalone/drakbackup:4699
+#: standalone/drakbackup:4381
 #, c-format
 msgid "Sending files by FTP"
 msgstr "Се испраќаат датотеките преку FTP"
 
-#: standalone/drakbackup:4702
+#: standalone/drakbackup:4384
 #, c-format
 msgid "Sending files..."
 msgstr "Праќа датотеки..."
 
-#: standalone/drakbackup:4772
+#: standalone/drakbackup:4455
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "Направете бекап Сега од конфигурационата датотека"
 
-#: standalone/drakbackup:4777
+#: standalone/drakbackup:4460
 #, c-format
 msgid "View Backup Configuration."
 msgstr "Приказ на Сигурносна копија на Конфигурација."
 
-#: standalone/drakbackup:4803
+#: standalone/drakbackup:4486
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Конфигурација со Волшебник"
 
-#: standalone/drakbackup:4808
+#: standalone/drakbackup:4491
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Напредна Конфигурација"
 
-#: standalone/drakbackup:4813
+#: standalone/drakbackup:4496
 #, c-format
 msgid "View Configuration"
 msgstr "Види Конфигурација"
 
-#: standalone/drakbackup:4817
+#: standalone/drakbackup:4500
 #, c-format
 msgid "View Last Log"
 msgstr "Види го Последниот Лог"
 
-#: standalone/drakbackup:4822
+#: standalone/drakbackup:4505
 #, fuzzy, c-format
 msgid "Backup Now"
 msgstr "Бекап Сега"
 
-#: standalone/drakbackup:4826
+#: standalone/drakbackup:4509
 #, fuzzy, c-format
 msgid ""
 "No configuration file found \n"
@@ -17925,67 +18057,67 @@ msgstr ""
 "Не е пронајдена датотеката\n"
 "Ве молиме одберете Волшебник или Напредно."
 
-#: standalone/drakbackup:4858 standalone/drakbackup:4865
+#: standalone/drakbackup:4530 standalone/drakbackup:4533
 #, c-format
 msgid "Drakbackup"
 msgstr "Drakbackup"
 
-#: standalone/drakboot:56
+#: standalone/drakboot:57
 #, fuzzy, c-format
 msgid "Graphical boot theme selection"
 msgstr "Печатач"
 
-#: standalone/drakboot:56
+#: standalone/drakboot:57
 #, c-format
 msgid "System mode"
 msgstr "Системски режим"
 
-#: 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 "/_Датотека"
 
-#: standalone/drakboot:67 standalone/drakfloppy:47 standalone/logdrake:76
+#: standalone/drakboot:68 standalone/drakfloppy:47 standalone/logdrake:77
 #, c-format
 msgid "/File/_Quit"
 msgstr "/Датотека/_Напушти"
 
-#: 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 "Инсталирање теми"
 
-#: standalone/drakboot:119
+#: standalone/drakboot:120
 #, c-format
 msgid "Create new theme"
 msgstr "Креирај нова тема"
 
-#: standalone/drakboot:133
+#: standalone/drakboot:134
 #, c-format
 msgid "Use graphical boot"
 msgstr ""
 
-#: standalone/drakboot:138
+#: 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."
 msgstr ""
 
-#: standalone/drakboot:145
+#: standalone/drakboot:146
 #, fuzzy, c-format
 msgid "Theme"
 msgstr "Теми"
 
-#: standalone/drakboot:147
+#: standalone/drakboot:149
 #, c-format
 msgid ""
 "Display theme\n"
@@ -17994,32 +18126,32 @@ msgstr ""
 "Приказ на тема\n"
 "под конзолата"
 
-#: standalone/drakboot:156
+#: standalone/drakboot:158
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "Вклучување на графичката околина по подигање на системот"
 
-#: standalone/drakboot:164
-#, c-format
-msgid "Yes, I want autologin with this (user, desktop)"
-msgstr "Да, сакам авто-најавување со овој (корисник, околина)"
-
-#: standalone/drakboot:165
+#: standalone/drakboot:166
 #, c-format
 msgid "No, I don't want autologin"
 msgstr "Не, не сакам авто-најавување"
 
-#: standalone/drakboot:171
+#: standalone/drakboot:167
+#, c-format
+msgid "Yes, I want autologin with this (user, desktop)"
+msgstr "Да, сакам авто-најавување со овој (корисник, околина)"
+
+#: standalone/drakboot:173
 #, c-format
 msgid "Default user"
 msgstr "Стандарден корисник"
 
-#: standalone/drakboot:172
+#: standalone/drakboot:174
 #, c-format
 msgid "Default desktop"
 msgstr "Стандардна Работна површина"
 
-#: standalone/drakboot:236
+#: standalone/drakboot:238
 #, c-format
 msgid "Installation of %s failed. The following error occured:"
 msgstr "Инсталацијата на %s не успеа. Се појавија следниве грешки:"
@@ -18269,12 +18401,12 @@ msgstr "Поврати преку мрежен протокол:%s"
 msgid "Server:"
 msgstr "Сервер: "
 
-#: standalone/drakclock:125 standalone/drakclock:137
+#: standalone/drakclock:129 standalone/drakclock:141
 #, fuzzy, c-format
 msgid "Reset"
 msgstr "Одбиј"
 
-#: standalone/drakclock:200
+#: standalone/drakclock:204
 #, c-format
 msgid ""
 "We need to install ntp package\n"
@@ -18283,212 +18415,203 @@ msgid ""
 "Do you want to install ntp ?"
 msgstr ""
 
-#: standalone/drakconnect:78
+#: standalone/drakconnect:81
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Конфигурација на Мрежа (%d адаптери)"
 
-#: standalone/drakconnect:89 standalone/drakconnect:686
+#: standalone/drakconnect:92 standalone/drakconnect:728
 #, fuzzy, c-format
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: standalone/drakconnect:89 standalone/drakconnect:686
+#: standalone/drakconnect:92 standalone/drakconnect:728
 #, c-format
 msgid "Interface:"
 msgstr "Интерфејс:"
 
-#: standalone/drakconnect:93 standalone/net_monitor:105
+#: standalone/drakconnect:96 standalone/net_monitor:105
 #, fuzzy, c-format
 msgid "Wait please"
 msgstr "Почекајте"
 
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116
 #, c-format
 msgid "Interface"
 msgstr "Интерфејс"
 
-#: standalone/drakconnect:113 standalone/drakconnect:502
-#: standalone/drakvpn:1136
-#, fuzzy, c-format
-msgid "Protocol"
-msgstr "Протокол"
-
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116 standalone/drakups:233
 #, fuzzy, c-format
 msgid "Driver"
 msgstr "Драјвер"
 
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116
 #, c-format
 msgid "State"
 msgstr "Состојба"
 
-#: standalone/drakconnect:130
+#: standalone/drakconnect:133
 #, fuzzy, c-format
 msgid "Hostname: "
 msgstr "Име на компјутер "
 
-#: standalone/drakconnect:132
+#: standalone/drakconnect:135
 #, c-format
 msgid "Configure hostname..."
 msgstr "Конфигурирај го името на хостот..."
 
-#: standalone/drakconnect:146 standalone/drakconnect:727
+#: standalone/drakconnect:149 standalone/drakconnect:769
 #, c-format
 msgid "LAN configuration"
 msgstr "LAN конфигурација"
 
-#: standalone/drakconnect:151
+#: standalone/drakconnect:154
 #, fuzzy, c-format
 msgid "Configure Local Area Network..."
 msgstr "Конфигурирај Локален Мрежа."
 
-#: standalone/drakconnect:159 standalone/drakconnect:228
-#: standalone/drakconnect:232
+#: standalone/drakconnect:162 standalone/drakconnect:237
+#: standalone/drakconnect:241
 #, c-format
 msgid "Apply"
 msgstr "Примени"
 
-#: standalone/drakconnect:254 standalone/drakconnect:263
-#: standalone/drakconnect:277 standalone/drakconnect:283
-#: standalone/drakconnect:293 standalone/drakconnect:294
-#: standalone/drakconnect:540
+#: standalone/drakconnect:197
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Врска со кабел"
+
+#: 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 ""
 
-#: 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
 #, fuzzy, c-format
 msgid "Account"
 msgstr "За"
 
-#: 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 ""
 
-#: standalone/drakconnect:325
+#: standalone/drakconnect:344
 #, fuzzy, c-format
 msgid "DNS servers"
 msgstr "DNS сервер"
 
-#: standalone/drakconnect:332
+#: standalone/drakconnect:351
 #, fuzzy, c-format
 msgid "Search Domain"
 msgstr "NIS Домен"
 
-#: standalone/drakconnect:338
+#: standalone/drakconnect:359
 #, fuzzy, c-format
 msgid "static"
 msgstr "Автоматска IP"
 
-#: standalone/drakconnect:338
-#, fuzzy, c-format
-msgid "dhcp"
-msgstr "користи dhcp"
+#: standalone/drakconnect:359
+#, c-format
+msgid "DHCP"
+msgstr ""
 
-#: standalone/drakconnect:457
+#: standalone/drakconnect:482
 #, fuzzy, c-format
 msgid "Flow control"
 msgstr "<control>S"
 
-#: standalone/drakconnect:458
+#: standalone/drakconnect:483
 #, fuzzy, c-format
 msgid "Line termination"
 msgstr "Интернет"
 
-#: standalone/drakconnect:463
-#, c-format
-msgid "Tone dialing"
-msgstr ""
-
-#: standalone/drakconnect:463
-#, c-format
-msgid "Pulse dialing"
-msgstr ""
-
-#: standalone/drakconnect:468
+#: standalone/drakconnect:493
 #, fuzzy, c-format
 msgid "Use lock file"
 msgstr "Избор на датотека"
 
-#: standalone/drakconnect:471
+#: standalone/drakconnect:496
 #, fuzzy, c-format
 msgid "Modem timeout"
 msgstr "Пауза пред подигање на кернел"
 
-#: standalone/drakconnect:475
+#: standalone/drakconnect:500
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr ""
 
-#: standalone/drakconnect:478
+#: standalone/drakconnect:503
 #, fuzzy, c-format
 msgid "Busy wait"
 msgstr "Кувајт"
 
-#: standalone/drakconnect:482
+#: standalone/drakconnect:507
 #, fuzzy, c-format
 msgid "Modem sound"
 msgstr "Модем"
 
-#: standalone/drakconnect:483
+#: standalone/drakconnect:508
 #, fuzzy, c-format
 msgid "Enable"
 msgstr "овозможи"
 
-#: standalone/drakconnect:483
+#: standalone/drakconnect:508
 #, fuzzy, c-format
 msgid "Disable"
 msgstr "неовозможено"
 
-#: standalone/drakconnect:522 standalone/harddrake2:58
+#: standalone/drakconnect:558 standalone/harddrake2:58
 #, c-format
 msgid "Media class"
 msgstr "Класа на медиумот"
 
-#: standalone/drakconnect:523 standalone/drakfloppy:140
+#: standalone/drakconnect:559 standalone/drakfloppy:140
 #, c-format
 msgid "Module name"
 msgstr "Име на Модулот"
 
-#: standalone/drakconnect:524
+#: standalone/drakconnect:560
 #, fuzzy, c-format
 msgid "Mac Address"
 msgstr "Пренеси Адреса:"
 
-#: standalone/drakconnect:525 standalone/harddrake2:21
+#: standalone/drakconnect:561 standalone/harddrake2:21
 #, c-format
 msgid "Bus"
 msgstr "Магистрала"
 
-#: standalone/drakconnect:526 standalone/harddrake2:29
+#: standalone/drakconnect:562 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr "Локација на магистралата"
 
-#: standalone/drakconnect:587
-#, c-format
+#: standalone/drakconnect:632 standalone/drakgw:248 standalone/drakpxe:138
+#, fuzzy, 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 ""
+"Не Вклучено.Нема детектирано ethernet мрежен адаптер на Вашиот систем. Ве "
+"молиме стартувајте ја алатката за конфигурација на хардвер."
 
-#: standalone/drakconnect:597
+#: standalone/drakconnect:638
 #, fuzzy, c-format
 msgid "Remove a network interface"
 msgstr "Изберете го мрежниот интерфејс"
 
-#: standalone/drakconnect:601
+#: standalone/drakconnect:642
 #, fuzzy, c-format
 msgid "Select the network interface to remove:"
 msgstr "Изберете го мрежниот интерфејс"
 
-#: standalone/drakconnect:617
+#: standalone/drakconnect:656
 #, fuzzy, c-format
 msgid ""
 "An error occured while deleting the \"%s\" network interface:\n"
@@ -18499,53 +18622,53 @@ msgstr ""
 "\n"
 "%s"
 
-#: standalone/drakconnect:619
+#: standalone/drakconnect:658
 #, c-format
 msgid ""
 "Congratulations, the \"%s\" network interface has been succesfully deleted"
 msgstr ""
 
-#: standalone/drakconnect:636
+#: standalone/drakconnect:675
 #, c-format
 msgid "No Ip"
 msgstr ""
 
-#: standalone/drakconnect:637
+#: standalone/drakconnect:676
 #, c-format
 msgid "No Mask"
 msgstr "Без маска"
 
-#: standalone/drakconnect:638 standalone/drakconnect:798
+#: standalone/drakconnect:677 standalone/drakconnect:840
 #, c-format
 msgid "up"
 msgstr ""
 
-#: standalone/drakconnect:638 standalone/drakconnect:798
+#: standalone/drakconnect:677 standalone/drakconnect:840
 #, fuzzy, c-format
 msgid "down"
 msgstr "направено"
 
-#: standalone/drakconnect:677 standalone/net_monitor:415
+#: standalone/drakconnect:718 standalone/net_monitor:415
 #, fuzzy, c-format
 msgid "Connected"
 msgstr "Поврзан"
 
-#: standalone/drakconnect:677 standalone/net_monitor:415
+#: standalone/drakconnect:718 standalone/net_monitor:415
 #, c-format
 msgid "Not connected"
 msgstr "Не е поврзан"
 
-#: standalone/drakconnect:678
+#: standalone/drakconnect:720
 #, c-format
 msgid "Disconnect..."
 msgstr "Откачи..."
 
-#: standalone/drakconnect:678
+#: standalone/drakconnect:720
 #, c-format
 msgid "Connect..."
 msgstr "Поврзан..."
 
-#: standalone/drakconnect:707
+#: standalone/drakconnect:749
 #, fuzzy, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
@@ -18554,17 +18677,17 @@ msgstr ""
 "Внимание, детектирана е друга Интернет конекција, која ја користи Вашата "
 "мрежа"
 
-#: standalone/drakconnect:723
+#: standalone/drakconnect:765
 #, fuzzy, c-format
 msgid "Deactivate now"
 msgstr "деактивирај сега"
 
-#: standalone/drakconnect:723
+#: standalone/drakconnect:765
 #, fuzzy, c-format
 msgid "Activate now"
 msgstr "активирај сега"
 
-#: standalone/drakconnect:731
+#: standalone/drakconnect:773
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -18573,27 +18696,27 @@ msgstr ""
 "Немате ниту еден конфигуриран интерфејс.\n"
 "Најпрво ги конфигурирајте со притискање на 'Configure'"
 
-#: standalone/drakconnect:745
+#: standalone/drakconnect:787
 #, c-format
 msgid "LAN Configuration"
 msgstr "Конфигурација на LAN"
 
-#: standalone/drakconnect:757
+#: standalone/drakconnect:799
 #, fuzzy, c-format
 msgid "Adapter %s: %s"
 msgstr "Адаптер %s: %s"
 
-#: standalone/drakconnect:766
+#: standalone/drakconnect:808
 #, c-format
 msgid "Boot Protocol"
 msgstr "Подигачки протокол"
 
-#: standalone/drakconnect:767
+#: standalone/drakconnect:809
 #, c-format
 msgid "Started on boot"
 msgstr "Покренато при стартување"
 
-#: standalone/drakconnect:803
+#: standalone/drakconnect:845
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
@@ -18602,7 +18725,7 @@ msgstr ""
 "овој интерфејс не е конфигуриран.\n"
 " Стартувај го волшебникот за конфгурација."
 
-#: standalone/drakconnect:858
+#: standalone/drakconnect:900
 #, fuzzy, c-format
 msgid ""
 "You don't have any configured Internet connection.\n"
@@ -18611,47 +18734,32 @@ msgstr ""
 "Немате Интернет конекција\n"
 " Создадете една притискакчи на 'Конфигурирај'"
 
-#: standalone/drakconnect:866
+#: standalone/drakconnect:908
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Конфигурација на Интернет конекција"
 
-#: standalone/drakconnect:907
-#, c-format
-msgid "Provider dns 1 (optional)"
-msgstr "Провајдер dns 1 (опција)"
-
-#: standalone/drakconnect:908
-#, c-format
-msgid "Provider dns 2 (optional)"
-msgstr "dns Провајдер 2 (опционо)"
-
-#: standalone/drakconnect:921
-#, c-format
-msgid "Ethernet Card"
-msgstr "Мрежна картичка"
-
-#: standalone/drakconnect:922
-#, c-format
-msgid "DHCP Client"
-msgstr "DHCP клиент"
+#: standalone/drakconnect:926
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Прв DNS Сервер (ако треба)"
 
-#: standalone/drakconnect:951
+#: standalone/drakconnect:948
 #, fuzzy, c-format
 msgid "Internet Connection Configuration"
 msgstr "Конфигурација на Интернет Конекција"
 
-#: standalone/drakconnect:952
+#: standalone/drakconnect:949
 #, c-format
 msgid "Internet access"
 msgstr "Интернет пристап"
 
-#: standalone/drakconnect:954 standalone/net_monitor:87
+#: standalone/drakconnect:951 standalone/net_monitor:87
 #, c-format
 msgid "Connection type: "
 msgstr "Тип на Врска: "
 
-#: standalone/drakconnect:957
+#: standalone/drakconnect:954
 #, fuzzy, c-format
 msgid "Status:"
 msgstr "Статус:"
@@ -18792,109 +18900,109 @@ msgstr ""
 " %s\n"
 " %s"
 
-#: standalone/drakfont:181
+#: standalone/drakfont:183
 #, c-format
 msgid "Search installed fonts"
 msgstr "Пребарај инсталирани фонтови"
 
-#: standalone/drakfont:183
+#: standalone/drakfont:185
 #, c-format
 msgid "Unselect fonts installed"
 msgstr "Отселектирај ги инсталираните фонтови"
 
-#: standalone/drakfont:206
+#: standalone/drakfont:208
 #, c-format
 msgid "parse all fonts"
 msgstr ""
 
-#: standalone/drakfont:208
+#: standalone/drakfont:210
 #, fuzzy, c-format
 msgid "No fonts found"
 msgstr "не се најдени фонтови"
 
-#: 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 "направено"
 
-#: standalone/drakfont:221
+#: standalone/drakfont:223
 #, fuzzy, c-format
 msgid "Could not find any font in your mounted partitions"
 msgstr "не се пронајде ниту еден фонт на вашите монтирани паритиции"
 
-#: standalone/drakfont:254
+#: standalone/drakfont:256
 #, c-format
 msgid "Reselect correct fonts"
 msgstr "Повторно ги селектирај точните фонтови"
 
-#: standalone/drakfont:257
+#: standalone/drakfont:259
 #, fuzzy, c-format
 msgid "Could not find any font.\n"
 msgstr "не можам да пронајдам ни еден фонт.\n"
 
-#: standalone/drakfont:267
+#: standalone/drakfont:269
 #, fuzzy, c-format
 msgid "Search for fonts in installed list"
 msgstr "Пребарај ги фонтовите во листата на инсталирани фонтови"
 
-#: standalone/drakfont:292
+#: standalone/drakfont:294
 #, fuzzy, c-format
 msgid "%s fonts conversion"
 msgstr "Конверзија на %s фонтови"
 
-#: standalone/drakfont:321
+#: standalone/drakfont:323
 #, fuzzy, c-format
 msgid "Fonts copy"
 msgstr "Фонтови"
 
-#: standalone/drakfont:324
+#: standalone/drakfont:326
 #, fuzzy, c-format
 msgid "True Type fonts installation"
 msgstr "Тип на инсталација на фонтови"
 
-#: standalone/drakfont:331
+#: standalone/drakfont:333
 #, c-format
 msgid "please wait during ttmkfdir..."
 msgstr "Ве молиме почекајте..."
 
-#: standalone/drakfont:332
+#: standalone/drakfont:334
 #, fuzzy, c-format
 msgid "True Type install done"
 msgstr "Точно Тип"
 
-#: standalone/drakfont:338 standalone/drakfont:353
+#: standalone/drakfont:340 standalone/drakfont:355
 #, c-format
 msgid "type1inst building"
 msgstr ""
 
-#: standalone/drakfont:347
+#: standalone/drakfont:349
 #, c-format
 msgid "Ghostscript referencing"
 msgstr "Ghostscript поврзување"
 
-#: standalone/drakfont:357
+#: standalone/drakfont:359
 #, c-format
 msgid "Suppress Temporary Files"
 msgstr "Потисни ги Привремените Датотеки"
 
-#: standalone/drakfont:360
+#: standalone/drakfont:362
 #, fuzzy, c-format
 msgid "Restart XFS"
 msgstr "Рестартирај го XFS"
 
-#: standalone/drakfont:406 standalone/drakfont:416
+#: standalone/drakfont:408 standalone/drakfont:418
 #, c-format
 msgid "Suppress Fonts Files"
 msgstr "Потисни ги Датотеките со Фонтови"
 
-#: standalone/drakfont:418
+#: standalone/drakfont:420
 #, c-format
 msgid "xfs restart"
 msgstr "xfs рестарт"
 
-#: standalone/drakfont:426
+#: standalone/drakfont:428
 #, fuzzy, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -18907,32 +19015,32 @@ msgstr ""
 "коритење и \n"
 "инсталирање на Вашиот систем.\n"
 
-#: standalone/drakfont:474 standalone/drakfont:483
+#: standalone/drakfont:477 standalone/drakfont:486
 #, c-format
 msgid "DrakFont"
 msgstr ""
 
-#: standalone/drakfont:484
+#: standalone/drakfont:487
 #, c-format
 msgid "Font List"
 msgstr "Листа на Фонтови"
 
-#: standalone/drakfont:490
+#: standalone/drakfont:493
 #, c-format
 msgid "About"
 msgstr "За"
 
-#: standalone/drakfont:492 standalone/drakfont:681 standalone/drakfont:719
+#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
 #, fuzzy, c-format
 msgid "Uninstall"
 msgstr "Пост деинсталација"
 
-#: standalone/drakfont:493
+#: standalone/drakfont:496
 #, fuzzy, c-format
 msgid "Import"
 msgstr "Внеси Фонтови"
 
-#: standalone/drakfont:509
+#: standalone/drakfont:512
 #, c-format
 msgid ""
 "Copyright (C) 2001-2002 by MandrakeSoft \n"
@@ -18945,7 +19053,7 @@ msgid ""
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
 
-#: standalone/drakfont:518
+#: standalone/drakfont:521
 #, fuzzy, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -18979,7 +19087,7 @@ msgstr ""
 "Софтвер, Корпорација, 59 Temple Place - Suite 330, Boston, MA 02111-1307, "
 "USA.\n"
 
-#: standalone/drakfont:534
+#: standalone/drakfont:537
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -18997,12 +19105,12 @@ msgid ""
 "             Convert ttf font files to afm and pfb fonts\n"
 msgstr ""
 
-#: standalone/drakfont:553
+#: standalone/drakfont:556
 #, fuzzy, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "Избери ги апликациите кои ќе ги подржат фонтовите:"
 
-#: standalone/drakfont:554
+#: standalone/drakfont:557
 #, fuzzy, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -19015,195 +19123,195 @@ msgstr ""
 "коритење и \n"
 "инсталирање на Вашиот систем.\n"
 
-#: 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 "Генерички Принтери"
 
-#: standalone/drakfont:583
+#: standalone/drakfont:586
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "Изберете ја фонт датотеката или директориум и кликнете на 'Додади'"
 
-#: standalone/drakfont:597
+#: standalone/drakfont:587
+#, c-format
+msgid "File Selection"
+msgstr "Избор на датотека"
+
+#: standalone/drakfont:600
 #, c-format
 msgid "You've not selected any font"
 msgstr "немате одбрано ни еден фонт"
 
-#: standalone/drakfont:646
+#: standalone/drakfont:652
 #, fuzzy, c-format
 msgid "Import fonts"
 msgstr "Внеси Фонтови"
 
-#: standalone/drakfont:651
+#: standalone/drakfont:657
 #, fuzzy, c-format
 msgid "Install fonts"
 msgstr "Деинсталација на Фонтови"
 
-#: standalone/drakfont:686
+#: standalone/drakfont:692
 #, c-format
 msgid "click here if you are sure."
 msgstr "кликнете ако сте сигурни"
 
-#: standalone/drakfont:688
+#: standalone/drakfont:694
 #, c-format
 msgid "here if no."
 msgstr "овде ако не."
 
-#: standalone/drakfont:727
+#: standalone/drakfont:733
 #, c-format
 msgid "Unselected All"
 msgstr "Сите се неселектирани"
 
-#: standalone/drakfont:730
+#: standalone/drakfont:736
 #, c-format
 msgid "Selected All"
 msgstr "Слектирани сите"
 
-#: standalone/drakfont:733
+#: standalone/drakfont:739
 #, fuzzy, c-format
 msgid "Remove List"
 msgstr "Отстрани листа"
 
-#: standalone/drakfont:744 standalone/drakfont:763
+#: standalone/drakfont:750 standalone/drakfont:769
 #, fuzzy, c-format
 msgid "Importing fonts"
 msgstr "Внеси Фонтови"
 
-#: standalone/drakfont:748 standalone/drakfont:768
+#: standalone/drakfont:754 standalone/drakfont:774
 #, c-format
 msgid "Initial tests"
 msgstr "Инстални тестови"
 
-#: standalone/drakfont:749
+#: standalone/drakfont:755
 #, fuzzy, c-format
 msgid "Copy fonts on your system"
 msgstr "Копирај ги фонтовите на Вашиот компјутер"
 
-#: standalone/drakfont:750
+#: standalone/drakfont:756
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Инсталирај и конвертирај ѓи Фонтовите"
 
-#: standalone/drakfont:751
+#: standalone/drakfont:757
 #, c-format
 msgid "Post Install"
 msgstr "Постинсталација"
 
-#: standalone/drakfont:769
+#: standalone/drakfont:775
 #, fuzzy, c-format
 msgid "Remove fonts on your system"
 msgstr "Отстрани ги фонтовите од системот"
 
-#: standalone/drakfont:770
+#: standalone/drakfont:776
 #, c-format
 msgid "Post Uninstall"
 msgstr "Пост деинсталација"
 
-#: standalone/drakgw:59 standalone/drakgw:190
+#: standalone/drakgw:58 standalone/drakgw:193
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "Делење на Интернет Конекцијата"
 
-#: standalone/drakgw:117 standalone/drakvpn:49
-#, fuzzy, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "Жалам, ние подржуваме само 2.4 јадра."
+#: standalone/drakgw:124
+#, c-format
+msgid "Internet Connection Sharing currently disabled"
+msgstr "Делењето на Интернет Конекцијата моментално е оневозможена"
 
-#: standalone/drakgw:128
+#: standalone/drakgw:125
 #, fuzzy, c-format
-msgid "Internet Connection Sharing currently enabled"
-msgstr "Делење на Интернет конекција овозможена"
-
-#: standalone/drakgw:129
-#, 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 ""
-"Подесувањето за Делење на Интернет Конекција е веќе завршено.\n"
-"Моментално е овозможна.\n"
 "\n"
-"Што сакате да правите?"
+" s неовозможено\n"
+"\n"
+" на?"
 
-#: standalone/drakgw:133 standalone/drakvpn:99
+#: standalone/drakgw:129 standalone/drakvpn:125
 #, c-format
-msgid "disable"
-msgstr "неовозможено"
+msgid "enable"
+msgstr "овозможи"
 
-#: 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 "реконфигурирај"
 
-#: 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 "откажи"
 
 #: standalone/drakgw:136
 #, c-format
-msgid "Disabling servers..."
-msgstr "Се оневозможуваат серверите..."
-
-#: standalone/drakgw:150
-#, c-format
-msgid "Internet Connection Sharing is now disabled."
-msgstr "Делењето на интернет конекцијата сега е оневозможено."
+msgid "Enabling servers..."
+msgstr "Овозможување на серверите..."
 
-#: standalone/drakgw:157
-#, c-format
-msgid "Internet Connection Sharing currently disabled"
-msgstr "Делењето на Интернет Конекцијата моментално е оневозможена"
+#: standalone/drakgw:148
+#, fuzzy, c-format
+msgid "Internet Connection Sharing is now enabled."
+msgstr "Делењето на интернет Конекцијата овозможено."
 
-#: standalone/drakgw:158
+#: standalone/drakgw:151
 #, fuzzy, c-format
+msgid "Internet Connection Sharing currently enabled"
+msgstr "Делење на Интернет конекција овозможена"
+
+#: 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 ""
+"Подесувањето за Делење на Интернет Конекција е веќе завршено.\n"
+"Моментално е овозможна.\n"
 "\n"
-" s неовозможено\n"
-"\n"
-" на?"
+"Што сакате да правите?"
 
-#: standalone/drakgw:162 standalone/drakvpn:125
+#: standalone/drakgw:156 standalone/drakvpn:99
 #, c-format
-msgid "enable"
-msgstr "овозможи"
+msgid "disable"
+msgstr "неовозможено"
 
-#: standalone/drakgw:169
+#: standalone/drakgw:159
 #, c-format
-msgid "Enabling servers..."
-msgstr "Овозможување на серверите..."
+msgid "Disabling servers..."
+msgstr "Се оневозможуваат серверите..."
 
-#: standalone/drakgw:175
-#, fuzzy, c-format
-msgid "Internet Connection Sharing is now enabled."
-msgstr "Делењето на интернет Конекцијата овозможено."
+#: standalone/drakgw:174
+#, c-format
+msgid "Internet Connection Sharing is now disabled."
+msgstr "Делењето на интернет конекцијата сега е оневозможено."
 
-#: standalone/drakgw:191
+#: standalone/drakgw:194
 #, fuzzy, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -19223,48 +19331,27 @@ msgstr ""
 "\n"
 " Забелешка Мрежа на Локален Мрежа."
 
-#: 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 ""
-"Ве молиме внесете го името на интерфејсот за поврзување на Интернет\n"
-"\n"
-"На пример:\n"
-"\t\tppp+ за модем или DSL конекција, \n"
-"\t\teth0, или eth1 за кабелска конекција, \n"
-"\t\tippp+ за ISDN конекција. \n"
-
-#: standalone/drakgw:230
+#: standalone/drakgw:237
 #, fuzzy, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Интерфејс %s (користејќи модул %s)"
 
-#: standalone/drakgw:231
+#: standalone/drakgw:238
 #, c-format
 msgid "Interface %s"
 msgstr "Интерфејс %s"
 
-#: standalone/drakgw:241 standalone/drakpxe:138
+#: standalone/drakgw:247 standalone/drakpxe:137
 #, fuzzy, c-format
-msgid ""
-"No ethernet network adapter has been detected on your system. Please run the "
-"hardware configuration tool."
-msgstr ""
-"Не Вклучено.Нема детектирано ethernet мрежен адаптер на Вашиот систем. Ве "
-"молиме стартувајте ја алатката за конфигурација на хардвер."
+msgid "No network adapter on your system!"
+msgstr "Нема мрежен адаптер на Вашиот систем!"
 
-#: standalone/drakgw:247
+#: standalone/drakgw:254
 #, c-format
 msgid "Network interface"
 msgstr "Мрежен Интерфејс"
 
-#: standalone/drakgw:248
+#: standalone/drakgw:255
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -19279,7 +19366,7 @@ msgstr ""
 "\n"
 "Ќе ја подесам вашата Локална Мрежа со тој адаптер."
 
-#: standalone/drakgw:255
+#: standalone/drakgw:262
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
@@ -19288,12 +19375,12 @@ msgstr ""
 "Ве молиме изберете која мрежна картичка ќе биде поврзана на твојата Локална "
 "Мрежа."
 
-#: standalone/drakgw:283
+#: standalone/drakgw:291
 #, c-format
 msgid "Network interface already configured"
 msgstr "Мрежата е веќе конфигурирана"
 
-#: standalone/drakgw:284
+#: standalone/drakgw:292
 #, fuzzy, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -19308,27 +19395,27 @@ msgstr ""
 "\n"
 " Можете да го направите рачно, но треба да знаете што правите."
 
-#: standalone/drakgw:289
+#: standalone/drakgw:297
 #, fuzzy, c-format
 msgid "Automatic reconfiguration"
 msgstr "Автоматска реконфигурација"
 
-#: standalone/drakgw:289
+#: standalone/drakgw:297
 #, fuzzy, c-format
 msgid "No (experts only)"
 msgstr "Не (само за експерти)"
 
-#: standalone/drakgw:290
+#: standalone/drakgw:298
 #, fuzzy, c-format
 msgid "Show current interface configuration"
 msgstr "Прикажи ја моменталната конфигурација на интерфејсот"
 
-#: standalone/drakgw:291
+#: standalone/drakgw:299
 #, c-format
 msgid "Current interface configuration"
 msgstr "Тековна конфигурација на интерфејсот"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:300
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -19345,7 +19432,7 @@ msgstr ""
 "IP препишување: %s\n"
 "Драјвер: %s"
 
-#: standalone/drakgw:305
+#: standalone/drakgw:313
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -19373,12 +19460,12 @@ msgstr ""
 "DHCP сервер за вас.\n"
 "\n"
 
-#: standalone/drakgw:312
+#: standalone/drakgw:320
 #, fuzzy, c-format
 msgid "Local Network adress"
 msgstr "Локален Мрежа"
 
-#: standalone/drakgw:316
+#: standalone/drakgw:324
 #, fuzzy, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -19394,76 +19481,76 @@ msgstr ""
 "е.\n"
 "\n"
 
-#: standalone/drakgw:320
+#: standalone/drakgw:328
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "(Ова) DHCP Сервер IP"
 
-#: standalone/drakgw:321
+#: standalone/drakgw:329
 #, c-format
 msgid "The DNS Server IP"
 msgstr "DNS Сервер IP"
 
-#: standalone/drakgw:322
+#: standalone/drakgw:330
 #, c-format
 msgid "The internal domain name"
 msgstr "Внатрешно име на домен"
 
-#: standalone/drakgw:323
+#: standalone/drakgw:331
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCP ранг"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:332
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCP и ранг"
 
-#: standalone/drakgw:325
+#: standalone/drakgw:333
 #, fuzzy, c-format
 msgid "The default lease (in seconds)"
 msgstr "Стандардно во секунди"
 
-#: standalone/drakgw:326
+#: standalone/drakgw:334
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "Максимален закуп (во секунди)"
 
-#: standalone/drakgw:327
+#: standalone/drakgw:335
 #, fuzzy, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Ре-конфигурација на интерфејс и DHCP сервер"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:342
 #, fuzzy, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr "Локален Мрежа."
 
-#: standalone/drakgw:344
+#: standalone/drakgw:352
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 "Потенцијален конфликт во LAN адресата е најден во сегашната конфигурација на "
 "%s!\n"
 
-#: standalone/drakgw:354
+#: standalone/drakgw:362
 #, c-format
 msgid "Configuring..."
 msgstr "Се конфигурира..."
 
-#: standalone/drakgw:355
+#: standalone/drakgw:363
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 "Конфигурирање на скрипти, инсталирање на софтвер(програмски дел),стартување "
 "на серверите..."
 
-#: 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 "Проблеми при инсталација на пакетот %s"
 
-#: standalone/drakgw:584
+#: standalone/drakgw:595
 #, fuzzy, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -19542,7 +19629,7 @@ msgstr "Сопствени поставувања"
 msgid "Editable"
 msgstr "неовозможено"
 
-#: standalone/drakperm:48 standalone/drakperm:315
+#: standalone/drakperm:48 standalone/drakperm:314
 #, c-format
 msgid "Path"
 msgstr "Пат"
@@ -19557,7 +19644,7 @@ msgstr "Корисник"
 msgid "Group"
 msgstr "Група"
 
-#: standalone/drakperm:48 standalone/drakperm:327
+#: standalone/drakperm:48 standalone/drakperm:326
 #, c-format
 msgid "Permissions"
 msgstr "Дозоли"
@@ -19616,7 +19703,8 @@ msgstr "Додади ново правило на крајот"
 msgid "Delete selected rule"
 msgstr "Избриши"
 
-#: 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"
@@ -19717,12 +19805,12 @@ msgstr "Тековен корисник"
 msgid "When checked, owner and group won't be changed"
 msgstr "Кога е штиклирано, сопственикот и групата нема да бидат променети"
 
-#: standalone/drakperm:301
+#: standalone/drakperm:300
 #, c-format
 msgid "Path selection"
 msgstr "Бирање на патека"
 
-#: standalone/drakperm:321
+#: standalone/drakperm:320
 #, c-format
 msgid "Property"
 msgstr "Својство"
@@ -19851,7 +19939,7 @@ msgstr "СИТЕ"
 msgid "LOCAL"
 msgstr "ЛОКАЛНО"
 
-#: standalone/draksec:44
+#: standalone/draksec:44 standalone/drakvpn:1144
 #, c-format
 msgid "default"
 msgstr "стандардно"
@@ -19871,7 +19959,7 @@ msgstr "не"
 msgid "yes"
 msgstr "да"
 
-#: standalone/draksec:70
+#: standalone/draksec:81
 #, fuzzy, c-format
 msgid ""
 "Here, you can setup the security level and administrator of your machine.\n"
@@ -19962,32 +20050,32 @@ msgstr ""
 "<span foreground=\"royalblue3\">Параноидна</span>: Овде сите влезови во "
 "системот се затворени и се е поставено на максимум"
 
-#: standalone/draksec:118
+#: standalone/draksec:129
 #, c-format
 msgid "(default value: %s)"
 msgstr "(вообичаена вредност: %s)"
 
-#: standalone/draksec:159
+#: standalone/draksec:170
 #, c-format
 msgid "Security Level:"
 msgstr "Безбедносно Ниво:"
 
-#: standalone/draksec:162
+#: standalone/draksec:173
 #, fuzzy, c-format
 msgid "Security Alerts:"
 msgstr "Безбедност:"
 
-#: standalone/draksec:166
+#: standalone/draksec:177
 #, fuzzy, c-format
 msgid "Security Administrator:"
 msgstr "Безбедност:"
 
-#: standalone/draksec:168
+#: standalone/draksec:179
 #, fuzzy, c-format
 msgid "Basic options"
 msgstr "DrakSec основни опции"
 
-#: standalone/draksec:181
+#: standalone/draksec:192
 #, c-format
 msgid ""
 "The following options can be set to customize your\n"
@@ -19997,27 +20085,27 @@ msgstr ""
 "вашата системска сигурност. Ако ви треба објаснување, видете во ПОМОШ за "
 "совет.\n"
 
-#: standalone/draksec:183
+#: standalone/draksec:194
 #, c-format
 msgid "Network Options"
 msgstr "Мрежни опции"
 
-#: standalone/draksec:183
+#: standalone/draksec:194
 #, fuzzy, c-format
 msgid "System Options"
 msgstr "Системски Опции"
 
-#: standalone/draksec:229
+#: standalone/draksec:240
 #, c-format
 msgid "Periodic Checks"
 msgstr "Периоднични Проверки"
 
-#: standalone/draksec:247
+#: standalone/draksec:258
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "Ве молиме почекајте, се сетира сигурносното ниво..."
 
-#: standalone/draksec:253
+#: standalone/draksec:264
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "Ве молиме почекајте, се подесуваат сигурносните опции..."
@@ -20072,37 +20160,37 @@ msgstr ""
 "пакетот 'ImageMagick' бара да има целосна конфигурација.\n"
 "Кликнете \"Во ред\" за инсталација на 'ImageMagick' \"Откажи\" за излез."
 
-#: standalone/draksplash:67
+#: standalone/draksplash:68
 #, c-format
 msgid "first step creation"
 msgstr "прв чекор на создавање"
 
-#: standalone/draksplash:70
+#: standalone/draksplash:71
 #, c-format
 msgid "final resolution"
 msgstr "крајна резолуција"
 
-#: standalone/draksplash:71 standalone/draksplash:165
+#: standalone/draksplash:72
 #, c-format
 msgid "choose image file"
 msgstr "избери датотека со слика"
 
-#: standalone/draksplash:72
+#: standalone/draksplash:73
 #, c-format
 msgid "Theme name"
 msgstr "Име на Темата"
 
-#: standalone/draksplash:77
+#: standalone/draksplash:78
 #, c-format
 msgid "Browse"
 msgstr "Разгледај"
 
-#: standalone/draksplash:87 standalone/draksplash:153
+#: standalone/draksplash:93 standalone/draksplash:158
 #, fuzzy, c-format
 msgid "Configure bootsplash picture"
 msgstr "Конфигурирај"
 
-#: standalone/draksplash:90
+#: standalone/draksplash:96
 #, c-format
 msgid ""
 "x coordinate of text box\n"
@@ -20111,7 +20199,7 @@ msgstr ""
 "xкоординатата на текст кутијата\n"
 "во број на карактери"
 
-#: standalone/draksplash:91
+#: standalone/draksplash:97
 #, c-format
 msgid ""
 "y coordinate of text box\n"
@@ -20120,17 +20208,17 @@ msgstr ""
 "y координата на текст полето\n"
 "со голем број на карактери"
 
-#: standalone/draksplash:92
+#: standalone/draksplash:98
 #, c-format
 msgid "text width"
 msgstr "широчина на текстот"
 
-#: standalone/draksplash:93
+#: standalone/draksplash:99
 #, c-format
 msgid "text box height"
 msgstr "висина на текст полето"
 
-#: standalone/draksplash:94
+#: standalone/draksplash:100
 #, c-format
 msgid ""
 "the progress bar x coordinate\n"
@@ -20139,7 +20227,7 @@ msgstr ""
 "x координатата на прогреста лента\n"
 "од нејзиниот горен лев агол"
 
-#: standalone/draksplash:95
+#: standalone/draksplash:101
 #, c-format
 msgid ""
 "the progress bar y coordinate\n"
@@ -20148,87 +20236,250 @@ msgstr ""
 "y координатата на прогрес барот\n"
 "од неговиот горен лев агол"
 
-#: standalone/draksplash:96
+#: standalone/draksplash:102
 #, c-format
 msgid "the width of the progress bar"
 msgstr "ширина на прогрес лентата"
 
-#: standalone/draksplash:97
+#: standalone/draksplash:103
 #, c-format
 msgid "the height of the progress bar"
 msgstr "висината на прогрес лентата"
 
-#: standalone/draksplash:98
+#: standalone/draksplash:104
 #, c-format
 msgid "the color of the progress bar"
 msgstr "бојата на прогресната лента"
 
-#: standalone/draksplash:113
+#: standalone/draksplash:119
 #, fuzzy, c-format
 msgid "Preview"
 msgstr "Преглед"
 
-#: standalone/draksplash:115
+#: standalone/draksplash:121
 #, c-format
 msgid "Save theme"
 msgstr "Зачувај Тема"
 
-#: standalone/draksplash:116
+#: standalone/draksplash:122
 #, c-format
 msgid "Choose color"
 msgstr "Избери боја"
 
-#: standalone/draksplash:119
+#: standalone/draksplash:125
 #, fuzzy, c-format
 msgid "Display logo on Console"
 msgstr "Прикажи го логото на Конзолата"
 
-#: standalone/draksplash:120
+#: standalone/draksplash:126
 #, fuzzy, c-format
 msgid "Make kernel message quiet by default"
 msgstr "Направи кернел порака како стандардна"
 
-#: standalone/draksplash:156 standalone/draksplash:320
-#: standalone/draksplash:448
+#: standalone/draksplash:161 standalone/draksplash:319
+#: standalone/draksplash:462
 #, c-format
 msgid "Notice"
 msgstr "Забелешка"
 
-#: 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 "оваа тема се уште нема подигачки екран во %s !"
 
-#: standalone/draksplash:162
+#: standalone/draksplash:167
 #, c-format
 msgid "choose image"
 msgstr "Избери слика"
 
-#: standalone/draksplash:204
+#: standalone/draksplash:209
 #, c-format
 msgid "saving Bootsplash theme..."
 msgstr "зачувување на Bootsplas темата..."
 
-#: standalone/draksplash:428
+#: standalone/draksplash:443
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "избор на боја на ProgressBar"
 
-#: standalone/draksplash:448
+#: standalone/draksplash:462
 #, c-format
 msgid "You must choose an image file first!"
 msgstr "Мора прво да одберете некоја датотека!"
 
-#: standalone/draksplash:453
+#: standalone/draksplash:467
 #, c-format
 msgid "Generating preview ..."
 msgstr "генерирање на прегледот..."
 
-#: standalone/draksplash:499
+#: standalone/draksplash:512
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr "%s BootSplash (%s) преглед"
 
+#: standalone/drakups:63
+#, c-format
+msgid "Connected through a serial port or an usb cable"
+msgstr ""
+
+#: standalone/drakups:69
+#, fuzzy, c-format
+msgid "Add an UPS device"
+msgstr "Додај"
+
+#: standalone/drakups:72
+#, fuzzy, c-format
+msgid ""
+"Welcome to the UPS configuration utility.\n"
+"\n"
+"Here, you'll be add a new UPS to your system.\n"
+msgstr ""
+"Добредојдовте во помошната алатка за конфигурирање на поштата.\n"
+"\n"
+"Овде можете да го подесите системскиот аларм.\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 ""
+
+#: standalone/drakups:82
+#, fuzzy, c-format
+msgid "Autodetection"
+msgstr "Авто-детекција"
+
+#: standalone/drakups:90 standalone/harddrake2:134
+#, c-format
+msgid "Detection in progress"
+msgstr "Детекцијата е во тек"
+
+#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479
+#: standalone/logdrake:485
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "Честитки!"
+
+#: standalone/drakups:109
+#, c-format
+msgid "The wizard successfully added the following UPS devices:"
+msgstr ""
+
+#: standalone/drakups:111
+#, fuzzy, c-format
+msgid "No new UPS devices was found"
+msgstr "Не е пронајдена слика!"
+
+#: standalone/drakups:116 standalone/drakups:128
+#, fuzzy, c-format
+msgid "UPS driver configuration"
+msgstr "CUPS принтерска конфигурација"
+
+#: standalone/drakups:116
+#, fuzzy, c-format
+msgid "Please select your UPS model."
+msgstr "Тестирајте го глушецот:"
+
+#: standalone/drakups:117
+#, fuzzy, c-format
+msgid "Manufacturer / Model:"
+msgstr "Производител на принтерот, модел"
+
+#: 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 ""
+
+#: standalone/drakups:133
+#, c-format
+msgid "Name:"
+msgstr "Име:"
+
+#: standalone/drakups:133
+#, fuzzy, c-format
+msgid "The name of your ups"
+msgstr "имтое на производителот на уредот"
+
+#: standalone/drakups:134
+#, fuzzy, c-format
+msgid "The driver that manage your ups"
+msgstr "имтое на производителот на уредот"
+
+#: standalone/drakups:135
+#, fuzzy, c-format
+msgid "Port:"
+msgstr "Порт"
+
+#: standalone/drakups:137
+#, fuzzy, c-format
+msgid "The port on which is connected your ups"
+msgstr "Изберете на која сериска порта е поврзан глушецот."
+
+#: standalone/drakups:144
+#, c-format
+msgid "The wizard successfully configured the new \"%s\" UPS device."
+msgstr ""
+
+#: standalone/drakups:232
+#, fuzzy, c-format
+msgid "UPS devices"
+msgstr "Сервиси"
+
+#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266
+#: standalone/harddrake2:63
+#, c-format
+msgid "Name"
+msgstr "Име"
+
+#: standalone/drakups:250
+#, fuzzy, c-format
+msgid "UPS users"
+msgstr "Корисници"
+
+#: standalone/drakups:265
+#, fuzzy, c-format
+msgid "Access Control Lists"
+msgstr "пристап до мрежни алатки"
+
+#: standalone/drakups:266
+#, c-format
+msgid "IP mask"
+msgstr ""
+
+#: standalone/drakups:277
+#, fuzzy, c-format
+msgid "Rules"
+msgstr "Рутери:"
+
+#: standalone/drakups:278
+#, fuzzy, c-format
+msgid "Action"
+msgstr "/_Опции"
+
+#: standalone/drakups:278 standalone/drakvpn:1144 standalone/harddrake2:57
+#, fuzzy, c-format
+msgid "Level"
+msgstr "Ниво"
+
+#: standalone/drakups:278
+#, fuzzy, c-format
+msgid "ACL name"
+msgstr "LVM име?"
+
+#: standalone/drakups:297 standalone/drakups:301 standalone/drakups:310
+#, fuzzy, c-format
+msgid "DrakUPS"
+msgstr "Дворак (US)"
+
+#: standalone/drakups:307
+#, fuzzy, c-format
+msgid "Welcome to the UPS configuration tools"
+msgstr "Тест на конфигурацијата"
+
 #: standalone/drakvpn:71
 #, fuzzy, c-format
 msgid "DrakVPN"
@@ -20292,7 +20543,7 @@ msgstr "Овозможување на серверите..."
 msgid "The VPN connection is now enabled."
 msgstr "Делењето на интернет Конекцијата овозможено."
 
-#: standalone/drakvpn:153 standalone/drakvpn:179
+#: standalone/drakvpn:153 standalone/drakvpn:181
 #, c-format
 msgid "Simple VPN setup."
 msgstr ""
@@ -20313,7 +20564,7 @@ msgid ""
 "drakconnect before going any further."
 msgstr ""
 
-#: standalone/drakvpn:180
+#: standalone/drakvpn:182
 #, c-format
 msgid ""
 "VPN connection.\n"
@@ -20329,12 +20580,12 @@ msgid ""
 "before going any further."
 msgstr ""
 
-#: standalone/drakvpn:192
+#: standalone/drakvpn:194
 #, fuzzy, c-format
 msgid "Kernel module."
 msgstr "Отстрани модул"
 
-#: standalone/drakvpn:193
+#: standalone/drakvpn:195
 #, c-format
 msgid ""
 "The kernel need to have ipsec support.\n"
@@ -20344,22 +20595,22 @@ msgid ""
 "This kernel has '%s' support."
 msgstr ""
 
-#: standalone/drakvpn:288
+#: standalone/drakvpn:290
 #, fuzzy, c-format
 msgid "Security Policies"
 msgstr "Безбедност:"
 
-#: standalone/drakvpn:288
+#: standalone/drakvpn:290
 #, c-format
 msgid "IKE daemon racoon"
 msgstr ""
 
-#: standalone/drakvpn:291 standalone/drakvpn:302
+#: standalone/drakvpn:293 standalone/drakvpn:304
 #, fuzzy, c-format
 msgid "Configuration file"
 msgstr "Конфигурација"
 
-#: standalone/drakvpn:292
+#: standalone/drakvpn:294
 #, c-format
 msgid ""
 "Configuration step !\n"
@@ -20371,7 +20622,7 @@ msgid ""
 "What would you like to configure ?\n"
 msgstr ""
 
-#: standalone/drakvpn:303
+#: standalone/drakvpn:305
 #, c-format
 msgid ""
 "Next, we will configure the %s file.\n"
@@ -20380,12 +20631,12 @@ msgid ""
 "Simply click on Next.\n"
 msgstr ""
 
-#: standalone/drakvpn:321 standalone/drakvpn:681
+#: standalone/drakvpn:323 standalone/drakvpn:683
 #, fuzzy, c-format
 msgid "%s entries"
 msgstr ", %s сектори"
 
-#: standalone/drakvpn:322
+#: standalone/drakvpn:324
 #, c-format
 msgid ""
 "The %s file contents\n"
@@ -20399,23 +20650,27 @@ msgid ""
 "What would you like to do ?\n"
 msgstr ""
 
-#: standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakvpn:331 standalone/drakvpn:692
 #, fuzzy, c-format
-msgid "Display"
+msgid ""
+"_:display here is a verb\n"
+"Display"
 msgstr "дневно"
 
-#: standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakvpn:331 standalone/drakvpn:692
 #, fuzzy, c-format
 msgid "Commit"
 msgstr "компактно"
 
-#: standalone/drakvpn:343 standalone/drakvpn:347 standalone/drakvpn:705
-#: standalone/drakvpn:709
+#: standalone/drakvpn:345 standalone/drakvpn:349 standalone/drakvpn:707
+#: standalone/drakvpn:711
 #, fuzzy, c-format
-msgid "Display configuration"
+msgid ""
+"_:display here is a verb\n"
+"Display configuration"
 msgstr "LAN конфигурација"
 
-#: standalone/drakvpn:348
+#: standalone/drakvpn:350
 #, c-format
 msgid ""
 "The %s file does not exist.\n"
@@ -20425,12 +20680,12 @@ msgid ""
 "You'll have to go back and choose 'add'.\n"
 msgstr ""
 
-#: standalone/drakvpn:364
+#: standalone/drakvpn:366
 #, c-format
 msgid "ipsec.conf entries"
 msgstr ""
 
-#: standalone/drakvpn:365
+#: standalone/drakvpn:367
 #, c-format
 msgid ""
 "The %s file contains different sections.\n"
@@ -20445,27 +20700,27 @@ msgid ""
 "Choose the section you would like to add.\n"
 msgstr ""
 
-#: standalone/drakvpn:372
+#: standalone/drakvpn:374
 #, fuzzy, c-format
 msgid "config setup"
 msgstr "реконфигурирај"
 
-#: standalone/drakvpn:372
+#: standalone/drakvpn:374
 #, fuzzy, c-format
 msgid "conn %default"
 msgstr "стандардно"
 
-#: standalone/drakvpn:372
+#: standalone/drakvpn:374
 #, fuzzy, c-format
 msgid "normal conn"
 msgstr "Нормално"
 
-#: standalone/drakvpn:378 standalone/drakvpn:419 standalone/drakvpn:506
+#: standalone/drakvpn:380 standalone/drakvpn:421 standalone/drakvpn:508
 #, fuzzy, c-format
 msgid "Exists !"
 msgstr "Излез"
 
-#: standalone/drakvpn:379 standalone/drakvpn:420
+#: standalone/drakvpn:381 standalone/drakvpn:422
 #, c-format
 msgid ""
 "A section with this name already exists.\n"
@@ -20475,7 +20730,7 @@ msgid ""
 "or change its name.\n"
 msgstr ""
 
-#: standalone/drakvpn:396
+#: standalone/drakvpn:398
 #, c-format
 msgid ""
 "This section has to be on top of your\n"
@@ -20487,37 +20742,37 @@ msgid ""
 "Choose continue or previous when you are done.\n"
 msgstr ""
 
-#: standalone/drakvpn:401
+#: standalone/drakvpn:403
 #, fuzzy, c-format
 msgid "interfaces"
 msgstr "Интерфејс"
 
-#: standalone/drakvpn:402
+#: standalone/drakvpn:404
 #, c-format
 msgid "klipsdebug"
 msgstr ""
 
-#: standalone/drakvpn:403
+#: standalone/drakvpn:405
 #, c-format
 msgid "plutodebug"
 msgstr ""
 
-#: standalone/drakvpn:404
+#: standalone/drakvpn:406
 #, c-format
 msgid "plutoload"
 msgstr ""
 
-#: standalone/drakvpn:405
+#: standalone/drakvpn:407
 #, c-format
 msgid "plutostart"
 msgstr ""
 
-#: standalone/drakvpn:406
+#: standalone/drakvpn:408
 #, c-format
 msgid "uniqueids"
 msgstr ""
 
-#: standalone/drakvpn:440
+#: standalone/drakvpn:442
 #, c-format
 msgid ""
 "This is the first section after the config\n"
@@ -20530,52 +20785,52 @@ msgid ""
 "section.\n"
 msgstr ""
 
-#: standalone/drakvpn:447
-#, c-format
-msgid "pfs"
-msgstr ""
+#: standalone/drakvpn:449
+#, fuzzy, c-format
+msgid "PFS"
+msgstr "HFS"
 
-#: standalone/drakvpn:448
+#: standalone/drakvpn:450
 #, c-format
 msgid "keyingtries"
 msgstr ""
 
-#: standalone/drakvpn:449
+#: standalone/drakvpn:451
 #, c-format
 msgid "compress"
 msgstr ""
 
-#: standalone/drakvpn:450
+#: standalone/drakvpn:452
 #, c-format
 msgid "disablearrivalcheck"
 msgstr ""
 
-#: standalone/drakvpn:451 standalone/drakvpn:490
+#: standalone/drakvpn:453 standalone/drakvpn:492
 #, fuzzy, c-format
 msgid "left"
 msgstr "Избриши"
 
-#: standalone/drakvpn:452 standalone/drakvpn:491
+#: standalone/drakvpn:454 standalone/drakvpn:493
 #, c-format
 msgid "leftcert"
 msgstr ""
 
-#: standalone/drakvpn:453 standalone/drakvpn:492
+#: standalone/drakvpn:455 standalone/drakvpn:494
 #, c-format
 msgid "leftrsasigkey"
 msgstr ""
 
-#: standalone/drakvpn:454 standalone/drakvpn:493
+#: standalone/drakvpn:456 standalone/drakvpn:495
 #, c-format
 msgid "leftsubnet"
 msgstr ""
 
-#: standalone/drakvpn:455 standalone/drakvpn:494
+#: standalone/drakvpn:457 standalone/drakvpn:496
 #, c-format
 msgid "leftnexthop"
 msgstr ""
 
-#: standalone/drakvpn:484
+#: standalone/drakvpn:486
 #, c-format
 msgid ""
 "Your %s file has several sections, or connections.\n"
@@ -20584,47 +20839,47 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:487
+#: standalone/drakvpn:489
 #, fuzzy, c-format
 msgid "section name"
 msgstr "Име на врска"
 
-#: standalone/drakvpn:488
+#: standalone/drakvpn:490
 #, fuzzy, c-format
 msgid "authby"
 msgstr "Пат"
 
-#: standalone/drakvpn:489
+#: standalone/drakvpn:491
 #, fuzzy, c-format
 msgid "auto"
 msgstr "За"
 
-#: standalone/drakvpn:495
+#: standalone/drakvpn:497
 #, fuzzy, c-format
 msgid "right"
 msgstr "Високо"
 
-#: standalone/drakvpn:496
+#: standalone/drakvpn:498
 #, fuzzy, c-format
 msgid "rightcert"
 msgstr "Повисоко"
 
-#: standalone/drakvpn:497
+#: standalone/drakvpn:499
 #, c-format
 msgid "rightrsasigkey"
 msgstr ""
 
-#: standalone/drakvpn:498
+#: standalone/drakvpn:500
 #, c-format
 msgid "rightsubnet"
 msgstr ""
 
-#: standalone/drakvpn:499
+#: standalone/drakvpn:501
 #, c-format
 msgid "rightnexthop"
 msgstr ""
 
-#: standalone/drakvpn:507
+#: standalone/drakvpn:509
 #, c-format
 msgid ""
 "A section with this name already exists.\n"
@@ -20634,7 +20889,7 @@ msgid ""
 "or change the name of the section.\n"
 msgstr ""
 
-#: standalone/drakvpn:539
+#: standalone/drakvpn:541
 #, c-format
 msgid ""
 "Add a Security Policy.\n"
@@ -20644,12 +20899,12 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:572 standalone/drakvpn:822
+#: standalone/drakvpn:574 standalone/drakvpn:824
 #, fuzzy, c-format
 msgid "Edit section"
 msgstr "Бирање на патека"
 
-#: standalone/drakvpn:573
+#: standalone/drakvpn:575
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -20658,18 +20913,18 @@ msgid ""
 "and then click on next.\n"
 msgstr ""
 
-#: standalone/drakvpn:576 standalone/drakvpn:656 standalone/drakvpn:827
-#: standalone/drakvpn:873
+#: standalone/drakvpn:578 standalone/drakvpn:658 standalone/drakvpn:829
+#: standalone/drakvpn:875
 #, fuzzy, c-format
 msgid "Section names"
 msgstr "Име на врска"
 
-#: standalone/drakvpn:586
+#: standalone/drakvpn:588
 #, fuzzy, c-format
 msgid "Can't edit !"
 msgstr "Не може да се отвори %s!"
 
-#: standalone/drakvpn:587
+#: standalone/drakvpn:589
 #, c-format
 msgid ""
 "You cannot edit this section.\n"
@@ -20680,7 +20935,7 @@ msgid ""
 "enable the oportunistic encryption.\n"
 msgstr ""
 
-#: standalone/drakvpn:596
+#: standalone/drakvpn:598
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -20689,7 +20944,7 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:607
+#: standalone/drakvpn:609
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -20698,7 +20953,7 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:620
+#: standalone/drakvpn:622
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -20708,7 +20963,7 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:641
+#: standalone/drakvpn:643
 #, c-format
 msgid ""
 "Edit a Security Policy.\n"
@@ -20718,12 +20973,12 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:652 standalone/drakvpn:869
+#: standalone/drakvpn:654 standalone/drakvpn:871
 #, fuzzy, c-format
 msgid "Remove section"
 msgstr "Отстрани листа"
 
-#: standalone/drakvpn:653 standalone/drakvpn:870
+#: standalone/drakvpn:655 standalone/drakvpn:872
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -20732,7 +20987,7 @@ msgid ""
 "and then click on next.\n"
 msgstr ""
 
-#: standalone/drakvpn:682
+#: standalone/drakvpn:684
 #, c-format
 msgid ""
 "The racoon.conf file configuration.\n"
@@ -20746,7 +21001,7 @@ msgid ""
 "  - commit \t\t (writes the changes to the real file)"
 msgstr ""
 
-#: standalone/drakvpn:710
+#: standalone/drakvpn:712
 #, c-format
 msgid ""
 "The %s file does not exist\n"
@@ -20756,12 +21011,12 @@ msgid ""
 "You'll have to go back and choose configure.\n"
 msgstr ""
 
-#: standalone/drakvpn:724
+#: standalone/drakvpn:726
 #, c-format
 msgid "racoonf.conf entries"
 msgstr ""
 
-#: standalone/drakvpn:725
+#: standalone/drakvpn:727
 #, c-format
 msgid ""
 "The 'add' sections step.\n"
@@ -20774,22 +21029,22 @@ msgid ""
 "Choose the section you would like to add.\n"
 msgstr ""
 
-#: standalone/drakvpn:731
+#: standalone/drakvpn:733
 #, fuzzy, c-format
 msgid "path"
 msgstr "Пат"
 
-#: standalone/drakvpn:731
+#: standalone/drakvpn:733
 #, fuzzy, c-format
 msgid "remote"
 msgstr "Отстрани"
 
-#: standalone/drakvpn:731
+#: standalone/drakvpn:733
 #, fuzzy, c-format
 msgid "sainfo"
 msgstr "Шпанија"
 
-#: standalone/drakvpn:739
+#: standalone/drakvpn:741
 #, c-format
 msgid ""
 "The 'add path' section step.\n"
@@ -20799,12 +21054,12 @@ msgid ""
 "Put your mouse over the certificate entry to obtain online help."
 msgstr ""
 
-#: standalone/drakvpn:742
+#: standalone/drakvpn:744
 #, fuzzy, c-format
 msgid "path type"
 msgstr "Промена на тип"
 
-#: standalone/drakvpn:746
+#: standalone/drakvpn:748
 #, c-format
 msgid ""
 "path include path : specifies a path to include\n"
@@ -20828,12 +21083,12 @@ msgid ""
 "Pre-shared key authentication method in phase 1."
 msgstr ""
 
-#: standalone/drakvpn:766
+#: standalone/drakvpn:768 standalone/drakvpn:861
 #, fuzzy, c-format
 msgid "real file"
 msgstr "Избор на датотека"
 
-#: standalone/drakvpn:789
+#: standalone/drakvpn:791
 #, c-format
 msgid ""
 "Make sure you already have the path sections\n"
@@ -20843,7 +21098,7 @@ msgid ""
 "Choose continue or previous when you are done.\n"
 msgstr ""
 
-#: standalone/drakvpn:806
+#: standalone/drakvpn:808
 #, c-format
 msgid ""
 "Make sure you already have the path sections\n"
@@ -20853,7 +21108,7 @@ msgid ""
 "Choose continue or previous when you are done.\n"
 msgstr ""
 
-#: standalone/drakvpn:823
+#: standalone/drakvpn:825
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -20862,7 +21117,7 @@ msgid ""
 "to edit and then click on next.\n"
 msgstr ""
 
-#: standalone/drakvpn:834
+#: standalone/drakvpn:836
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -20873,7 +21128,7 @@ msgid ""
 "Choose continue when you are done to write the data.\n"
 msgstr ""
 
-#: standalone/drakvpn:843
+#: standalone/drakvpn:845
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -20883,7 +21138,7 @@ msgid ""
 "Choose continue when you are done to write the data."
 msgstr ""
 
-#: standalone/drakvpn:851
+#: standalone/drakvpn:853
 #, c-format
 msgid ""
 "This section has to be on top of your\n"
@@ -20897,17 +21152,12 @@ msgid ""
 "Choose continue or previous when you are done.\n"
 msgstr ""
 
-#: standalone/drakvpn:858
+#: standalone/drakvpn:860
 #, c-format
 msgid "path_type"
 msgstr ""
 
-#: standalone/drakvpn:859
-#, fuzzy, c-format
-msgid "real_file"
-msgstr "Избор на датотека"
-
-#: standalone/drakvpn:899
+#: standalone/drakvpn:901
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -20919,12 +21169,12 @@ msgid ""
 "section is configured."
 msgstr ""
 
-#: standalone/drakvpn:919
+#: standalone/drakvpn:921
 #, c-format
 msgid "Sainfo source address"
 msgstr ""
 
-#: standalone/drakvpn:920
+#: standalone/drakvpn:922
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -20947,12 +21197,12 @@ msgid ""
 "\t172.16.1.0/24 is the source address"
 msgstr ""
 
-#: standalone/drakvpn:937
+#: standalone/drakvpn:939
 #, fuzzy, c-format
 msgid "Sainfo source protocol"
 msgstr "Европски протокол"
 
-#: standalone/drakvpn:938
+#: standalone/drakvpn:940
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -20972,12 +21222,12 @@ msgid ""
 "\tthe first 'any' allows any protocol for the source"
 msgstr ""
 
-#: standalone/drakvpn:952
+#: standalone/drakvpn:954
 #, c-format
 msgid "Sainfo destination address"
 msgstr ""
 
-#: standalone/drakvpn:953
+#: standalone/drakvpn:955
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21000,12 +21250,12 @@ msgid ""
 "\t172.16.2.0/24 is the destination address"
 msgstr ""
 
-#: standalone/drakvpn:970
+#: standalone/drakvpn:972
 #, fuzzy, c-format
 msgid "Sainfo destination protocol"
 msgstr "Алатка за миграција на Прозорци"
 
-#: standalone/drakvpn:971
+#: standalone/drakvpn:973
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21025,12 +21275,12 @@ msgid ""
 "\tthe last 'any' allows any protocol for the destination"
 msgstr ""
 
-#: standalone/drakvpn:985
+#: standalone/drakvpn:987
 #, c-format
 msgid "PFS group"
 msgstr ""
 
-#: standalone/drakvpn:987
+#: standalone/drakvpn:989
 #, c-format
 msgid ""
 "define the group of Diffie-Hellman exponentiations.\n"
@@ -21040,12 +21290,12 @@ msgid ""
 "Or you can define 1, 2, or 5 as the DH group number."
 msgstr ""
 
-#: standalone/drakvpn:992
+#: standalone/drakvpn:994
 #, fuzzy, c-format
 msgid "Lifetime number"
 msgstr "број"
 
-#: standalone/drakvpn:993
+#: standalone/drakvpn:995
 #, c-format
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
@@ -21066,12 +21316,12 @@ msgid ""
 "So, here, the lifetime numbers are 1, 1, 30, 30, 60 and 12.\n"
 msgstr ""
 
-#: standalone/drakvpn:1009
+#: standalone/drakvpn:1011
 #, c-format
 msgid "Lifetime unit"
 msgstr ""
 
-#: standalone/drakvpn:1011
+#: standalone/drakvpn:1013
 #, c-format
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
@@ -21093,27 +21343,32 @@ msgid ""
 "'hour'.\n"
 msgstr ""
 
-#: standalone/drakvpn:1027 standalone/drakvpn:1112
+#: standalone/drakvpn:1029 standalone/drakvpn:1114
 #, fuzzy, c-format
 msgid "Encryption algorithm"
 msgstr "автентикација"
 
-#: standalone/drakvpn:1029
+#: standalone/drakvpn:1031
 #, fuzzy, c-format
 msgid "Authentication algorithm"
 msgstr "автентикација"
 
-#: standalone/drakvpn:1031
+#: standalone/drakvpn:1033
 #, c-format
 msgid "Compression algorithm"
 msgstr ""
 
-#: standalone/drakvpn:1039
+#: standalone/drakvpn:1034
+#, fuzzy, c-format
+msgid "deflate"
+msgstr "стандардно"
+
+#: standalone/drakvpn:1041
 #, fuzzy, c-format
 msgid "Remote"
 msgstr "Отстрани"
 
-#: standalone/drakvpn:1040
+#: standalone/drakvpn:1042
 #, c-format
 msgid ""
 "remote (address | anonymous) [[port]] { statements }\n"
@@ -21128,12 +21383,12 @@ msgid ""
 "remote ::1 [8000]"
 msgstr ""
 
-#: standalone/drakvpn:1048
+#: standalone/drakvpn:1050
 #, fuzzy, c-format
 msgid "Exchange mode"
 msgstr "Режим на бирање"
 
-#: standalone/drakvpn:1050
+#: standalone/drakvpn:1052
 #, c-format
 msgid ""
 "defines the exchange mode for phase 1 when racoon is the\n"
@@ -21144,12 +21399,22 @@ msgid ""
 "racoon uses when it is the initiator.\n"
 msgstr ""
 
-#: standalone/drakvpn:1056
+#: standalone/drakvpn:1058
 #, fuzzy, c-format
 msgid "Generate policy"
 msgstr "Безбедност"
 
-#: standalone/drakvpn:1058
+#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#, c-format
+msgid "off"
+msgstr ""
+
+#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#, fuzzy, c-format
+msgid "on"
+msgstr "Завршено"
+
+#: standalone/drakvpn:1060
 #, c-format
 msgid ""
 "This directive is for the responder.  Therefore you\n"
@@ -21168,12 +21433,12 @@ msgid ""
 "the initiator case.  The default value is off."
 msgstr ""
 
-#: standalone/drakvpn:1072
+#: standalone/drakvpn:1074
 #, fuzzy, c-format
 msgid "Passive"
 msgstr "Палестина"
 
-#: standalone/drakvpn:1074
+#: standalone/drakvpn:1076
 #, c-format
 msgid ""
 "If you do not want to initiate the negotiation, set this\n"
@@ -21181,59 +21446,59 @@ msgid ""
 "server."
 msgstr ""
 
-#: standalone/drakvpn:1077
+#: standalone/drakvpn:1079
 #, c-format
 msgid "Certificate type"
 msgstr ""
 
-#: standalone/drakvpn:1079
+#: standalone/drakvpn:1081
 #, fuzzy, c-format
 msgid "My certfile"
 msgstr "Избор на датотека"
 
-#: standalone/drakvpn:1080
+#: standalone/drakvpn:1082
 #, fuzzy, c-format
 msgid "Name of the certificate"
 msgstr "Име на принтерот"
 
-#: standalone/drakvpn:1081
+#: standalone/drakvpn:1083
 #, c-format
 msgid "My private key"
 msgstr ""
 
-#: standalone/drakvpn:1082
+#: standalone/drakvpn:1084
 #, fuzzy, c-format
 msgid "Name of the private key"
 msgstr "Име на принтерот"
 
-#: standalone/drakvpn:1083
+#: standalone/drakvpn:1085
 #, fuzzy, c-format
 msgid "Peers certfile"
 msgstr "Избор на датотека"
 
-#: standalone/drakvpn:1084
+#: standalone/drakvpn:1086
 #, c-format
 msgid "Name of the peers certificate"
 msgstr ""
 
-#: standalone/drakvpn:1085
+#: standalone/drakvpn:1087
 #, fuzzy, c-format
 msgid "Verify cert"
 msgstr "одлично"
 
-#: 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 ""
 
-#: standalone/drakvpn:1089
+#: standalone/drakvpn:1091
 #, c-format
 msgid "My identifier"
 msgstr ""
 
-#: standalone/drakvpn:1090
+#: standalone/drakvpn:1092
 #, c-format
 msgid ""
 "specifies the identifier sent to the remote host and the\n"
@@ -21260,17 +21525,17 @@ msgid ""
 "my_identifier user_fqdn \"myemail@mydomain.com\""
 msgstr ""
 
-#: standalone/drakvpn:1110
+#: standalone/drakvpn:1112
 #, fuzzy, c-format
 msgid "Peers identifier"
 msgstr "Принтер"
 
-#: standalone/drakvpn:1111
+#: standalone/drakvpn:1113
 #, fuzzy, c-format
 msgid "Proposal"
 msgstr "Протокол"
 
-#: standalone/drakvpn:1113
+#: standalone/drakvpn:1115
 #, c-format
 msgid ""
 "specify the encryption algorithm used for the\n"
@@ -21282,70 +21547,105 @@ msgid ""
 "For other transforms, this statement should not be used."
 msgstr ""
 
-#: standalone/drakvpn:1120
+#: standalone/drakvpn:1122
 #, c-format
 msgid "Hash algorithm"
 msgstr ""
 
-#: standalone/drakvpn:1121
+#: standalone/drakvpn:1123
 #, fuzzy, c-format
 msgid "Authentication method"
 msgstr "автентикација"
 
-#: standalone/drakvpn:1122
+#: standalone/drakvpn:1124
 #, fuzzy, c-format
 msgid "DH group"
 msgstr "Група"
 
-#: standalone/drakvpn:1129
+#: standalone/drakvpn:1131
 #, fuzzy, c-format
 msgid "Command"
 msgstr "Командна линија"
 
-#: standalone/drakvpn:1130
+#: standalone/drakvpn:1132
 #, c-format
 msgid "Source IP range"
 msgstr ""
 
-#: standalone/drakvpn:1131
+#: standalone/drakvpn:1133
 #, c-format
 msgid "Destination IP range"
 msgstr ""
 
-#: standalone/drakvpn:1132
+#: standalone/drakvpn:1134
 #, fuzzy, c-format
 msgid "Upper-layer protocol"
 msgstr "Европски протокол"
 
-#: standalone/drakvpn:1133
+#: standalone/drakvpn:1134 standalone/drakvpn:1141
+#, fuzzy, c-format
+msgid "any"
+msgstr "Ден"
+
+#: standalone/drakvpn:1136
 #, fuzzy, c-format
 msgid "Flag"
 msgstr "Знамиња"
 
-#: standalone/drakvpn:1134
+#: standalone/drakvpn:1137
 #, fuzzy, c-format
 msgid "Direction"
 msgstr "Опис"
 
-#: standalone/drakvpn:1135
+#: standalone/drakvpn:1138
 #, c-format
 msgid "IPsec policy"
 msgstr ""
 
-#: standalone/drakvpn:1137
+#: standalone/drakvpn:1138
+#, fuzzy, c-format
+msgid "ipsec"
+msgstr "Msec"
+
+#: standalone/drakvpn:1138
+#, fuzzy, c-format
+msgid "discard"
+msgstr "оневозможено"
+
+#: standalone/drakvpn:1141
 #, fuzzy, c-format
 msgid "Mode"
 msgstr "Модел"
 
-#: standalone/drakvpn:1138
+#: standalone/drakvpn:1141
+#, fuzzy, c-format
+msgid "tunnel"
+msgstr "Канал"
+
+#: standalone/drakvpn:1141
+#, fuzzy, c-format
+msgid "transport"
+msgstr "пренесено"
+
+#: standalone/drakvpn:1143
 #, fuzzy, c-format
 msgid "Source/destination"
 msgstr "Работна станица"
 
-#: standalone/drakvpn:1139 standalone/harddrake2:57
+#: standalone/drakvpn:1144
+#, c-format
+msgid "require"
+msgstr ""
+
+#: standalone/drakvpn:1144
 #, fuzzy, c-format
-msgid "Level"
-msgstr "Ниво"
+msgid "use"
+msgstr "Глушец"
+
+#: standalone/drakvpn:1144
+#, fuzzy, c-format
+msgid "unique"
+msgstr "Мартиник"
 
 #: standalone/drakxtv:46
 #, c-format
@@ -21775,11 +22075,6 @@ msgid "the number of buttons the mouse has"
 msgstr "бројот на копчиња што ги има глушецот"
 
 #: standalone/harddrake2:63
-#, c-format
-msgid "Name"
-msgstr "Име"
-
-#: standalone/harddrake2:63
 #, fuzzy, c-format
 msgid "the name of the CPU"
 msgstr "имтое на производителот на уредот"
@@ -21841,13 +22136,13 @@ msgstr ""
 "процесорот да ги запре непроверените кернелските пристапи на корисничката "
 "моморија (aka ова е заштитник од багови)"
 
-#: 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 "/_Опции"
 
-#: 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
@@ -21895,11 +22190,6 @@ msgstr ""
 
 #: standalone/harddrake2:115
 #, c-format
-msgid "Select a device !"
-msgstr "Избери уред!"
-
-#: standalone/harddrake2:115
-#, c-format
 msgid ""
 "Once you've selected a device, you'll be able to see the device information "
 "in fields displayed on the right frame (\"Information\")"
@@ -21937,42 +22227,37 @@ msgstr ""
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 
-#: standalone/harddrake2:133
-#, c-format
-msgid "Detection in progress"
-msgstr "Детекцијата е во тек"
-
-#: standalone/harddrake2:140
+#: standalone/harddrake2:141
 #, c-format
 msgid "Harddrake2 version %s"
 msgstr "Harddrake2 верзија %s "
 
-#: standalone/harddrake2:156
+#: standalone/harddrake2:157
 #, c-format
 msgid "Detected hardware"
 msgstr "Детектиран хардвер"
 
-#: standalone/harddrake2:161
+#: standalone/harddrake2:162
 #, c-format
 msgid "Configure module"
 msgstr "Конфигурирај модул"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:169
 #, c-format
 msgid "Run config tool"
 msgstr "Алатка за конфугурација"
 
-#: standalone/harddrake2:215
+#: standalone/harddrake2:216
 #, c-format
 msgid "unknown"
 msgstr "непознат"
 
-#: standalone/harddrake2:216
+#: standalone/harddrake2:217
 #, c-format
 msgid "Unknown"
 msgstr "Непознат"
 
-#: standalone/harddrake2:234
+#: standalone/harddrake2:235
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
@@ -21980,22 +22265,22 @@ msgstr ""
 "Притиснете на уред во левата гранка за да се прикаже неговата информацијата "
 "овде."
 
-#: standalone/harddrake2:282
+#: standalone/harddrake2:286
 #, c-format
 msgid "secondary"
 msgstr "секундарен"
 
-#: standalone/harddrake2:282
+#: standalone/harddrake2:286
 #, c-format
 msgid "primary"
 msgstr "примарен"
 
-#: standalone/harddrake2:290
+#: standalone/harddrake2:294
 #, fuzzy, c-format
 msgid "burner"
 msgstr "режач"
 
-#: standalone/harddrake2:290
+#: standalone/harddrake2:294
 #, c-format
 msgid "DVD"
 msgstr "DVD"
@@ -22015,210 +22300,210 @@ msgstr "Дали сакате BackSpace да го врати Delete во кон
 msgid "The change is done, but to be effective you must logout"
 msgstr "Промената е направена, но за да има ефект треба да се одјавите"
 
-#: standalone/logdrake:50
+#: standalone/logdrake:51
 #, fuzzy, c-format
-msgid "Mandrake Tools Explanation"
+msgid "Mandrake Tools Logs"
 msgstr "Алатки"
 
-#: standalone/logdrake:51
+#: standalone/logdrake:52
 #, fuzzy, c-format
 msgid "Logdrake"
 msgstr "logdrake"
 
-#: standalone/logdrake:64
+#: standalone/logdrake:65
 #, c-format
 msgid "Show only for the selected day"
 msgstr "Прикажи само за избраниот ден"
 
-#: standalone/logdrake:71
+#: standalone/logdrake:72
 #, c-format
 msgid "/File/_New"
 msgstr "/Дадотека/_Нова"
 
-#: 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 "/Датотека/_Отвори"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:73
 #, c-format
 msgid "<control>O"
 msgstr "<control>O"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:74
 #, fuzzy, c-format
 msgid "/File/_Save"
 msgstr "Датотека/_Зачувај"
 
-#: 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 "/Датотека/Зачувај_како"
 
-#: standalone/logdrake:75
+#: standalone/logdrake:76
 #, c-format
 msgid "/File/-"
 msgstr "/Датотека/-"
 
-#: standalone/logdrake:78
+#: standalone/logdrake:79
 #, c-format
 msgid "/Options/Test"
 msgstr "/Опции/Тест"
 
-#: standalone/logdrake:80
+#: standalone/logdrake:81
 #, c-format
 msgid "/Help/_About..."
 msgstr "/Помош/_За..."
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr ""
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr ""
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr ""
 
-#: standalone/logdrake:114
+#: standalone/logdrake:113
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
 msgstr ""
 
-#: standalone/logdrake:118
+#: standalone/logdrake:117
 #, c-format
 msgid "search"
 msgstr "барај"
 
-#: standalone/logdrake:130
+#: standalone/logdrake:129
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "Алатка за надгледување на вашите логови"
 
-#: standalone/logdrake:131 standalone/net_monitor:85
+#: standalone/logdrake:130 standalone/net_monitor:85
 #, fuzzy, c-format
 msgid "Settings"
 msgstr "Подесувања"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "Matching"
 msgstr "Совпаѓам"
 
-#: standalone/logdrake:137
+#: standalone/logdrake:136
 #, c-format
 msgid "but not matching"
 msgstr "но не се совпаѓаат"
 
-#: standalone/logdrake:141
+#: standalone/logdrake:140
 #, c-format
 msgid "Choose file"
 msgstr "Избери датотека"
 
-#: standalone/logdrake:150
+#: standalone/logdrake:149
 #, fuzzy, c-format
 msgid "Calendar"
 msgstr "Календар"
 
-#: standalone/logdrake:160
+#: standalone/logdrake:159
 #, c-format
 msgid "Content of the file"
 msgstr "Содржина на датотеката"
 
-#: standalone/logdrake:164 standalone/logdrake:377
+#: standalone/logdrake:163 standalone/logdrake:429
 #, c-format
 msgid "Mail alert"
 msgstr "Поштенски аларм"
 
-#: standalone/logdrake:171
+#: standalone/logdrake:170
 #, c-format
 msgid "The alert wizard had unexpectly failled:"
 msgstr ""
 
-#: standalone/logdrake:219
+#: standalone/logdrake:221
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr "Ве молиме почекајте, датотеката се расчленува: %s"
 
-#: standalone/logdrake:355
+#: standalone/logdrake:406
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Apache World Wide Web Сервер"
 
-#: standalone/logdrake:356
+#: standalone/logdrake:407
 #, fuzzy, c-format
 msgid "Domain Name Resolver"
 msgstr "Домејн Име"
 
-#: standalone/logdrake:357
+#: standalone/logdrake:408
 #, c-format
 msgid "Ftp Server"
 msgstr "Ftp Сервер"
 
-#: standalone/logdrake:358
+#: standalone/logdrake:409
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Postfix E-mail сервер"
 
-#: standalone/logdrake:359
+#: standalone/logdrake:410
 #, fuzzy, c-format
 msgid "Samba Server"
 msgstr "Samba ���"
 
-#: standalone/logdrake:360
+#: standalone/logdrake:411
 #, c-format
 msgid "SSH Server"
 msgstr "SSH Сервер"
 
-#: standalone/logdrake:361
+#: standalone/logdrake:412
 #, c-format
 msgid "Webmin Service"
 msgstr "Webmin Сервис"
 
-#: standalone/logdrake:362
+#: standalone/logdrake:413
 #, c-format
 msgid "Xinetd Service"
 msgstr "Xinetd Сервис"
 
-#: standalone/logdrake:372
+#: standalone/logdrake:424
 #, fuzzy, c-format
 msgid "Configure the mail alert system"
 msgstr "Промени го системот за печатење"
 
-#: standalone/logdrake:373
+#: standalone/logdrake:425
 #, c-format
 msgid "Stop the mail alert system"
 msgstr ""
 
-#: standalone/logdrake:380
+#: standalone/logdrake:432
 #, c-format
 msgid "Mail alert configuration"
 msgstr "Конфигурирање на известување за пошта"
 
-#: standalone/logdrake:381
+#: standalone/logdrake:433
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -22229,73 +22514,68 @@ msgstr ""
 "\n"
 "Овде можете да го подесите системскиот аларм.\n"
 
-#: standalone/logdrake:384
+#: standalone/logdrake:436
 #, fuzzy, c-format
 msgid "What do you want to do?"
 msgstr "Каде сакате да го монтирате %s?"
 
-#: standalone/logdrake:391
+#: standalone/logdrake:443
 #, fuzzy, c-format
 msgid "Services settings"
 msgstr "подесување на сервисот"
 
-#: 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 "Ќе добиете аларм ако еден од избраните сервиси повеќе не работи"
 
-#: standalone/logdrake:399
+#: standalone/logdrake:451
 #, fuzzy, c-format
 msgid "Load setting"
 msgstr "вчитај подесување"
 
-#: standalone/logdrake:400
+#: standalone/logdrake:452
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr ""
 
-#: standalone/logdrake:401
+#: standalone/logdrake:453
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "Оптеретеност"
 
-#: standalone/logdrake:406
+#: standalone/logdrake:458
 #, fuzzy, c-format
 msgid "Alert configuration"
 msgstr "Автоматски"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:459
 #, c-format
 msgid "Please enter your email address below "
 msgstr "Ве молиме внесете ја вашата email адреса подоле"
 
-#: standalone/logdrake:408
+#: standalone/logdrake:460
 #, fuzzy, c-format
 msgid "and enter the name (or the IP) of the SMTP server you whish to use"
 msgstr ""
 "Внесете IP адреса и порта на компјутерите чии што принтери сакате да ги "
 "користите."
 
-#: standalone/logdrake:427 standalone/logdrake:433
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Честитки!"
-
-#: standalone/logdrake:427
+#: standalone/logdrake:479
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr ""
 
-#: standalone/logdrake:433
+#: standalone/logdrake:485
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr ""
 
-#: standalone/logdrake:492
+#: standalone/logdrake:544
 #, fuzzy, c-format
 msgid "Save as.."
 msgstr "Зачувај како."
@@ -22606,166 +22886,179 @@ msgstr ""
 msgid "Printer Management \n"
 msgstr "Ново име на принтерот"
 
-#: standalone/scannerdrake:53
+#: standalone/scannerdrake:50
+#, fuzzy, c-format
+msgid ""
+"SANE packages need to be installed to use scanners.\n"
+"\n"
+"Do you want to install the SANE packages?"
+msgstr "Треба да се инсталира пакетот %s. Дали сакате да го инсталирате?"
+
+#: standalone/scannerdrake:54
+#, fuzzy, c-format
+msgid "Aborting Scannerdrake."
+msgstr "Scannerdrake"
+
+#: standalone/scannerdrake:59
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr ""
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:60
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr ""
 
-#: standalone/scannerdrake:60 standalone/scannerdrake:452
+#: standalone/scannerdrake:66 standalone/scannerdrake:459
 #, c-format
 msgid "Searching for configured scanners ..."
 msgstr "Барање на конфигурирани скенери ..."
 
-#: standalone/scannerdrake:64 standalone/scannerdrake:456
+#: standalone/scannerdrake:70 standalone/scannerdrake:463
 #, fuzzy, c-format
 msgid "Searching for new scanners ..."
 msgstr "Барање на нови скенери..."
 
-#: standalone/scannerdrake:72 standalone/scannerdrake:478
+#: standalone/scannerdrake:78 standalone/scannerdrake:485
 #, c-format
 msgid "Re-generating list of configured scanners ..."
 msgstr "Регенерирање на листа на подесени скенери ..."
 
-#: standalone/scannerdrake:94 standalone/scannerdrake:135
-#: standalone/scannerdrake:149
+#: standalone/scannerdrake:100 standalone/scannerdrake:141
+#: standalone/scannerdrake:155
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
 msgstr "%s не е поддржан од оваа верзија на Linux."
 
-#: standalone/scannerdrake:97
+#: standalone/scannerdrake:103
 #, fuzzy, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "%s најдено на %s, конфигурирај го автоматски?"
 
-#: standalone/scannerdrake:109
+#: standalone/scannerdrake:115
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr "%s не е во базата на скенерот, подеси го рачно?"
 
-#: standalone/scannerdrake:124
+#: standalone/scannerdrake:130
 #, fuzzy, c-format
 msgid "Select a scanner model"
 msgstr "Избор на моделот на скенер"
 
-#: standalone/scannerdrake:125
+#: standalone/scannerdrake:131
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:126
+#: standalone/scannerdrake:132
 #, fuzzy, c-format
 msgid "Detected model: %s"
 msgstr "Детектиран модел: %s"
 
-#: standalone/scannerdrake:128
+#: standalone/scannerdrake:134
 #, c-format
 msgid ", "
 msgstr ", "
 
-#: standalone/scannerdrake:129
+#: standalone/scannerdrake:135
 #, c-format
 msgid "Port: %s"
 msgstr "Порта: %s"
 
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:161
 #, fuzzy, c-format
 msgid "The %s is not known by this version of Scannerdrake."
 msgstr "%s е непозат/а за оваа верзија на Scannerdrake."
 
-#: standalone/scannerdrake:163 standalone/scannerdrake:177
+#: standalone/scannerdrake:169 standalone/scannerdrake:183
 #, c-format
 msgid "Do not install firmware file"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "
 "can be installed."
 msgstr ""
 
-#: 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 "
 "manufacturer's home page, or on your Windows partition."
 msgstr ""
 
-#: standalone/scannerdrake:172 standalone/scannerdrake:231
+#: standalone/scannerdrake:178 standalone/scannerdrake:237
 #, c-format
 msgid "Install firmware file from"
 msgstr ""
 
-#: standalone/scannerdrake:192
+#: standalone/scannerdrake:198
 #, fuzzy, c-format
 msgid "Select firmware file"
 msgstr "Избор на датотека"
 
-#: 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 ""
 
-#: standalone/scannerdrake:218
+#: standalone/scannerdrake:224
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
 "everytime when they are turned on."
 msgstr ""
 
-#: 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 "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:225
+#: standalone/scannerdrake:231
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
 "firmware here by supplying the new firmware file."
 msgstr ""
 
-#: standalone/scannerdrake:227
+#: standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware for the"
 msgstr ""
 
-#: standalone/scannerdrake:250
+#: standalone/scannerdrake:256
 #, fuzzy, c-format
 msgid "Select firmware file for the %s"
 msgstr "Избор на датотека"
 
-#: standalone/scannerdrake:276
+#: standalone/scannerdrake:282
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr ""
 
-#: standalone/scannerdrake:286
+#: standalone/scannerdrake:292
 #, fuzzy, c-format
 msgid "The %s is unsupported"
 msgstr "%s не е поддржан"
 
-#: standalone/scannerdrake:291
+#: standalone/scannerdrake:297
 #, fuzzy, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
@@ -22775,44 +23068,44 @@ msgstr ""
 "Можете да го вклучете printerdrake преку Мандрак Контролниот Центар во "
 "Хардвер секцијата."
 
-#: 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 "Автоматски ги детектирај достапните порти"
 
-#: standalone/scannerdrake:297 standalone/scannerdrake:343
+#: standalone/scannerdrake:303 standalone/scannerdrake:349
 #, fuzzy, c-format
 msgid "Please select the device where your %s is attached"
 msgstr "Ве молиме одберете го уредот каде е закачен/а %s"
 
-#: standalone/scannerdrake:298
+#: standalone/scannerdrake:304
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(Забелешка: Паралелните порти не можат да бидат автоматски пронајдени)"
 
-#: standalone/scannerdrake:300 standalone/scannerdrake:345
+#: standalone/scannerdrake:306 standalone/scannerdrake:351
 #, c-format
 msgid "choose device"
 msgstr "избери уред"
 
-#: standalone/scannerdrake:334
+#: standalone/scannerdrake:340
 #, fuzzy, c-format
 msgid "Searching for scanners ..."
 msgstr "Барање на скенери..."
 
-#: standalone/scannerdrake:368
-#, c-format
+#: standalone/scannerdrake:375
+#, fuzzy, 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 ""
 "Вашиот %s е конфигуриран.\n"
 "Сега можете да скенирате документи со користење на \"XSane\" од Мултимедија/"
 "Графика во апликационото мени."
 
-#: standalone/scannerdrake:392
+#: standalone/scannerdrake:399
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -22825,7 +23118,7 @@ msgstr ""
 "%s\n"
 "се можни на твојот систем.\n"
 
-#: standalone/scannerdrake:393
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -22837,51 +23130,51 @@ msgstr ""
 "%s\n"
 "е приклучен на Вашиот компјутер.\n"
 
-#: standalone/scannerdrake:396 standalone/scannerdrake:399
+#: standalone/scannerdrake:403 standalone/scannerdrake:406
 #, fuzzy, c-format
 msgid "There are no scanners found which are available on your system.\n"
 msgstr "Не е најден скенер на Вашиот систем.\n"
 
-#: standalone/scannerdrake:413
+#: standalone/scannerdrake:420
 #, c-format
 msgid "Search for new scanners"
 msgstr "Барај нови скенери"
 
-#: standalone/scannerdrake:419
+#: standalone/scannerdrake:426
 #, fuzzy, c-format
 msgid "Add a scanner manually"
 msgstr "Избор"
 
-#: standalone/scannerdrake:426
+#: standalone/scannerdrake:433
 #, fuzzy, c-format
 msgid "Install/Update firmware files"
 msgstr "Избор на датотека"
 
-#: standalone/scannerdrake:432
+#: standalone/scannerdrake:439
 #, c-format
 msgid "Scanner sharing"
 msgstr "Делење на Скенер"
 
-#: standalone/scannerdrake:491 standalone/scannerdrake:656
+#: standalone/scannerdrake:498 standalone/scannerdrake:663
 #, c-format
 msgid "All remote machines"
 msgstr "Сите локални компјутери"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:806
+#: standalone/scannerdrake:510 standalone/scannerdrake:813
 #, c-format
 msgid "This machine"
 msgstr "Оваа машина"
 
-#: 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 ""
 "Овде можете да изберете дали скенерите поврзани на оваа машина треба да се "
 "достапни за оддалечени машини и за кои оддалечени машини."
 
-#: standalone/scannerdrake:544
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
@@ -22890,33 +23183,33 @@ msgstr ""
 "Овде можете исто така да одлучите дали скенерите на оддалечените машини би "
 "требало да се направат како достапни за оваа машина."
 
-#: standalone/scannerdrake:547
+#: standalone/scannerdrake:554
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr "Скенерите на оваа машина се достапни и на други компјутери"
 
-#: standalone/scannerdrake:549
+#: standalone/scannerdrake:556
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "Скенер делен со хост: "
 
-#: standalone/scannerdrake:563
+#: standalone/scannerdrake:570
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "Користи скенери од локални компјутери"
 
-#: standalone/scannerdrake:566
+#: standalone/scannerdrake:573
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "Користи ги скенерите од хост:"
 
-#: 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 "Делење на локални скенери"
 
-#: standalone/scannerdrake:594
+#: standalone/scannerdrake:601
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
@@ -22924,55 +23217,63 @@ msgid ""
 msgstr ""
 "Ова се машините на кои што локално поврзаните скенер(и) треба да се достапни:"
 
-#: standalone/scannerdrake:605 standalone/scannerdrake:755
+#: standalone/scannerdrake:612 standalone/scannerdrake:762
 #, c-format
 msgid "Add host"
 msgstr "Додади компјутер"
 
-#: standalone/scannerdrake:611 standalone/scannerdrake:761
+#: standalone/scannerdrake:618 standalone/scannerdrake:768
 #, c-format
 msgid "Edit selected host"
 msgstr "Уреди го селектираниот домаќин"
 
-#: standalone/scannerdrake:620 standalone/scannerdrake:770
+#: standalone/scannerdrake:627 standalone/scannerdrake:777
 #, fuzzy, c-format
 msgid "Remove selected host"
 msgstr "Отстрани го хостот"
 
-#: 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 "Име/IP адреса на хост:"
 
-#: 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 "Изберете го хостот на кој локалните скенери би требало да работат:"
 
-#: 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 "Мора да внесете име на компјутерот или IP адреса.\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 "Овој хост веќе е на листата, не може да биде додаден повторно.\n"
 
-#: standalone/scannerdrake:743
+#: standalone/scannerdrake:750
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "Користење на далечински скенери"
 
-#: standalone/scannerdrake:744
+#: standalone/scannerdrake:751
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr "Ова се машините од кои скенерите треба да бидат користени:"
 
-#: standalone/scannerdrake:904
+#: standalone/scannerdrake:908
+#, fuzzy, 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 "Треба да се инсталира пакетот %s. Дали сакате да го инсталирате?"
+
+#: standalone/scannerdrake:912 standalone/scannerdrake:916
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr ""
@@ -22987,7 +23288,7 @@ msgstr "Некои уреди во \"%s\" се избришани:"
 msgid "Some devices were added: %s\n"
 msgstr "Некои уреди беа додадени.\n"
 
-#: standalone/service_harddrake:94
+#: standalone/service_harddrake:98
 #, fuzzy, c-format
 msgid "Hardware probing in progress"
 msgstr "Хардвер проверката е во тек"
@@ -23082,22 +23383,22 @@ msgstr "Инсталирање надградба"
 msgid "Exit install"
 msgstr "Излези од Инсталацијата"
 
-#: ugtk2.pm:1047
+#: ugtk2.pm:1075
 #, c-format
 msgid "Is this correct?"
 msgstr "Дали е ова точно?"
 
-#: ugtk2.pm:1175
+#: ugtk2.pm:1203
 #, c-format
 msgid "Expand Tree"
 msgstr "Рашири го дрвото"
 
-#: ugtk2.pm:1176
+#: ugtk2.pm:1204
 #, c-format
 msgid "Collapse Tree"
 msgstr "Собери го дрвото"
 
-#: ugtk2.pm:1177
+#: ugtk2.pm:1205
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "Избор меѓу линеарно и сортирано по група"
@@ -23114,267 +23415,335 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Неуспешна инсталација на тема!"
 
-#~ msgid "Configuration of a remote printer"
-#~ msgstr "Конфигурација на оддалечен принтер"
-
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "configure %s"
-#~ msgstr "реконфигурирај"
+msgid "Office Workstation"
+msgstr "Канцелариски"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "protocol = "
-#~ msgstr "Протокол"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Канцелариски програми: wordprocessors (kword, abiword), spreadsheets "
+"(kspread, "
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "level = "
-#~ msgstr "ниво"
+msgid "Game station"
+msgstr "Игри"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "Office Workstation"
-#~ msgstr "Канцелариски"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Занимација"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Канцелариски програми: wordprocessors (kword, abiword), spreadsheets "
-#~ "(kspread, "
+msgid "Multimedia station"
+msgstr "Мултимедија"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "Game station"
-#~ msgstr "Игри"
+msgid "Sound and video playing/editing programs"
+msgstr "Програми за музика и видео"
 
-#, fuzzy
-#~ msgid "Amusement programs: arcade, boards, strategy, etc"
-#~ msgstr "Занимација"
+#: ../../share/compssUsers:999
+msgid "Internet station"
+msgstr "Интернет"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "Multimedia station"
-#~ msgstr "Мултимедија"
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr ""
+"Алатки за читање и пракање е-маил и новости (pine, mutt, tin..) и "
+"пребарување на Интернет"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "Sound and video playing/editing programs"
-#~ msgstr "Програми за музика и видео"
+msgid "Network Computer (client)"
+msgstr "Мрежа (Клиент)"
 
-#~ msgid "Internet station"
-#~ msgstr "Интернет"
+#: ../../share/compssUsers:999
+msgid "Clients for different protocols including ssh"
+msgstr "Клиенти за различни протоколи, бклучувајќи и ssh"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid ""
-#~ "Set of tools to read and send mail and news (mutt, tin..) and to browse "
-#~ "the Web"
-#~ msgstr ""
-#~ "Алатки за читање и пракање е-маил и новости (pine, mutt, tin..) и "
-#~ "пребарување на Интернет"
+msgid "Configuration"
+msgstr "Конфигурација"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "Network Computer (client)"
-#~ msgstr "Мрежа (Клиент)"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Алатки за бришење на конфигурацијата на системот"
 
-#~ msgid "Clients for different protocols including ssh"
-#~ msgstr "Клиенти за различни протоколи, бклучувајќи и ssh"
+#: ../../share/compssUsers:999
+msgid "Console Tools"
+msgstr "Конзолски алатки"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "Configuration"
-#~ msgstr "Конфигурација"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Уредувачи, школки, алатки, терминали"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "Tools to ease the configuration of your computer"
-#~ msgstr "Алатки за бришење на конфигурацијата на системот"
+msgid "KDE Workstation"
+msgstr "KDE"
 
-#~ msgid "Scientific Workstation"
-#~ msgstr "Наука"
+#: ../../share/compssUsers:999
+#, fuzzy
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"К Десктоп Опкружување, основно графичко опкружување со колекција на алатки."
 
-#~ msgid "Scientific applications such as gnuplot"
-#~ msgstr "Научни апликации како gnuplot"
+#: ../../share/compssUsers:999
+#, fuzzy
+msgid "GNOME Workstation"
+msgstr "KDE"
 
-#~ msgid "Console Tools"
-#~ msgstr "Конзолски алатки"
+#: ../../share/compssUsers:999
+#, fuzzy
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "Графичко опкружување со user-friendly и алатки за десктоп"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "Editors, shells, file tools, terminals"
-#~ msgstr "Уредувачи, школки, алатки, терминали"
+msgid "Other Graphical Desktops"
+msgstr "Други Графички Десктопови"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "KDE Workstation"
-#~ msgstr "KDE"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, и.т.н"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid ""
-#~ "The K Desktop Environment, the basic graphical environment with a "
-#~ "collection of accompanying tools"
-#~ msgstr ""
-#~ "К Десктоп Опкружување, основно графичко опкружување со колекција на "
-#~ "алатки."
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C и C++ програми, датотеки и датотеки"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "Gnome Workstation"
-#~ msgstr "Гноме"
+msgid "Documentation"
+msgstr "Документација"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid ""
-#~ "A graphical environment with user-friendly set of applications and "
-#~ "desktop tools"
-#~ msgstr "Графичко опкружување со user-friendly и алатки за десктоп"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Книги и -Како да- за Linux Бесплатен Софтвер"
+
+#: ../../share/compssUsers:999
+msgid "LSB"
+msgstr "LSB"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "Other Graphical Desktops"
-#~ msgstr "Други Графички Десктопови"
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Стандардна База"
+
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: ../../share/compssUsers:999
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+#: ../../share/compssUsers:999
+msgid "Mail"
+msgstr "Пошта"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-#~ msgstr "Icewm, Window Maker, Enlightenment, Fvwm, и.т.н"
+msgid "Postfix mail server"
+msgstr "Postfix Маил сервер"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "C and C++ development libraries, programs and include files"
-#~ msgstr "C и C++ програми, датотеки и датотеки"
+msgid "Database"
+msgstr "База на податоци"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "Documentation"
-#~ msgstr "Документација"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL или MySQL сервер за бази на податоци"
 
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Интернет gateway"
+
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "Books and Howto's on Linux and Free Software"
-#~ msgstr "Книги и -Како да- за Linux Бесплатен Софтвер"
+msgid "Network Computer server"
+msgstr "Мрежа (Клиент)"
 
-#~ msgid "LSB"
-#~ msgstr "LSB"
+#: ../../share/compssUsers:999
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "Linux Standard Base. Third party applications support"
-#~ msgstr "Linux Стандардна База"
+msgid "Set of tools to read and send mail and news and to browse the Web"
+msgstr ""
+"Алатки за читање и пракање е-маил и новости (pine, mutt, tin..) и "
+"пребарување на Интернет"
 
-#~ msgid "Web/FTP"
-#~ msgstr "Web/FTP"
+#~ msgid "Provider dns 1 (optional)"
+#~ msgstr "Провајдер dns 1 (опција)"
 
-#~ msgid "Apache, Pro-ftpd"
-#~ msgstr "Apache, Pro-ftpd"
+#~ msgid "Provider dns 2 (optional)"
+#~ msgstr "dns Провајдер 2 (опционо)"
 
-#~ msgid "Mail"
-#~ msgstr "Пошта"
+#~ msgid "Ethernet Card"
+#~ msgstr "Мрежна картичка"
 
-#, fuzzy
-#~ msgid "Postfix mail server"
-#~ msgstr "Postfix Маил сервер"
+#~ msgid "DHCP Client"
+#~ msgstr "DHCP клиент"
 
 #, fuzzy
-#~ msgid "Database"
-#~ msgstr "База на податоци"
+#~ msgid "Display"
+#~ msgstr "дневно"
 
 #, fuzzy
-#~ msgid "PostgreSQL or MySQL database server"
-#~ msgstr "PostgreSQL или MySQL сервер за бази на податоци"
-
-#~ msgid "Firewall/Router"
-#~ msgstr "Firewall/Router"
+#~ msgid "Display configuration"
+#~ msgstr "LAN конфигурација"
 
-#~ msgid "Internet gateway"
-#~ msgstr "Интернет gateway"
+#~ msgid ""
+#~ "Change\n"
+#~ "Restore Path"
+#~ msgstr ""
+#~ "Промени\n"
+#~ "Врати Патека"
 
 #, fuzzy
-#~ msgid "Domain Name and Network Information Server"
-#~ msgstr "DNS сервер"
+#~ msgid "European protocol"
+#~ msgstr "Европски протокол"
 
-#, fuzzy
-#~ msgid "Network Computer server"
-#~ msgstr "Мрежа (Клиент)"
+#~ msgid "Found \"%s\" interface do you want to use it ?"
+#~ msgstr "Најден е \"%s\" интерфејс. Дали сакате да го користите?"
 
-#, fuzzy
-#~ msgid "Set of tools to read and send mail and news and to browse the Web"
+#~ msgid "What kind is your ISDN connection?"
+#~ msgstr "Од каков вид е Вашата ISDN конекција?"
+
+#~ msgid "Do you want to start a new configuration ?"
+#~ msgstr "Дали сакате да ја започнете нова конфигурацијата?"
+
+#~ msgid ""
+#~ "I have detected an ISDN PCI card, but I don't know its type. Please "
+#~ "select a PCI card on the next screen."
 #~ msgstr ""
-#~ "Алатки за читање и пракање е-маил и новости (pine, mutt, tin..) и "
-#~ "пребарување на Интернет"
+#~ "Открив ISDN PCI картичка, но не го знам нејзиниот тип. Ве молам изберете "
+#~ "една PCI картичка на следниот екран."
 
-#, fuzzy
-#~ msgid "add"
-#~ msgstr "Додај"
+#~ msgid "No ISDN PCI card found. Please select one on the next screen."
+#~ msgstr ""
+#~ "Не е најдена ISDN PCI картичка. Ве молам изберете една  на следниот екран."
 
-#, fuzzy
-#~ msgid "edit"
-#~ msgstr "Измени"
+#~ msgid "DrakTermServ"
+#~ msgstr "DrakTermServ"
 
-#, fuzzy
-#~ msgid "remove"
-#~ msgstr "Отстрани"
+#~ msgid "Under Devel ... please wait."
+#~ msgstr "Во развој ... Ве молиме почекајте."
 
 #, fuzzy
-#~ msgid "Add an UPS device"
-#~ msgstr "Додај"
+#~ msgid "Windows (FAT32)"
+#~ msgstr "Windows (FAT32)"
 
 #, fuzzy
 #~ msgid ""
-#~ "Welcome to the UPS configuration utility.\n"
-#~ "\n"
-#~ "Here, you'll be add a new UPS to your system.\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"
 #~ msgstr ""
-#~ "Добредојдовте во помошната алатка за конфигурирање на поштата.\n"
+#~ "Ве молиме внесете го името на интерфејсот за поврзување на Интернет\n"
 #~ "\n"
-#~ "Овде можете да го подесите системскиот аларм.\n"
+#~ "На пример:\n"
+#~ "\t\tppp+ за модем или DSL конекција, \n"
+#~ "\t\teth0, или eth1 за кабелска конекција, \n"
+#~ "\t\tippp+ за ISDN конекција. \n"
 
 #, fuzzy
-#~ msgid "Autodetection"
-#~ msgstr "Авто-детекција"
+#~ msgid ""
+#~ "Enter your CD Writer device name\n"
+#~ " ex: 0,1,0"
+#~ msgstr ""
+#~ "Ве молам внесете името на вашиот CD Writer уред\n"
+#~ "пр: 0,1,0"
 
-#, fuzzy
-#~ msgid "No new UPS devices was found"
-#~ msgstr "Не е пронајдена слика!"
+#~ msgid "Scientific Workstation"
+#~ msgstr "Наука"
 
-#, fuzzy
-#~ msgid "UPS driver configuration"
-#~ msgstr "CUPS принтерска конфигурација"
+#~ msgid "Scientific applications such as gnuplot"
+#~ msgstr "Научни апликации како gnuplot"
 
 #, fuzzy
-#~ msgid "Please select your UPS model."
-#~ msgstr "Тестирајте го глушецот:"
+#~ msgid "Domain Name and Network Information Server"
+#~ msgstr "DNS сервер"
 
 #, fuzzy
-#~ msgid "Manufacturer / Model:"
-#~ msgstr "Производител на принтерот, модел"
+#~ msgid "No wireless network adapter on your system!"
+#~ msgstr "Нема мрежен адаптер на Вашиот систем!"
 
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "Име: "
+#~ msgid "Can't create log file!"
+#~ msgstr "Не можам да клреирам лог датотеки!"
 
 #, fuzzy
-#~ msgid "The name of your ups"
-#~ msgstr "имтое на производителот на уредот"
+#~ msgid "dhcp"
+#~ msgstr "користи dhcp"
 
-#, fuzzy
-#~ msgid "Port:"
-#~ msgstr "Порт"
+#~ msgid "Please select media for backup..."
+#~ msgstr "Одберете го медиумот за бекап..."
 
 #, fuzzy
-#~ msgid "The port on which is connected your ups"
-#~ msgstr "Изберете на која сериска порта е поврзан глушецот."
+#~ msgid "real_file"
+#~ msgstr "Избор на датотека"
+
+#~ msgid "Configuration of a remote printer"
+#~ msgstr "Конфигурација на оддалечен принтер"
 
 #, fuzzy
-#~ msgid "UPS devices"
-#~ msgstr "Сервиси"
+#~ msgid "configure %s"
+#~ msgstr "реконфигурирај"
 
 #, fuzzy
-#~ msgid "UPS users"
-#~ msgstr "Корисници"
+#~ msgid "protocol = "
+#~ msgstr "Протокол"
 
 #, fuzzy
-#~ msgid "Access Control Lists"
-#~ msgstr "пристап до мрежни алатки"
+#~ msgid "level = "
+#~ msgstr "ниво"
 
 #, fuzzy
-#~ msgid "Rules"
-#~ msgstr "Рутери:"
+#~ msgid "Gnome Workstation"
+#~ msgstr "Гноме"
 
 #, fuzzy
-#~ msgid "Action"
-#~ msgstr "/_Опции"
+#~ msgid "add"
+#~ msgstr "Додај"
 
 #, fuzzy
-#~ msgid "ACL name"
-#~ msgstr "LVM име?"
+#~ msgid "edit"
+#~ msgstr "Измени"
 
 #, fuzzy
-#~ msgid "Welcome to the UPS configuration tools"
-#~ msgstr "Тест на конфигурацијата"
+#~ msgid "remove"
+#~ msgstr "Отстрани"
 
 #~ msgid "Running \"%s\" ..."
 #~ msgstr "Извршување на \"%s\" ..."
diff --git a/perl-install/share/po/nn.po b/perl-install/share/po/nn.po
new file mode 100644
index 000000000..f08d7ceb5
--- /dev/null
+++ b/perl-install/share/po/nn.po
@@ -0,0 +1,21404 @@
+# translation of nn.po to Norwegian Nynorsk
+# translation of DrakX.pot to Norwegian Nynorsk
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# Karl Ove Hufthammer <karl@huftis.org>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: nn\n"
+"POT-Creation-Date: 2004-03-19 14:32+0100\n"
+"PO-Revision-Date: 2004-03-14 15:33+0100\n"
+"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
+"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#: ../move/move.pm:359
+#, c-format
+msgid ""
+"Your USB key doesn't have any valid Windows (FAT) partitions.\n"
+"We need one to continue (beside, it's more standard so that you\n"
+"will be able to move and access your files from machines\n"
+"running Windows). Please plug in an USB key containing a\n"
+"Windows partition instead.\n"
+"\n"
+"\n"
+"You may also proceed without an USB key - you'll still be\n"
+"able to use Mandrake Move as a normal live Mandrake\n"
+"Operating System."
+msgstr ""
+"USB-nøkkelen inneheld ikkje ein Windows-partisjon (FAT-partisjon).\n"
+"Du treng ein slik partisjon for å kunna halda fram. I tillegg er dette "
+"standard, så du vil kunna lesa og skriva til filene frå maskiner som kjører\n"
+"Windows. Set inn ein USB-nøkkel som inneheld ein Windows-partisjon.\n"
+"\n"
+"\n"
+"Du kan òg halda fram utan USB-nøkkel. Du kan då bruka\n"
+"Mandrake Move som eit vanleg CD-basert operativesystem."
+
+#: ../move/move.pm:369
+#, c-format
+msgid ""
+"We didn't detect any USB key on your system. If you\n"
+"plug in an USB key now, Mandrake Move will have the ability\n"
+"to transparently save the data in your home directory and\n"
+"system wide configuration, for next boot on this computer\n"
+"or another one. Note: if you plug in a key now, wait several\n"
+"seconds before detecting again.\n"
+"\n"
+"\n"
+"You may also proceed without an USB key - you'll still be\n"
+"able to use Mandrake Move as a normal live Mandrake\n"
+"Operating System."
+msgstr ""
+"Fann ikkej USB-nøkkel på systemet. Viss du set inn\n"
+"ein USB-nøkkel no, kan du lagra filer i heimemappa, og\n"
+"endra systemoppsettet, slik at det tilgjengeleg neste \n"
+"gong du startar systemet. Merk: Du må venta eit par sekund\n"
+"etter at du har sett inn nøkkelen før han kan bli gjekjend.\n"
+"\n"
+"\n"
+"Du kan òg halda fram utan USB-nøkkel. Du kan då bruka\n"
+"Mandrake Move som eit vanleg CD-basert operativesystem."
+
+#: ../move/move.pm:380
+#, c-format
+msgid "Need a key to save your data"
+msgstr "Treng nøkkel for å kunna lagra data"
+
+#: ../move/move.pm:382
+#, c-format
+msgid "Detect USB key again"
+msgstr "Sjå etter USB-nøkkel på nytt"
+
+#: ../move/move.pm:383 ../move/move.pm:413
+#, c-format
+msgid "Continue without USB key"
+msgstr "Hald fram utan USB-nøkkel"
+
+#: ../move/move.pm:394 ../move/move.pm:408
+#, c-format
+msgid "Key isn't writable"
+msgstr "Nøkkelen er ikkje skrivbar"
+
+#: ../move/move.pm:396
+#, c-format
+msgid ""
+"The USB key seems to have write protection enabled, but we can't safely\n"
+"unplug it now.\n"
+"\n"
+"\n"
+"Click the button to reboot the machine, unplug it, remove write protection,\n"
+"plug the key again, and launch Mandrake Move again."
+msgstr ""
+"USB-nøkkelen er skriveverna, men du kan ikkje sikkert fjerna han no.\n"
+"\n"
+"\n"
+"Trykk «Start på nytt» for å starta maskina på nytt, fjern nøkkelen,\n"
+"slå av skrivevernet, og start så Mandrake Move på nytt."
+
+#: ../move/move.pm:402 help.pm:418 install_steps_interactive.pm:1319
+#, c-format
+msgid "Reboot"
+msgstr "Start på nytt"
+
+#: ../move/move.pm:410
+#, c-format
+msgid ""
+"The USB key seems to have write protection enabled. Please\n"
+"unplug it, remove write protection, and then plug it again."
+msgstr ""
+"USB-nøkkelen er skriveverna. Ta han ut, fjern skrivevernet,\n"
+"og set han inn igjen."
+
+#: ../move/move.pm:412
+#, c-format
+msgid "Retry"
+msgstr "Prøv på nytt"
+
+#: ../move/move.pm:423
+#, c-format
+msgid "Setting up USB key"
+msgstr "Set opp USB-nøkkel"
+
+#: ../move/move.pm:423
+#, c-format
+msgid "Please wait, setting up system configuration files on USB key..."
+msgstr "Vent litt. Set opp systemoppsettfilene på USB-nøkkelen ..."
+
+#: ../move/move.pm:445
+#, c-format
+msgid "Enter your user information, password will be used for screensaver"
+msgstr "Skriv inn brukarinformasjon. Passordet blir brukt for skjermspararen."
+
+#: ../move/move.pm:455
+#, c-format
+msgid "Auto configuration"
+msgstr "Autooppsett"
+
+#: ../move/move.pm:455
+#, c-format
+msgid "Please wait, detecting and configuring devices..."
+msgstr "Vent litt. Ser etter og set opp maskinvare ..."
+
+#: ../move/move.pm:502 ../move/move.pm:559 ../move/move.pm:563
+#: ../move/tree/mdk_totem:86 diskdrake/dav.pm:77 diskdrake/hd_gtk.pm:117
+#: diskdrake/interactive.pm:215 diskdrake/interactive.pm:228
+#: diskdrake/interactive.pm:369 diskdrake/interactive.pm:384
+#: 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: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: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: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"
+msgstr "Feil"
+
+#: ../move/move.pm:503 install_steps.pm:83
+#, c-format
+msgid ""
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
+msgstr "Det oppstod ein kritisk feil. Hald fram på eige ansvar."
+
+#: ../move/move.pm:559 install_steps_interactive.pm:40
+#, c-format
+msgid "An error occurred"
+msgstr "Det oppstod ein feil"
+
+#: ../move/move.pm:565
+#, c-format
+msgid ""
+"An error occurred:\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"This may come from corrupted system configuration files\n"
+"on the USB key, in this case removing them and then\n"
+"rebooting Mandrake Move would fix the problem. To do\n"
+"so, click on the corresponding button.\n"
+"\n"
+"\n"
+"You may also want to reboot and remove the USB key, or\n"
+"examine its contents under another OS, or even have\n"
+"a look at log files in console #3 and #4 to try to\n"
+"guess what's happening."
+msgstr ""
+"Det oppstod ein feil:\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"Dette kan vera fordi systemoppsettfilene på USB-nøkkelen\n"
+"er øydelagde. Prøv å fjerna dei, og start så Mandrake Move\n"
+"på nytt.\n"
+"\n"
+"\n"
+"Du kan òg starta på nytt og fjerna USB-nøkkelen, eller sjå\n"
+"på innhaldet på han under eit anna operativsystem. I tillegg\n"
+"kan du sjå nærare på loggfilene i konsoll 3 og 4 for å finna\n"
+"ut kva som har gått galt."
+
+#: ../move/move.pm:580
+#, c-format
+msgid "Remove system config files"
+msgstr "Fjern systemoppsettfiler"
+
+#: ../move/move.pm:581
+#, c-format
+msgid "Simply reboot"
+msgstr "Enkel omstart"
+
+#: ../move/tree/mdk_totem:60
+#, c-format
+msgid "You can only run with no CDROM support"
+msgstr "Du kan berre kjøra utan CD-ROM-støtte"
+
+#: ../move/tree/mdk_totem:81
+#, c-format
+msgid "Kill those programs"
+msgstr "Avslutt programma"
+
+#: ../move/tree/mdk_totem:82
+#, c-format
+msgid "No CDROM support"
+msgstr "Ikkje CD-ROM-støtte"
+
+#: ../move/tree/mdk_totem:87
+#, c-format
+msgid ""
+"You can't use another CDROM when the following programs are running: \n"
+"%s"
+msgstr ""
+"Du kan ikkje bruka ein annan CD når desse programma kjører: \n"
+"%s"
+
+#: ../move/tree/mdk_totem:101
+#, c-format
+msgid "Copying to memory to allow removing the CDROM"
+msgstr "Kopierer til minne for å gjera det mogleg å bytta CD"
+
+#: Xconfig/card.pm:16
+#, c-format
+msgid "256 kB"
+msgstr "256 KiB"
+
+#: Xconfig/card.pm:17
+#, c-format
+msgid "512 kB"
+msgstr "512 KiB"
+
+#: Xconfig/card.pm:18
+#, c-format
+msgid "1 MB"
+msgstr "1 MiB"
+
+#: Xconfig/card.pm:19
+#, c-format
+msgid "2 MB"
+msgstr "2 MiB"
+
+#: Xconfig/card.pm:20
+#, c-format
+msgid "4 MB"
+msgstr "4 MiB"
+
+#: Xconfig/card.pm:21
+#, c-format
+msgid "8 MB"
+msgstr "8 MiB"
+
+#: Xconfig/card.pm:22
+#, c-format
+msgid "16 MB"
+msgstr "16 MiB"
+
+#: Xconfig/card.pm:23
+#, c-format
+msgid "32 MB"
+msgstr "32 MiB"
+
+#: Xconfig/card.pm:24
+#, c-format
+msgid "64 MB or more"
+msgstr "64 MiB eller meir"
+
+#: Xconfig/card.pm:211
+#, c-format
+msgid "X server"
+msgstr "X-tenar"
+
+#: Xconfig/card.pm:212
+#, c-format
+msgid "Choose an X server"
+msgstr "Vel X-tenar"
+
+#: Xconfig/card.pm:244
+#, c-format
+msgid "Multi-head configuration"
+msgstr "Fleirhovudoppsett"
+
+#: Xconfig/card.pm:245
+#, c-format
+msgid ""
+"Your system supports multiple head configuration.\n"
+"What do you want to do?"
+msgstr ""
+"Systemet ditt støttar fleirhovudoppsett.\n"
+"Kva vil du gjera?"
+
+#: Xconfig/card.pm:312
+#, c-format
+msgid "Can't install XFree package: %s"
+msgstr "Kan ikkje installera XFree-pakke: %s"
+
+#: Xconfig/card.pm:322
+#, c-format
+msgid "Select the memory size of your graphics card"
+msgstr "Vel minnestorleik til skjermkortet"
+
+#: Xconfig/card.pm:398
+#, c-format
+msgid "XFree configuration"
+msgstr "XFree-oppsett"
+
+#: Xconfig/card.pm:400
+#, c-format
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Kva XFree-oppsett ønskjer du?"
+
+#: Xconfig/card.pm:434
+#, c-format
+msgid "Configure all heads independently"
+msgstr "Set opp alle hovuda for seg"
+
+#: Xconfig/card.pm:435
+#, c-format
+msgid "Use Xinerama extension"
+msgstr "Bruk Xinerama-utviding"
+
+#: Xconfig/card.pm:440
+#, c-format
+msgid "Configure only card \"%s\"%s"
+msgstr "Set berre opp kortet «%s»%s"
+
+#: Xconfig/card.pm:454 Xconfig/card.pm:456 Xconfig/various.pm:23
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
+
+#: Xconfig/card.pm:467 Xconfig/card.pm:493 Xconfig/various.pm:23
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "XFree %s med 3D-maskinvareakselerasjon"
+
+#: Xconfig/card.pm:470
+#, c-format
+msgid ""
+"Your card can have 3D hardware acceleration support but only with XFree %s.\n"
+"Your card is supported by XFree %s which may have a better support in 2D."
+msgstr ""
+"Kortet støttar 3D-maskinvareakselerasjon, men berre med Xfree %s.\n"
+"Kortet er òg støtta i XFree %s, som kanskje har betre støtte i 2D."
+
+#: Xconfig/card.pm:472 Xconfig/card.pm:495
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr "Kortet støttar 3D-maskinvareakselerasjon med XFree %s."
+
+#: Xconfig/card.pm:480 Xconfig/card.pm:501
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "XFree %s med EKSPERIMENTELL 3D-maskinvareakselerasjon"
+
+#: Xconfig/card.pm:483
+#, c-format
+msgid ""
+"Your card can have 3D hardware acceleration support but only with XFree %s,\n"
+"NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.\n"
+"Your card is supported by XFree %s which may have a better support in 2D."
+msgstr ""
+"Kortet støttar 3D-maskinvareakselerasjon, men berre med Xfree %s.\n"
+"MERK AT DETTE ER EKSPERIMENTELL STØTTTE OG KAN LÅSA MASKINA DI.\n"
+"Kortet er òg støtta i XFree %s, som kanskje har betre støtte i 2D."
+
+#: Xconfig/card.pm:486 Xconfig/card.pm:503
+#, c-format
+msgid ""
+"Your card can have 3D hardware acceleration support with XFree %s,\n"
+"NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
+msgstr ""
+"Kortet støttar 3D-maskinvareakselerasjon med Xfree %s.\n"
+"MERK AT DETTE ER EKSPERIMENTELL STØTTTE OG KAN LÅSA MASKINA DI."
+
+#: Xconfig/card.pm:509
+#, c-format
+msgid "Xpmac (installation display driver)"
+msgstr "Xpamc (installasjonsskjermdrivar)"
+
+#: Xconfig/main.pm:88 Xconfig/main.pm:89 Xconfig/monitor.pm:106 any.pm:823
+#, c-format
+msgid "Custom"
+msgstr "Eigendefinert"
+
+#: Xconfig/main.pm:113 diskdrake/dav.pm:28 help.pm:14
+#: 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 "Avslutt"
+
+#: Xconfig/main.pm:115
+#, c-format
+msgid "Graphic Card"
+msgstr "Skjermkort"
+
+#: Xconfig/main.pm:118 Xconfig/monitor.pm:100
+#, c-format
+msgid "Monitor"
+msgstr "Skjerm"
+
+#: Xconfig/main.pm:121 Xconfig/resolution_and_depth.pm:228
+#, c-format
+msgid "Resolution"
+msgstr "Oppløysing"
+
+#: Xconfig/main.pm:126
+#, c-format
+msgid "Test"
+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: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 "Val"
+
+#: Xconfig/main.pm:180
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"The current configuration is:\n"
+"\n"
+"%s"
+msgstr ""
+"Vil du behalda endringane?\n"
+"Gjeldande oppsett er:\n"
+"\n"
+"%s"
+
+#: Xconfig/monitor.pm:101
+#, c-format
+msgid "Choose a monitor"
+msgstr "Vel skjerm"
+
+#: Xconfig/monitor.pm:107
+#, c-format
+msgid "Plug'n Play"
+msgstr "Finn automatisk"
+
+#: Xconfig/monitor.pm:108 mouse.pm:49
+#, c-format
+msgid "Generic"
+msgstr "Generell"
+
+#: Xconfig/monitor.pm:109 standalone/drakconnect:556 standalone/harddrake2:68
+#: standalone/harddrake2:69
+#, c-format
+msgid "Vendor"
+msgstr "Merke"
+
+#: Xconfig/monitor.pm:119
+#, c-format
+msgid "Plug'n Play probing failed. Please select the correct monitor"
+msgstr "Klarte ikkje finna rett skjermtype. Vel skjermtype."
+
+#: Xconfig/monitor.pm:124
+#, c-format
+msgid ""
+"The two critical parameters are the vertical refresh rate, which is the "
+"rate\n"
+"at which the whole screen is refreshed, and most importantly the horizontal\n"
+"sync rate, which is the rate at which scanlines are displayed.\n"
+"\n"
+"It is VERY IMPORTANT that you do not specify a monitor type with a sync "
+"range\n"
+"that is beyond the capabilities of your monitor: you may damage your "
+"monitor.\n"
+" If in doubt, choose a conservative setting."
+msgstr ""
+"Dei to kritiske parametrane er loddrett frekvens, som er kor ofte heile\n"
+"skjermen blir oppdatert, og vassrett frekvens, som er kor ofte skannlinjene\n"
+"blir teikna opp.\n"
+"\n"
+"Det er veldig viktig at du ikkje vel ein skjermtype med frekvensområde\n"
+"større enn skjermen din tåler, då dette kan øydeleggja skjermen.\n"
+"Er du i tvil bør du derfor velja eit lågt frekvensområde."
+
+#: Xconfig/monitor.pm:131
+#, c-format
+msgid "Horizontal refresh rate"
+msgstr "Vassrett frekvens"
+
+#: Xconfig/monitor.pm:132
+#, c-format
+msgid "Vertical refresh rate"
+msgstr "Loddrett frekvens"
+
+#: Xconfig/resolution_and_depth.pm:12
+#, c-format
+msgid "256 colors (8 bits)"
+msgstr "256 fargar (8 bit)"
+
+#: Xconfig/resolution_and_depth.pm:13
+#, c-format
+msgid "32 thousand colors (15 bits)"
+msgstr "32 tusen fargar (15 bit)"
+
+#: Xconfig/resolution_and_depth.pm:14
+#, c-format
+msgid "65 thousand colors (16 bits)"
+msgstr "65 tusen fargar (16 bit)"
+
+#: Xconfig/resolution_and_depth.pm:15
+#, c-format
+msgid "16 million colors (24 bits)"
+msgstr "16 millionar fargar (24 bit)"
+
+#: Xconfig/resolution_and_depth.pm:16
+#, c-format
+msgid "4 billion colors (32 bits)"
+msgstr "4 milliardar fargar (32 bit)"
+
+#: Xconfig/resolution_and_depth.pm:141
+#, c-format
+msgid "Resolutions"
+msgstr "Oppløysingar"
+
+#: Xconfig/resolution_and_depth.pm:275
+#, c-format
+msgid "Choose the resolution and the color depth"
+msgstr "Vel oppløysing og fargedjupn"
+
+#: Xconfig/resolution_and_depth.pm:276
+#, c-format
+msgid "Graphics card: %s"
+msgstr "Skjermkort: %s"
+
+#: Xconfig/resolution_and_depth.pm:289 interactive.pm:403
+#: 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: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 "OK"
+
+#: 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: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: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 "Avbryt"
+
+#: Xconfig/resolution_and_depth.pm:289 diskdrake/hd_gtk.pm:154
+#: 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 "Hjelp"
+
+#: Xconfig/test.pm:30
+#, c-format
+msgid "Test of the configuration"
+msgstr "Test av oppsett"
+
+#: Xconfig/test.pm:31
+#, c-format
+msgid "Do you want to test the configuration?"
+msgstr "Vil du testa dette oppsettet?"
+
+#: Xconfig/test.pm:31
+#, c-format
+msgid "Warning: testing this graphic card may freeze your computer"
+msgstr "Åtvaring: Test av dette skjermkortet kan låsa maskina"
+
+#: Xconfig/test.pm:71
+#, c-format
+msgid ""
+"An error occurred:\n"
+"%s\n"
+"Try to change some parameters"
+msgstr ""
+"Det oppstod ein feil:\n"
+"%s\n"
+"Prøv å endra nokre parametrar."
+
+#: Xconfig/test.pm:149
+#, c-format
+msgid "Leaving in %d seconds"
+msgstr "Forlèt om %d sekund"
+
+#: Xconfig/test.pm:149
+#, c-format
+msgid "Is this the correct setting?"
+msgstr "Er dette rett innstilling?"
+
+#: Xconfig/various.pm:29
+#, c-format
+msgid "Keyboard layout: %s\n"
+msgstr "Tastaturoppsett: %s\n"
+
+#: Xconfig/various.pm:30
+#, c-format
+msgid "Mouse type: %s\n"
+msgstr "Mustype: %s\n"
+
+#: Xconfig/various.pm:31
+#, c-format
+msgid "Mouse device: %s\n"
+msgstr "Museining: %s\n"
+
+#: Xconfig/various.pm:32
+#, c-format
+msgid "Monitor: %s\n"
+msgstr "Skjerm: %s\n"
+
+#: Xconfig/various.pm:33
+#, c-format
+msgid "Monitor HorizSync: %s\n"
+msgstr "Vassrett frekvens: %s\n"
+
+#: Xconfig/various.pm:34
+#, c-format
+msgid "Monitor VertRefresh: %s\n"
+msgstr "Loddrett frekvens: %s\n"
+
+#: Xconfig/various.pm:35
+#, c-format
+msgid "Graphics card: %s\n"
+msgstr "Skjermkort: %s\n"
+
+#: Xconfig/various.pm:36
+#, c-format
+msgid "Graphics memory: %s kB\n"
+msgstr "Minne: %s KiB\n"
+
+#: Xconfig/various.pm:38
+#, c-format
+msgid "Color depth: %s\n"
+msgstr "Fargedjupn: %s\n"
+
+#: Xconfig/various.pm:39
+#, c-format
+msgid "Resolution: %s\n"
+msgstr "Oppløysing: %s\n"
+
+#: Xconfig/various.pm:41
+#, c-format
+msgid "XFree86 server: %s\n"
+msgstr "XFree86-tenar: %s\n"
+
+#: Xconfig/various.pm:42
+#, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86-drivar: %s\n"
+
+#: Xconfig/various.pm:71
+#, c-format
+msgid "Graphical interface at startup"
+msgstr "Grafisk oppstart"
+
+#: Xconfig/various.pm:73
+#, c-format
+msgid ""
+"I can setup your computer to automatically start the graphical interface "
+"(XFree) upon booting.\n"
+"Would you like XFree to start when you reboot?"
+msgstr ""
+"Det mogleg å starta det grafiske grensesnittet automatisk når maskina blir "
+"slått på.\n"
+"Ønskjer du denne funksjonen?"
+
+#: Xconfig/various.pm:86
+#, c-format
+msgid ""
+"Your graphic card seems to have a TV-OUT connector.\n"
+"It can be configured to work using frame-buffer.\n"
+"\n"
+"For this you have to plug your graphic card to your TV before booting your "
+"computer.\n"
+"Then choose the \"TVout\" entry in the bootloader\n"
+"\n"
+"Do you have this feature?"
+msgstr ""
+
+#: Xconfig/various.pm:98
+#, c-format
+msgid "What norm is your TV using?"
+msgstr "Kva fjernsynsstandard brukar fjernsynet ditt?"
+
+#: 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 "Vent litt "
+
+#: any.pm:103
+#, c-format
+msgid "Bootloader installation in progress"
+msgstr "Installerer oppstartslastar"
+
+#: any.pm:142
+#, c-format
+msgid ""
+"You decided to install the bootloader on a partition.\n"
+"This implies you already have a bootloader on the hard drive you boot (eg: "
+"System Commander).\n"
+"\n"
+"On which drive are you booting?"
+msgstr ""
+"Du har valt å installera oppstartslastaren på ein partisjon.\n"
+"Dette betyr at du allereie har ein oppstartslastar (som System Commander) på "
+"oppstartsdisken.\n"
+"\n"
+"Kven av diskane er oppstartsdisk?"
+
+#: any.pm:165 any.pm:197 help.pm:800
+#, c-format
+msgid "First sector of drive (MBR)"
+msgstr "Første sektor på stasjonen (MBR)"
+
+#: any.pm:166
+#, c-format
+msgid "First sector of the root partition"
+msgstr "Første sektor på rotpartisjonen"
+
+#: any.pm:168
+#, c-format
+msgid "On Floppy"
+msgstr "På ein diskett"
+
+#: any.pm:170 help.pm:768 help.pm:800 printer/printerdrake.pm:3418
+#, c-format
+msgid "Skip"
+msgstr "Hopp over"
+
+#: any.pm:175
+#, c-format
+msgid "SILO Installation"
+msgstr "SILO-installering"
+
+#: any.pm:175
+#, c-format
+msgid "LILO/grub Installation"
+msgstr "LILO-/grub-installering"
+
+#: any.pm:176
+#, c-format
+msgid "Where do you want to install the bootloader?"
+msgstr "Kor vil du installera oppstartslastaren?"
+
+#: any.pm:197
+#, c-format
+msgid "First sector of boot partition"
+msgstr "Første sektor på oppstartspartisjonen"
+
+#: any.pm:208
+#, c-format
+msgid "Boot Style Configuration"
+msgstr "Oppsettype"
+
+#: any.pm:210 any.pm:244
+#, c-format
+msgid "Bootloader main options"
+msgstr "Hovudval for oppstartslastar"
+
+#: any.pm:214
+#, c-format
+msgid "Give the ram size in MB"
+msgstr "Minnestorleik i MiB"
+
+#: any.pm:216
+#, c-format
+msgid ""
+"Option ``Restrict command line options'' is of no use without a password"
+msgstr "Valet «Avgrens kommandolinjeval» er ubrukeleg utan passord"
+
+#: any.pm:217 any.pm:524 install_steps_interactive.pm:1163
+#, c-format
+msgid "The passwords do not match"
+msgstr "Passorda er ikkje like"
+
+#: any.pm:217 any.pm:524 diskdrake/interactive.pm:1255
+#: install_steps_interactive.pm:1163
+#, c-format
+msgid "Please try again"
+msgstr "Prøv igjen"
+
+#: any.pm:222 any.pm:247 help.pm:768
+#, c-format
+msgid "Bootloader to use"
+msgstr "Oppstartslastar"
+
+#: any.pm:224
+#, c-format
+msgid "Bootloader installation"
+msgstr "Installering av oppstartslastar"
+
+#: any.pm:226 any.pm:249 help.pm:768
+#, c-format
+msgid "Boot device"
+msgstr "Oppstartseining"
+
+#: any.pm:228
+#, c-format
+msgid "Delay before booting default image"
+msgstr "Ventetid før oppstart med standardbilete"
+
+#: any.pm:229 help.pm:768
+#, c-format
+msgid "Enable ACPI"
+msgstr "Bruk ACPI"
+
+#: any.pm:230
+#, c-format
+msgid "Force No APIC"
+msgstr "Tving ikkje-APIC"
+
+#: 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 "Passord"
+
+#: any.pm:233 any.pm:552 install_steps_interactive.pm:1169
+#, c-format
+msgid "Password (again)"
+msgstr "Passord (på nytt)"
+
+#: any.pm:234
+#, c-format
+msgid "Restrict command line options"
+msgstr "Avgrens kommandolinjeval"
+
+#: any.pm:234
+#, c-format
+msgid "restrict"
+msgstr "avgrens"
+
+#: any.pm:236
+#, c-format
+msgid "Clean /tmp at each boot"
+msgstr "Tøm «/tmp» ved kvar oppstart"
+
+#: any.pm:237
+#, c-format
+msgid "Precise RAM size if needed (found %d MB)"
+msgstr "Nøyaktig minnestorleik om nødvendig (fann %d MiB)"
+
+#: any.pm:239
+#, c-format
+msgid "Enable multiple profiles"
+msgstr "Bruk fleire profilar"
+
+#: any.pm:248
+#, c-format
+msgid "Init Message"
+msgstr "Startmelding"
+
+#: any.pm:250
+#, c-format
+msgid "Open Firmware Delay"
+msgstr "Pause for Open Firmware"
+
+#: any.pm:251
+#, c-format
+msgid "Kernel Boot Timeout"
+msgstr "Tidsgrense for kjerneoppstart"
+
+#: any.pm:252
+#, c-format
+msgid "Enable CD Boot?"
+msgstr "Skal det vera mogleg å starta opp frå CD?"
+
+#: any.pm:253
+#, c-format
+msgid "Enable OF Boot?"
+msgstr "Skal det vera mogleg å starta opp frå Open Firmware?"
+
+#: any.pm:254
+#, c-format
+msgid "Default OS?"
+msgstr "Standardoperativsystem?"
+
+#: any.pm:295
+#, c-format
+msgid "Image"
+msgstr "Bilete"
+
+#: any.pm:296 any.pm:305
+#, c-format
+msgid "Root"
+msgstr "Rot"
+
+#: any.pm:297 any.pm:318
+#, c-format
+msgid "Append"
+msgstr "Legg til"
+
+#: any.pm:299
+#, c-format
+msgid "Video mode"
+msgstr "Videomodus"
+
+#: any.pm:301
+#, c-format
+msgid "Initrd"
+msgstr "Initrd"
+
+#: any.pm:310 any.pm:315 any.pm:317
+#, c-format
+msgid "Label"
+msgstr "Merkelapp"
+
+#: any.pm:312 any.pm:322 harddrake/v4l.pm:236 standalone/drakfloppy:88
+#: standalone/drakfloppy:94
+#, c-format
+msgid "Default"
+msgstr "Standard"
+
+#: any.pm:319
+#, c-format
+msgid "Initrd-size"
+msgstr "Initrd-storleik"
+
+#: any.pm:321
+#, c-format
+msgid "NoVideo"
+msgstr "Ingen video"
+
+#: any.pm:332
+#, c-format
+msgid "Empty label not allowed"
+msgstr "Kan ikkje ha tom merkelapp"
+
+#: any.pm:333
+#, c-format
+msgid "You must specify a kernel image"
+msgstr "Du må velja ein kjerne"
+
+#: any.pm:333
+#, c-format
+msgid "You must specify a root partition"
+msgstr "Du må velja ein rotpartisjon"
+
+#: any.pm:334
+#, c-format
+msgid "This label is already used"
+msgstr "Merkelappen er allereie brukt"
+
+#: any.pm:347
+#, c-format
+msgid "Which type of entry do you want to add?"
+msgstr "Kva type oppføring vil du leggja til?"
+
+#: any.pm:348
+#, c-format
+msgid "Linux"
+msgstr "Linux"
+
+#: any.pm:348
+#, c-format
+msgid "Other OS (SunOS...)"
+msgstr "Anna operativsystem (SunOS ...)"
+
+#: any.pm:349
+#, c-format
+msgid "Other OS (MacOS...)"
+msgstr "Anna operativsystem (MacOS ...)"
+
+#: any.pm:349
+#, c-format
+msgid "Other OS (windows...)"
+msgstr "Anna operativsystem (Windows ...)"
+
+#: any.pm:377
+#, c-format
+msgid ""
+"Here are the entries on your boot menu so far.\n"
+"You can create additional entries or change the existing ones."
+msgstr ""
+"Her er oppføringane på oppstartsmenyen.\n"
+"Du kan leggja til fleire, eller endra dei som er der."
+
+#: any.pm:509
+#, c-format
+msgid "access to X programs"
+msgstr "tilgang til X-program"
+
+#: any.pm:510
+#, c-format
+msgid "access to rpm tools"
+msgstr "tilgang til rpm-verktøy"
+
+#: any.pm:511
+#, c-format
+msgid "allow \"su\""
+msgstr "godta «su»"
+
+#: any.pm:512
+#, c-format
+msgid "access to administrative files"
+msgstr "tilgang til administrative filer"
+
+#: any.pm:513
+#, c-format
+msgid "access to network tools"
+msgstr "tilgang til nettverksverktøy"
+
+#: any.pm:514
+#, c-format
+msgid "access to compilation tools"
+msgstr "tilgang til kompileringsverktøy"
+
+#: any.pm:520
+#, c-format
+msgid "(already added %s)"
+msgstr "(allereie lagt til «%s»)"
+
+#: any.pm:525
+#, c-format
+msgid "This password is too simple"
+msgstr "Passordet er for lett"
+
+#: any.pm:526
+#, c-format
+msgid "Please give a user name"
+msgstr "Skriv inn brukarnamn"
+
+#: any.pm:527
+#, c-format
+msgid ""
+"The user name must contain only lower cased letters, numbers, `-' and `_'"
+msgstr ""
+"Brukarnamnet kan berre innehelda små bokstavar, tala og teikna «-» og «_»"
+
+#: any.pm:528
+#, c-format
+msgid "The user name is too long"
+msgstr "Brukarnamnet er for langt"
+
+#: any.pm:529
+#, c-format
+msgid "This user name has already been added"
+msgstr "Brukarnamnet finst allereie"
+
+#: any.pm:533
+#, c-format
+msgid "Add user"
+msgstr "Legg til brukar"
+
+#: any.pm:534
+#, c-format
+msgid ""
+"Enter a user\n"
+"%s"
+msgstr ""
+"Skriv inn ny brukar\n"
+"%s"
+
+#: 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:4076
+#: standalone/drakbackup:2802 standalone/scannerdrake:636
+#: standalone/scannerdrake:786
+#, c-format
+msgid "Done"
+msgstr "Ferdig"
+
+#: any.pm:538 help.pm:52
+#, c-format
+msgid "Accept user"
+msgstr "Godta brukar"
+
+#: any.pm:549
+#, c-format
+msgid "Real name"
+msgstr "Fullt namn"
+
+#: any.pm:550 help.pm:52 printer/printerdrake.pm:1373
+#: printer/printerdrake.pm:1493
+#, c-format
+msgid "User name"
+msgstr "Brukarnamn"
+
+#: any.pm:553
+#, c-format
+msgid "Shell"
+msgstr "Skal"
+
+#: any.pm:555
+#, c-format
+msgid "Icon"
+msgstr "Ikon"
+
+#: any.pm:596 security/l10n.pm:14
+#, c-format
+msgid "Autologin"
+msgstr "Automatisk innlogging"
+
+#: any.pm:597
+#, c-format
+msgid "I can set up your computer to automatically log on one user."
+msgstr "Du kan automatisk logga på standardbrukaren ved oppstart."
+
+#: any.pm:598 help.pm:52
+#, c-format
+msgid "Do you want to use this feature?"
+msgstr "Ønskjer du å bruka denne funksjonen?"
+
+#: any.pm:599
+#, c-format
+msgid "Choose the default user:"
+msgstr "Vel standardbrukar:"
+
+#: any.pm:600
+#, c-format
+msgid "Choose the window manager to run:"
+msgstr "Vel vindaugsbehandlar:"
+
+#: any.pm:612
+#, c-format
+msgid "Please choose a language to use."
+msgstr "Vel språk."
+
+#: any.pm:633
+#, c-format
+msgid ""
+"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 ""
+"Mandrakelinux støttar fleire språk. Her\n"
+"kan du velja kva språk du vil ha tilgjengeleg."
+
+#: any.pm:651 help.pm:660
+#, c-format
+msgid "Use Unicode by default"
+msgstr "Bruk Unicode som standard"
+
+#: any.pm:652 help.pm:660
+#, c-format
+msgid "All languages"
+msgstr "Alle språk"
+
+#: any.pm:688 help.pm:581 help.pm:991 install_steps_interactive.pm:908
+#, c-format
+msgid "Country / Region"
+msgstr "Land/område"
+
+#: any.pm:689
+#, c-format
+msgid "Please choose your country."
+msgstr "Vel land."
+
+#: any.pm:691
+#, c-format
+msgid "Here is the full list of available countries"
+msgstr "Her er heile lista over land"
+
+#: 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 "Meir"
+
+#: any.pm:823
+#, c-format
+msgid "No sharing"
+msgstr "Inga deling"
+
+#: any.pm:823
+#, c-format
+msgid "Allow all users"
+msgstr "Tillèt alle brukarar"
+
+#: any.pm:827
+#, c-format
+msgid ""
+"Would you like to allow users to share some of their directories?\n"
+"Allowing this will permit users to simply click on \"Share\" in konqueror "
+"and nautilus.\n"
+"\n"
+"\"Custom\" permit a per-user granularity.\n"
+msgstr ""
+"Vil du la brukarane kunna dela nokre av mappene deira?\n"
+"Dei kan då trykka «Del» i Konqueror eller Nautilus på mappene dei ønskjer å "
+"dela.\n"
+"\n"
+"Med «Eigendefinert» kan du velja oppsett for kvar brukar for seg.\n"
+
+#: any.pm:843
+#, c-format
+msgid ""
+"You can export using NFS or Samba. Please select which you'd like to use."
+msgstr "Du kan eksportera med NFS og Samba. Vel kven av dei du vil bruka."
+
+#: any.pm:851
+#, c-format
+msgid "The package %s is going to be removed."
+msgstr "Pakken «%s» blir fjerna."
+
+#: any.pm:863
+#, c-format
+msgid "Launch userdrake"
+msgstr "Set opp brukarar"
+
+#: any.pm:865
+#, c-format
+msgid ""
+"The per-user sharing uses the group \"fileshare\". \n"
+"You can use userdrake to add a user to this group."
+msgstr ""
+"Dei brukarspesifikke delingsinnstillingane brukar gruppa\n"
+"«fileshare». Du kan bruka brukaroppsettprogrammet til\n"
+"å leggja til brukarar her."
+
+#: authentication.pm:12
+#, c-format
+msgid "Local files"
+msgstr "Lokale filer"
+
+#: authentication.pm:12
+#, c-format
+msgid "LDAP"
+msgstr "LDAP"
+
+#: authentication.pm:12
+#, c-format
+msgid "NIS"
+msgstr "NIS"
+
+#: authentication.pm:12 authentication.pm:50
+#, c-format
+msgid "Windows Domain"
+msgstr "Windows-domene"
+
+#: authentication.pm:33
+#, c-format
+msgid "Authentication LDAP"
+msgstr "Autentisering for LDAP"
+
+#: authentication.pm:34
+#, c-format
+msgid "LDAP Base dn"
+msgstr "LDAP-grunn-DN"
+
+#: authentication.pm:35
+#, c-format
+msgid "LDAP Server"
+msgstr "LDAP-tenar"
+
+#: authentication.pm:40
+#, c-format
+msgid "Authentication NIS"
+msgstr "Autentisering for NS"
+
+#: authentication.pm:41
+#, c-format
+msgid "NIS Domain"
+msgstr "NIS-domene"
+
+#: authentication.pm:42
+#, c-format
+msgid "NIS Server"
+msgstr "NIS-tenar"
+
+#: authentication.pm:47
+#, c-format
+msgid ""
+"For this to work for a W2K PDC, you will probably need to have the admin "
+"run: C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /"
+"add and reboot the server.\n"
+"You will also need the username/password of a Domain Admin to join the "
+"machine to the Windows(TM) domain.\n"
+"If networking is not yet enabled, Drakx will attempt to join the domain "
+"after the network setup step.\n"
+"Should this setup fail for some reason and domain authentication is not "
+"working, run 'smbpasswd -j DOMAIN -U USER%%PASSWORD' using your Windows(tm) "
+"Domain, and Admin Username/Password, after system boot.\n"
+"The command 'wbinfo -t' will test whether your authentication secrets are "
+"good."
+msgstr ""
+
+#: authentication.pm:49
+#, c-format
+msgid "Authentication Windows Domain"
+msgstr "Autentisering for Windows-domene"
+
+#: authentication.pm:51
+#, c-format
+msgid "Domain Admin User Name"
+msgstr "Brukarnamn for domeneadministrator"
+
+#: authentication.pm:52
+#, c-format
+msgid "Domain Admin Password"
+msgstr "Passord for domeneadministrator"
+
+#: authentication.pm:83
+#, c-format
+msgid "Can't use broadcast with no NIS domain"
+msgstr "Kan ikkje kringkasta utan NIS-domene"
+
+#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
+#: bootloader.pm:533
+#, c-format
+msgid ""
+"Welcome to the operating system chooser!\n"
+"\n"
+"Choose an operating system from the list above or\n"
+"wait for default boot.\n"
+"\n"
+msgstr ""
+"Velkommen!\n"
+"\n"
+"Vel eit operativsystem fraa lista ovanfor,\n"
+"eller vent (for standard operativsystem).\n"
+"\n"
+
+#: bootloader.pm:665
+#, c-format
+msgid "SILO"
+msgstr "SILO"
+
+#: bootloader.pm:668 help.pm:768
+#, c-format
+msgid "LILO with graphical menu"
+msgstr "LILO med grafisk meny"
+
+#: bootloader.pm:670 help.pm:768
+#, c-format
+msgid "LILO with text menu"
+msgstr "LILO med tekstmeny"
+
+#: bootloader.pm:672
+#, c-format
+msgid "Grub"
+msgstr "Grub"
+
+#: bootloader.pm:674
+#, c-format
+msgid "Yaboot"
+msgstr "Yaboot"
+
+#: bootloader.pm:1147
+#, c-format
+msgid "not enough room in /boot"
+msgstr "Ikkje nok plass på «/boot»"
+
+#: bootloader.pm:1175
+#, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "Du kan ikkje installera oppstartslastaren på ein «%s»-partisjon\n"
+
+#: bootloader.pm:1219
+#, c-format
+msgid ""
+"Your bootloader configuration must be updated because partition has been "
+"renumbered"
+msgstr ""
+"Oppstartslastaren må oppdaterast, då partisjonane har fått ny rekkjefølgje"
+
+#: bootloader.pm:1226
+#, c-format
+msgid ""
+"The bootloader can't be installed correctly. You have to boot rescue and "
+"choose \"%s\""
+msgstr ""
+"Klarte ikkje installera oppstartslastaren. Du må kjøra redningsmodus og "
+"velja «%s»"
+
+#: bootloader.pm:1227
+#, c-format
+msgid "Re-install Boot Loader"
+msgstr "Installer oppstartslastar på nytt"
+
+#: common.pm:125
+#, c-format
+msgid "KB"
+msgstr "KiB"
+
+#: common.pm:125
+#, c-format
+msgid "MB"
+msgstr "MiB"
+
+#: common.pm:125
+#, c-format
+msgid "GB"
+msgstr "GiB"
+
+#: common.pm:133
+#, c-format
+msgid "TB"
+msgstr "TiB"
+
+#: common.pm:141
+#, c-format
+msgid "%d minutes"
+msgstr "%d minutt"
+
+#: common.pm:143
+#, c-format
+msgid "1 minute"
+msgstr "1 minutt"
+
+#: common.pm:145
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekund"
+
+#: common.pm:197
+#, c-format
+msgid "Can't make screenshots before partitioning"
+msgstr "Kan ikkje ta skjermbilete før partisjonering"
+
+#: common.pm:204
+#, c-format
+msgid "Screenshots will be available after install in %s"
+msgstr "Skjermbilete blir tilgjengelege i «%s» etter installeringa er ferdig"
+
+#: common.pm:269
+#, c-format
+msgid "kdesu missing"
+msgstr "Manglar kdesu"
+
+#: common.pm:272
+#, c-format
+msgid "consolehelper missing"
+msgstr "Manglar konsollhjelpar"
+
+#: 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 "Frankrike"
+
+#: crypto.pm:15 lang.pm:212
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: 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:217
+#, c-format
+msgid "Czech Republic"
+msgstr "Tsjekkia"
+
+#: crypto.pm:18 crypto.pm:31 lang.pm:218 network/adsl_consts.pm:134
+#: network/adsl_consts.pm:142
+#, c-format
+msgid "Germany"
+msgstr "Tyskland"
+
+#: crypto.pm:19 crypto.pm:32 lang.pm:249
+#, c-format
+msgid "Greece"
+msgstr "Hellas"
+
+#: crypto.pm:20 crypto.pm:33 lang.pm:322
+#, c-format
+msgid "Norway"
+msgstr "Noreg"
+
+#: crypto.pm:21 crypto.pm:34 lang.pm:351 network/adsl_consts.pm:240
+#, c-format
+msgid "Sweden"
+msgstr "Sverige"
+
+#: crypto.pm:22 crypto.pm:36 lang.pm:321 network/adsl_consts.pm:178
+#: network/netconnect.pm:47
+#, c-format
+msgid "Netherlands"
+msgstr "Nederland"
+
+#: 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 "Italia"
+
+#: crypto.pm:24 crypto.pm:38 lang.pm:177
+#, c-format
+msgid "Austria"
+msgstr "Austerrike"
+
+#: crypto.pm:35 crypto.pm:65 lang.pm:385 network/netconnect.pm:50
+#, c-format
+msgid "United States"
+msgstr "USA"
+
+#: diskdrake/dav.pm:19
+#, c-format
+msgid ""
+"WebDAV is a protocol that allows you to mount a web server's directory\n"
+"locally, and treat it like a local filesystem (provided the web server is\n"
+"configured as a WebDAV server). If you would like to add WebDAV mount\n"
+"points, select \"New\"."
+msgstr ""
+
+#: diskdrake/dav.pm:27
+#, c-format
+msgid "New"
+msgstr "Ny"
+
+#: diskdrake/dav.pm:63 diskdrake/interactive.pm:417 diskdrake/smbnfs_gtk.pm:75
+#, c-format
+msgid "Unmount"
+msgstr "Avmonter"
+
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:414 diskdrake/smbnfs_gtk.pm:76
+#, c-format
+msgid "Mount"
+msgstr "Monter"
+
+#: diskdrake/dav.pm:65 help.pm:137
+#, c-format
+msgid "Server"
+msgstr "Tenar"
+
+#: diskdrake/dav.pm:66 diskdrake/interactive.pm:408
+#: diskdrake/interactive.pm:616 diskdrake/interactive.pm:635
+#: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:79
+#, c-format
+msgid "Mount point"
+msgstr "Monteringspunkt"
+
+#: diskdrake/dav.pm:85
+#, c-format
+msgid "Please enter the WebDAV server URL"
+msgstr "Skriv inn WebDAV-tenaradresse"
+
+#: diskdrake/dav.pm:89
+#, c-format
+msgid "The URL must begin with http:// or https://"
+msgstr "URL-en må begynna med «http://» eller «https://»"
+
+#: diskdrake/dav.pm:111
+#, c-format
+msgid "Server: "
+msgstr "Tenar: "
+
+#: diskdrake/dav.pm:112 diskdrake/interactive.pm:469
+#: diskdrake/interactive.pm:1149 diskdrake/interactive.pm:1225
+#, c-format
+msgid "Mount point: "
+msgstr "Monteringspunkt: "
+
+#: diskdrake/dav.pm:113 diskdrake/interactive.pm:1233
+#, c-format
+msgid "Options: %s"
+msgstr "Val: %s"
+
+#: diskdrake/hd_gtk.pm:96 diskdrake/interactive.pm:995
+#: diskdrake/interactive.pm:1005 diskdrake/interactive.pm:1065
+#, c-format
+msgid "Read carefully!"
+msgstr "Les nøye!"
+
+#: diskdrake/hd_gtk.pm:96
+#, c-format
+msgid "Please make a backup of your data first"
+msgstr "Reservekopier alle viktige data først"
+
+#: diskdrake/hd_gtk.pm:99
+#, c-format
+msgid ""
+"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 ""
+"Viss du skal bruka aboot må du hugsa å lata det vera litt ledig plass\n"
+"(2048 sektorar er nok) på begynnelsen av disken"
+
+#: diskdrake/hd_gtk.pm:156 help.pm:544
+#, c-format
+msgid "Wizard"
+msgstr "Vegvisar"
+
+#: diskdrake/hd_gtk.pm:189
+#, c-format
+msgid "Choose action"
+msgstr "Vel handling"
+
+#: diskdrake/hd_gtk.pm:193
+#, c-format
+msgid ""
+"You have one big Microsoft Windows partition.\n"
+"I suggest you first resize that partition\n"
+"(click on it, then click on \"Resize\")"
+msgstr ""
+"Du har éin stor Microsoft Windows-partisjon.\n"
+"Du bør først endra storleiken på denne\n"
+"(trykk på han og vel «Endra storleik»)"
+
+#: diskdrake/hd_gtk.pm:195
+#, c-format
+msgid "Please click on a partition"
+msgstr "Trykk på ein partisjon"
+
+#: 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 "Detaljar"
+
+#: diskdrake/hd_gtk.pm:255
+#, c-format
+msgid "No hard drives found"
+msgstr "Fann ingen harddiskar"
+
+#: diskdrake/hd_gtk.pm:326
+#, c-format
+msgid "Ext2"
+msgstr "Ext2"
+
+#: diskdrake/hd_gtk.pm:326
+#, c-format
+msgid "Journalised FS"
+msgstr "Journalfilsystem"
+
+#: diskdrake/hd_gtk.pm:326
+#, c-format
+msgid "Swap"
+msgstr "Vekslepartisjon"
+
+#: diskdrake/hd_gtk.pm:326
+#, c-format
+msgid "SunOS"
+msgstr "SunOS"
+
+#: diskdrake/hd_gtk.pm:326
+#, c-format
+msgid "HFS"
+msgstr "HFS"
+
+#: diskdrake/hd_gtk.pm:326
+#, c-format
+msgid "Windows"
+msgstr "Windows"
+
+#: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:327 mouse.pm:167
+#: services.pm:164 standalone/drakbackup:1673 standalone/drakperm:250
+#, c-format
+msgid "Other"
+msgstr "Anna"
+
+#: diskdrake/hd_gtk.pm:327 diskdrake/interactive.pm:1165
+#, c-format
+msgid "Empty"
+msgstr "Tom"
+
+#: diskdrake/hd_gtk.pm:331
+#, c-format
+msgid "Filesystem types:"
+msgstr "Filsystemtypar:"
+
+#: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:350 diskdrake/hd_gtk.pm:353
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Bruk «%s» i stadenfor"
+
+#: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:353
+#: diskdrake/interactive.pm:409 diskdrake/interactive.pm:569
+#: diskdrake/removable.pm:26 diskdrake/removable.pm:49
+#: standalone/harddrake2:67
+#, c-format
+msgid "Type"
+msgstr "Type"
+
+#: diskdrake/hd_gtk.pm:348 diskdrake/interactive.pm:431
+#, c-format
+msgid "Create"
+msgstr "Opprett"
+
+#: diskdrake/hd_gtk.pm:350 diskdrake/interactive.pm:418
+#: standalone/drakperm:124 standalone/printerdrake:231
+#, c-format
+msgid "Delete"
+msgstr "Slett"
+
+#: diskdrake/hd_gtk.pm:353
+#, c-format
+msgid "Use ``Unmount'' first"
+msgstr "Bruk «Avmonter» først"
+
+#: diskdrake/interactive.pm:179
+#, c-format
+msgid "Choose another partition"
+msgstr "Vel ein annan partisjon"
+
+#: diskdrake/interactive.pm:179
+#, c-format
+msgid "Choose a partition"
+msgstr "Vel partisjon"
+
+#: diskdrake/interactive.pm:208
+#, c-format
+msgid "Exit"
+msgstr "Avslutt"
+
+#: diskdrake/interactive.pm:241 help.pm:544
+#, c-format
+msgid "Undo"
+msgstr "Angra"
+
+#: diskdrake/interactive.pm:241
+#, c-format
+msgid "Toggle to normal mode"
+msgstr "Skift til normalmodus"
+
+#: diskdrake/interactive.pm:241
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Skift til ekspertmodus"
+
+#: diskdrake/interactive.pm:260
+#, c-format
+msgid "Continue anyway?"
+msgstr "Vil du likevel halda fram?"
+
+#: diskdrake/interactive.pm:265
+#, c-format
+msgid "Quit without saving"
+msgstr "Avslutt utan å lagra"
+
+#: diskdrake/interactive.pm:265
+#, c-format
+msgid "Quit without writing the partition table?"
+msgstr "Vil du avslutta utan å lagra partisjontabellen?"
+
+#: diskdrake/interactive.pm:270
+#, c-format
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Vil du lagra endringar i «/etc/fstab»"
+
+#: diskdrake/interactive.pm:277 install_steps_interactive.pm:301
+#, c-format
+msgid "You need to reboot for the partition table modifications to take place"
+msgstr ""
+"Du må starta på nytt for at endringane i partisjontabellen skal trå i kraft"
+
+#: diskdrake/interactive.pm:290 help.pm:544
+#, c-format
+msgid "Clear all"
+msgstr "Fjern alle"
+
+#: diskdrake/interactive.pm:291 help.pm:544
+#, c-format
+msgid "Auto allocate"
+msgstr "Tildel automatisk"
+
+#: diskdrake/interactive.pm:297
+#, c-format
+msgid "Hard drive information"
+msgstr "Harddiskinformasjon"
+
+#: diskdrake/interactive.pm:329
+#, c-format
+msgid "All primary partitions are used"
+msgstr "Alle primærpartisjonane er brukt"
+
+#: diskdrake/interactive.pm:330
+#, c-format
+msgid "I can't add any more partitions"
+msgstr "Kan ikkje legga til fleire partisjonar"
+
+#: diskdrake/interactive.pm:331
+#, c-format
+msgid ""
+"To have more partitions, please delete one to be able to create an extended "
+"partition"
+msgstr ""
+"Du har fleire partisjonar. Du må først sletta éin av dei for å kunna laga "
+"ein utvida partisjon."
+
+#: diskdrake/interactive.pm:342 help.pm:544
+#, c-format
+msgid "Save partition table"
+msgstr "Lagra partisjonstabell"
+
+#: diskdrake/interactive.pm:343 help.pm:544
+#, c-format
+msgid "Restore partition table"
+msgstr "Opna partisjonstabell"
+
+#: diskdrake/interactive.pm:344 help.pm:544
+#, c-format
+msgid "Rescue partition table"
+msgstr "Redd partisjonstabell"
+
+#: diskdrake/interactive.pm:346 help.pm:544
+#, c-format
+msgid "Reload partition table"
+msgstr "Last partisjonstabell på nytt"
+
+#: diskdrake/interactive.pm:348
+#, c-format
+msgid "Removable media automounting"
+msgstr "Automontering av fjernbare medium"
+
+#: diskdrake/interactive.pm:357 diskdrake/interactive.pm:377
+#, c-format
+msgid "Select file"
+msgstr "Vel fil"
+
+#: diskdrake/interactive.pm:364
+#, c-format
+msgid ""
+"The backup partition table has not the same size\n"
+"Still continue?"
+msgstr ""
+"Partisjonstabellenkopien har ikkje same storleik.\n"
+"Vil du likevel halda fram?"
+
+#: 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 "Åtvaring"
+
+#: diskdrake/interactive.pm:379
+#, c-format
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Sett inn ein diskett i stasjonen.\n"
+"Alt innhald på denne disketten blir sletta."
+
+#: diskdrake/interactive.pm:390
+#, c-format
+msgid "Trying to rescue partition table"
+msgstr "Prøver å redda partisjonstabell"
+
+#: diskdrake/interactive.pm:396
+#, c-format
+msgid "Detailed information"
+msgstr "Detaljert informasjon"
+
+#: diskdrake/interactive.pm:411 diskdrake/interactive.pm:706
+#, c-format
+msgid "Resize"
+msgstr "Endra storleik"
+
+#: diskdrake/interactive.pm:412 diskdrake/interactive.pm:774
+#, c-format
+msgid "Move"
+msgstr "Flytt"
+
+#: diskdrake/interactive.pm:413
+#, c-format
+msgid "Format"
+msgstr "Formater"
+
+#: diskdrake/interactive.pm:415
+#, c-format
+msgid "Add to RAID"
+msgstr "Legg til i RAID"
+
+#: diskdrake/interactive.pm:416
+#, c-format
+msgid "Add to LVM"
+msgstr "Legg til i LVM"
+
+#: diskdrake/interactive.pm:419
+#, c-format
+msgid "Remove from RAID"
+msgstr "Fjern frå RAID"
+
+#: diskdrake/interactive.pm:420
+#, c-format
+msgid "Remove from LVM"
+msgstr "Fjern frå LVM"
+
+#: diskdrake/interactive.pm:421
+#, c-format
+msgid "Modify RAID"
+msgstr "Endra RAID"
+
+#: diskdrake/interactive.pm:422
+#, c-format
+msgid "Use for loopback"
+msgstr "Bruk til filmontering"
+
+#: diskdrake/interactive.pm:462
+#, c-format
+msgid "Create a new partition"
+msgstr "Lag ny partisjon"
+
+#: diskdrake/interactive.pm:465
+#, c-format
+msgid "Start sector: "
+msgstr "Startsektor: "
+
+#: diskdrake/interactive.pm:467 diskdrake/interactive.pm:876
+#, c-format
+msgid "Size in MB: "
+msgstr "Storleik i MiB: "
+
+#: diskdrake/interactive.pm:468 diskdrake/interactive.pm:877
+#, c-format
+msgid "Filesystem type: "
+msgstr "Filsystemtype: "
+
+#: diskdrake/interactive.pm:473
+#, c-format
+msgid "Preference: "
+msgstr "Innstilling: "
+
+#: diskdrake/interactive.pm:476
+#, c-format
+msgid "Logical volume name "
+msgstr "Logisk volumnamn"
+
+#: diskdrake/interactive.pm:505
+#, c-format
+msgid ""
+"You can't create a new partition\n"
+"(since you reached the maximal number of primary partitions).\n"
+"First remove a primary partition and create an extended partition."
+msgstr ""
+"Du kan ikkje laga ein ny partisjon\n"
+"(sidan du har nådd grensa på talet på partisjonar).\n"
+"Du må først fjerna ein primærpartisjon, og så laga ein utvida partisjon."
+
+#: diskdrake/interactive.pm:535
+#, c-format
+msgid "Remove the loopback file?"
+msgstr "Vil du fjerna filmonteringsfila?"
+
+#: diskdrake/interactive.pm:554
+#, c-format
+msgid ""
+"After changing type of partition %s, all data on this partition will be lost"
+msgstr ""
+"Når du har endra partisjonstypen til «%s» vil alle data på denne partisjonen "
+"vera tapt"
+
+#: diskdrake/interactive.pm:565
+#, c-format
+msgid "Change partition type"
+msgstr "Endra partisjonstype"
+
+#: diskdrake/interactive.pm:566 diskdrake/removable.pm:48
+#, c-format
+msgid "Which filesystem do you want?"
+msgstr "Kva filsystem vil du ha?"
+
+#: diskdrake/interactive.pm:574
+#, c-format
+msgid "Switching from ext2 to ext3"
+msgstr "Byter frå «ext2» til «ext3»"
+
+#: diskdrake/interactive.pm:603
+#, c-format
+msgid "Where do you want to mount the loopback file %s?"
+msgstr "Kor vil du montera filmonteringsfila «%s»?"
+
+#: diskdrake/interactive.pm:604
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Kor vil du montera eininga «%s»?"
+
+#: diskdrake/interactive.pm:609
+#, c-format
+msgid ""
+"Can't unset mount point as this partition is used for loop back.\n"
+"Remove the loopback first"
+msgstr ""
+
+#: diskdrake/interactive.pm:634
+#, c-format
+msgid "Where do you want to mount %s?"
+msgstr "Kor vil du montera «%s»?"
+
+#: diskdrake/interactive.pm:658 diskdrake/interactive.pm:738
+#: install_interactive.pm:156 install_interactive.pm:186
+#, c-format
+msgid "Resizing"
+msgstr "Endrar storleik"
+
+#: diskdrake/interactive.pm:658
+#, c-format
+msgid "Computing FAT filesystem bounds"
+msgstr "Reknar ut grenser for FAT-filsystem"
+
+#: diskdrake/interactive.pm:694
+#, c-format
+msgid "This partition is not resizeable"
+msgstr "Kan ikkje endra storleik på partisjonenen"
+
+#: diskdrake/interactive.pm:699
+#, c-format
+msgid "All data on this partition should be backed-up"
+msgstr "Du bør ta reservekopi av alle data på denne partisjonen"
+
+#: diskdrake/interactive.pm:701
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr ""
+"Når du har endra storleik på «%s» vil alle data på denne partisjonen vera "
+"tapt"
+
+#: diskdrake/interactive.pm:706
+#, c-format
+msgid "Choose the new size"
+msgstr "Vel ny storleik"
+
+#: diskdrake/interactive.pm:707
+#, c-format
+msgid "New size in MB: "
+msgstr "Ny storleik i MiB: "
+
+#: diskdrake/interactive.pm:751 install_interactive.pm:194
+#, c-format
+msgid ""
+"To ensure data integrity after resizing the partition(s), \n"
+"filesystem checks will be run on your next boot into Windows(TM)"
+msgstr ""
+"For å sikra dataintegritet på partisjonen/-ane\n"
+"blir det kjørt filsystemkontroll neste gongar du startar Windows™"
+
+#: diskdrake/interactive.pm:775
+#, c-format
+msgid "Which disk do you want to move it to?"
+msgstr "Kva disk vil du flytta han til?"
+
+#: diskdrake/interactive.pm:776
+#, c-format
+msgid "Sector"
+msgstr "Sektor"
+
+#: diskdrake/interactive.pm:777
+#, c-format
+msgid "Which sector do you want to move it to?"
+msgstr "Kva sektor vil du flytta han til?"
+
+#: diskdrake/interactive.pm:780
+#, c-format
+msgid "Moving"
+msgstr "Flyttar"
+
+#: diskdrake/interactive.pm:780
+#, c-format
+msgid "Moving partition..."
+msgstr "Flyttar partisjon ..."
+
+#: diskdrake/interactive.pm:802
+#, c-format
+msgid "Choose an existing RAID to add to"
+msgstr "Vel ein eksisterande RAID å leggja til i"
+
+#: diskdrake/interactive.pm:803 diskdrake/interactive.pm:820
+#, c-format
+msgid "new"
+msgstr "ny"
+
+#: diskdrake/interactive.pm:818
+#, c-format
+msgid "Choose an existing LVM to add to"
+msgstr "Vel ein eksisterande LVM å leggja til i"
+
+#: diskdrake/interactive.pm:824
+#, c-format
+msgid "LVM name?"
+msgstr "LVM-namn?"
+
+#: diskdrake/interactive.pm:861
+#, c-format
+msgid "This partition can't be used for loopback"
+msgstr "Partisjonen kan ikkje brukast til filmontering."
+
+#: diskdrake/interactive.pm:874
+#, c-format
+msgid "Loopback"
+msgstr "Filmontering"
+
+#: diskdrake/interactive.pm:875
+#, c-format
+msgid "Loopback file name: "
+msgstr "Filmonteringsfil: "
+
+#: diskdrake/interactive.pm:880
+#, c-format
+msgid "Give a file name"
+msgstr "Skriv inn filnamn"
+
+#: diskdrake/interactive.pm:883
+#, c-format
+msgid "File is already used by another loopback, choose another one"
+msgstr "Fila er allereie brukt til filmontering. Vel ei anna fil."
+
+#: diskdrake/interactive.pm:884
+#, c-format
+msgid "File already exists. Use it?"
+msgstr "Fila finst allereie. Vil du bruka ho?"
+
+#: diskdrake/interactive.pm:907
+#, c-format
+msgid "Mount options"
+msgstr "Monteringsval"
+
+#: diskdrake/interactive.pm:914
+#, c-format
+msgid "Various"
+msgstr "Ymse"
+
+#: diskdrake/interactive.pm:978
+#, c-format
+msgid "device"
+msgstr "eining"
+
+#: diskdrake/interactive.pm:979
+#, c-format
+msgid "level"
+msgstr "nivå"
+
+#: diskdrake/interactive.pm:980
+#, c-format
+msgid "chunk size"
+msgstr "blokkstorleik"
+
+#: diskdrake/interactive.pm:996
+#, c-format
+msgid "Be careful: this operation is dangerous."
+msgstr "Åtvaring: Denne operasjonen er farleg."
+
+#: diskdrake/interactive.pm:1011
+#, c-format
+msgid "What type of partitioning?"
+msgstr "Kva type partisjonering?"
+
+#: diskdrake/interactive.pm:1027
+#, c-format
+msgid "The package %s is needed. Install it?"
+msgstr "Treng pakken «%s». Vil du installera han?"
+
+#: diskdrake/interactive.pm:1056
+#, c-format
+msgid "You'll need to reboot before the modification can take place"
+msgstr "Du må starta på nytt for at endringane skal trå i kraft"
+
+#: diskdrake/interactive.pm:1065
+#, c-format
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "Partisjonstabellen til «%s» blir no lagra."
+
+#: diskdrake/interactive.pm:1078
+#, c-format
+msgid "After formatting partition %s, all data on this partition will be lost"
+msgstr "Når du har formatert «%s» vil alle data på denne partisjonen vera tapt"
+
+#: diskdrake/interactive.pm:1095
+#, c-format
+msgid "Move files to the new partition"
+msgstr "Flytt filer til ny partisjon"
+
+#: diskdrake/interactive.pm:1095
+#, c-format
+msgid "Hide files"
+msgstr "Skjul filer"
+
+#: diskdrake/interactive.pm:1096
+#, c-format
+msgid ""
+"Directory %s already contains data\n"
+"(%s)"
+msgstr ""
+"Katalogen «%s» inneheld allereie data\n"
+"(%s)"
+
+#: diskdrake/interactive.pm:1107
+#, c-format
+msgid "Moving files to the new partition"
+msgstr "Flyttar filer til ny partisjon"
+
+#: diskdrake/interactive.pm:1111
+#, c-format
+msgid "Copying %s"
+msgstr "Kopierer «%s»"
+
+#: diskdrake/interactive.pm:1115
+#, c-format
+msgid "Removing %s"
+msgstr "Fjernar «%s»"
+
+#: diskdrake/interactive.pm:1129
+#, c-format
+msgid "partition %s is now known as %s"
+msgstr "Partisjonen «%s» har no namnet «%s»"
+
+#: diskdrake/interactive.pm:1150 diskdrake/interactive.pm:1210
+#, c-format
+msgid "Device: "
+msgstr "Eining: "
+
+#: diskdrake/interactive.pm:1151
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "DOS-stasjonsbokstav: %s (berre gissing)\n"
+
+#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1163
+#: diskdrake/interactive.pm:1229
+#, c-format
+msgid "Type: "
+msgstr "Type: "
+
+#: diskdrake/interactive.pm:1159 install_steps_gtk.pm:339
+#, c-format
+msgid "Name: "
+msgstr "Namn: "
+
+#: diskdrake/interactive.pm:1167
+#, c-format
+msgid "Start: sector %s\n"
+msgstr "Start: sektor %s\n"
+
+#: diskdrake/interactive.pm:1168
+#, c-format
+msgid "Size: %s"
+msgstr "Storleik: %s"
+
+#: diskdrake/interactive.pm:1170
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s sektorar"
+
+#: diskdrake/interactive.pm:1172
+#, c-format
+msgid "Cylinder %d to %d\n"
+msgstr "Sylinder %d til %d\n"
+
+#: diskdrake/interactive.pm:1173
+#, c-format
+msgid "Number of logical extents: %d"
+msgstr "Talet på logiske dataområde: %d"
+
+#: diskdrake/interactive.pm:1174
+#, c-format
+msgid "Formatted\n"
+msgstr "Formatert\n"
+
+#: diskdrake/interactive.pm:1175
+#, c-format
+msgid "Not formatted\n"
+msgstr "Ikkje formatert\n"
+
+#: diskdrake/interactive.pm:1176
+#, c-format
+msgid "Mounted\n"
+msgstr "Montert\n"
+
+#: diskdrake/interactive.pm:1177
+#, c-format
+msgid "RAID md%s\n"
+msgstr "RAID MD%s\n"
+
+#: diskdrake/interactive.pm:1179
+#, c-format
+msgid ""
+"Loopback file(s):\n"
+"   %s\n"
+msgstr ""
+"Filmonteringsfil(er):\n"
+"   %s\n"
+
+#: diskdrake/interactive.pm:1180
+#, c-format
+msgid ""
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
+msgstr ""
+"Partisjon starta opp som standard\n"
+"    (for MS-DOS-oppstart – ikkje for lilo)\n"
+
+#: diskdrake/interactive.pm:1182
+#, c-format
+msgid "Level %s\n"
+msgstr "Nivå %s\n"
+
+#: diskdrake/interactive.pm:1183
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Blokkstorleik %s\n"
+
+#: diskdrake/interactive.pm:1184
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "RAID-diskar %s\n"
+
+#: diskdrake/interactive.pm:1186
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Filmonteringsfil: %s"
+
+#: diskdrake/interactive.pm:1189
+#, c-format
+msgid ""
+"\n"
+"Chances are, this partition is\n"
+"a Driver partition. You should\n"
+"probably leave it alone.\n"
+msgstr ""
+"\n"
+"Denne partisjonen er truleg\n"
+"ein drivarpartisjon. Då bør\n"
+"du ikkje røra han.\n"
+
+#: diskdrake/interactive.pm:1192
+#, c-format
+msgid ""
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
+msgstr ""
+
+#: diskdrake/interactive.pm:1211
+#, c-format
+msgid "Read-only"
+msgstr "Skrivebeskytta"
+
+#: diskdrake/interactive.pm:1212
+#, c-format
+msgid "Size: %s\n"
+msgstr "Storleik: %s\n"
+
+#: diskdrake/interactive.pm:1213
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geometri: %s sylindrar – %s hovud – %s sektorar\n"
+
+#: diskdrake/interactive.pm:1214
+#, c-format
+msgid "Info: "
+msgstr "Informasjon: "
+
+#: diskdrake/interactive.pm:1215
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM-diskar %s\n"
+
+#: diskdrake/interactive.pm:1216
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Partisjonstabelltype: %s\n"
+
+#: diskdrake/interactive.pm:1217
+#, c-format
+msgid "on channel %d id %d\n"
+msgstr "på kanal %d – id %d\n"
+
+#: diskdrake/interactive.pm:1250
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Krypteringsnøkkel for filsystem"
+
+#: diskdrake/interactive.pm:1251
+#, c-format
+msgid "Choose your filesystem encryption key"
+msgstr "Vel krypteringsnøkkel for filsystemet"
+
+#: diskdrake/interactive.pm:1254
+#, c-format
+msgid "This encryption key is too simple (must be at least %d characters long)"
+msgstr "Krypteringsnøkkelen er for enkel. Han må vera på minst %d teikn."
+
+#: diskdrake/interactive.pm:1255
+#, c-format
+msgid "The encryption keys do not match"
+msgstr "Krypteringsnøklane er ikkje like"
+
+#: diskdrake/interactive.pm:1258 network/netconnect.pm:972
+#: standalone/drakconnect:393
+#, c-format
+msgid "Encryption key"
+msgstr "Krypteringsnøkkel"
+
+#: diskdrake/interactive.pm:1259
+#, c-format
+msgid "Encryption key (again)"
+msgstr "Krypteringsnøkkel (på nytt)"
+
+#: diskdrake/removable.pm:47
+#, c-format
+msgid "Change type"
+msgstr "Endra type"
+
+#: diskdrake/smbnfs_gtk.pm:163
+#, c-format
+msgid "Can't login using username %s (bad password?)"
+msgstr "Klarte ikkje logga på med brukarnamnet «%s» (feil passord?)"
+
+#: diskdrake/smbnfs_gtk.pm:167 diskdrake/smbnfs_gtk.pm:176
+#, c-format
+msgid "Domain Authentication Required"
+msgstr "Treng domeneautentisering"
+
+#: diskdrake/smbnfs_gtk.pm:168
+#, c-format
+msgid "Which username"
+msgstr "Kva brukarnamn"
+
+#: diskdrake/smbnfs_gtk.pm:168
+#, c-format
+msgid "Another one"
+msgstr "Endå ein"
+
+#: diskdrake/smbnfs_gtk.pm:177
+#, c-format
+msgid ""
+"Please enter your username, password and domain name to access this host."
+msgstr "Skriv inn brukarnamn, passord og domenenamn for verten."
+
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3591
+#, c-format
+msgid "Username"
+msgstr "Brukarnamn"
+
+#: diskdrake/smbnfs_gtk.pm:181
+#, c-format
+msgid "Domain"
+msgstr "Domene"
+
+#: diskdrake/smbnfs_gtk.pm:205
+#, c-format
+msgid "Search servers"
+msgstr "Søk etter tenarar"
+
+#: diskdrake/smbnfs_gtk.pm:210
+#, c-format
+msgid "Search new servers"
+msgstr "Søk etter nye tenarar"
+
+#: do_pkgs.pm:21
+#, c-format
+msgid "The package %s needs to be installed. Do you want to install it?"
+msgstr "Pakken «%s» må installerast. Vil du installera han no?"
+
+#: do_pkgs.pm:26
+#, c-format
+msgid "Mandatory package %s is missing"
+msgstr "Manglar den obligatoriske pakken «%s»"
+
+#: do_pkgs.pm:143
+#, c-format
+msgid "Installing packages..."
+msgstr "Installerer pakkar ..."
+
+#: do_pkgs.pm:217
+#, c-format
+msgid "Removing packages..."
+msgstr "Fjernar pakkar ..."
+
+#: fs.pm:409
+#, c-format
+msgid ""
+"Do not update inode access times on this file system\n"
+"(e.g, for faster access on the news spool to speed up news servers)."
+msgstr "Ikkje oppdater tilgangstider på inodar på filsystemet."
+
+#: fs.pm:412
+#, c-format
+msgid ""
+"Can only be mounted explicitly (i.e.,\n"
+"the -a option will not cause the file system to be mounted)."
+msgstr ""
+"Kan berre monterast eksplisitt (for eksempel vil\n"
+"ikkje «-a»-valet montera filsystemet)."
+
+#: fs.pm:415
+#, c-format
+msgid "Do not interpret character or block special devices on the file system."
+msgstr "Ikkje tolk teikn- og blokkspesialeiningar på filsystemet."
+
+#: fs.pm:417
+#, c-format
+msgid ""
+"Do not allow execution of any binaries on the mounted\n"
+"file system. This option might be useful for a server that has file systems\n"
+"containing binaries for architectures other than its own."
+msgstr ""
+"Ikkje tillèt kjøring av programfiler på det monterte\n"
+"filsystemet. Dette valet kan vera nyttig for tenarar som\n"
+"har filsystem med programfiler for andre operativsystem."
+
+#: fs.pm:421
+#, c-format
+msgid ""
+"Do not allow set-user-identifier or set-group-identifier\n"
+"bits to take effect. (This seems safe, but is in fact rather unsafe if you\n"
+"have suidperl(1) installed.)"
+msgstr ""
+
+#: fs.pm:425
+#, c-format
+msgid "Mount the file system read-only."
+msgstr "Monter filsystemet som skriveverna."
+
+#: fs.pm:427
+#, c-format
+msgid "All I/O to the file system should be done synchronously."
+msgstr "All lesing og skriving til filsystemet skal gjerast synkront."
+
+#: fs.pm:431
+#, c-format
+msgid ""
+"Allow an ordinary user to mount the file system. The\n"
+"name of the mounting user is written to mtab so that he can unmount the "
+"file\n"
+"system again. This option implies the options noexec, nosuid, and nodev\n"
+"(unless overridden by subsequent options, as in the option line\n"
+"user,exec,dev,suid )."
+msgstr ""
+"Tillèt at vanlege brukarar kan montera filsystemet. Namnet\n"
+"på brukaren som monterer systemet blir lagra i «mtab»,\n"
+"slik at han kan avmontera det seinare. Dette valet medfører\n"
+"«noxec», «nosuid» og «nodev» (med mindre det blir overstyrt\n"
+"av seinare val, eksempelvis «user,exec,dev,suid»)."
+
+#: fs.pm:439
+#, c-format
+msgid "Give write access to ordinary users"
+msgstr "Gjev skrivetilgang til vanlege brukarar"
+
+#: fs.pm:441
+#, c-format
+msgid "Give read-only access to ordinary users"
+msgstr "Gjev berre lesetilgang til vanlege brukarar"
+
+#: 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-formatering av %s mislukka"
+
+#: fs.pm:647
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "Kan ikkje formatera «%s» som type «%s»"
+
+#: fs.pm:654 fs.pm:661
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formaterer partisjonen «%s»"
+
+#: fs.pm:658
+#, c-format
+msgid "Creating and formatting file %s"
+msgstr "Lagar og formaterer partisjonen «%s»"
+
+#: fs.pm:718 fs.pm:771
+#, c-format
+msgid "Mounting partition %s"
+msgstr "Monterer partisjonen «%s»"
+
+#: fs.pm:719 fs.pm:772
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "Klarte ikkje montera partisjonen «%s» i mappa «%s»"
+
+#: fs.pm:739 fs.pm:747
+#, c-format
+msgid "Checking %s"
+msgstr "Kontrollerer «%s»"
+
+#: fs.pm:788 partition_table.pm:638
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "Feil ved avmontering av «%s»: %s"
+
+#: fs.pm:820
+#, c-format
+msgid "Enabling swap partition %s"
+msgstr "Slår på vekslepartisjonen «%s»"
+
+#: fsedit.pm:21
+#, c-format
+msgid "simple"
+msgstr "enkel"
+
+#: fsedit.pm:25
+#, c-format
+msgid "with /usr"
+msgstr "med «/usr»"
+
+#: fsedit.pm:30
+#, c-format
+msgid "server"
+msgstr "tenar"
+
+#: fsedit.pm:254
+#, c-format
+msgid ""
+"I can't read the partition table of device %s, it's too corrupted for me :(\n"
+"I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to not allow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to lose all the partitions?\n"
+msgstr ""
+
+#: fsedit.pm:513
+#, c-format
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Du kan ikkje bruka JFS på partisjonar mindre enn 16 MiB"
+
+#: fsedit.pm:514
+#, c-format
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Du kan ikkje bruka ReiserFS på partisjonar mindre enn 32 MiB"
+
+#: fsedit.pm:533
+#, c-format
+msgid "Mount points must begin with a leading /"
+msgstr "Alle monteringspunkt må starta med teiknet «/»"
+
+#: fsedit.pm:534
+#, c-format
+msgid "Mount points should contain only alphanumerical characters"
+msgstr "Monteringspunkt kan berre innhelda tal og bokstavar"
+
+#: fsedit.pm:535
+#, c-format
+msgid "There is already a partition with mount point %s\n"
+msgstr "Det finst allereie ein partisjon med monteringspunktet «%s»\n"
+
+#: fsedit.pm:537
+#, c-format
+msgid ""
+"You've selected a software RAID partition as root (/).\n"
+"No bootloader is able to handle this without a /boot partition.\n"
+"Please be sure to add a /boot partition"
+msgstr ""
+"Du har valt programvare-RAID-partisjon som rot («/»).\n"
+"Ingen oppstartslastar kan bruka denne utan ein «/boot»-partisjon.\n"
+"Hugs derfor å leggja til ein «/boot»-partisjon òg."
+
+#: fsedit.pm:540
+#, c-format
+msgid "You can't use a LVM Logical Volume for mount point %s"
+msgstr ""
+
+#: fsedit.pm:542
+#, fuzzy, 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 ""
+"Du har valt programvare-RAID-partisjon som rot («/»).\n"
+"Ingen oppstartslastar kan bruka denne utan ein «/boot»-partisjon.\n"
+"Hugs derfor å leggja til ein «/boot»-partisjon òg."
+
+#: fsedit.pm:545
+#, c-format
+msgid ""
+"You may not be able to install lilo (since lilo doesn't handle a LV on "
+"multiple PVs)"
+msgstr ""
+"Det kan henda du ikkje kan installera lilo (sidan lilo ikkje kan handtera "
+"eitt logiske dataområde delt over fleire fysiske)"
+
+#: fsedit.pm:548 fsedit.pm:550
+#, c-format
+msgid "This directory should remain within the root filesystem"
+msgstr "Denne mappa bør bli verande i rotfilsystemet"
+
+#: fsedit.pm:552
+#, c-format
+msgid ""
+"You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
+"point\n"
+msgstr ""
+"Du treng eit ekte filsystem(«ext2», «ext3», «reiserfs», «xfs» eller «jfs») "
+"for dette monteringspunktet\n"
+
+#: fsedit.pm:554
+#, c-format
+msgid "You can't use an encrypted file system for mount point %s"
+msgstr "Du kan ikkje bruka eit kryptert filsystem for monteringspunktet «%s»"
+
+#: fsedit.pm:615
+#, c-format
+msgid "Not enough free space for auto-allocating"
+msgstr "Ikkje nok ledig plass for automatisk oppsett"
+
+#: fsedit.pm:617
+#, c-format
+msgid "Nothing to do"
+msgstr "Ingenting å gjera"
+
+#: fsedit.pm:713
+#, c-format
+msgid "Error opening %s for writing: %s"
+msgstr "Klarte ikkje opna «%s» for skriving: %s"
+
+#: harddrake/data.pm:53
+#, c-format
+msgid "Floppy"
+msgstr "Diskett"
+
+#: harddrake/data.pm:54
+#, c-format
+msgid "Zip"
+msgstr "Zip"
+
+#: harddrake/data.pm:55
+#, c-format
+msgid "Disk"
+msgstr "Disk"
+
+#: harddrake/data.pm:56
+#, c-format
+msgid "CDROM"
+msgstr "CD-ROM"
+
+#: harddrake/data.pm:57
+#, c-format
+msgid "CD/DVD burners"
+msgstr "CD- og DVD-brennarar"
+
+#: harddrake/data.pm:58
+#, c-format
+msgid "DVD-ROM"
+msgstr "DVD-ROM"
+
+#: harddrake/data.pm:59 standalone/drakbackup:2116
+#, c-format
+msgid "Tape"
+msgstr "Band"
+
+#: harddrake/data.pm:60
+#, c-format
+msgid "Videocard"
+msgstr "Skjermkort"
+
+#: harddrake/data.pm:61
+#, c-format
+msgid "Tvcard"
+msgstr "Fjernsynskort"
+
+#: harddrake/data.pm:62
+#, c-format
+msgid "Other MultiMedia devices"
+msgstr "Andre multimedieeiningar"
+
+#: harddrake/data.pm:63
+#, c-format
+msgid "Soundcard"
+msgstr "Lydkort"
+
+#: harddrake/data.pm:64
+#, c-format
+msgid "Webcam"
+msgstr "Vevkamera"
+
+#: harddrake/data.pm:68
+#, c-format
+msgid "Processors"
+msgstr "Prosessorar"
+
+#: harddrake/data.pm:69
+#, c-format
+msgid "ISDN adapters"
+msgstr "ISDN-kort"
+
+#: harddrake/data.pm:70
+#, c-format
+msgid "Ethernetcard"
+msgstr "Nettverkskort"
+
+#: 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:79
+#, c-format
+msgid "ADSL adapters"
+msgstr "ADSL-kort"
+
+#: harddrake/data.pm:81
+#, fuzzy, c-format
+msgid "AGP controllers"
+msgstr "USB-kontrollarar"
+
+#: harddrake/data.pm:82
+#, c-format
+msgid "Bridges and system controllers"
+msgstr "Bruer og systemkontrollarar"
+
+#: harddrake/data.pm:83 help.pm:203 help.pm:991
+#: install_steps_interactive.pm:940 printer/printerdrake.pm:687
+#: printer/printerdrake.pm:4175
+#, c-format
+msgid "Printer"
+msgstr "Skrivar"
+
+#: harddrake/data.pm:85 help.pm:991 install_steps_interactive.pm:933
+#, c-format
+msgid "Mouse"
+msgstr "Mus"
+
+#: harddrake/data.pm:90
+#, c-format
+msgid "Joystick"
+msgstr "Styrespak"
+
+#: harddrake/data.pm:92
+#, c-format
+msgid "(E)IDE/ATA controllers"
+msgstr "(E)IDE/ATA-kontrollarar"
+
+#: harddrake/data.pm:94
+#, c-format
+msgid "Firewire controllers"
+msgstr "Firewire-kontrollarar"
+
+#: harddrake/data.pm:95
+#, c-format
+msgid "SCSI controllers"
+msgstr "SCSI-kontrollarar"
+
+#: harddrake/data.pm:96
+#, c-format
+msgid "USB controllers"
+msgstr "USB-kontrollarar"
+
+#: harddrake/data.pm:97
+#, c-format
+msgid "SMBus controllers"
+msgstr "SMBus-kontrollarar"
+
+#: harddrake/data.pm:98
+#, c-format
+msgid "Scanner"
+msgstr "Skannar"
+
+#: harddrake/data.pm:100 standalone/harddrake2:319
+#, c-format
+msgid "Unknown/Others"
+msgstr "Ukjend/andre"
+
+#: harddrake/data.pm:114
+#, c-format
+msgid "cpu # "
+msgstr "Prosessornummer "
+
+#: harddrake/sound.pm:150 standalone/drakconnect:169
+#, c-format
+msgid "Please Wait... Applying the configuration"
+msgstr "Vent litt ... Gjer klar oppsett"
+
+#: harddrake/sound.pm:186
+#, c-format
+msgid "No alternative driver"
+msgstr "Ingen alternativ drivar"
+
+#: 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 ""
+"Det finst ingen OSS- eller ALSA-drivarar for lydkortet ditt («%s») som "
+"brukar «%s»"
+
+#: harddrake/sound.pm:193
+#, c-format
+msgid "Sound configuration"
+msgstr "Lydoppsett"
+
+#: harddrake/sound.pm:195
+#, c-format
+msgid ""
+"Here you can select an alternative driver (either OSS or ALSA) for your "
+"sound card (%s)."
+msgstr ""
+"Her kan du velja ein annan OSS- eller ALSA-drivar for lydkortet ditt («%s»)."
+
+#: harddrake/sound.pm:197
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Your card currently use the %s\"%s\" driver (default driver for your card is "
+"\"%s\")"
+msgstr ""
+"\n"
+"\n"
+"Kortet brukar %s«%s»-drivaren (standarddrivaren for kortet er «%s»)."
+
+#: harddrake/sound.pm:199
+#, c-format
+msgid ""
+"OSS (Open Sound System) was the first sound API. It's an OS independent "
+"sound API (it's available on most UNIX(tm) systems) but it's a very basic "
+"and limited API.\n"
+"What's more, OSS drivers all reinvent the wheel.\n"
+"\n"
+"ALSA (Advanced Linux Sound Architecture) is a modularized architecture "
+"which\n"
+"supports quite a large range of ISA, USB and PCI cards.\n"
+"\n"
+"It also provides a much higher API than OSS.\n"
+"\n"
+"To use alsa, one can either use:\n"
+"- the old compatibility OSS api\n"
+"- the new ALSA api that provides many enhanced features but requires using "
+"the ALSA library.\n"
+msgstr ""
+"OSS (Open Sound System) var det første lydgrensesnittet. Det er\n"
+"operativsystemuavhengig (og tilgjengeleg på dei fleste UNIX™-system),\n"
+"men er òg ganske teknisk avgrensa.\n"
+"\n"
+"ALSA (Advanced Linux Sound Architecture) er ein modularisert arkitektur som\n"
+"støttar veldig mange ISA-, USB- og PCI-kort.\n"
+"\n"
+"Systemet har òg eit betre grensesnitt enn OSS har.\n"
+"\n"
+"For å bruka ALSA kan du enten bruka det gamle OSS-grensesnittet, eller det "
+"nye ALSA-grensesnittet, med mange nye funksjonar.\n"
+
+#: harddrake/sound.pm:213 harddrake/sound.pm:293 standalone/drakups:134
+#, c-format
+msgid "Driver:"
+msgstr "Drivar:"
+
+#: harddrake/sound.pm:218
+#, c-format
+msgid "Trouble shooting"
+msgstr "Feilsøkjing"
+
+#: harddrake/sound.pm:226
+#, c-format
+msgid ""
+"The old \"%s\" driver is blacklisted.\n"
+"\n"
+"It has been reported to oops the kernel on unloading.\n"
+"\n"
+"The new \"%s\" driver'll only be used on next bootstrap."
+msgstr ""
+
+#: harddrake/sound.pm:234
+#, c-format
+msgid "No open source driver"
+msgstr "Ingen open kjeldekode-drivarar"
+
+#: 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 ""
+"Det finst ingen fri drivar for lydkortet ditt («%s»), men det finst ein "
+"godseigd drivar på «%s»."
+
+#: harddrake/sound.pm:238
+#, c-format
+msgid "No known driver"
+msgstr "Ingen kjend drivar"
+
+#: harddrake/sound.pm:239
+#, c-format
+msgid "There's no known driver for your sound card (%s)"
+msgstr "Det finst ingen kjend drivar for lydkortet ditt («%s»)"
+
+#: harddrake/sound.pm:243
+#, c-format
+msgid "Unknown driver"
+msgstr "Ukjend drivar"
+
+#: harddrake/sound.pm:244
+#, c-format
+msgid "Error: The \"%s\" driver for your sound card is unlisted"
+msgstr "Feil: Drivaren «%s» for lydkortet ditt er ikkje med i lista"
+
+#: harddrake/sound.pm:257
+#, c-format
+msgid "Sound trouble shooting"
+msgstr "Feilsøkjing av lyd"
+
+#: harddrake/sound.pm:258
+#, c-format
+msgid ""
+"The classic bug sound tester is to run the following commands:\n"
+"\n"
+"\n"
+"- \"lspcidrake -v | fgrep AUDIO\" will tell you which driver your card uses\n"
+"by default\n"
+"\n"
+"- \"grep sound-slot /etc/modules.conf\" will tell you what driver it\n"
+"currently uses\n"
+"\n"
+"- \"/sbin/lsmod\" will enable you to check if its module (driver) is\n"
+"loaded or not\n"
+"\n"
+"- \"/sbin/chkconfig --list sound\" and \"/sbin/chkconfig --list alsa\" will\n"
+"tell you if sound and alsa services're configured to be run on\n"
+"initlevel 3\n"
+"\n"
+"- \"aumix -q\" will tell you if the sound volume is muted or not\n"
+"\n"
+"- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound card.\n"
+msgstr ""
+
+#: harddrake/sound.pm:284
+#, c-format
+msgid "Let me pick any driver"
+msgstr "Vel drivar"
+
+#: harddrake/sound.pm:287
+#, c-format
+msgid "Choosing an arbitrary driver"
+msgstr "Val av annan drivar"
+
+#: harddrake/sound.pm:288
+#, c-format
+msgid ""
+"If you really think that you know which driver is the right one for your "
+"card\n"
+"you can pick one in the above list.\n"
+"\n"
+"The current driver for your \"%s\" sound card is \"%s\" "
+msgstr ""
+"Vis du kjenner til ein annan drivar som fungerer med lydkortet ditt, kan du "
+"velja han her.\n"
+"\n"
+"Lydkortet «%s» brukar no drivaren «%s»."
+
+#: harddrake/v4l.pm:14 harddrake/v4l.pm:66
+#, c-format
+msgid "Auto-detect"
+msgstr "Oppdag automatisk"
+
+#: harddrake/v4l.pm:67 harddrake/v4l.pm:219
+#, c-format
+msgid "Unknown|Generic"
+msgstr "Ukjend/generell"
+
+#: harddrake/v4l.pm:100
+#, c-format
+msgid "Unknown|CPH05X (bt878) [many vendors]"
+msgstr "Ukjend|CPH05X (bt878) (mange merke)"
+
+#: harddrake/v4l.pm:101
+#, c-format
+msgid "Unknown|CPH06X (bt878) [many vendors]"
+msgstr "Ukjend|CPH06X (bt878) (mange merke)"
+
+#: harddrake/v4l.pm:245
+#, c-format
+msgid ""
+"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-"
+"detect the rights parameters.\n"
+"If your card is misdetected, you can force the right tuner and card types "
+"here. Just select your tv card parameters if needed."
+msgstr ""
+
+#: harddrake/v4l.pm:248
+#, c-format
+msgid "Card model:"
+msgstr "Kortmodell:"
+
+#: harddrake/v4l.pm:249
+#, c-format
+msgid "Tuner type:"
+msgstr "Mottakartype:"
+
+#: harddrake/v4l.pm:250
+#, c-format
+msgid "Number of capture buffers:"
+msgstr "Talet på opptaksbufferar:"
+
+#: harddrake/v4l.pm:250
+#, c-format
+msgid "number of capture buffers for mmap'ed capture"
+msgstr ""
+
+#: harddrake/v4l.pm:252
+#, c-format
+msgid "PLL setting:"
+msgstr "PLL-innstilling:"
+
+#: harddrake/v4l.pm:253
+#, c-format
+msgid "Radio support:"
+msgstr "Radiostøtte:"
+
+#: harddrake/v4l.pm:253
+#, c-format
+msgid "enable radio support"
+msgstr "Bruk radiostøtte"
+
+#: help.pm:11
+#, c-format
+msgid ""
+"Before continuing, you should carefully read the terms of the license. It\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 ""
+"Du bør lesa vilkåra i lisensavtala nøye før du eventuelt held fram.\n"
+"Avtala dekkjer heile Mandrakelinux-distribusjonen. Kryss av for\n"
+"«%s» berre viss du er einig i alle vilkåra. Elles vil «%s»-knappen\n"
+"starta maskina på nytt."
+
+#: help.pm:14 install_steps_gtk.pm:596 install_steps_interactive.pm:88
+#: install_steps_interactive.pm:697 standalone/drakautoinst:216
+#, c-format
+msgid "Accept"
+msgstr "Godta"
+
+#: help.pm:17
+#, c-format
+msgid ""
+"GNU/Linux is a multi-user system, meaning each user may have their own\n"
+"preferences, their own files and so on. You can read the ``Starter Guide''\n"
+"to learn more about multi-user systems. But unlike \"root\", who is the\n"
+"system administrator, the users you add at this point will not be\n"
+"authorized to change anything except their own files and their own\n"
+"configurations, protecting the system from unintentional or malicious\n"
+"changes that impact on the system as a whole. You will have to create at\n"
+"least one regular user for yourself -- this is the account which you should\n"
+"use for routine, day-to-day use. Although it is very easy to log in as\n"
+"\"root\" to do anything and everything, it may also be very dangerous! A\n"
+"very simple mistake could mean that your system will not work any more. If\n"
+"you make a serious mistake as a regular user, the worst that will happen is\n"
+"that you will lose some information, but not affect the entire system.\n"
+"\n"
+"The first field asks you for a real name. Of course, this is not mandatory\n"
+"-- you can actually enter whatever you like. DrakX will use the first word\n"
+"you typed in this field and copy it to the \"%s\" field, which is the name\n"
+"this user will enter to log onto the system. If you like, you may override\n"
+"the default and change the user name. The next step is to enter a password.\n"
+"From a security point of view, a non-privileged (regular) user password is\n"
+"not as crucial as the \"root\" password, but that is no reason to neglect\n"
+"it by making it blank or too simple: after all, your files could be the\n"
+"ones at risk.\n"
+"\n"
+"Once you click on \"%s\", you can add other users. Add a user for each one\n"
+"of your friends: your father or your sister, for example. Click \"%s\" when\n"
+"you have finished adding users.\n"
+"\n"
+"Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
+"that user (bash by default).\n"
+"\n"
+"When you have finished adding users, you will be asked to choose a user who\n"
+"can automatically log into the system when the computer boots up. If you\n"
+"are interested in that feature (and do not care much about local security),\n"
+"choose the desired user and window manager, then click \"%s\". If you are\n"
+"not interested in this feature, uncheck the \"%s\" box."
+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: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 "Neste"
+
+#: help.pm:52 help.pm:418 help.pm:444 help.pm:660 help.pm:733 help.pm:768
+#: interactive.pm:371
+#, c-format
+msgid "Advanced"
+msgstr "Avansert"
+
+#: help.pm:55
+#, c-format
+msgid ""
+"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"You can keep the choices made by the wizard, since they are good for most\n"
+"common installations. If you make any changes, you must at least define a\n"
+"root partition (\"/\"). Do not choose too small a partition or you will not\n"
+"be able to install enough software. If you want to store your data on a\n"
+"separate partition, you will also need to create a \"/home\" partition\n"
+"(only possible if you have more than one Linux partition available).\n"
+"\n"
+"Each partition is listed as follows: \"Name\", \"Capacity\".\n"
+"\n"
+"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\n"
+"\n"
+"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
+"\"sd\" if it is a SCSI hard drive.\n"
+"\n"
+"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard drives:\n"
+"\n"
+" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+"\n"
+" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+"\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+"\n"
+" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+"\n"
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc."
+msgstr ""
+
+#: help.pm:86
+#, c-format
+msgid ""
+"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 ""
+"Mandrakelinux-distribusjonen ligg fordelt på fleire plater. Du blir "
+"automatisk\n"
+"bedt om bytta plate for alle pakkar som ikkje er tilgjengeleg på denne."
+
+#: help.pm:91
+#, 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 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. 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"
+"\n"
+" * \"%s\": if you plan to use your machine as a workstation, select one or\n"
+"more of the groups that are in the workstation category.\n"
+"\n"
+" * \"%s\": if you plan on using your machine for programming, select the\n"
+"appropriate groups from that category.\n"
+"\n"
+" * \"%s\": if your machine is intended to be a server, select which of the\n"
+"more common services you wish to install on your machine.\n"
+"\n"
+" * \"%s\": this is where you will choose your preferred graphical\n"
+"environment. At least one must be selected if you want to have a graphical\n"
+"interface available.\n"
+"\n"
+"Moving the mouse cursor over a group name will display a short explanatory\n"
+"text about that group. If you unselect all groups when performing a regular\n"
+"installation (as opposed to an upgrade), a dialog will pop up proposing\n"
+"different options for a minimal installation:\n"
+"\n"
+" * \"%s\": install the minimum number of packages possible to have a\n"
+"working graphical desktop.\n"
+"\n"
+" * \"%s\": installs the base system plus basic utilities and their\n"
+"documentation. This installation is suitable for setting up a server.\n"
+"\n"
+" * \"%s\": will install the absolute minimum number of packages necessary\n"
+"to get a working Linux system. With this installation you will only have a\n"
+"command line interface. The total size of this installation is about 65\n"
+"megabytes.\n"
+"\n"
+"You can check the \"%s\" box, which is useful if you are familiar with the\n"
+"packages being offered or if you want to have total control over what will\n"
+"be installed.\n"
+"\n"
+"If you started the installation in \"%s\" mode, you can unselect all groups\n"
+"to avoid installing any new package. This is useful for repairing or\n"
+"updating an existing system."
+msgstr ""
+
+#: help.pm:137
+#, c-format
+msgid "Workstation"
+msgstr "Arbeidstasjon"
+
+#: help.pm:137
+#, c-format
+msgid "Development"
+msgstr "Utvikling"
+
+#: help.pm:137
+#, c-format
+msgid "Graphical Environment"
+msgstr "Grafisk miljø"
+
+#: help.pm:137 install_steps_interactive.pm:559
+#, c-format
+msgid "With X"
+msgstr "Med X"
+
+#: help.pm:137
+#, c-format
+msgid "With basic documentation"
+msgstr "Med grunnleggjande hjelpetekstar"
+
+#: help.pm:137
+#, c-format
+msgid "Truly minimal install"
+msgstr "Heilt minimal installasjon"
+
+#: help.pm:137 install_steps_gtk.pm:270 install_steps_interactive.pm:605
+#, c-format
+msgid "Individual package selection"
+msgstr "Direkte pakkeval"
+
+#: help.pm:137 help.pm:602
+#, c-format
+msgid "Upgrade"
+msgstr "Oppgrader"
+
+#: help.pm:140
+#, c-format
+msgid ""
+"If you told the installer that you wanted to individually select packages,\n"
+"it will present a tree containing all packages classified by groups and\n"
+"subgroups. While browsing the tree, you can select entire groups,\n"
+"subgroups, or individual packages.\n"
+"\n"
+"Whenever you select a package on the tree, a description appears on the\n"
+"right to let you know the purpose of the package.\n"
+"\n"
+"!! If a server package has been selected, either because you specifically\n"
+"chose the individual package or because it was part of a group of packages,\n"
+"you will be asked to confirm that you really want those servers to be\n"
+"installed. By default 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 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"
+"default during boot. !!\n"
+"\n"
+"The \"%s\" option is used to disable the warning dialog which appears\n"
+"whenever the installer automatically selects a package to resolve a\n"
+"dependency issue. Some packages have relationships between each them such\n"
+"that installation of one package requires that some other program is also\n"
+"required to be installed. The installer can determine which packages are\n"
+"required to satisfy a dependency to successfully complete the installation.\n"
+"\n"
+"The tiny floppy disk icon at the bottom of the list allows you to load a\n"
+"package list created during a previous installation. This is useful if you\n"
+"have a number of machines that you wish to configure identically. Clicking\n"
+"on this icon will ask you to insert a floppy disk previously created at the\n"
+"end of another installation. See the second tip of last step on how to\n"
+"create such a floppy."
+msgstr ""
+
+#: 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 "Nei"
+
+#: 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 "Ja"
+
+#: help.pm:172
+#, c-format
+msgid "Automatic dependencies"
+msgstr "Automatisk avhengnadshandtering"
+
+#: help.pm:175
+#, c-format
+msgid ""
+"You will now set up your Internet/network connection. If you wish to\n"
+"connect your computer to the Internet or to a local network, click \"%s\".\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"
+"\n"
+"When configuring your network, the available connections options are:\n"
+"Normal modem connection, Winmodem connection, ISDN modem, ADSL connection,\n"
+"cable modem, and finally a simple LAN connection (Ethernet).\n"
+"\n"
+"We will not detail each configuration option - just make sure that you have\n"
+"all the parameters, such as IP address, default gateway, DNS servers, etc.\n"
+"from your Internet Service Provider or system administrator.\n"
+"\n"
+"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 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"
+"for details about the configuration, or simply wait until your system is\n"
+"installed and use the program described there to configure your connection."
+msgstr ""
+
+#: help.pm:197
+#, c-format
+msgid "Use auto detection"
+msgstr "Oppdag automatisk"
+
+#: help.pm:200
+#, c-format
+msgid ""
+"\"%s\": clicking on the \"%s\" button will open the printer configuration\n"
+"wizard. Consult the corresponding chapter of the ``Starter Guide'' for more\n"
+"information on how to setup a new printer. The interface presented there is\n"
+"similar to the one used during installation."
+msgstr ""
+
+#: help.pm:203 help.pm:581 help.pm:991 install_steps_gtk.pm:646
+#: standalone/drakbackup:2406 standalone/drakbackup:2414
+#: standalone/drakbackup:2422 standalone/drakbackup:2430
+#, c-format
+msgid "Configure"
+msgstr "Set opp"
+
+#: help.pm:206
+#, c-format
+msgid ""
+"This dialog is used to choose which services you wish to start at boot\n"
+"time.\n"
+"\n"
+"DrakX will list all the services available on the current installation.\n"
+"Review each one carefully and uncheck those which are not needed at boot\n"
+"time.\n"
+"\n"
+"A short explanatory text will be displayed about a service when it is\n"
+"selected. However, if you are not sure whether a service is useful or not,\n"
+"it is safer to leave the default behavior.\n"
+"\n"
+"!! At this stage, be very careful if you intend to use your machine as a\n"
+"server: you will probably not want to start any services that you do not\n"
+"need. Please remember that several services can be dangerous if they are\n"
+"enabled on a server. In general, select only the services you really need.\n"
+"!!"
+msgstr ""
+
+#: help.pm:224
+#, c-format
+msgid ""
+"GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
+"local time according to the time zone you selected. If the clock on your\n"
+"motherboard is set to local time, you may deactivate this by unselecting\n"
+"\"%s\", which will let GNU/Linux know that the system clock and the\n"
+"hardware clock are in the same time zone. This is useful when the machine\n"
+"also hosts another operating system like Windows.\n"
+"\n"
+"The \"%s\" option will automatically regulate the clock by connecting to a\n"
+"remote time server on the Internet. For this feature to work, you must have\n"
+"a working Internet connection. It is best to choose a time server located\n"
+"near you. This option actually installs a time server that can be used by\n"
+"other machines on your local network as well."
+msgstr ""
+
+#: help.pm:235 install_steps_interactive.pm:835
+#, c-format
+msgid "Hardware clock set to GMT"
+msgstr "Maskinvareklokka er sett til GMT"
+
+#: help.pm:235
+#, c-format
+msgid "Automatic time synchronization"
+msgstr "Automatisk tidssynkronisering"
+
+#: help.pm:238
+#, c-format
+msgid ""
+"Graphic Card\n"
+"\n"
+"   The installer will normally automatically detect and configure the\n"
+"graphic card installed on your machine. If it is not the case, you can\n"
+"choose from this list the card you actually have installed.\n"
+"\n"
+"   In the situation where different servers are available for your card,\n"
+"with or without 3D acceleration, you are asked to choose the server that\n"
+"best suits your needs."
+msgstr ""
+"Skjermkort\n"
+"\n"
+"Installasjonsprogrammet klarar vanlegvis å finna ut kva skjermkort du har,\n"
+"og å setja dette opp automatisk. Men viss dette ikkje går, kan du velja "
+"kortet\n"
+"sjølv frå denne oversikta.\n"
+"\n"
+"Viss det finst tenarar med og utan 3D-akselerasjon for skjermkortet ditt,\n"
+"kan du velja tenaren som passar best for deg."
+
+#: help.pm:249
+#, c-format
+msgid ""
+"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
+"on which all the graphical environments (KDE, GNOME, AfterStep,\n"
+"WindowMaker, etc.) bundled with 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"
+"\n"
+"   The installer will normally automatically detect and configure the\n"
+"graphic card installed on your machine. If it is not the case, you can\n"
+"choose from this list the card you actually have installed.\n"
+"\n"
+"   In the situation where different servers are available for your card,\n"
+"with or without 3D acceleration, you are asked to choose the server that\n"
+"best suits your needs.\n"
+"\n"
+"\n"
+"\n"
+"Monitor\n"
+"\n"
+"   The installer will normally automatically detect and configure the\n"
+"monitor connected to your machine. If it is incorrect, you can choose from\n"
+"this list the monitor you actually have connected to your computer.\n"
+"\n"
+"\n"
+"\n"
+"Resolution\n"
+"\n"
+"   Here you can choose the resolutions and color depths available for your\n"
+"hardware. Choose the one that best suits your needs (you will be able to\n"
+"change that after installation though). A sample of the chosen\n"
+"configuration is shown in the monitor picture.\n"
+"\n"
+"\n"
+"\n"
+"Test\n"
+"\n"
+"   Depending on your hardware, this entry might not appear.\n"
+"\n"
+"   the system will try to open a graphical screen at the desired\n"
+"resolution. If you can see the message during the test and answer \"%s\",\n"
+"then DrakX will proceed to the next step. If you cannot see the message, it\n"
+"means that some part of the auto-detected configuration was incorrect and\n"
+"the test will automatically end after 12 seconds, bringing you back to the\n"
+"menu. Change settings until you get a correct graphical display.\n"
+"\n"
+"\n"
+"\n"
+"Options\n"
+"\n"
+"   Here you can choose whether you want to have your machine automatically\n"
+"switch to a graphical interface at boot. Obviously, you want to check\n"
+"\"%s\" if your machine is to act as a server, or if you were not successful\n"
+"in getting the display configured."
+msgstr ""
+
+#: help.pm:304
+#, c-format
+msgid ""
+"Monitor\n"
+"\n"
+"   The installer will normally automatically detect and configure the\n"
+"monitor connected to your machine. If it is incorrect, you can choose from\n"
+"this list the monitor you actually have connected to your computer."
+msgstr ""
+"Skjerm\n"
+"\n"
+"Installasjonsprogrammet klarar vanlegvis å finna ut kva skjerm du har,\n"
+"og å setja denne opp automatisk. Men viss dette ikkje går, kan du velja "
+"skjermen\n"
+"sjølv frå denne oversikta."
+
+#: help.pm:311
+#, c-format
+msgid ""
+"Resolution\n"
+"\n"
+"   Here you can choose the resolutions and color depths available for your\n"
+"hardware. Choose the one that best suits your needs (you will be able to\n"
+"change that after installation though). A sample of the chosen\n"
+"configuration is shown in the monitor picture."
+msgstr ""
+"Oppløysing\n"
+"\n"
+"Her kan du velja kva skjermoppløysing og fargedjupn du vil kjøra med.\n"
+"Vel dei innstillingane som passar best for deg (du kan òg endra "
+"innstillingane\n"
+"i ettertid). Det blir vist eit eksempel på valt oppsett på skjermbiletet."
+
+#: help.pm:319
+#, c-format
+msgid ""
+"In the situation where different servers are available for your card, with\n"
+"or without 3D acceleration, you are asked to choose the server that best\n"
+"suits your needs."
+msgstr ""
+"Viss det finst tenarar med og utan 3D-akselerasjon for skjermkortet ditt,\n"
+"kan du velja tenaren som passar best for deg."
+
+#: help.pm:324
+#, c-format
+msgid ""
+"Options\n"
+"\n"
+"   Here you can choose whether you want to have your machine automatically\n"
+"switch to a graphical interface at boot. Obviously, you want to check\n"
+"\"%s\" if your machine is to act as a server, or if you were not successful\n"
+"in getting the display configured."
+msgstr ""
+
+#: help.pm:332
+#, c-format
+msgid ""
+"At this point, you need to decide where you want to install the Mandrake\n"
+"Linux operating system on your hard drive. If your hard drive is empty or\n"
+"if an existing operating system is using all the available space you will\n"
+"have to partition the drive. Basically, partitioning a hard drive consists\n"
+"of logically dividing it to create the space needed to install your new\n"
+"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"
+"installed on the drive, partitioning can be intimidating and stressful if\n"
+"you are an inexperienced user. Fortunately, DrakX includes a wizard which\n"
+"simplifies this process. Before continuing with this step, read through the\n"
+"rest of this section and above all, take your time.\n"
+"\n"
+"Depending on your hard drive configuration, several options are available:\n"
+"\n"
+" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+"drive(s). If you use this option there will be no further prompts.\n"
+"\n"
+" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+"your hard drive. If you want to use them, choose this option. You will then\n"
+"be asked to choose the mount points associated with each of the partitions.\n"
+"The legacy mount points are selected by default, and for the most part it's\n"
+"a good idea to keep them.\n"
+"\n"
+" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+"all the space available on it, you will have to create free space for\n"
+"GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
+"data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
+"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 Mandrakelinux and Microsoft Windows on\n"
+"the same computer.\n"
+"\n"
+"   Before choosing this option, please understand that after this\n"
+"procedure, the size of your Microsoft Windows partition will be smaller\n"
+"then when you started. You will have less free space under Microsoft\n"
+"Windows to store your data or to install new software.\n"
+"\n"
+" * \"%s\": if you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrakelinux system,\n"
+"choose this option. Be careful, because you will not be able to undo your\n"
+"choice after you confirm.\n"
+"\n"
+"   !! If you choose this option, all data on your disk will be deleted. !!\n"
+"\n"
+" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
+"partitioning everything from scratch. All data on your disk will be lost.\n"
+"\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
+"\n"
+" * \"%s\": choose this option if you want to manually partition your hard\n"
+"drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
+"easily lose all your data. That's why this option is really only\n"
+"recommended if you have done something like this before and have some\n"
+"experience. For more instructions on how to use the DiskDrake utility,\n"
+"refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
+msgstr ""
+
+#: help.pm:389 install_interactive.pm:95
+#, c-format
+msgid "Use free space"
+msgstr "Bruk ledig plass"
+
+#: help.pm:389
+#, c-format
+msgid "Use existing partition"
+msgstr "Bruk gammal partisjon"
+
+#: help.pm:389 install_interactive.pm:137
+#, c-format
+msgid "Use the free space on the Windows partition"
+msgstr "Bruk ledig plass på Windows-partisjon"
+
+#: help.pm:389 install_interactive.pm:211
+#, c-format
+msgid "Erase entire disk"
+msgstr "Slett heile disken"
+
+#: help.pm:389
+#, c-format
+msgid "Remove Windows"
+msgstr "Fjern Windows"
+
+#: help.pm:389 install_interactive.pm:226
+#, c-format
+msgid "Custom disk partitioning"
+msgstr "Eigendefinert partisjonering"
+
+#: help.pm:392
+#, c-format
+msgid ""
+"There you are. Installation is now complete and your GNU/Linux system is\n"
+"ready to use. Just click \"%s\" to reboot the system. Don't forget to\n"
+"remove the installation media (CD-ROM or floppy). The first thing you\n"
+"should see after your computer has finished doing its hardware tests is the\n"
+"bootloader menu, giving you the choice of which operating system to start.\n"
+"\n"
+"The \"%s\" button shows two more buttons to:\n"
+"\n"
+" * \"%s\": to create an installation floppy disk that will automatically\n"
+"perform a whole installation without the help of an operator, similar to\n"
+"the installation you just configured.\n"
+"\n"
+"   Note that two different options are available after clicking the button:\n"
+"\n"
+"    * \"%s\". This is a partially automated installation. The partitioning\n"
+"step is the only interactive procedure.\n"
+"\n"
+"    * \"%s\". Fully automated installation: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
+"\n"
+"   This feature is very handy when installing a number of similar machines.\n"
+"See the Auto install section on our web site for more information.\n"
+"\n"
+" * \"%s\": saves a list of the packages selected in this installation. To\n"
+"use this selection with another installation, insert the floppy and start\n"
+"the installation. At the prompt, press the [F1] key and type >>linux\n"
+"defcfg=\"floppy\" <<."
+msgstr ""
+
+#: help.pm:418
+#, c-format
+msgid "Generate auto-install floppy"
+msgstr "Lag diskett for automatisk installering"
+
+#: help.pm:418 install_steps_interactive.pm:1329
+#, c-format
+msgid "Replay"
+msgstr "Spel av"
+
+#: help.pm:418 install_steps_interactive.pm:1329
+#, c-format
+msgid "Automated"
+msgstr "Automatisert"
+
+#: help.pm:418 install_steps_interactive.pm:1332
+#, c-format
+msgid "Save packages selection"
+msgstr "Lagra pakkeval"
+
+#: help.pm:421
+#, c-format
+msgid ""
+"Any partitions that have been newly defined must be formatted for use\n"
+"(formatting means creating a file system).\n"
+"\n"
+"At this time, you may wish to reformat some already existing partitions to\n"
+"erase any data they contain. If you wish to do that, please select those\n"
+"partitions as well.\n"
+"\n"
+"Please note that it is not necessary to reformat all pre-existing\n"
+"partitions. You must reformat the partitions containing the operating\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
+"reformat partitions containing data that you wish to keep (typically\n"
+"\"/home\").\n"
+"\n"
+"Please be careful when selecting partitions. After formatting, all data on\n"
+"the selected partitions will be deleted and you will not be able to recover\n"
+"it.\n"
+"\n"
+"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"
+"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."
+msgstr ""
+
+#: help.pm:444 help.pm:1005 install_steps_gtk.pm:431 interactive.pm:404
+#: 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 "Førre"
+
+#: help.pm:447
+#, c-format
+msgid ""
+"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"
+"if you have a working Internet connection, or \"%s\" if you prefer to\n"
+"install updated packages later.\n"
+"\n"
+"Choosing \"%s\" will display a list of places from which updates can be\n"
+"retrieved. You should choose one near to you. A package-selection tree will\n"
+"appear: review the selection, and press \"%s\" to retrieve and install the\n"
+"selected package(s), or \"%s\" to abort."
+msgstr ""
+
+#: help.pm:457 help.pm:602 install_steps_gtk.pm:430
+#: install_steps_interactive.pm:148 standalone/drakbackup:4279
+#, c-format
+msgid "Install"
+msgstr "Installer"
+
+#: help.pm:460
+#, c-format
+msgid ""
+"At this point, DrakX will allow you to choose the security level desired\n"
+"for the machine. As a rule of thumb, the security level should be set\n"
+"higher if the machine will contain crucial data, or if it will be a machine\n"
+"directly exposed to the Internet. The trade-off of a higher security level\n"
+"is generally obtained at the expense of ease of use.\n"
+"\n"
+"If you do not know what to choose, stay with the default option. You will\n"
+"be able to change that security level later with tool draksec from the\n"
+"Mandrake Control Center.\n"
+"\n"
+"The \"%s\" field can inform the system of the user on this computer who\n"
+"will be responsible for security. Security messages will be sent to that\n"
+"address."
+msgstr ""
+
+#: help.pm:472
+#, c-format
+msgid "Security Administrator"
+msgstr "Tryggleiksansvarleg"
+
+#: help.pm:475
+#, c-format
+msgid ""
+"At this point, you need to choose which partition(s) will be used for the\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"
+"\n"
+"To create partitions, you must first select a hard drive. You can select\n"
+"the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
+"``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
+"\n"
+"To partition the selected hard drive, you can use these options:\n"
+"\n"
+" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+"\n"
+" * \"%s\": this option enables you to automatically create ext3 and swap\n"
+"partitions in the free space of your hard drive\n"
+"\n"
+"\"%s\": gives access to additional features:\n"
+"\n"
+" * \"%s\": saves the partition table to a floppy. Useful for later\n"
+"partition-table recovery if necessary. It is strongly recommended that you\n"
+"perform this step.\n"
+"\n"
+" * \"%s\": allows you to restore a previously saved partition table from a\n"
+"floppy disk.\n"
+"\n"
+" * \"%s\": if your partition table is damaged, you can try to recover it\n"
+"using this option. Please be careful and remember that it doesn't always\n"
+"work.\n"
+"\n"
+" * \"%s\": discards all changes and reloads the partition table that was\n"
+"originally on the hard drive.\n"
+"\n"
+" * \"%s\": un-checking this option will force users to manually mount and\n"
+"unmount removable media such as floppies and CD-ROMs.\n"
+"\n"
+" * \"%s\": use this option if you wish to use a wizard to partition your\n"
+"hard drive. This is recommended if you do not have a good understanding of\n"
+"partitioning.\n"
+"\n"
+" * \"%s\": use this option to cancel your changes.\n"
+"\n"
+" * \"%s\": allows additional actions on partitions (type, options, format)\n"
+"and gives more information about the hard drive.\n"
+"\n"
+" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+"save your changes back to disk.\n"
+"\n"
+"When defining the size of a partition, you can finely set the partition\n"
+"size by using the Arrow keys of your keyboard.\n"
+"\n"
+"Note: you can reach any option using the keyboard. Navigate through the\n"
+"partitions using [Tab] and the [Up/Down] arrows.\n"
+"\n"
+"When a partition is selected, you can use:\n"
+"\n"
+" * Ctrl-c to create a new partition (when an empty partition is selected)\n"
+"\n"
+" * Ctrl-d to delete a partition\n"
+"\n"
+" * Ctrl-m to set the mount point\n"
+"\n"
+"To get information about the different file system types available, please\n"
+"read the ext2FS chapter from the ``Reference Manual''.\n"
+"\n"
+"If you are installing on a PPC machine, you will want to create a small HFS\n"
+"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
+"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
+"may find it a useful place to store a spare kernel and ramdisk images for\n"
+"emergency boot situations."
+msgstr ""
+
+#: help.pm:544
+#, c-format
+msgid "Removable media auto-mounting"
+msgstr "Automatisk montering av fjernbare medium"
+
+#: help.pm:544
+#, c-format
+msgid "Toggle between normal/expert mode"
+msgstr "Byt mellom normal- og ekspertmodus"
+
+#: help.pm:547
+#, c-format
+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"
+"Mandrakelinux operating system.\n"
+"\n"
+"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
+"\"Capacity\".\n"
+"\n"
+"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\n"
+"\n"
+"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
+"\"sd\" if it is a SCSI hard drive.\n"
+"\n"
+"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard drives:\n"
+"\n"
+" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+"\n"
+" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+"\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+"\n"
+" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+"\n"
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc.\n"
+"\n"
+"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"disk or partition is called \"C:\")."
+msgstr ""
+
+#: help.pm:578
+#, c-format
+msgid ""
+"\"%s\": check the current country selection. If you are not in this\n"
+"country, click on the \"%s\" button and choose another one. If your country\n"
+"is not in the first list shown, click the \"%s\" button to get the complete\n"
+"country list."
+msgstr ""
+
+#: help.pm:584
+#, c-format
+msgid ""
+"This step is activated only if an existing GNU/Linux partition has been\n"
+"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 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"
+"system, you should use this option. However, depending on your partitioning\n"
+"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 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 Mandrakelinux systems\n"
+"running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
+"to Mandrakelinux version \"8.1\" is not recommended."
+msgstr ""
+
+#: help.pm:605
+#, c-format
+msgid ""
+"Depending on the language you chose in section , DrakX will automatically\n"
+"select a particular type of keyboard configuration. Check that the\n"
+"selection suits you or choose another keyboard layout.\n"
+"\n"
+"Also, you may not have a keyboard that corresponds exactly to your\n"
+"language: for example, if you are an English-speaking Swiss native, you may\n"
+"have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
+"you may find yourself in the same situation where your native language and\n"
+"country-set keyboard do not match. In either case, this installation step\n"
+"will allow you to select an appropriate keyboard from a list.\n"
+"\n"
+"Click on the \"%s\" button to be presented with the complete list of\n"
+"supported keyboards.\n"
+"\n"
+"If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
+"dialog will allow you to choose the key binding that will switch the\n"
+"keyboard between the Latin and non-Latin layouts."
+msgstr ""
+
+#: help.pm:624
+#, c-format
+msgid ""
+"Your choice of preferred language will affect the language of the\n"
+"documentation, the installer and the system in general. Select first the\n"
+"region you are located in, and then the language you speak.\n"
+"\n"
+"Clicking on the \"%s\" button will allow you to select other languages to\n"
+"be installed on your workstation, thereby installing the language-specific\n"
+"files for system documentation and applications. For example, if you will\n"
+"host users from Spain on your machine, select English as the default\n"
+"language in the tree view and \"%s\" in the Advanced section.\n"
+"\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, 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"
+"languages, Russian, Japanese, Chinese, Korean, Thai, Greek, Turkish, most\n"
+"iso-8859-2 languages), the legacy encoding will be used by default;\n"
+"\n"
+" * Other languages will use unicode by default;\n"
+"\n"
+" * If two or more languages are required, and those languages are not using\n"
+"the same encoding, then unicode will be used for the whole system;\n"
+"\n"
+" * Finally, unicode can also be forced for the system at user request by\n"
+"selecting option \"%s\" independently of which language(s) have been\n"
+"chosen.\n"
+"\n"
+"Note that you're not limited to choosing a single additional language. You\n"
+"may choose several ones, or even install them all by selecting the \"%s\"\n"
+"box. Selecting support for a language means translations, fonts, spell\n"
+"checkers, etc. for that language will also be installed.\n"
+"\n"
+"To switch between the various languages installed on the system, you can\n"
+"launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
+"language used by the entire system. Running the command as a regular user\n"
+"will only change the language settings for that particular user."
+msgstr ""
+
+#: help.pm:660
+#, c-format
+msgid "Espanol"
+msgstr "Spansk"
+
+#: help.pm:663
+#, c-format
+msgid ""
+"Usually, DrakX has no problems detecting the number of buttons on your\n"
+"mouse. If it does, it assumes you have a two-button mouse and will\n"
+"configure it for third-button emulation. The third-button mouse button of a\n"
+"two-button mouse can be ``pressed'' by simultaneously clicking the left and\n"
+"right mouse buttons. DrakX will automatically know whether your mouse uses\n"
+"a PS/2, serial or USB interface.\n"
+"\n"
+"In case you have a 3 buttons mouse without wheel, you can choose the mouse\n"
+"that says \"%s\". DrakX will then configure your mouse so that you can\n"
+"simulate the wheel with it: to do so, press the middle button and move your\n"
+"mouse up and down.\n"
+"\n"
+"If for some reason you wish to specify a different type of mouse, select it\n"
+"from the list provided.\n"
+"\n"
+"If you choose a mouse other than the default, a test screen will be\n"
+"displayed. Use the buttons and wheel to verify that the settings are\n"
+"correct and that the mouse is working correctly. If the mouse is not\n"
+"working well, press the space bar or [Return] key to cancel the test and to\n"
+"go back to the list of choices.\n"
+"\n"
+"Wheel mice are occasionally not detected automatically, so you will need to\n"
+"select your mouse from a list. Be sure to select the one corresponding to\n"
+"the port that your mouse is attached to. After selecting a mouse and\n"
+"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
+"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
+"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
+"buttons and check that the mouse pointer moves on-screen as you move your\n"
+"mouse."
+msgstr ""
+
+#: help.pm:691
+#, c-format
+msgid "with Wheel emulation"
+msgstr "med hjulemulering"
+
+#: help.pm:694
+#, c-format
+msgid ""
+"Please select the correct port. For example, the \"COM1\" port under\n"
+"Windows is named \"ttyS0\" under GNU/Linux."
+msgstr ""
+
+#: help.pm:698
+#, c-format
+msgid ""
+"This is the most crucial decision point for the security of your GNU/Linux\n"
+"system: you have to enter the \"root\" password. \"Root\" is the system\n"
+"administrator and is the only user authorized to make updates, add users,\n"
+"change the overall system configuration, and so on. In short, \"root\" can\n"
+"do everything! That is why you must choose a password that is difficult to\n"
+"guess - DrakX will tell you if the password you chose is too easy. As you\n"
+"can see, you are not forced to enter a password, but we strongly advise you\n"
+"against this. GNU/Linux is just as prone to operator error as any other\n"
+"operating system. Since \"root\" can overcome all limitations and\n"
+"unintentionally erase all data on partitions by carelessly accessing the\n"
+"partitions themselves, it is important that it be difficult to become\n"
+"\"root\".\n"
+"\n"
+"The password should be a mixture of alphanumeric characters and at least 8\n"
+"characters long. Never write down the \"root\" password -- it makes it far\n"
+"too easy to compromise a system.\n"
+"\n"
+"One caveat -- do not make the password too long or complicated because you\n"
+"must be able to remember it!\n"
+"\n"
+"The password will not be displayed on screen as you type it in. To reduce\n"
+"the chance of a blind typing error you will need to enter the password\n"
+"twice. If you do happen to make the same typing error twice, this\n"
+"``incorrect'' password will be the one you will have use the first time you\n"
+"connect.\n"
+"\n"
+"If you wish access to this computer to be controlled by an authentication\n"
+"server, click the \"%s\" button.\n"
+"\n"
+"If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
+"services, select the appropriate one for \"%s\". If you do not know which\n"
+"one to use, you should ask your network administrator.\n"
+"\n"
+"If you happen to have problems with remembering passwords, if your computer\n"
+"will never be connected to the Internet and you absolutely trust everybody\n"
+"who uses your computer, you can choose to have \"%s\"."
+msgstr ""
+
+#: help.pm:733
+#, c-format
+msgid "authentication"
+msgstr "autentisering"
+
+#. -PO: keep this short or else the buttons will not fit in the window
+#: help.pm:733 install_steps_interactive.pm:1159
+#, c-format
+msgid "No password"
+msgstr "Ingen passord"
+
+#: help.pm:736
+#, c-format
+msgid ""
+"This dialog allows you to fine tune your bootloader:\n"
+"\n"
+" * \"%s\": there are three choices for your bootloader:\n"
+"\n"
+"    * \"%s\": if you prefer GRUB (text menu).\n"
+"\n"
+"    * \"%s\": if you prefer LILO with its text menu interface.\n"
+"\n"
+"    * \"%s\": if you prefer LILO with its graphical interface.\n"
+"\n"
+" * \"%s\": in most cases, you will not change the default (\"%s\"), but if\n"
+"you prefer, the bootloader can be installed on the second hard drive\n"
+"(\"%s\"), or even on a floppy disk (\"%s\");\n"
+"\n"
+" * \"%s\": after a boot or a reboot of the computer, this is the delay\n"
+"given to the user at the console to select a boot entry other than the\n"
+"default.\n"
+"\n"
+" * \"%s\": ACPI is a new standard (appeared during year 2002) for power\n"
+"management, notably for laptops. If you know your hardware supports it and\n"
+"you need it, check this box.\n"
+"\n"
+" * \"%s\": If you noticed hardware problems on your machine (IRQ conflicts,\n"
+"instabilities, machine freeze, ...) you should try disabling APIC by\n"
+"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 Mandrakelinux\n"
+"system! Be sure you know what you are doing before changing any of the\n"
+"options. !!\n"
+"\n"
+"Clicking the \"%s\" button in this dialog will offer advanced options which\n"
+"are normally reserved for the expert user."
+msgstr ""
+
+#: help.pm:768
+#, c-format
+msgid "GRUB"
+msgstr "GRUB"
+
+#: help.pm:768
+#, c-format
+msgid "/dev/hda"
+msgstr "/dev/hda"
+
+#: help.pm:768
+#, c-format
+msgid "/dev/hdb"
+msgstr "/dev/hdb"
+
+#: help.pm:768
+#, c-format
+msgid "/dev/fd0"
+msgstr "/dev/fd0"
+
+#: help.pm:768
+#, c-format
+msgid "Delay before booting the default image"
+msgstr "Ventetid før oppstart med standardbilete"
+
+#: help.pm:768
+#, c-format
+msgid "Force no APIC"
+msgstr "Tving ikkje-APIC"
+
+#: help.pm:771
+#, c-format
+msgid ""
+"After you have configured the general bootloader parameters, the list of\n"
+"boot options that will be available at boot time will be displayed.\n"
+"\n"
+"If there are other operating systems installed on your machine they will\n"
+"automatically be added to the boot menu. You can fine-tune the existing\n"
+"options by clicking \"%s\" to create a new entry; selecting an entry and\n"
+"clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your\n"
+"changes.\n"
+"\n"
+"You may also not want to give access to these other operating systems to\n"
+"anyone who goes to the console and reboots the machine. You can delete the\n"
+"corresponding entries for the operating systems to remove them from the\n"
+"bootloader menu, but you will need a boot disk in order to boot those other\n"
+"operating systems!"
+msgstr ""
+
+#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
+#: 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 "Legg til"
+
+#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
+#, c-format
+msgid "Modify"
+msgstr "Endra"
+
+#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
+#: standalone/drakups:282 standalone/drakups:331 standalone/drakups:351
+#: standalone/drakvpn:331 standalone/drakvpn:692
+#, c-format
+msgid "Remove"
+msgstr "Fjern"
+
+#: help.pm:787
+#, c-format
+msgid ""
+"LILO and GRUB are GNU/Linux bootloaders. Normally, this stage is totally\n"
+"automated. DrakX will analyze the disk boot sector and act according to\n"
+"what it finds there:\n"
+"\n"
+" * if a Windows boot sector is found, it will replace it with a GRUB/LILO\n"
+"boot sector. This way you will be able to load either GNU/Linux or any\n"
+"other OS installed on your machine.\n"
+"\n"
+" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
+"one.\n"
+"\n"
+"If it cannot make a determination, DrakX will ask you where to place the\n"
+"bootloader. Generally, the \"%s\" is the safest place. Choosing \"%s\"\n"
+"won't install any bootloader. Use it only if you know what you are doing."
+msgstr ""
+
+#: help.pm:803
+#, c-format
+msgid ""
+"Now, it's time to select a printing system for your computer. Other OSs may\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"
+"if you have a direct connection to your printer, you want to be able to\n"
+"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
+"will handle only very simple network cases and is somewhat slow when used\n"
+"with networks.) It's recommended that you use \"pdq\" if this is your first\n"
+"experience with GNU/Linux.\n"
+"\n"
+" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
+"printing to your local printer or to one halfway around the planet. It is\n"
+"simple to configure and can act as a server or a client for the ancient\n"
+"\"lpd \" printing system, so it is compatible with older operating systems\n"
+"which may still need print services. While quite powerful, the basic setup\n"
+"is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
+"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
+"front-ends for printing or choosing printer options and for managing the\n"
+"printer.\n"
+"\n"
+"If you make a choice now, and later find that you don't like your printing\n"
+"system you may change it by running PrinterDrake from the Mandrake Control\n"
+"Center and clicking the expert button."
+msgstr ""
+
+#: help.pm:826
+#, c-format
+msgid "pdq"
+msgstr "pdq"
+
+#: help.pm:826 printer/cups.pm:115 printer/data.pm:83
+#, c-format
+msgid "CUPS"
+msgstr "CUPS"
+
+#: help.pm:829
+#, c-format
+msgid ""
+"DrakX will first detect any IDE devices present in your computer. It will\n"
+"also scan for one or more PCI SCSI cards on your system. If a SCSI card is\n"
+"found, DrakX will automatically install the appropriate driver.\n"
+"\n"
+"Because hardware detection is not foolproof, DrakX may fail in detecting\n"
+"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"\n"
+"If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
+"want to configure options for it. You should allow DrakX to probe the\n"
+"hardware for the card-specific options which are needed to initialize the\n"
+"adapter. Most of the time, DrakX will get through this step without any\n"
+"issues.\n"
+"\n"
+"If DrakX is not able to probe for the options to automatically determine\n"
+"which parameters need to be passed to the hardware, you'll need to manually\n"
+"configure the driver."
+msgstr ""
+
+#: help.pm:847
+#, c-format
+msgid ""
+"You can add additional entries in yaboot for other operating systems,\n"
+"alternate kernels, or for an emergency boot image.\n"
+"\n"
+"For other OSs, the entry consists only of a label and the \"root\"\n"
+"partition.\n"
+"\n"
+"For Linux, there are a few possible options:\n"
+"\n"
+" * Label: this is the name you will have to type at the yaboot prompt to\n"
+"select this boot option.\n"
+"\n"
+" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
+"variation of vmlinux with an extension.\n"
+"\n"
+" * Root: the \"root\" device or ``/'' for your Linux installation.\n"
+"\n"
+" * Append: on Apple hardware, the kernel append option is often used to\n"
+"assist in initializing video hardware, or to enable keyboard mouse button\n"
+"emulation for the missing 2nd and 3rd mouse buttons on a stock Apple mouse.\n"
+"The following are some examples:\n"
+"\n"
+"   \t      video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
+"hda=autotune\n"
+"\n"
+"   \t      video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
+"\n"
+" * Initrd: this option can be used either to load initial modules before\n"
+"the boot device is available, or to load a ramdisk image for an emergency\n"
+"boot situation.\n"
+"\n"
+" * Initrd-size: the default ramdisk size is generally 4096 Kbytes. If you\n"
+"need to allocate a large ramdisk, this option can be used to specify a\n"
+"ramdisk larger than the default.\n"
+"\n"
+" * Read-write: normally the \"root\" partition is initially mounted as\n"
+"read-only, to allow a file system check before the system becomes ``live''.\n"
+"You can override the default with this option.\n"
+"\n"
+" * NoVideo: should the Apple video hardware prove to be exceptionally\n"
+"problematic, you can select this option to boot in ``novideo'' mode, with\n"
+"native frame buffer support.\n"
+"\n"
+" * Default: selects this entry as being the default Linux selection,\n"
+"selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
+"highlighted with a ``*'' if you press [Tab] to see the boot selections."
+msgstr ""
+
+#: help.pm:894
+#, c-format
+msgid ""
+"Yaboot is a bootloader for NewWorld Macintosh hardware and can be used to\n"
+"boot GNU/Linux, MacOS or MacOSX. Normally, MacOS and MacOSX are correctly\n"
+"detected and installed in the bootloader menu. If this is not the case, you\n"
+"can add an entry by hand in this screen. Take care to choose the correct\n"
+"parameters.\n"
+"\n"
+"Yaboot's main options are:\n"
+"\n"
+" * Init Message: a simple text message displayed before the boot prompt.\n"
+"\n"
+" * Boot Device: indicates where you want to place the information required\n"
+"to boot to GNU/Linux. Generally, you set up a bootstrap partition earlier\n"
+"to hold this information.\n"
+"\n"
+" * Open Firmware Delay: unlike LILO, there are two delays available with\n"
+"yaboot. The first delay is measured in seconds and at this point, you can\n"
+"choose between CD, OF boot, MacOS or Linux;\n"
+"\n"
+" * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
+"After selecting Linux, you will have this delay in 0.1 second increments\n"
+"before your default kernel description is selected;\n"
+"\n"
+" * Enable CD Boot?: checking this option allows you to choose ``C'' for CD\n"
+"at the first boot prompt.\n"
+"\n"
+" * Enable OF Boot?: checking this option allows you to choose ``N'' for\n"
+"Open Firmware at the first boot prompt.\n"
+"\n"
+" * Default OS: you can select which OS will boot by default when the Open\n"
+"Firmware Delay expires."
+msgstr ""
+
+#: help.pm:926
+#, c-format
+msgid ""
+"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
+"If you notice the sound card displayed is not the one that is actually\n"
+"present on your system, you can click on the button and choose another\n"
+"driver."
+msgstr ""
+
+#: help.pm:929 help.pm:991 install_steps_interactive.pm:967
+#: install_steps_interactive.pm:984
+#, c-format
+msgid "Sound card"
+msgstr "Lydkort"
+
+#: help.pm:932
+#, c-format
+msgid ""
+"As a review, DrakX will present a summary of information it has about your\n"
+"system. Depending on your installed hardware, you may have some or all of\n"
+"the following entries. Each entry is made up of the configuration item to\n"
+"be configured, followed by a quick summary of the current configuration.\n"
+"Click on the corresponding \"%s\" button to change that.\n"
+"\n"
+" * \"%s\": check the current keyboard map configuration and change it if\n"
+"necessary.\n"
+"\n"
+" * \"%s\": check the current country selection. If you are not in this\n"
+"country, click on the \"%s\" button and choose another one. If your country\n"
+"is not in the first list shown, click the \"%s\" button to get the complete\n"
+"country list.\n"
+"\n"
+" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
+"you have chosen. You can click on the \"%s\" button here if this is not\n"
+"correct.\n"
+"\n"
+" * \"%s\": check the current mouse configuration and click on the button to\n"
+"change it if necessary.\n"
+"\n"
+" * \"%s\": clicking on the \"%s\" button will open the printer\n"
+"configuration wizard. Consult the corresponding chapter of the ``Starter\n"
+"Guide'' for more information on how to setup a new printer. The interface\n"
+"presented there is similar to the one used during installation.\n"
+"\n"
+" * \"%s\": if a sound card is detected on your system, it is displayed\n"
+"here. If you notice the sound card displayed is not the one that is\n"
+"actually present on your system, you can click on the button and choose\n"
+"another driver.\n"
+"\n"
+" * \"%s\": by default, DrakX configures your graphical interface in\n"
+"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
+"\"%s\" to reconfigure your graphical interface.\n"
+"\n"
+" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
+"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
+"configure it manually.\n"
+"\n"
+" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
+"here. You can click on \"%s\" to change the parameters associated with the\n"
+"card.\n"
+"\n"
+" * \"%s\": If you wish to configure your Internet or local network access\n"
+"now.\n"
+"\n"
+" * \"%s\": this entry allows you to redefine the security level as set in a\n"
+"previous step ().\n"
+"\n"
+" * \"%s\": if you plan to connect your machine to the Internet, it's a good\n"
+"idea to protect yourself from intrusions by setting up a firewall. Consult\n"
+"the corresponding section of the ``Starter Guide'' for details about\n"
+"firewall settings.\n"
+"\n"
+" * \"%s\": if you wish to change your bootloader configuration, click that\n"
+"button. This should be reserved to advanced users.\n"
+"\n"
+" * \"%s\": here you'll be able to fine control which services will be run\n"
+"on your machine. If you plan to use this machine as a server it's a good\n"
+"idea to review this setup."
+msgstr ""
+
+#: help.pm:991 install_steps_interactive.pm:110
+#: install_steps_interactive.pm:900 standalone/keyboarddrake:23
+#, c-format
+msgid "Keyboard"
+msgstr "Tastatur"
+
+#: help.pm:991 install_steps_interactive.pm:926
+#, c-format
+msgid "Timezone"
+msgstr "Tidssone"
+
+#: help.pm:991
+#, c-format
+msgid "Graphical Interface"
+msgstr "Grafisk grensesnitt"
+
+#: help.pm:991 install_steps_interactive.pm:1000
+#, c-format
+msgid "TV card"
+msgstr "Fjernsynskort"
+
+#: help.pm:991
+#, c-format
+msgid "ISDN card"
+msgstr "ISDN-kort"
+
+#: help.pm:991 install_steps_interactive.pm:1018 standalone/drakbackup:2101
+#, c-format
+msgid "Network"
+msgstr "Nettverk"
+
+#: help.pm:991 install_steps_interactive.pm:1044
+#, c-format
+msgid "Security Level"
+msgstr "Tryggleiksnivå"
+
+#: help.pm:991 install_steps_interactive.pm:1058
+#, c-format
+msgid "Firewall"
+msgstr "Brannmur"
+
+#: help.pm:991 install_steps_interactive.pm:1072
+#, c-format
+msgid "Bootloader"
+msgstr "Oppstartslastar"
+
+#: help.pm:991 install_steps_interactive.pm:1082 services.pm:195
+#, c-format
+msgid "Services"
+msgstr "Tenester"
+
+#: help.pm:994
+#, c-format
+msgid ""
+"Choose the hard drive you want to erase in order to install your new\n"
+"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"and will not be recoverable!"
+msgstr ""
+
+#: help.pm:999
+#, c-format
+msgid ""
+"Click on \"%s\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
+"\n"
+"Click on \"%s\" to quit this operation without losing data and partitions\n"
+"present on this hard drive."
+msgstr ""
+
+#: install2.pm:119
+#, c-format
+msgid ""
+"Can't access kernel modules corresponding to your kernel (file %s is "
+"missing), this generally means your boot floppy in not in sync with the "
+"Installation medium (please create a newer boot floppy)"
+msgstr ""
+
+#: install2.pm:169
+#, c-format
+msgid "You must also format %s"
+msgstr "Du må òg formatera «%s»"
+
+#: install_any.pm:411
+#, c-format
+msgid ""
+"You have selected the following server(s): %s\n"
+"\n"
+"\n"
+"These servers are activated by default. They don't have any known security\n"
+"issues, but some new ones could be found. In that case, you must make sure\n"
+"to upgrade as soon as possible.\n"
+"\n"
+"\n"
+"Do you really want to install these servers?\n"
+msgstr ""
+
+#: install_any.pm:432
+#, c-format
+msgid ""
+"The following packages will be removed to allow upgrading your system: %s\n"
+"\n"
+"\n"
+"Do you really want to remove these packages?\n"
+msgstr ""
+
+#: install_any.pm:827
+#, c-format
+msgid "Insert a FAT formatted floppy in drive %s"
+msgstr "Set inn ein diskett med FAT-filsystemet i stasjon «%s»"
+
+#: install_any.pm:831
+#, c-format
+msgid "This floppy is not FAT formatted"
+msgstr "Disketten er ikkje formatert med FAT-filsystemet"
+
+#: install_any.pm:843
+#, c-format
+msgid ""
+"To use this saved packages selection, boot installation with ``linux "
+"defcfg=floppy''"
+msgstr ""
+
+#: install_any.pm:871 partition_table.pm:847
+#, c-format
+msgid "Error reading file %s"
+msgstr "Klarte ikkje lesa fila «%s»"
+
+#: install_any.pm:995
+#, c-format
+msgid ""
+"An error occurred - no valid devices were found on which to create new "
+"filesystems. Please check your hardware for the cause of this problem"
+msgstr ""
+
+#: install_gtk.pm:161
+#, c-format
+msgid "System installation"
+msgstr "Systeminstallering"
+
+#: install_gtk.pm:164
+#, c-format
+msgid "System configuration"
+msgstr "Systemoppsett"
+
+#: install_interactive.pm:22
+#, c-format
+msgid ""
+"Some hardware on your computer needs ``proprietary'' drivers to work.\n"
+"You can find some information about them at: %s"
+msgstr ""
+"Noko av maskinvaren treng godseigde drivarar for å fungera.\n"
+"Du finn meir informasjon om desse på: %s"
+
+#: install_interactive.pm:62
+#, c-format
+msgid ""
+"You must have a root partition.\n"
+"For this, create a partition (or click on an existing one).\n"
+"Then choose action ``Mount point'' and set it to `/'"
+msgstr ""
+
+#: install_interactive.pm:67
+#, c-format
+msgid ""
+"You don't have a swap partition.\n"
+"\n"
+"Continue anyway?"
+msgstr ""
+"Du har ingen vekslepartisjon.\n"
+"\n"
+"Vil du likevel halda fram?"
+
+#: install_interactive.pm:70 install_steps.pm:206
+#, c-format
+msgid "You must have a FAT partition mounted in /boot/efi"
+msgstr "Du må ha ein FAT-partisjon montert i «/boot/efi»"
+
+#: install_interactive.pm:97
+#, c-format
+msgid "Not enough free space to allocate new partitions"
+msgstr "Ikkje nok ledig plass til nye partisjonar"
+
+#: install_interactive.pm:105
+#, c-format
+msgid "Use existing partitions"
+msgstr "Bruk gamle partisjonar"
+
+#: install_interactive.pm:107
+#, c-format
+msgid "There is no existing partition to use"
+msgstr "Det finst ingen gammal partisjon å bruka"
+
+#: install_interactive.pm:114
+#, c-format
+msgid "Use the Windows partition for loopback"
+msgstr "Bruk Windows-partisjonen til filmontering"
+
+#: install_interactive.pm:117
+#, c-format
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Kva partisjon vil du bruka for Linux4Win?"
+
+#: install_interactive.pm:119
+#, c-format
+msgid "Choose the sizes"
+msgstr "Vel storleikar"
+
+#: install_interactive.pm:120
+#, c-format
+msgid "Root partition size in MB: "
+msgstr "Storleik på rotpartisjon i MiB: "
+
+#: install_interactive.pm:121
+#, c-format
+msgid "Swap partition size in MB: "
+msgstr "Storleik på vekslepartisjon i MiB: "
+
+#: install_interactive.pm:130
+#, c-format
+msgid "There is no FAT partition to use as loopback (or not enough space left)"
+msgstr ""
+"Det finst ingen FAT-partisjon som kan brukast til filmontering (eller det er "
+"ikkje nok ledig plass)"
+
+#: install_interactive.pm:139
+#, c-format
+msgid "Which partition do you want to resize?"
+msgstr "Kva partisjon vil du endra storleik på?"
+
+#: install_interactive.pm:153
+#, c-format
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
+msgstr ""
+
+#: install_interactive.pm:156
+#, c-format
+msgid "Computing the size of the Windows partition"
+msgstr "Reknar ut storleik på Windows-partisjon"
+
+#: install_interactive.pm:163
+#, c-format
+msgid ""
+"Your Windows partition is too fragmented. Please reboot your computer under "
+"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"installation."
+msgstr ""
+
+#: install_interactive.pm:164
+#, c-format
+msgid ""
+"WARNING!\n"
+"\n"
+"DrakX will now resize your Windows partition. Be careful: this\n"
+"operation is dangerous. If you have not already done so, you\n"
+"first need to exit the installation, run \"chkdsk c:\" from a\n"
+"Command Prompt under Windows (beware, running graphical program\n"
+"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
+"Command Prompt!), optionally run defrag, then restart the\n"
+"installation. You should also backup your data.\n"
+"When sure, press Ok."
+msgstr ""
+
+#: install_interactive.pm:176
+#, c-format
+msgid "Which size do you want to keep for Windows on"
+msgstr "Kva storleik vil du behalda for Windows på"
+
+#: install_interactive.pm:177
+#, c-format
+msgid "partition %s"
+msgstr "partisjon %s"
+
+#: install_interactive.pm:186
+#, c-format
+msgid "Resizing Windows partition"
+msgstr "Endrar storleik på Windows-partisjon"
+
+#: install_interactive.pm:191
+#, c-format
+msgid "FAT resizing failed: %s"
+msgstr "Klarte ikkje krympa/auka FAT: %s"
+
+#: install_interactive.pm:206
+#, c-format
+msgid "There is no FAT partition to resize (or not enough space left)"
+msgstr ""
+
+#: install_interactive.pm:211
+#, c-format
+msgid "Remove Windows(TM)"
+msgstr "Fjern Windows™"
+
+#: install_interactive.pm:213
+#, c-format
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr "Du har meir enn éin harddisk. Kven av dei vil du installera Linux på?"
+
+#: install_interactive.pm:217
+#, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr ""
+
+#: install_interactive.pm:230
+#, c-format
+msgid "Use fdisk"
+msgstr "Bruk fdisk"
+
+#: install_interactive.pm:233
+#, c-format
+msgid ""
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
+
+#: install_interactive.pm:269
+#, c-format
+msgid "I can't find any room for installing"
+msgstr "Ikkje nok plass for installering"
+
+#: install_interactive.pm:273
+#, c-format
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "Partisjonsvegvisaren fann følgjande løysingar:"
+
+#: install_interactive.pm:279
+#, c-format
+msgid "Partitioning failed: %s"
+msgstr "Feil ved partisjonering: %s"
+
+#: install_interactive.pm:286
+#, c-format
+msgid "Bringing up the network"
+msgstr "Koplar til nettverket"
+
+#: install_interactive.pm:291
+#, c-format
+msgid "Bringing down the network"
+msgstr "Koplar frå nettverket"
+
+#: install_messages.pm:9
+#, c-format
+msgid ""
+"Introduction\n"
+"\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 Mandrakelinux distribution.\n"
+"\n"
+"\n"
+"1. License Agreement\n"
+"\n"
+"Please read this document carefully. This document is a license agreement "
+"between you and  \n"
+"MandrakeSoft S.A. which applies to the Software Products.\n"
+"By installing, duplicating or using the Software Products in any manner, you "
+"explicitly \n"
+"accept and fully agree to conform to the terms and conditions of this "
+"License. \n"
+"If you disagree with any portion of the License, you are not allowed to "
+"install, duplicate or use \n"
+"the Software Products. \n"
+"Any attempt to install, duplicate or use the Software Products in a manner "
+"which does not comply \n"
+"with the terms and conditions of this License is void and will terminate "
+"your rights under this \n"
+"License. Upon termination of the License,  you must immediately destroy all "
+"copies of the \n"
+"Software Products.\n"
+"\n"
+"\n"
+"2. Limited Warranty\n"
+"\n"
+"The Software Products and attached documentation are provided \"as is\", "
+"with no warranty, to the \n"
+"extent permitted by law.\n"
+"MandrakeSoft S.A. will, in no circumstances and to the extent permitted by "
+"law, be liable for any special,\n"
+"incidental, direct or indirect damages whatsoever (including without "
+"limitation damages for loss of \n"
+"business, interruption of business, financial loss, legal fees and penalties "
+"resulting from a court \n"
+"judgment, or any other consequential loss) arising out of  the use or "
+"inability to use the Software \n"
+"Products, even if MandrakeSoft S.A. has been advised of the possibility or "
+"occurence of such \n"
+"damages.\n"
+"\n"
+"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
+"COUNTRIES\n"
+"\n"
+"To the extent permitted by law, MandrakeSoft S.A. or its distributors will, "
+"in no circumstances, be \n"
+"liable for any special, incidental, direct or indirect damages whatsoever "
+"(including without \n"
+"limitation damages for loss of business, interruption of business, financial "
+"loss, legal fees \n"
+"and penalties resulting from a court judgment, or any other consequential "
+"loss) arising out \n"
+"of the possession and use of software components or arising out of  "
+"downloading software components \n"
+"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"
+"included in the Software Products.\n"
+"\n"
+"\n"
+"3. The GPL License and Related Licenses\n"
+"\n"
+"The Software Products consist of components created by different persons or "
+"entities.  Most \n"
+"of these components are governed under the terms and conditions of the GNU "
+"General Public \n"
+"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
+"licenses allow you to use, \n"
+"duplicate, adapt or redistribute the components which they cover. Please "
+"read carefully the terms \n"
+"and conditions of the license agreement for each component before using any "
+"component. Any question \n"
+"on a component license should be addressed to the component author and not "
+"to MandrakeSoft.\n"
+"The programs developed by MandrakeSoft S.A. are governed by the GPL License. "
+"Documentation written \n"
+"by MandrakeSoft S.A. is governed by a specific license. Please refer to the "
+"documentation for \n"
+"further details.\n"
+"\n"
+"\n"
+"4. Intellectual Property Rights\n"
+"\n"
+"All rights to the components of the Software Products belong to their "
+"respective authors and are \n"
+"protected by intellectual property and copyright laws applicable to software "
+"programs.\n"
+"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\", \"Mandrakelinux\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  \n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.  \n"
+msgstr ""
+
+#: install_messages.pm:89
+#, c-format
+msgid ""
+"Warning: Free Software may not necessarily be patent free, and some Free\n"
+"Software included may be covered by patents in your country. For example, "
+"the\n"
+"MP3 decoders included may require a licence for further usage (see\n"
+"http://www.mp3licensing.com for more details). If you are unsure if a "
+"patent\n"
+"may be applicable to you, check your local laws."
+msgstr ""
+
+#: install_messages.pm:96
+#, c-format
+msgid ""
+"\n"
+"Warning\n"
+"\n"
+"Please read carefully the terms below. If you disagree with any\n"
+"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
+"to continue the installation without using these media.\n"
+"\n"
+"\n"
+"Some components contained in the next CD media are not governed\n"
+"by the GPL License or similar agreements. Each such component is then\n"
+"governed by the terms and conditions of its own specific license. \n"
+"Please read carefully and comply with such specific licenses before \n"
+"you use or redistribute the said components. \n"
+"Such licenses will in general prevent the transfer,  duplication \n"
+"(except for backup purposes), redistribution, reverse engineering, \n"
+"de-assembly, de-compilation or modification of the component. \n"
+"Any breach of agreement will immediately terminate your rights under \n"
+"the specific license. Unless the specific license terms grant you such\n"
+"rights, you usually cannot install the programs on more than one\n"
+"system, or adapt it to be used on a network. In doubt, please contact \n"
+"directly the distributor or editor of the component. \n"
+"Transfer to third parties or copying of such components including the \n"
+"documentation is usually forbidden.\n"
+"\n"
+"\n"
+"All rights to the components of the next CD media belong to their \n"
+"respective authors and are protected by intellectual property and \n"
+"copyright laws applicable to software programs.\n"
+msgstr ""
+
+#: install_messages.pm:128
+#, c-format
+msgid ""
+"Congratulations, installation is complete.\n"
+"Remove the boot media and press return to reboot.\n"
+"\n"
+"\n"
+"For information on fixes which are available for this release of "
+"Mandrakelinux,\n"
+"consult the Errata available from:\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"\n"
+"Information on configuring your system is available in the post\n"
+"install chapter of the Official Mandrakelinux User's Guide."
+msgstr ""
+
+#: install_messages.pm:141
+#, c-format
+msgid "http://www.mandrakelinux.com/en/100errata.php3"
+msgstr "http://www.mandrakelinux.com/en/100errata.php3"
+
+#: install_steps.pm:241
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr ""
+
+#: install_steps.pm:406
+#, c-format
+msgid ""
+"Some important packages didn't get installed properly.\n"
+"Either your cdrom drive or your cdrom is defective.\n"
+"Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm"
+"\"\n"
+msgstr ""
+
+#: install_steps.pm:535
+#, c-format
+msgid "No floppy drive available"
+msgstr "Det finst ingen diskettstasjon"
+
+#: install_steps_auto_install.pm:76 install_steps_stdio.pm:27
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Kjører steg «%s»\n"
+
+#: install_steps_gtk.pm:178
+#, c-format
+msgid ""
+"Your system is low on resources. You may have some problem installing\n"
+"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
+msgstr ""
+
+#: install_steps_gtk.pm:232 install_steps_interactive.pm:587
+#, c-format
+msgid "Package Group Selection"
+msgstr "Pakkegruppeval"
+
+#: install_steps_gtk.pm:292 install_steps_interactive.pm:519
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Totalstorleik: %d / %d MiB"
+
+#: install_steps_gtk.pm:338
+#, c-format
+msgid "Bad package"
+msgstr "Ugyldig pakke"
+
+#: install_steps_gtk.pm:340
+#, c-format
+msgid "Version: "
+msgstr "Versjon: "
+
+#: install_steps_gtk.pm:341
+#, c-format
+msgid "Size: "
+msgstr "Storleik: "
+
+#: install_steps_gtk.pm:341
+#, c-format
+msgid "%d KB\n"
+msgstr "%d KiB\n"
+
+#: install_steps_gtk.pm:342
+#, c-format
+msgid "Importance: "
+msgstr "Prioritet: "
+
+#: install_steps_gtk.pm:375
+#, c-format
+msgid "You can't select/unselect this package"
+msgstr "Du kan ikkje velja eller fjerna denne pakken"
+
+#: install_steps_gtk.pm:379
+#, c-format
+msgid "due to missing %s"
+msgstr "på grunn av manglande «%s»"
+
+#: install_steps_gtk.pm:380
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "då «%s» ikkje er tilfredsstilt"
+
+#: install_steps_gtk.pm:381
+#, c-format
+msgid "trying to promote %s"
+msgstr "Prøver å prioritera «%s»"
+
+#: install_steps_gtk.pm:382
+#, c-format
+msgid "in order to keep %s"
+msgstr "for å kunna behalda «%s»"
+
+#: install_steps_gtk.pm:387
+#, c-format
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr ""
+"Du kan ikkje velja denne pakken, då det ikkje er nok ledig plass til å "
+"installera han."
+
+#: install_steps_gtk.pm:390
+#, c-format
+msgid "The following packages are going to be installed"
+msgstr "Desse pakkane blir installerte"
+
+#: install_steps_gtk.pm:391
+#, c-format
+msgid "The following packages are going to be removed"
+msgstr "Desse pakkane blir fjerna"
+
+#: install_steps_gtk.pm:415
+#, c-format
+msgid "This is a mandatory package, it can't be unselected"
+msgstr "Dette er ein obligatorisk pakke. Du kan ikkje velja han vekk."
+
+#: install_steps_gtk.pm:417
+#, c-format
+msgid "You can't unselect this package. It is already installed"
+msgstr "Du kan ikkje velja vekk denne pakken, då han allereie er installert."
+
+#: install_steps_gtk.pm:420
+#, c-format
+msgid ""
+"This package must be upgraded.\n"
+"Are you sure you want to deselect it?"
+msgstr ""
+
+#: install_steps_gtk.pm:423
+#, c-format
+msgid "You can't unselect this package. It must be upgraded"
+msgstr ""
+
+#: install_steps_gtk.pm:428
+#, c-format
+msgid "Show automatically selected packages"
+msgstr ""
+
+#: install_steps_gtk.pm:433
+#, c-format
+msgid "Load/Save on floppy"
+msgstr ""
+
+#: install_steps_gtk.pm:434
+#, c-format
+msgid "Updating package selection"
+msgstr ""
+
+#: install_steps_gtk.pm:439
+#, c-format
+msgid "Minimal install"
+msgstr ""
+
+#: install_steps_gtk.pm:453 install_steps_interactive.pm:427
+#, c-format
+msgid "Choose the packages you want to install"
+msgstr ""
+
+#: install_steps_gtk.pm:469 install_steps_interactive.pm:673
+#, c-format
+msgid "Installing"
+msgstr ""
+
+#: install_steps_gtk.pm:475
+#, c-format
+msgid "No details"
+msgstr ""
+
+#: install_steps_gtk.pm:476
+#, c-format
+msgid "Estimating"
+msgstr "Estimerer"
+
+#: install_steps_gtk.pm:482
+#, c-format
+msgid "Time remaining "
+msgstr "Tid igjen"
+
+#: install_steps_gtk.pm:494
+#, c-format
+msgid "Please wait, preparing installation..."
+msgstr ""
+
+#: install_steps_gtk.pm:555
+#, c-format
+msgid "%d packages"
+msgstr "%d pakkar"
+
+#: install_steps_gtk.pm:560
+#, c-format
+msgid "Installing package %s"
+msgstr ""
+
+#: install_steps_gtk.pm:596 install_steps_interactive.pm:88
+#: install_steps_interactive.pm:697
+#, c-format
+msgid "Refuse"
+msgstr "Ikkje godta"
+
+#: install_steps_gtk.pm:597 install_steps_interactive.pm:698
+#, c-format
+msgid ""
+"Change your Cd-Rom!\n"
+"\n"
+"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
+"done.\n"
+"If you don't have it, press Cancel to avoid installation from this Cd-Rom."
+msgstr ""
+
+#: install_steps_gtk.pm:612 install_steps_interactive.pm:710
+#, c-format
+msgid "There was an error ordering packages:"
+msgstr ""
+
+#: install_steps_gtk.pm:612 install_steps_gtk.pm:616
+#: install_steps_interactive.pm:710 install_steps_interactive.pm:714
+#, c-format
+msgid "Go on anyway?"
+msgstr ""
+
+#: install_steps_gtk.pm:616 install_steps_interactive.pm:714
+#, c-format
+msgid "There was an error installing packages:"
+msgstr ""
+
+#: install_steps_gtk.pm:656 install_steps_interactive.pm:882
+#: install_steps_interactive.pm:1034
+#, c-format
+msgid "not configured"
+msgstr ""
+
+#: install_steps_interactive.pm:81
+#, c-format
+msgid "Do you want to recover your system?"
+msgstr ""
+
+#: install_steps_interactive.pm:82
+#, c-format
+msgid "License agreement"
+msgstr "Lisensavtale"
+
+#: install_steps_interactive.pm:111
+#, c-format
+msgid "Please choose your keyboard layout."
+msgstr "Vel tastaturoppsett."
+
+#: install_steps_interactive.pm:113
+#, c-format
+msgid "Here is the full list of keyboards available"
+msgstr ""
+
+#: install_steps_interactive.pm:143
+#, c-format
+msgid "Install/Upgrade"
+msgstr "Installer/oppgrader"
+
+#: install_steps_interactive.pm:144
+#, c-format
+msgid "Is this an install or an upgrade?"
+msgstr ""
+
+#: install_steps_interactive.pm:150
+#, c-format
+msgid "Upgrade %s"
+msgstr ""
+
+#: install_steps_interactive.pm:160
+#, c-format
+msgid "Encryption key for %s"
+msgstr ""
+
+#: install_steps_interactive.pm:177
+#, c-format
+msgid "Please choose your type of mouse."
+msgstr ""
+
+#: install_steps_interactive.pm:186 standalone/mousedrake:46
+#, c-format
+msgid "Mouse Port"
+msgstr ""
+
+#: install_steps_interactive.pm:187 standalone/mousedrake:47
+#, c-format
+msgid "Please choose which serial port your mouse is connected to."
+msgstr ""
+
+#: install_steps_interactive.pm:197
+#, c-format
+msgid "Buttons emulation"
+msgstr ""
+
+#: install_steps_interactive.pm:199
+#, c-format
+msgid "Button 2 Emulation"
+msgstr ""
+
+#: install_steps_interactive.pm:200
+#, c-format
+msgid "Button 3 Emulation"
+msgstr ""
+
+#: install_steps_interactive.pm:221
+#, c-format
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: install_steps_interactive.pm:221
+#, c-format
+msgid "Configuring PCMCIA cards..."
+msgstr ""
+
+#: install_steps_interactive.pm:228
+#, c-format
+msgid "IDE"
+msgstr ""
+
+#: install_steps_interactive.pm:228
+#, c-format
+msgid "Configuring IDE"
+msgstr ""
+
+#: install_steps_interactive.pm:248 network/tools.pm:195
+#, c-format
+msgid "No partition available"
+msgstr ""
+
+#: install_steps_interactive.pm:251
+#, c-format
+msgid "Scanning partitions to find mount points"
+msgstr ""
+
+#: install_steps_interactive.pm:258
+#, c-format
+msgid "Choose the mount points"
+msgstr ""
+
+#: install_steps_interactive.pm:288
+#, c-format
+msgid ""
+"No free space for 1MB bootstrap! Install will continue, but to boot your "
+"system, you'll need to create the bootstrap partition in DiskDrake"
+msgstr ""
+
+#: install_steps_interactive.pm:325
+#, c-format
+msgid "Choose the partitions you want to format"
+msgstr ""
+
+#: install_steps_interactive.pm:327
+#, c-format
+msgid "Check bad blocks?"
+msgstr ""
+
+#: install_steps_interactive.pm:359
+#, c-format
+msgid ""
+"Failed to check filesystem %s. Do you want to repair the errors? (beware, "
+"you can lose data)"
+msgstr ""
+
+#: install_steps_interactive.pm:362
+#, c-format
+msgid "Not enough swap space to fulfill installation, please add some"
+msgstr ""
+
+#: install_steps_interactive.pm:369
+#, c-format
+msgid "Looking for available packages and rebuilding rpm database..."
+msgstr ""
+
+#: install_steps_interactive.pm:370 install_steps_interactive.pm:389
+#, c-format
+msgid "Looking for available packages..."
+msgstr ""
+
+#: install_steps_interactive.pm:373
+#, c-format
+msgid "Looking at packages already installed..."
+msgstr ""
+
+#: install_steps_interactive.pm:377
+#, c-format
+msgid "Finding packages to upgrade..."
+msgstr ""
+
+#: install_steps_interactive.pm:398
+#, c-format
+msgid ""
+"Your system does not have enough space left for installation or upgrade (%d "
+"> %d)"
+msgstr ""
+
+#: install_steps_interactive.pm:439
+#, c-format
+msgid ""
+"Please choose load or save package selection on floppy.\n"
+"The format is the same as auto_install generated floppies."
+msgstr ""
+
+#: install_steps_interactive.pm:441
+#, c-format
+msgid "Load from floppy"
+msgstr ""
+
+#: install_steps_interactive.pm:441
+#, c-format
+msgid "Save on floppy"
+msgstr ""
+
+#: install_steps_interactive.pm:445
+#, c-format
+msgid "Package selection"
+msgstr ""
+
+#: install_steps_interactive.pm:445
+#, c-format
+msgid "Loading from floppy"
+msgstr ""
+
+#: install_steps_interactive.pm:450
+#, c-format
+msgid "Insert a floppy containing package selection"
+msgstr ""
+
+#: install_steps_interactive.pm:533
+#, c-format
+msgid ""
+"Due to incompatibilities of the 2.6 series kernel with the LSB runtime\n"
+"tests, the 2.4 series kernel will be installed as the default to insure\n"
+"compliance under the \"LSB\" group selection."
+msgstr ""
+
+#: install_steps_interactive.pm:540
+#, c-format
+msgid "Selected size is larger than available space"
+msgstr ""
+
+#: install_steps_interactive.pm:555
+#, c-format
+msgid "Type of install"
+msgstr ""
+
+#: install_steps_interactive.pm:556
+#, c-format
+msgid ""
+"You haven't selected any group of packages.\n"
+"Please choose the minimal installation you want:"
+msgstr ""
+
+#: install_steps_interactive.pm:560
+#, c-format
+msgid "With basic documentation (recommended!)"
+msgstr ""
+
+#: install_steps_interactive.pm:561
+#, c-format
+msgid "Truly minimal install (especially no urpmi)"
+msgstr ""
+
+#: install_steps_interactive.pm:604 standalone/drakxtv:53
+#, c-format
+msgid "All"
+msgstr "Alle"
+
+#: install_steps_interactive.pm:648
+#, c-format
+msgid ""
+"If you have all the CDs in the list below, click Ok.\n"
+"If you have none of those CDs, click Cancel.\n"
+"If only some CDs are missing, unselect them, then click Ok."
+msgstr ""
+
+#: install_steps_interactive.pm:653
+#, c-format
+msgid "Cd-Rom labeled \"%s\""
+msgstr ""
+
+#: install_steps_interactive.pm:673
+#, c-format
+msgid "Preparing installation"
+msgstr "Førebur installasjon"
+
+#: install_steps_interactive.pm:682
+#, c-format
+msgid ""
+"Installing package %s\n"
+"%d%%"
+msgstr ""
+
+#: install_steps_interactive.pm:728
+#, c-format
+msgid "Post-install configuration"
+msgstr ""
+
+#: install_steps_interactive.pm:734
+#, c-format
+msgid "Please insert the Boot floppy used in drive %s"
+msgstr ""
+
+#: install_steps_interactive.pm:740
+#, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr ""
+
+#: install_steps_interactive.pm:761
+#, c-format
+msgid ""
+"You now have the opportunity to download updated packages. These packages\n"
+"have been updated after the distribution was released. They may\n"
+"contain security or bug fixes.\n"
+"\n"
+"To download these packages, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to install the updates ?"
+msgstr ""
+
+#: install_steps_interactive.pm:782
+#, c-format
+msgid ""
+"Contacting Mandrakelinux web site to get the list of available mirrors..."
+msgstr ""
+
+#: install_steps_interactive.pm:787
+#, c-format
+msgid "Choose a mirror from which to get the packages"
+msgstr ""
+
+#: install_steps_interactive.pm:801
+#, c-format
+msgid "Contacting the mirror to get the list of available packages..."
+msgstr ""
+
+#: install_steps_interactive.pm:805
+#, c-format
+msgid "Unable to contact mirror %s"
+msgstr ""
+
+#: install_steps_interactive.pm:805
+#, c-format
+msgid "Would you like to try again?"
+msgstr ""
+
+#: install_steps_interactive.pm:831 standalone/drakclock:42
+#, c-format
+msgid "Which is your timezone?"
+msgstr ""
+
+#: install_steps_interactive.pm:836
+#, c-format
+msgid "Automatic time synchronization (using NTP)"
+msgstr ""
+
+#: install_steps_interactive.pm:844
+#, c-format
+msgid "NTP Server"
+msgstr ""
+
+#: install_steps_interactive.pm:886 steps.pm:30
+#, c-format
+msgid "Summary"
+msgstr "Samandrag"
+
+#: 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 "System"
+
+#: 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 "Maskinvare"
+
+#: install_steps_interactive.pm:945 install_steps_interactive.pm:954
+#, c-format
+msgid "Remote CUPS server"
+msgstr ""
+
+#: install_steps_interactive.pm:945
+#, c-format
+msgid "No printer"
+msgstr "Ingen skrivar"
+
+#: install_steps_interactive.pm:987
+#, c-format
+msgid "Do you have an ISA sound card?"
+msgstr ""
+
+#: install_steps_interactive.pm:989
+#, c-format
+msgid "Run \"sndconfig\" after installation to configure your sound card"
+msgstr ""
+
+#: install_steps_interactive.pm:991
+#, c-format
+msgid "No sound card detected. Try \"harddrake\" after installation"
+msgstr ""
+
+#: install_steps_interactive.pm:1011
+#, c-format
+msgid "Graphical interface"
+msgstr ""
+
+#: install_steps_interactive.pm:1017 install_steps_interactive.pm:1032
+#, c-format
+msgid "Network & Internet"
+msgstr "Nettverk og Internett"
+
+#: install_steps_interactive.pm:1033
+#, c-format
+msgid "Proxies"
+msgstr "Mellomtenarar"
+
+#: install_steps_interactive.pm:1034
+#, c-format
+msgid "configured"
+msgstr ""
+
+#: install_steps_interactive.pm:1043 install_steps_interactive.pm:1057
+#: steps.pm:20
+#, c-format
+msgid "Security"
+msgstr "Tryggleik"
+
+#: install_steps_interactive.pm:1062
+#, c-format
+msgid "activated"
+msgstr "påslått"
+
+#: install_steps_interactive.pm:1062
+#, c-format
+msgid "disabled"
+msgstr "avslått"
+
+#: install_steps_interactive.pm:1071
+#, c-format
+msgid "Boot"
+msgstr "Oppstart"
+
+#  -PO: example: lilo-graphic on /dev/hda1
+#. -PO: example: lilo-graphic on /dev/hda1
+#: install_steps_interactive.pm:1075
+#, c-format
+msgid "%s on %s"
+msgstr "%s på %s"
+
+#: install_steps_interactive.pm:1086 services.pm:177
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: install_steps_interactive.pm:1096
+#, c-format
+msgid "You have not configured X. Are you sure you really want this?"
+msgstr ""
+
+#: install_steps_interactive.pm:1154
+#, c-format
+msgid "Set root password and network authentication methods"
+msgstr ""
+
+#: install_steps_interactive.pm:1155
+#, c-format
+msgid "Set root password"
+msgstr "Vel «root»-passord"
+
+#: install_steps_interactive.pm:1165
+#, c-format
+msgid "This password is too short (it must be at least %d characters long)"
+msgstr ""
+
+#: install_steps_interactive.pm:1170 network/netconnect.pm:563
+#: standalone/drakauth:26 standalone/drakconnect:451
+#, c-format
+msgid "Authentication"
+msgstr "Autentisering"
+
+#: install_steps_interactive.pm:1201
+#, c-format
+msgid "Preparing bootloader..."
+msgstr ""
+
+#: install_steps_interactive.pm:1211
+#, c-format
+msgid ""
+"You appear to have an OldWorld or Unknown\n"
+" machine, the yaboot bootloader will not work for you.\n"
+"The install will continue, but you'll\n"
+" need to use BootX or some other means to boot your machine"
+msgstr ""
+
+#: install_steps_interactive.pm:1217
+#, c-format
+msgid "Do you want to use aboot?"
+msgstr ""
+
+#: install_steps_interactive.pm:1220
+#, c-format
+msgid ""
+"Error installing aboot, \n"
+"try to force installation even if that destroys the first partition?"
+msgstr ""
+
+#: install_steps_interactive.pm:1231
+#, c-format
+msgid "Installing bootloader"
+msgstr "Installerer oppstartslastar"
+
+#: install_steps_interactive.pm:1238
+#, c-format
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr ""
+
+#: install_steps_interactive.pm:1243
+#, c-format
+msgid ""
+"You may need to change your Open Firmware boot-device to\n"
+" enable the bootloader.  If you don't see the bootloader prompt at\n"
+" reboot, hold down Command-Option-O-F at reboot and enter:\n"
+" setenv boot-device %s,\\\\:tbxi\n"
+" Then type: shut-down\n"
+"At your next boot you should see the bootloader prompt."
+msgstr ""
+
+#: 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 ""
+
+#: install_steps_interactive.pm:1288 standalone/drakautoinst:76
+#, c-format
+msgid "Insert a blank floppy in drive %s"
+msgstr ""
+
+#: install_steps_interactive.pm:1293
+#, c-format
+msgid "Please insert another floppy for drivers disk"
+msgstr ""
+
+#: install_steps_interactive.pm:1295
+#, c-format
+msgid "Creating auto install floppy..."
+msgstr "Lagar diskett for automatisk installasjon ..."
+
+#: install_steps_interactive.pm:1307
+#, c-format
+msgid ""
+"Some steps are not completed.\n"
+"\n"
+"Do you really want to quit now?"
+msgstr ""
+
+#: install_steps_interactive.pm:1322
+#, c-format
+msgid "Generate auto install floppy"
+msgstr "Lag diskett for automatisk installasjon"
+
+#: install_steps_interactive.pm:1324
+#, c-format
+msgid ""
+"The auto install can be fully automated if wanted,\n"
+"in that case it will take over the hard drive!!\n"
+"(this is meant for installing on another box).\n"
+"\n"
+"You may prefer to replay the installation.\n"
+msgstr ""
+
+#: install_steps_newt.pm:20
+#, c-format
+msgid "Mandrakelinux Installation %s"
+msgstr "Mandrakelinux-installering %s"
+
+#: install_steps_newt.pm:33
+#, c-format
+msgid ""
+"  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
+msgstr ""
+
+#: interactive.pm:170
+#, c-format
+msgid "Choose a file"
+msgstr "Vel fil"
+
+#: interactive.pm:372
+#, c-format
+msgid "Basic"
+msgstr "Grunnleggjande"
+
+#: interactive.pm:403 interactive/newt.pm:308 ugtk2.pm:510
+#, c-format
+msgid "Finish"
+msgstr "Fullfør"
+
+#: interactive/newt.pm:83
+#, c-format
+msgid "Do"
+msgstr "Gjer"
+
+#: interactive/stdio.pm:29 interactive/stdio.pm:148
+#, c-format
+msgid "Bad choice, try again\n"
+msgstr ""
+
+#: interactive/stdio.pm:30 interactive/stdio.pm:149
+#, c-format
+msgid "Your choice? (default %s) "
+msgstr ""
+
+#: interactive/stdio.pm:54
+#, c-format
+msgid ""
+"Entries you'll have to fill:\n"
+"%s"
+msgstr ""
+
+#: interactive/stdio.pm:70
+#, c-format
+msgid "Your choice? (0/1, default `%s') "
+msgstr ""
+
+#: interactive/stdio.pm:94
+#, c-format
+msgid "Button `%s': %s"
+msgstr ""
+
+#: interactive/stdio.pm:95
+#, c-format
+msgid "Do you want to click on this button?"
+msgstr ""
+
+#: interactive/stdio.pm:104
+#, c-format
+msgid "Your choice? (default `%s'%s) "
+msgstr ""
+
+#: interactive/stdio.pm:104
+#, c-format
+msgid " enter `void' for void entry"
+msgstr ""
+
+#: interactive/stdio.pm:122
+#, c-format
+msgid "=> There are many things to choose from (%s).\n"
+msgstr ""
+
+#: interactive/stdio.pm:125
+#, c-format
+msgid ""
+"Please choose the first number of the 10-range you wish to edit,\n"
+"or just hit Enter to proceed.\n"
+"Your choice? "
+msgstr ""
+
+#: interactive/stdio.pm:138
+#, c-format
+msgid ""
+"=> Notice, a label changed:\n"
+"%s"
+msgstr ""
+
+#: interactive/stdio.pm:145
+#, c-format
+msgid "Re-submit"
+msgstr ""
+
+#: keyboard.pm:137 keyboard.pm:169
+#, c-format
+msgid "Czech (QWERTZ)"
+msgstr "Tsjekkisk (QWERTZ)"
+
+#: keyboard.pm:138 keyboard.pm:171
+#, c-format
+msgid "German"
+msgstr "Tysk"
+
+#: keyboard.pm:139
+#, c-format
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: keyboard.pm:140 keyboard.pm:179
+#, c-format
+msgid "Spanish"
+msgstr "Spansk"
+
+#: keyboard.pm:141 keyboard.pm:180
+#, c-format
+msgid "Finnish"
+msgstr "Finsk"
+
+#: keyboard.pm:142 keyboard.pm:181
+#, c-format
+msgid "French"
+msgstr "Fransk"
+
+#: keyboard.pm:143 keyboard.pm:220
+#, c-format
+msgid "Norwegian"
+msgstr "Norsk"
+
+#: keyboard.pm:144
+#, c-format
+msgid "Polish"
+msgstr "Polsk"
+
+#: keyboard.pm:145 keyboard.pm:229
+#, c-format
+msgid "Russian"
+msgstr "Russisk"
+
+#: keyboard.pm:147 keyboard.pm:233
+#, c-format
+msgid "Swedish"
+msgstr "Svensk"
+
+#: keyboard.pm:148 keyboard.pm:252
+#, c-format
+msgid "UK keyboard"
+msgstr "Britisk tastatur"
+
+#: keyboard.pm:149 keyboard.pm:253
+#, c-format
+msgid "US keyboard"
+msgstr "USA-tastatur"
+
+#: keyboard.pm:151
+#, c-format
+msgid "Albanian"
+msgstr "Albansk"
+
+#: keyboard.pm:152
+#, c-format
+msgid "Armenian (old)"
+msgstr "Armensk (gammal)"
+
+#: keyboard.pm:153
+#, c-format
+msgid "Armenian (typewriter)"
+msgstr "Armensk (skrivemaskin)"
+
+#: keyboard.pm:154
+#, c-format
+msgid "Armenian (phonetic)"
+msgstr "Armensk (fonetisk)"
+
+#: keyboard.pm:155
+#, c-format
+msgid "Arabic"
+msgstr "Arabisk"
+
+#: keyboard.pm:156
+#, c-format
+msgid "Azerbaidjani (latin)"
+msgstr "Aserbajdsjansk (latinsk)"
+
+#: keyboard.pm:158
+#, c-format
+msgid "Belgian"
+msgstr "Belgisk"
+
+#: keyboard.pm:159
+#, c-format
+msgid "Bengali"
+msgstr "Bengali"
+
+#: keyboard.pm:160
+#, c-format
+msgid "Bulgarian (phonetic)"
+msgstr "Bulgarsk (fonetisk)"
+
+#: keyboard.pm:161
+#, c-format
+msgid "Bulgarian (BDS)"
+msgstr "Bulgarsk (BDS)"
+
+#: keyboard.pm:162
+#, c-format
+msgid "Brazilian (ABNT-2)"
+msgstr "Bulgarsk (ABNT-2)"
+
+#: keyboard.pm:165
+#, c-format
+msgid "Bosnian"
+msgstr "Bosnisk"
+
+#: keyboard.pm:166
+#, c-format
+msgid "Belarusian"
+msgstr "Kviterussisk"
+
+#: keyboard.pm:167
+#, c-format
+msgid "Swiss (German layout)"
+msgstr "Sveitsisk (tysk oppsett)"
+
+#: keyboard.pm:168
+#, c-format
+msgid "Swiss (French layout)"
+msgstr "Sveitsisk (fransk oppsett)"
+
+#: keyboard.pm:170
+#, c-format
+msgid "Czech (QWERTY)"
+msgstr "Tsjekkisk (QWERTY)"
+
+#: keyboard.pm:172
+#, c-format
+msgid "German (no dead keys)"
+msgstr "Tysk (utan dødtastar)"
+
+#: keyboard.pm:173
+#, c-format
+msgid "Devanagari"
+msgstr "Devanagari"
+
+#: keyboard.pm:174
+#, c-format
+msgid "Danish"
+msgstr "Dansk"
+
+#: keyboard.pm:175
+#, c-format
+msgid "Dvorak (US)"
+msgstr "Dvorak (USA)"
+
+#: keyboard.pm:176
+#, c-format
+msgid "Dvorak (Norwegian)"
+msgstr "Dvorak (norsk)"
+
+#: keyboard.pm:177
+#, c-format
+msgid "Dvorak (Swedish)"
+msgstr "Dvorak (svensk)"
+
+#: keyboard.pm:178
+#, c-format
+msgid "Estonian"
+msgstr "Estisk"
+
+#: keyboard.pm:182
+#, c-format
+msgid "Georgian (\"Russian\" layout)"
+msgstr "Georgisk («russisk» oppsett)"
+
+#: keyboard.pm:183
+#, c-format
+msgid "Georgian (\"Latin\" layout)"
+msgstr "Georgisk («latinsk» oppsett)"
+
+#: keyboard.pm:184
+#, c-format
+msgid "Greek"
+msgstr "Gresk"
+
+#: keyboard.pm:185
+#, c-format
+msgid "Greek (polytonic)"
+msgstr ""
+
+#: keyboard.pm:186
+#, c-format
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: keyboard.pm:187
+#, c-format
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: keyboard.pm:188
+#, c-format
+msgid "Hungarian"
+msgstr "Ungarsk"
+
+#: keyboard.pm:189
+#, c-format
+msgid "Croatian"
+msgstr "Kroatisk"
+
+#: keyboard.pm:190
+#, c-format
+msgid "Irish"
+msgstr "Irsk"
+
+#: keyboard.pm:191
+#, c-format
+msgid "Israeli"
+msgstr "Israelsk"
+
+#: keyboard.pm:192
+#, c-format
+msgid "Israeli (Phonetic)"
+msgstr "Israelsk (fonetisk)"
+
+#: keyboard.pm:193
+#, c-format
+msgid "Iranian"
+msgstr "Iransk"
+
+#: keyboard.pm:194
+#, c-format
+msgid "Icelandic"
+msgstr "Islandsk"
+
+#: keyboard.pm:195
+#, c-format
+msgid "Italian"
+msgstr "Italiensk"
+
+#: keyboard.pm:196
+#, c-format
+msgid "Inuktitut"
+msgstr "Inuittisk"
+
+#: keyboard.pm:200
+#, c-format
+msgid "Japanese 106 keys"
+msgstr ""
+
+#: keyboard.pm:201
+#, c-format
+msgid "Kannada"
+msgstr "Kannada"
+
+#: keyboard.pm:204
+#, c-format
+msgid "Korean keyboard"
+msgstr "Koreansk tastatur"
+
+#: keyboard.pm:205
+#, c-format
+msgid "Latin American"
+msgstr "Latin-Amerika"
+
+#: keyboard.pm:206
+#, c-format
+msgid "Laotian"
+msgstr ""
+
+#: keyboard.pm:207
+#, c-format
+msgid "Lithuanian AZERTY (old)"
+msgstr ""
+
+#: keyboard.pm:209
+#, c-format
+msgid "Lithuanian AZERTY (new)"
+msgstr ""
+
+#: keyboard.pm:210
+#, c-format
+msgid "Lithuanian \"number row\" QWERTY"
+msgstr ""
+
+#: keyboard.pm:211
+#, c-format
+msgid "Lithuanian \"phonetic\" QWERTY"
+msgstr ""
+
+#: keyboard.pm:212
+#, c-format
+msgid "Latvian"
+msgstr "Latvisk"
+
+#: keyboard.pm:213
+#, c-format
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: keyboard.pm:214
+#, c-format
+msgid "Macedonian"
+msgstr "Makedonsk"
+
+#: keyboard.pm:215
+#, c-format
+msgid "Myanmar (Burmese)"
+msgstr ""
+
+#: keyboard.pm:216
+#, c-format
+msgid "Mongolian (cyrillic)"
+msgstr "Mongolsk (kyrillisk)"
+
+#: keyboard.pm:217
+#, c-format
+msgid "Maltese (UK)"
+msgstr "Maltesisk (Storbritannia)"
+
+#: keyboard.pm:218
+#, c-format
+msgid "Maltese (US)"
+msgstr "Maltesisk (USA)"
+
+#: keyboard.pm:219
+#, c-format
+msgid "Dutch"
+msgstr "Nederlandsk"
+
+#: keyboard.pm:221
+#, c-format
+msgid "Oriya"
+msgstr "Oriya"
+
+#: keyboard.pm:222
+#, c-format
+msgid "Polish (qwerty layout)"
+msgstr "Polsk (QWERTY-oppsett)"
+
+#: keyboard.pm:223
+#, c-format
+msgid "Polish (qwertz layout)"
+msgstr "Polsk (QWERTZ-oppsett)"
+
+#: keyboard.pm:224
+#, c-format
+msgid "Portuguese"
+msgstr "Portugisisk"
+
+#: keyboard.pm:225
+#, c-format
+msgid "Canadian (Quebec)"
+msgstr ""
+
+#: keyboard.pm:227
+#, c-format
+msgid "Romanian (qwertz)"
+msgstr "Rumensk (QWERTZ)"
+
+#: keyboard.pm:228
+#, c-format
+msgid "Romanian (qwerty)"
+msgstr "Romansk (QWERTZY)"
+
+#: keyboard.pm:230
+#, c-format
+msgid "Russian (Phonetic)"
+msgstr "Russisk (fonetisk)"
+
+#: keyboard.pm:231
+#, c-format
+msgid "Saami (norwegian)"
+msgstr "Samisk (norsk)"
+
+#: keyboard.pm:232
+#, c-format
+msgid "Saami (swedish/finnish)"
+msgstr "Samisk (finsk/svensk)"
+
+#: keyboard.pm:234
+#, c-format
+msgid "Slovenian"
+msgstr "Slovensk"
+
+#: keyboard.pm:235
+#, c-format
+msgid "Slovakian (QWERTZ)"
+msgstr "Slovensk (QWERTZ)"
+
+#: keyboard.pm:236
+#, c-format
+msgid "Slovakian (QWERTY)"
+msgstr "Slovensk (QWERTY)"
+
+#: keyboard.pm:238
+#, c-format
+msgid "Serbian (cyrillic)"
+msgstr "Serbisk (kyrillisk)"
+
+#: keyboard.pm:239
+#, fuzzy, c-format
+msgid "Syriac"
+msgstr "Syrisk"
+
+#: keyboard.pm:240
+#, c-format
+msgid "Syriac (phonetic)"
+msgstr ""
+
+#: keyboard.pm:241
+#, c-format
+msgid "Telugu"
+msgstr "Telugu"
+
+#: keyboard.pm:243
+#, c-format
+msgid "Tamil (ISCII-layout)"
+msgstr "Tamil (ISCII-oppsett)"
+
+#: keyboard.pm:244
+#, c-format
+msgid "Tamil (Typewriter-layout)"
+msgstr "Tamil (skrivemaskin-oppsett)"
+
+#: keyboard.pm:245
+#, c-format
+msgid "Thai keyboard"
+msgstr "Thai-tastatur"
+
+#: keyboard.pm:247
+#, c-format
+msgid "Tajik keyboard"
+msgstr "Tadsjikisk tastatur"
+
+#: keyboard.pm:248
+#, c-format
+msgid "Turkish (traditional \"F\" model)"
+msgstr "Tyrkisk (tradisjonell F-modell)"
+
+#: keyboard.pm:249
+#, c-format
+msgid "Turkish (modern \"Q\" model)"
+msgstr "Tyrkisk (moderne Q-modell)"
+
+#: keyboard.pm:251
+#, c-format
+msgid "Ukrainian"
+msgstr "Ukrainsk"
+
+#: keyboard.pm:254
+#, c-format
+msgid "US keyboard (international)"
+msgstr "USA-tastatur (internasjonalt)"
+
+#: keyboard.pm:255
+#, c-format
+msgid "Uzbek (cyrillic)"
+msgstr "Usbekisk (kyrillisk)"
+
+#: keyboard.pm:256
+#, c-format
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr ""
+
+#: keyboard.pm:257
+#, c-format
+msgid "Yugoslavian (latin)"
+msgstr ""
+
+#: keyboard.pm:264
+#, c-format
+msgid "Right Alt key"
+msgstr "«Alt Gr»"
+
+#: keyboard.pm:265
+#, c-format
+msgid "Both Shift keys simultaneously"
+msgstr "Begge «Shift»-tastane samtidig"
+
+#: keyboard.pm:266
+#, c-format
+msgid "Control and Shift keys simultaneously"
+msgstr "«Ctrl» og «Shift» samtidig"
+
+#: keyboard.pm:267
+#, c-format
+msgid "CapsLock key"
+msgstr "«Caps Lock»"
+
+#: keyboard.pm:268
+#, c-format
+msgid "Ctrl and Alt keys simultaneously"
+msgstr "«Ctrl» og «Alt» samtidig"
+
+#: keyboard.pm:269
+#, c-format
+msgid "Alt and Shift keys simultaneously"
+msgstr "«Alt» og «Shift» samtidig"
+
+#: keyboard.pm:270
+#, c-format
+msgid "\"Menu\" key"
+msgstr "«Meny»"
+
+#: keyboard.pm:271
+#, c-format
+msgid "Left \"Windows\" key"
+msgstr "Venstre «Windows»-tast"
+
+#: keyboard.pm:272
+#, c-format
+msgid "Right \"Windows\" key"
+msgstr "Høgre «Windows»-tast"
+
+#: keyboard.pm:273
+#, c-format
+msgid "Both Control keys simultaneously"
+msgstr "Begge «Ctrl»-tastane samtidig"
+
+#: keyboard.pm:274
+#, c-format
+msgid "Both Alt keys simultaneously"
+msgstr "Begge «Alt»-tastane samtidig"
+
+#: keyboard.pm:275
+#, c-format
+msgid "Left Shift key"
+msgstr "Venstre «Shift»-tast"
+
+#: keyboard.pm:276
+#, c-format
+msgid "Right Shift key"
+msgstr "Høgre «Shift»-tast"
+
+#: keyboard.pm:277
+#, c-format
+msgid "Left Alt key"
+msgstr "Venstre «Alt»-tast"
+
+#: keyboard.pm:278
+#, c-format
+msgid "Left Control key"
+msgstr "Venstre «Ctrl»-tast"
+
+#: keyboard.pm:279
+#, c-format
+msgid "Right Control key"
+msgstr "Høgre «Ctrl»-tast"
+
+#: keyboard.pm:310
+#, c-format
+msgid ""
+"Here you can choose the key or key combination that will \n"
+"allow switching between the different keyboard layouts\n"
+"(eg: latin and non latin)"
+msgstr ""
+
+#: keyboard.pm:315
+#, c-format
+msgid ""
+"This setting will be activated after the installation.\n"
+"During installation, you will need to use the Right Control\n"
+"key to switch between the different keyboard layouts."
+msgstr ""
+
+#: lang.pm:149
+#, c-format
+msgid "default:LTR"
+msgstr "default:LTR"
+
+#: lang.pm:165
+#, c-format
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+#: lang.pm:166
+#, c-format
+msgid "Andorra"
+msgstr "Andorra"
+
+#: lang.pm:167
+#, c-format
+msgid "United Arab Emirates"
+msgstr "Dei sameinte arabiske emirata"
+
+#: lang.pm:168
+#, c-format
+msgid "Antigua and Barbuda"
+msgstr "Antigua og Barbuda"
+
+#: lang.pm:169
+#, c-format
+msgid "Anguilla"
+msgstr "Anguilla"
+
+#: lang.pm:170
+#, c-format
+msgid "Albania"
+msgstr "Albania"
+
+#: lang.pm:171
+#, c-format
+msgid "Armenia"
+msgstr "Armenia"
+
+#: lang.pm:172
+#, c-format
+msgid "Netherlands Antilles"
+msgstr "Dei nederlandske Antillane"
+
+#: lang.pm:173
+#, c-format
+msgid "Angola"
+msgstr "Angola"
+
+#: lang.pm:174
+#, c-format
+msgid "Antarctica"
+msgstr "Antarktika"
+
+#: lang.pm:175 standalone/drakxtv:51
+#, c-format
+msgid "Argentina"
+msgstr "Argentina"
+
+#: lang.pm:176
+#, c-format
+msgid "American Samoa"
+msgstr "Amerikansk Samoa"
+
+#: lang.pm:178 network/adsl_consts.pm:20 standalone/drakxtv:49
+#, c-format
+msgid "Australia"
+msgstr "Australia"
+
+#: lang.pm:179
+#, c-format
+msgid "Aruba"
+msgstr "Aruba"
+
+#: lang.pm:180
+#, c-format
+msgid "Azerbaijan"
+msgstr "Aserbajdsjan"
+
+#: lang.pm:181
+#, c-format
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnia-Hercegovina"
+
+#: lang.pm:182
+#, c-format
+msgid "Barbados"
+msgstr "Barbados"
+
+#: lang.pm:183
+#, c-format
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#: lang.pm:185
+#, c-format
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+#: lang.pm:186
+#, c-format
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+#: lang.pm:187
+#, c-format
+msgid "Bahrain"
+msgstr "Bahrain"
+
+#: lang.pm:188
+#, c-format
+msgid "Burundi"
+msgstr "Burundi"
+
+#: lang.pm:189
+#, c-format
+msgid "Benin"
+msgstr "Benin"
+
+#: lang.pm:190
+#, c-format
+msgid "Bermuda"
+msgstr "Bermuda"
+
+#: lang.pm:191
+#, c-format
+msgid "Brunei Darussalam"
+msgstr "Brunei"
+
+#: lang.pm:192
+#, c-format
+msgid "Bolivia"
+msgstr "Bolivia"
+
+#: lang.pm:193
+#, c-format
+msgid "Brazil"
+msgstr "Brasil"
+
+#: lang.pm:194
+#, c-format
+msgid "Bahamas"
+msgstr "Bahamas"
+
+#: lang.pm:195
+#, c-format
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#: lang.pm:196
+#, c-format
+msgid "Bouvet Island"
+msgstr "Bouvetøya"
+
+#: lang.pm:197
+#, c-format
+msgid "Botswana"
+msgstr "Botswana"
+
+#: lang.pm:198
+#, c-format
+msgid "Belarus"
+msgstr "Kviterussland"
+
+#: lang.pm:199
+#, c-format
+msgid "Belize"
+msgstr "Belize"
+
+#: lang.pm:200
+#, c-format
+msgid "Canada"
+msgstr "Canada"
+
+#: lang.pm:201
+#, c-format
+msgid "Cocos (Keeling) Islands"
+msgstr "Kokosøyane"
+
+#: lang.pm:202
+#, c-format
+msgid "Congo (Kinshasa)"
+msgstr ""
+
+#: lang.pm:203
+#, c-format
+msgid "Central African Republic"
+msgstr "Den sentralafrikanske republikken"
+
+#: lang.pm:204
+#, c-format
+msgid "Congo (Brazzaville)"
+msgstr ""
+
+#: lang.pm:205
+#, c-format
+msgid "Switzerland"
+msgstr "Sveits"
+
+#: lang.pm:206
+#, c-format
+msgid "Cote d'Ivoire"
+msgstr "Elfenbeinskysten"
+
+#: lang.pm:207
+#, c-format
+msgid "Cook Islands"
+msgstr "Cookøyane"
+
+#: lang.pm:208
+#, c-format
+msgid "Chile"
+msgstr "Chile"
+
+#: lang.pm:209
+#, c-format
+msgid "Cameroon"
+msgstr "Kamerun"
+
+#: lang.pm:210
+#, c-format
+msgid "China"
+msgstr "Kina"
+
+#: lang.pm:211
+#, c-format
+msgid "Colombia"
+msgstr "Colombia"
+
+#: lang.pm:213
+#, c-format
+msgid "Cuba"
+msgstr "Cuba"
+
+#: lang.pm:214
+#, c-format
+msgid "Cape Verde"
+msgstr "Kapp Verde"
+
+#: lang.pm:215
+#, c-format
+msgid "Christmas Island"
+msgstr "Christmasøya"
+
+#: lang.pm:216
+#, c-format
+msgid "Cyprus"
+msgstr "Kypros"
+
+#: lang.pm:219
+#, c-format
+msgid "Djibouti"
+msgstr "Djibouti"
+
+#: lang.pm:220
+#, c-format
+msgid "Denmark"
+msgstr "Danmark"
+
+#: lang.pm:221
+#, c-format
+msgid "Dominica"
+msgstr "Dominica"
+
+#: lang.pm:222
+#, c-format
+msgid "Dominican Republic"
+msgstr "Den dominikanske republikken"
+
+#: lang.pm:223
+#, c-format
+msgid "Algeria"
+msgstr "Algerie"
+
+#: lang.pm:224
+#, c-format
+msgid "Ecuador"
+msgstr "Ecuador"
+
+#: lang.pm:225
+#, c-format
+msgid "Estonia"
+msgstr "Estland"
+
+#: lang.pm:226
+#, c-format
+msgid "Egypt"
+msgstr "Egypt"
+
+#: lang.pm:227
+#, c-format
+msgid "Western Sahara"
+msgstr "Vest-Sahara"
+
+#: lang.pm:228
+#, c-format
+msgid "Eritrea"
+msgstr "Eritrea"
+
+#: 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 "Spania"
+
+#: lang.pm:230
+#, c-format
+msgid "Ethiopia"
+msgstr "Etiopia"
+
+#: lang.pm:231 network/adsl_consts.pm:127
+#, c-format
+msgid "Finland"
+msgstr "Finland"
+
+#: lang.pm:232
+#, c-format
+msgid "Fiji"
+msgstr "Fiji"
+
+#: lang.pm:233
+#, c-format
+msgid "Falkland Islands (Malvinas)"
+msgstr "Falklandsøyane"
+
+#: lang.pm:234
+#, c-format
+msgid "Micronesia"
+msgstr "Mikronesiaføderasjonen"
+
+#: lang.pm:235
+#, c-format
+msgid "Faroe Islands"
+msgstr "Færøyane"
+
+#: lang.pm:237
+#, c-format
+msgid "Gabon"
+msgstr "Gabon"
+
+#: lang.pm:238 network/adsl_consts.pm:247 network/adsl_consts.pm:255
+#: network/netconnect.pm:51
+#, c-format
+msgid "United Kingdom"
+msgstr "Storbritannia"
+
+#: lang.pm:239
+#, c-format
+msgid "Grenada"
+msgstr "Grenada"
+
+#: lang.pm:240
+#, c-format
+msgid "Georgia"
+msgstr "Georgia"
+
+#: lang.pm:241
+#, c-format
+msgid "French Guiana"
+msgstr "Fransk Guyana"
+
+#: lang.pm:242
+#, c-format
+msgid "Ghana"
+msgstr "Ghana"
+
+#: lang.pm:243
+#, c-format
+msgid "Gibraltar"
+msgstr "Gibraltar"
+
+#: lang.pm:244
+#, c-format
+msgid "Greenland"
+msgstr "Grønland"
+
+#: lang.pm:245
+#, c-format
+msgid "Gambia"
+msgstr "Gambia"
+
+#: lang.pm:246
+#, c-format
+msgid "Guinea"
+msgstr "Guinea"
+
+#: lang.pm:247
+#, c-format
+msgid "Guadeloupe"
+msgstr "Guadeloupe"
+
+#: lang.pm:248
+#, c-format
+msgid "Equatorial Guinea"
+msgstr "Ekvatorial-Guinea"
+
+#: lang.pm:250
+#, c-format
+msgid "South Georgia and the South Sandwich Islands"
+msgstr "Sør-Georgia og dei sørlege Sandwichøyane"
+
+#: lang.pm:251
+#, c-format
+msgid "Guatemala"
+msgstr "Guatemala"
+
+#: lang.pm:252
+#, c-format
+msgid "Guam"
+msgstr "Guam"
+
+#: lang.pm:253
+#, c-format
+msgid "Guinea-Bissau"
+msgstr "Guinea-Bissau"
+
+#: lang.pm:254
+#, c-format
+msgid "Guyana"
+msgstr "Guyana"
+
+#: lang.pm:255
+#, c-format
+msgid "China (Hong Kong)"
+msgstr "Kina (Hongkong)"
+
+#: lang.pm:256
+#, c-format
+msgid "Heard and McDonald Islands"
+msgstr ""
+
+#: lang.pm:257
+#, c-format
+msgid "Honduras"
+msgstr "Honduras"
+
+#: lang.pm:258
+#, c-format
+msgid "Croatia"
+msgstr "Kroatia"
+
+#: lang.pm:259
+#, c-format
+msgid "Haiti"
+msgstr "Haiti"
+
+#: lang.pm:260 network/adsl_consts.pm:152
+#, c-format
+msgid "Hungary"
+msgstr "Ungarn"
+
+#: lang.pm:261
+#, c-format
+msgid "Indonesia"
+msgstr "Indonesia"
+
+#: lang.pm:262 standalone/drakxtv:48
+#, c-format
+msgid "Ireland"
+msgstr "Irland"
+
+#: lang.pm:263
+#, c-format
+msgid "Israel"
+msgstr "Israel"
+
+#: lang.pm:264
+#, c-format
+msgid "India"
+msgstr "India"
+
+#: lang.pm:265
+#, fuzzy, c-format
+msgid "British Indian Ocean Territory"
+msgstr "Britisk-Indisk havområde"
+
+#: lang.pm:266
+#, c-format
+msgid "Iraq"
+msgstr "Irak"
+
+#: lang.pm:267
+#, c-format
+msgid "Iran"
+msgstr "Iran"
+
+#: lang.pm:268
+#, c-format
+msgid "Iceland"
+msgstr "Island"
+
+#: lang.pm:270
+#, c-format
+msgid "Jamaica"
+msgstr "Jamaica"
+
+#: lang.pm:271
+#, c-format
+msgid "Jordan"
+msgstr "Jordan"
+
+#: lang.pm:272
+#, c-format
+msgid "Japan"
+msgstr "Japan"
+
+#: lang.pm:273
+#, c-format
+msgid "Kenya"
+msgstr "Kenya"
+
+#: lang.pm:274
+#, c-format
+msgid "Kyrgyzstan"
+msgstr "Kirgisistan"
+
+#: lang.pm:275
+#, c-format
+msgid "Cambodia"
+msgstr "Kambodsja"
+
+#: lang.pm:276
+#, c-format
+msgid "Kiribati"
+msgstr "Kiribati"
+
+#: lang.pm:277
+#, c-format
+msgid "Comoros"
+msgstr "Komorane"
+
+#: lang.pm:278
+#, c-format
+msgid "Saint Kitts and Nevis"
+msgstr "St. Kitts og Nevis"
+
+#: lang.pm:279
+#, c-format
+msgid "Korea (North)"
+msgstr "Nord-Korea"
+
+#: lang.pm:280
+#, c-format
+msgid "Korea"
+msgstr "Sør-Korea"
+
+#: lang.pm:281
+#, c-format
+msgid "Kuwait"
+msgstr "Kuwait"
+
+#: lang.pm:282
+#, c-format
+msgid "Cayman Islands"
+msgstr "Caymanøyane"
+
+#: lang.pm:283
+#, c-format
+msgid "Kazakhstan"
+msgstr "Kasakhstan"
+
+#: lang.pm:284
+#, c-format
+msgid "Laos"
+msgstr "Laos"
+
+#: lang.pm:285
+#, c-format
+msgid "Lebanon"
+msgstr "Libanon"
+
+#: lang.pm:286
+#, c-format
+msgid "Saint Lucia"
+msgstr "St. Lucia"
+
+#: lang.pm:287
+#, c-format
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+#: lang.pm:288
+#, c-format
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: lang.pm:289
+#, c-format
+msgid "Liberia"
+msgstr "Liberia"
+
+#: lang.pm:290
+#, c-format
+msgid "Lesotho"
+msgstr "Lesotho"
+
+#: lang.pm:291
+#, c-format
+msgid "Lithuania"
+msgstr "Litauen"
+
+#: lang.pm:292
+#, c-format
+msgid "Luxembourg"
+msgstr "Luxembourg"
+
+#: lang.pm:293
+#, c-format
+msgid "Latvia"
+msgstr "Latvia"
+
+#: lang.pm:294
+#, c-format
+msgid "Libya"
+msgstr "Libya"
+
+#: lang.pm:295
+#, c-format
+msgid "Morocco"
+msgstr "Marokko"
+
+#: lang.pm:296
+#, c-format
+msgid "Monaco"
+msgstr "Monaco"
+
+#: lang.pm:297
+#, c-format
+msgid "Moldova"
+msgstr "Moldova"
+
+#: lang.pm:298
+#, c-format
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: lang.pm:299
+#, c-format
+msgid "Marshall Islands"
+msgstr "Marshalløyane"
+
+#: lang.pm:300
+#, c-format
+msgid "Macedonia"
+msgstr "Makedonia"
+
+#: lang.pm:301
+#, c-format
+msgid "Mali"
+msgstr "Mali"
+
+#: lang.pm:302
+#, c-format
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: lang.pm:303
+#, c-format
+msgid "Mongolia"
+msgstr "Mongolia"
+
+#: lang.pm:304
+#, c-format
+msgid "Northern Mariana Islands"
+msgstr "Nord-Marianane"
+
+#: lang.pm:305
+#, c-format
+msgid "Martinique"
+msgstr "Martinique"
+
+#: lang.pm:306
+#, c-format
+msgid "Mauritania"
+msgstr "Mauritania"
+
+#: lang.pm:307
+#, c-format
+msgid "Montserrat"
+msgstr "Montserrat"
+
+#: lang.pm:308
+#, c-format
+msgid "Malta"
+msgstr "Malta"
+
+#: lang.pm:309
+#, c-format
+msgid "Mauritius"
+msgstr "Mauritius"
+
+#: lang.pm:310
+#, c-format
+msgid "Maldives"
+msgstr "Maldivane"
+
+#: lang.pm:311
+#, c-format
+msgid "Malawi"
+msgstr "Malawi"
+
+#: lang.pm:312
+#, c-format
+msgid "Mexico"
+msgstr "Mexico"
+
+#: lang.pm:313
+#, c-format
+msgid "Malaysia"
+msgstr "Malaysia"
+
+#: lang.pm:314
+#, c-format
+msgid "Mozambique"
+msgstr "Mosambik"
+
+#: lang.pm:315
+#, c-format
+msgid "Namibia"
+msgstr "Namibia"
+
+#: lang.pm:316
+#, c-format
+msgid "New Caledonia"
+msgstr "Ny-Caledonia"
+
+#: lang.pm:317
+#, c-format
+msgid "Niger"
+msgstr "Niger"
+
+#: lang.pm:318
+#, c-format
+msgid "Norfolk Island"
+msgstr "Norfolkøya"
+
+#: lang.pm:319
+#, c-format
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#: lang.pm:320
+#, c-format
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+#: lang.pm:323
+#, c-format
+msgid "Nepal"
+msgstr "Nepal"
+
+#: lang.pm:324
+#, c-format
+msgid "Nauru"
+msgstr "Nauru"
+
+#: lang.pm:325
+#, c-format
+msgid "Niue"
+msgstr "Niue"
+
+#: lang.pm:326
+#, c-format
+msgid "New Zealand"
+msgstr "New Zealand"
+
+#: lang.pm:327
+#, c-format
+msgid "Oman"
+msgstr "Oman"
+
+#: lang.pm:328
+#, c-format
+msgid "Panama"
+msgstr "Panama"
+
+#: lang.pm:329
+#, c-format
+msgid "Peru"
+msgstr "Peru"
+
+#: lang.pm:330
+#, c-format
+msgid "French Polynesia"
+msgstr "Fransk Polynesia"
+
+#: lang.pm:331
+#, c-format
+msgid "Papua New Guinea"
+msgstr "Papua Ny-Guinea"
+
+#: lang.pm:332
+#, c-format
+msgid "Philippines"
+msgstr "Filippinane"
+
+#: lang.pm:333
+#, c-format
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: lang.pm:334 network/adsl_consts.pm:186
+#, c-format
+msgid "Poland"
+msgstr "Polen"
+
+#: lang.pm:335
+#, c-format
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint-Pierre-et-Miquelon"
+
+#: lang.pm:336
+#, c-format
+msgid "Pitcairn"
+msgstr "Pitcairn"
+
+#: lang.pm:337
+#, c-format
+msgid "Puerto Rico"
+msgstr "Puerto Rico"
+
+#: lang.pm:338
+#, c-format
+msgid "Palestine"
+msgstr "Palestina"
+
+#: lang.pm:339 network/adsl_consts.pm:196
+#, c-format
+msgid "Portugal"
+msgstr "Portugal"
+
+#: lang.pm:340
+#, c-format
+msgid "Paraguay"
+msgstr "Paraguay"
+
+#: lang.pm:341
+#, c-format
+msgid "Palau"
+msgstr "Palau"
+
+#: lang.pm:342
+#, c-format
+msgid "Qatar"
+msgstr "Qatar"
+
+#: lang.pm:343
+#, c-format
+msgid "Reunion"
+msgstr "Réunion"
+
+#: lang.pm:344
+#, c-format
+msgid "Romania"
+msgstr "Romania"
+
+#: lang.pm:345
+#, c-format
+msgid "Russia"
+msgstr "Russland"
+
+#: lang.pm:346
+#, c-format
+msgid "Rwanda"
+msgstr "Rwanda"
+
+#: lang.pm:347
+#, c-format
+msgid "Saudi Arabia"
+msgstr "Saudi-Arabia"
+
+#: lang.pm:348
+#, c-format
+msgid "Solomon Islands"
+msgstr "Salomonøyane"
+
+#: lang.pm:349
+#, c-format
+msgid "Seychelles"
+msgstr "Seychellane"
+
+#: lang.pm:350
+#, c-format
+msgid "Sudan"
+msgstr "Sudan"
+
+#: lang.pm:352
+#, c-format
+msgid "Singapore"
+msgstr "Singapore"
+
+#: lang.pm:353
+#, c-format
+msgid "Saint Helena"
+msgstr "St. Helena"
+
+#: lang.pm:354
+#, c-format
+msgid "Slovenia"
+msgstr "Slovenia"
+
+#: lang.pm:355
+#, c-format
+msgid "Svalbard and Jan Mayen Islands"
+msgstr "Svalbard og Jan Mayen"
+
+#: lang.pm:356
+#, c-format
+msgid "Slovakia"
+msgstr "Slovakia"
+
+#: lang.pm:357
+#, c-format
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+#: lang.pm:358
+#, c-format
+msgid "San Marino"
+msgstr "San Marino"
+
+#: lang.pm:359
+#, c-format
+msgid "Senegal"
+msgstr "Senegal"
+
+#: lang.pm:360
+#, c-format
+msgid "Somalia"
+msgstr "Somalia"
+
+#: lang.pm:361
+#, c-format
+msgid "Suriname"
+msgstr "Surinam"
+
+#: lang.pm:362
+#, c-format
+msgid "Sao Tome and Principe"
+msgstr "São Tomé og Príncipe"
+
+#: lang.pm:363
+#, c-format
+msgid "El Salvador"
+msgstr "El Salvador"
+
+#: lang.pm:364
+#, c-format
+msgid "Syria"
+msgstr "Syria"
+
+#: lang.pm:365
+#, c-format
+msgid "Swaziland"
+msgstr "Swaziland"
+
+#: lang.pm:366
+#, c-format
+msgid "Turks and Caicos Islands"
+msgstr "Turks- og Caicosøyane"
+
+#: lang.pm:367
+#, c-format
+msgid "Chad"
+msgstr "Tsjad"
+
+#: lang.pm:368
+#, c-format
+msgid "French Southern Territories"
+msgstr ""
+
+#: lang.pm:369
+#, c-format
+msgid "Togo"
+msgstr "Togo"
+
+#: lang.pm:370
+#, c-format
+msgid "Thailand"
+msgstr "Thailand"
+
+#: lang.pm:371
+#, c-format
+msgid "Tajikistan"
+msgstr "Tadsjikistan"
+
+#: lang.pm:372
+#, c-format
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#: lang.pm:373
+#, c-format
+msgid "East Timor"
+msgstr "Aust-Timor"
+
+#: lang.pm:374
+#, c-format
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+#: lang.pm:375
+#, c-format
+msgid "Tunisia"
+msgstr "Tunisia"
+
+#: lang.pm:376
+#, c-format
+msgid "Tonga"
+msgstr "Tonga"
+
+#: lang.pm:377
+#, c-format
+msgid "Turkey"
+msgstr "Turkey"
+
+#: lang.pm:378
+#, c-format
+msgid "Trinidad and Tobago"
+msgstr "Trinidad og Tobago"
+
+#: lang.pm:379
+#, c-format
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+#: lang.pm:380
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: lang.pm:381
+#, c-format
+msgid "Tanzania"
+msgstr "Tanzania"
+
+#: lang.pm:382
+#, c-format
+msgid "Ukraine"
+msgstr "Ukraina"
+
+#: lang.pm:383
+#, c-format
+msgid "Uganda"
+msgstr "Uganda"
+
+#: lang.pm:384
+#, c-format
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: lang.pm:386
+#, c-format
+msgid "Uruguay"
+msgstr "Uruguay"
+
+#: lang.pm:387
+#, c-format
+msgid "Uzbekistan"
+msgstr "Usbekistan"
+
+#: lang.pm:388
+#, c-format
+msgid "Vatican"
+msgstr "Vatikanstaten"
+
+#: lang.pm:389
+#, c-format
+msgid "Saint Vincent and the Grenadines"
+msgstr "St. Vincent og Grenadinane"
+
+#: lang.pm:390
+#, c-format
+msgid "Venezuela"
+msgstr "Venezuela"
+
+#: lang.pm:391
+#, c-format
+msgid "Virgin Islands (British)"
+msgstr "Jomfruøyane (Storbritannia)"
+
+#: lang.pm:392
+#, c-format
+msgid "Virgin Islands (U.S.)"
+msgstr "Jomfruøyane (USA)"
+
+#: lang.pm:393
+#, c-format
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: lang.pm:394
+#, c-format
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: lang.pm:395
+#, c-format
+msgid "Wallis and Futuna"
+msgstr ""
+
+#: lang.pm:396
+#, c-format
+msgid "Samoa"
+msgstr "Samoa"
+
+#: lang.pm:397
+#, c-format
+msgid "Yemen"
+msgstr "Jemen"
+
+#: lang.pm:398
+#, c-format
+msgid "Mayotte"
+msgstr "Mayotte"
+
+#: lang.pm:399
+#, c-format
+msgid "Serbia & Montenegro"
+msgstr "Serbia og Montenegro"
+
+#: lang.pm:400 standalone/drakxtv:50
+#, c-format
+msgid "South Africa"
+msgstr "Sør-Afrika"
+
+#: lang.pm:401
+#, c-format
+msgid "Zambia"
+msgstr "Zambia"
+
+#: lang.pm:402
+#, c-format
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+#: lang.pm:983
+#, c-format
+msgid "Welcome to %s"
+msgstr "Velkommen til %s"
+
+#: loopback.pm:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Sirkelmontering %s\n"
+
+#: lvm.pm:115
+#, c-format
+msgid "Remove the logical volumes first\n"
+msgstr "Du må først fjerna det logiske dataområdet.\n"
+
+#: modules/interactive.pm:21 standalone/drakconnect:959
+#, c-format
+msgid "Parameters"
+msgstr "Parametrar"
+
+#: modules/interactive.pm:21 standalone/draksec:44
+#, c-format
+msgid "NONE"
+msgstr "INGEN"
+
+#: modules/interactive.pm:22
+#, c-format
+msgid "Module configuration"
+msgstr "Moduloppsett"
+
+#: modules/interactive.pm:22
+#, c-format
+msgid "You can configure each parameter of the module here."
+msgstr ""
+
+#: modules/interactive.pm:63
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Fann %s %s-grensesnitt"
+
+#: modules/interactive.pm:64
+#, c-format
+msgid "Do you have another one?"
+msgstr "Har du fleire?"
+
+#: modules/interactive.pm:65
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Har du fleire %s-grensesnitt?"
+
+#: modules/interactive.pm:71
+#, c-format
+msgid "See hardware info"
+msgstr "Sjå maskinvareinformasjon"
+
+#  -PO: the first %s is the card type (scsi, network, sound,...)
+#  -PO: the second is the vendor+model name
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: modules/interactive.pm:87
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Installerer drivaren til %s-kortet «%s»"
+
+#: modules/interactive.pm:87
+#, c-format
+msgid "(module %s)"
+msgstr "(modul «%s»)"
+
+#: modules/interactive.pm:98
+#, c-format
+msgid ""
+"You may now provide options to module %s.\n"
+"Note that any address should be entered with the prefix 0x like '0x123'"
+msgstr ""
+
+#: modules/interactive.pm:104
+#, c-format
+msgid ""
+"You may now provide options to module %s.\n"
+"Options are in format ``name=value name2=value2 ...''.\n"
+"For instance, ``io=0x300 irq=7''"
+msgstr ""
+
+#: modules/interactive.pm:106
+#, c-format
+msgid "Module options:"
+msgstr "Modulval:"
+
+#  -PO: the %s is the driver type (scsi, network, sound,...)
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: modules/interactive.pm:118
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Kva %s-drivar vil du bruka?"
+
+#: modules/interactive.pm:127
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without them. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+
+#: modules/interactive.pm:131
+#, c-format
+msgid "Autoprobe"
+msgstr "Automatisk søk"
+
+#: modules/interactive.pm:131
+#, c-format
+msgid "Specify options"
+msgstr "Endra innstillingar"
+
+#: modules/interactive.pm:143
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+
+#: modules/parameters.pm:49
+#, c-format
+msgid "a number"
+msgstr "eit tal"
+
+#: modules/parameters.pm:51
+#, c-format
+msgid "%d comma separated numbers"
+msgstr "%d kommadelte tal"
+
+#: modules/parameters.pm:51
+#, c-format
+msgid "%d comma separated strings"
+msgstr "%d kommadelte tekstar"
+
+#: modules/parameters.pm:53
+#, c-format
+msgid "comma separated numbers"
+msgstr "commadelte tal"
+
+#: modules/parameters.pm:53
+#, c-format
+msgid "comma separated strings"
+msgstr "kommadelte tekstar"
+
+#: mouse.pm:25
+#, c-format
+msgid "Sun - Mouse"
+msgstr "Sun-mus"
+
+#: mouse.pm:31 security/level.pm:12
+#, c-format
+msgid "Standard"
+msgstr "Standard"
+
+#: mouse.pm:32
+#, c-format
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
+
+#: mouse.pm:33
+#, c-format
+msgid "Generic PS2 Wheel Mouse"
+msgstr "Generell PS/2-hjulmus"
+
+#: mouse.pm:34
+#, c-format
+msgid "GlidePoint"
+msgstr "GlidePoint"
+
+#: 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 "Automatisk"
+
+#: mouse.pm:39 mouse.pm:73
+#, c-format
+msgid "Kensington Thinking Mouse"
+msgstr ""
+
+#: mouse.pm:40 mouse.pm:68
+#, c-format
+msgid "Genius NetMouse"
+msgstr ""
+
+#: mouse.pm:41
+#, c-format
+msgid "Genius NetScroll"
+msgstr ""
+
+#: mouse.pm:42 mouse.pm:52
+#, c-format
+msgid "Microsoft Explorer"
+msgstr ""
+
+#: mouse.pm:47 mouse.pm:79
+#, c-format
+msgid "1 button"
+msgstr ""
+
+#: mouse.pm:48 mouse.pm:57
+#, c-format
+msgid "Generic 2 Button Mouse"
+msgstr ""
+
+#: mouse.pm:50 mouse.pm:59
+#, c-format
+msgid "Generic 3 Button Mouse with Wheel emulation"
+msgstr ""
+
+#: mouse.pm:51
+#, c-format
+msgid "Wheel"
+msgstr "Hjul"
+
+#: mouse.pm:55
+#, c-format
+msgid "serial"
+msgstr "seriell"
+
+#: mouse.pm:58
+#, c-format
+msgid "Generic 3 Button Mouse"
+msgstr ""
+
+#: mouse.pm:60
+#, c-format
+msgid "Microsoft IntelliMouse"
+msgstr ""
+
+#: mouse.pm:61
+#, c-format
+msgid "Logitech MouseMan"
+msgstr ""
+
+#: mouse.pm:62
+#, c-format
+msgid "Logitech MouseMan with Wheel emulation"
+msgstr ""
+
+#: mouse.pm:63
+#, c-format
+msgid "Mouse Systems"
+msgstr ""
+
+#: mouse.pm:65
+#, c-format
+msgid "Logitech CC Series"
+msgstr ""
+
+#: mouse.pm:66
+#, c-format
+msgid "Logitech CC Series with Wheel emulation"
+msgstr ""
+
+#: mouse.pm:67
+#, c-format
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr ""
+
+#: mouse.pm:69
+#, c-format
+msgid "MM Series"
+msgstr ""
+
+#: mouse.pm:70
+#, c-format
+msgid "MM HitTablet"
+msgstr ""
+
+#: mouse.pm:71
+#, c-format
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr ""
+
+#: mouse.pm:72
+#, c-format
+msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
+msgstr ""
+
+#: mouse.pm:74
+#, c-format
+msgid "Kensington Thinking Mouse with Wheel emulation"
+msgstr ""
+
+#: mouse.pm:77
+#, c-format
+msgid "busmouse"
+msgstr ""
+
+#: mouse.pm:80
+#, c-format
+msgid "2 buttons"
+msgstr ""
+
+#: mouse.pm:81
+#, c-format
+msgid "3 buttons"
+msgstr ""
+
+#: mouse.pm:82
+#, c-format
+msgid "3 buttons with Wheel emulation"
+msgstr ""
+
+#: mouse.pm:86
+#, c-format
+msgid "Universal"
+msgstr "Universell"
+
+#: mouse.pm:88
+#, c-format
+msgid "Any PS/2 & USB mice"
+msgstr ""
+
+#: mouse.pm:92 standalone/drakvpn:1138
+#, c-format
+msgid "none"
+msgstr "ingen"
+
+#: mouse.pm:94
+#, c-format
+msgid "No mouse"
+msgstr "Inga mus"
+
+#: mouse.pm:515
+#, c-format
+msgid "Please test the mouse"
+msgstr ""
+
+#: mouse.pm:517
+#, c-format
+msgid "To activate the mouse,"
+msgstr ""
+
+#: mouse.pm:518
+#, c-format
+msgid "MOVE YOUR WHEEL!"
+msgstr ""
+
+#: network/adsl.pm:19
+#, c-format
+msgid "use pppoe"
+msgstr ""
+
+#: network/adsl.pm:20
+#, c-format
+msgid "use pptp"
+msgstr ""
+
+#: network/adsl.pm:21
+#, c-format
+msgid "use dhcp"
+msgstr ""
+
+#: network/adsl.pm:22
+#, c-format
+msgid "Alcatel speedtouch usb"
+msgstr ""
+
+#: network/adsl.pm:22 network/adsl.pm:23 network/adsl.pm:24
+#, c-format
+msgid " - detected"
+msgstr ""
+
+#: network/adsl.pm:23
+#, c-format
+msgid "Sagem (using pppoa) usb"
+msgstr ""
+
+#: network/adsl.pm:24
+#, c-format
+msgid "Sagem (using dhcp) usb"
+msgstr ""
+
+#: network/adsl.pm:35 network/netconnect.pm:754
+#, c-format
+msgid "Connect to the Internet"
+msgstr "Kobla til Internett"
+
+#: network/adsl.pm:36 network/netconnect.pm:755
+#, c-format
+msgid ""
+"The most common way to connect with adsl is pppoe.\n"
+"Some connections use pptp, a few use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+
+#: network/adsl.pm:41 network/netconnect.pm:759
+#, c-format
+msgid "ADSL connection type :"
+msgstr ""
+
+#: network/drakfirewall.pm:12
+#, c-format
+msgid "Web Server"
+msgstr ""
+
+#: network/drakfirewall.pm:17
+#, c-format
+msgid "Domain Name Server"
+msgstr ""
+
+#: network/drakfirewall.pm:22
+#, c-format
+msgid "SSH server"
+msgstr "SSH-tenar"
+
+#: network/drakfirewall.pm:27
+#, c-format
+msgid "FTP server"
+msgstr "FTP-tenar"
+
+#: network/drakfirewall.pm:32
+#, c-format
+msgid "Mail Server"
+msgstr "E-posttenar"
+
+#: network/drakfirewall.pm:37
+#, c-format
+msgid "POP and IMAP Server"
+msgstr "POP- og IMAP-tenar"
+
+#: network/drakfirewall.pm:42
+#, c-format
+msgid "Telnet server"
+msgstr "Telnet-tenar"
+
+#: network/drakfirewall.pm:48
+#, c-format
+msgid "Samba server"
+msgstr "Samba-tenar"
+
+#: network/drakfirewall.pm:54
+#, c-format
+msgid "CUPS server"
+msgstr "CUPS-tenar"
+
+#: network/drakfirewall.pm:60
+#, c-format
+msgid "Echo request (ping)"
+msgstr ""
+
+#: network/drakfirewall.pm:125
+#, c-format
+msgid "No network card"
+msgstr "Ingen nettverkskort"
+
+#: network/drakfirewall.pm:146
+#, c-format
+msgid ""
+"drakfirewall configurator\n"
+"\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 ""
+
+#: network/drakfirewall.pm:152
+#, c-format
+msgid ""
+"drakfirewall configurator\n"
+"\n"
+"Make sure you have configured your Network/Internet access with\n"
+"drakconnect before going any further."
+msgstr ""
+
+#: network/drakfirewall.pm:169
+#, c-format
+msgid "Which services would you like to allow the Internet to connect to?"
+msgstr ""
+
+#: network/drakfirewall.pm:170
+#, c-format
+msgid ""
+"You can enter miscellaneous ports. \n"
+"Valid examples are: 139/tcp 139/udp 600:610/tcp 600:610/udp.\n"
+"Have a look at /etc/services for information."
+msgstr ""
+
+#: network/drakfirewall.pm:176
+#, c-format
+msgid ""
+"Invalid port given: %s.\n"
+"The proper format is \"port/tcp\" or \"port/udp\", \n"
+"where port is between 1 and 65535.\n"
+"\n"
+"You can also give a range of ports (eg: 24300:24350/udp)"
+msgstr ""
+
+#: network/drakfirewall.pm:186
+#, c-format
+msgid "Everything (no firewall)"
+msgstr ""
+
+#: network/drakfirewall.pm:188
+#, c-format
+msgid "Other ports"
+msgstr "Andre portar"
+
+#: network/isdn.pm:113 network/netconnect.pm:424
+#, c-format
+msgid "Unlisted - edit manually"
+msgstr ""
+
+#: network/isdn.pm:156 network/netconnect.pm:376
+#, c-format
+msgid "ISA / PCMCIA"
+msgstr ""
+
+#: network/isdn.pm:156 network/netconnect.pm:376
+#, c-format
+msgid "I don't know"
+msgstr "Eg veit ikkje"
+
+#: network/isdn.pm:157 network/netconnect.pm:376
+#, c-format
+msgid "PCI"
+msgstr "PCI"
+
+#: network/isdn.pm:158 network/netconnect.pm:376
+#, c-format
+msgid "USB"
+msgstr "USB"
+
+#: 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 "Manual"
+msgstr "Manuelt"
+
+#: network/netconnect.pm:88 network/netconnect.pm:453
+#: network/netconnect.pm:463 network/netconnect.pm:822
+#: network/netconnect.pm:827
+#, c-format
+msgid "Manual choice"
+msgstr ""
+
+#: network/netconnect.pm:88
+#, c-format
+msgid "Internal ISDN card"
+msgstr ""
+
+#: network/netconnect.pm:97
+#, c-format
+msgid "Ad-hoc"
+msgstr ""
+
+#: network/netconnect.pm:98
+#, c-format
+msgid "Managed"
+msgstr ""
+
+#: network/netconnect.pm:99
+#, c-format
+msgid "Master"
+msgstr ""
+
+#: network/netconnect.pm:100
+#, c-format
+msgid "Repeater"
+msgstr ""
+
+#: network/netconnect.pm:101
+#, c-format
+msgid "Secondary"
+msgstr "Sekundær"
+
+#: network/netconnect.pm:102
+#, c-format
+msgid "Auto"
+msgstr "Automatisk"
+
+#: network/netconnect.pm:105 printer/printerdrake.pm:1133
+#: standalone/drakups:64
+#, c-format
+msgid "Manual configuration"
+msgstr "Manuelt oppsett"
+
+#: network/netconnect.pm:106
+#, c-format
+msgid "Automatic IP (BOOTP/DHCP)"
+msgstr "Automatisk IP (BOOTP/DHCP)"
+
+#: network/netconnect.pm:108
+#, c-format
+msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
+msgstr ""
+
+#: network/netconnect.pm:111
+#, c-format
+msgid "Protocol for the rest of the world"
+msgstr ""
+
+#: network/netconnect.pm:113 standalone/drakconnect:528
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr ""
+
+#: network/netconnect.pm:114 standalone/drakconnect:529
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+
+#: network/netconnect.pm:146
+#, c-format
+msgid "Alcatel speedtouch USB modem"
+msgstr ""
+
+#: network/netconnect.pm:147
+#, c-format
+msgid "Sagem USB modem"
+msgstr ""
+
+#: network/netconnect.pm:148
+#, c-format
+msgid "Bewan modem"
+msgstr ""
+
+#: network/netconnect.pm:149
+#, c-format
+msgid "ECI Hi-Focus modem"
+msgstr ""
+
+#: network/netconnect.pm:153
+#, c-format
+msgid "Dynamic Host Configuration Protocol (DHCP)"
+msgstr ""
+
+#: network/netconnect.pm:154
+#, c-format
+msgid "Manual TCP/IP configuration"
+msgstr ""
+
+#: network/netconnect.pm:155
+#, c-format
+msgid "Point to Point Tunneling Protocol (PPTP)"
+msgstr ""
+
+#: network/netconnect.pm:156
+#, c-format
+msgid "PPP over Ethernet (PPPoE)"
+msgstr ""
+
+#: network/netconnect.pm:157
+#, c-format
+msgid "PPP over ATM (PPPoA)"
+msgstr ""
+
+#: network/netconnect.pm:161
+#, c-format
+msgid "Bridged Ethernet LLC"
+msgstr ""
+
+#: network/netconnect.pm:162
+#, c-format
+msgid "Bridged Ethernet VC"
+msgstr ""
+
+#: network/netconnect.pm:163
+#, c-format
+msgid "Routed IP LLC"
+msgstr ""
+
+#: network/netconnect.pm:164
+#, c-format
+msgid "Routed IP VC"
+msgstr ""
+
+#: network/netconnect.pm:165
+#, c-format
+msgid "PPPOA LLC"
+msgstr ""
+
+#: network/netconnect.pm:166
+#, c-format
+msgid "PPPOA VC"
+msgstr ""
+
+#: network/netconnect.pm:170 standalone/drakconnect:466
+#, c-format
+msgid "Script-based"
+msgstr "Skriptbasert"
+
+#: network/netconnect.pm:171 standalone/drakconnect:466
+#, c-format
+msgid "PAP"
+msgstr "PAP"
+
+#: network/netconnect.pm:172 standalone/drakconnect:466
+#, c-format
+msgid "Terminal-based"
+msgstr "Terminalbasert"
+
+#: network/netconnect.pm:173 standalone/drakconnect:466
+#, c-format
+msgid "CHAP"
+msgstr "CHAP"
+
+#: network/netconnect.pm:174 standalone/drakconnect:466
+#, c-format
+msgid "PAP/CHAP"
+msgstr "PAP/CHAP"
+
+#: network/netconnect.pm:219 standalone/drakconnect:55
+#, c-format
+msgid "Network & Internet Configuration"
+msgstr ""
+
+#: network/netconnect.pm:225
+#, c-format
+msgid "(detected on port %s)"
+msgstr ""
+
+#  -PO: here, "(detected)" string will be appended to eg "ADSL connection"
+#. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
+#: network/netconnect.pm:227
+#, c-format
+msgid "(detected %s)"
+msgstr ""
+
+#: network/netconnect.pm:227
+#, c-format
+msgid "(detected)"
+msgstr ""
+
+#: network/netconnect.pm:229
+#, c-format
+msgid "Modem connection"
+msgstr ""
+
+#: network/netconnect.pm:230
+#, c-format
+msgid "ISDN connection"
+msgstr ""
+
+#: network/netconnect.pm:231
+#, c-format
+msgid "ADSL connection"
+msgstr ""
+
+#: network/netconnect.pm:232
+#, c-format
+msgid "Cable connection"
+msgstr ""
+
+#: network/netconnect.pm:233
+#, c-format
+msgid "LAN connection"
+msgstr ""
+
+#: network/netconnect.pm:234 network/netconnect.pm:248
+#, c-format
+msgid "Wireless connection"
+msgstr ""
+
+#: network/netconnect.pm:244
+#, c-format
+msgid "Choose the connection you want to configure"
+msgstr ""
+
+#: network/netconnect.pm:261
+#, c-format
+msgid ""
+"We are now going to configure the %s connection.\n"
+"\n"
+"\n"
+"Press \"%s\" to continue."
+msgstr ""
+
+#: network/netconnect.pm:269 network/netconnect.pm:781
+#, c-format
+msgid "Connection Configuration"
+msgstr ""
+
+#: network/netconnect.pm:270 network/netconnect.pm:782
+#, c-format
+msgid "Please fill or check the field below"
+msgstr ""
+
+#: network/netconnect.pm:277 standalone/drakconnect:519
+#, c-format
+msgid "Card IRQ"
+msgstr ""
+
+#: network/netconnect.pm:278 standalone/drakconnect:520
+#, c-format
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: network/netconnect.pm:279 standalone/drakconnect:521
+#, c-format
+msgid "Card IO"
+msgstr ""
+
+#: network/netconnect.pm:280 standalone/drakconnect:522
+#, c-format
+msgid "Card IO_0"
+msgstr ""
+
+#: network/netconnect.pm:281
+#, c-format
+msgid "Card IO_1"
+msgstr ""
+
+#: network/netconnect.pm:282
+#, c-format
+msgid "Your personal phone number"
+msgstr ""
+
+#: network/netconnect.pm:283 network/netconnect.pm:785
+#, c-format
+msgid "Provider name (ex provider.net)"
+msgstr ""
+
+#: network/netconnect.pm:284 standalone/drakconnect:463
+#, c-format
+msgid "Provider phone number"
+msgstr ""
+
+#: network/netconnect.pm:285
+#, c-format
+msgid "Provider DNS 1 (optional)"
+msgstr ""
+
+#: network/netconnect.pm:286
+#, c-format
+msgid "Provider DNS 2 (optional)"
+msgstr ""
+
+#: network/netconnect.pm:287 standalone/drakconnect:419
+#, c-format
+msgid "Dialing mode"
+msgstr ""
+
+#: network/netconnect.pm:288 standalone/drakconnect:424
+#: standalone/drakconnect:484
+#, c-format
+msgid "Connection speed"
+msgstr ""
+
+#: network/netconnect.pm:289 standalone/drakconnect:429
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr ""
+
+#: network/netconnect.pm:292 network/netconnect.pm:788
+#: standalone/drakconnect:461
+#, c-format
+msgid "Account Login (user name)"
+msgstr ""
+
+#: network/netconnect.pm:293 network/netconnect.pm:789
+#: standalone/drakconnect:462
+#, c-format
+msgid "Account Password"
+msgstr ""
+
+#: network/netconnect.pm:323 network/netconnect.pm:637
+#: network/netconnect.pm:820
+#, c-format
+msgid "Select the network interface to configure:"
+msgstr ""
+
+#: network/netconnect.pm:323 network/netconnect.pm:457
+#: network/netconnect.pm:641 standalone/drakgw:113 standalone/drakvpn:49
+#, c-format
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr ""
+
+#: 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 ""
+
+#: network/netconnect.pm:326 network/netconnect.pm:334
+#, c-format
+msgid "External ISDN modem"
+msgstr ""
+
+#: network/netconnect.pm:365 standalone/harddrake2:115
+#, c-format
+msgid "Select a device !"
+msgstr "Vel ei eining."
+
+#: 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-oppsett"
+
+#: network/netconnect.pm:375
+#, c-format
+msgid "What kind of card do you have?"
+msgstr ""
+
+#: 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 ""
+
+#: network/netconnect.pm:389
+#, c-format
+msgid "Continue"
+msgstr "Hald fram"
+
+#: network/netconnect.pm:389
+#, c-format
+msgid "Abort"
+msgstr "Avbryt"
+
+#: network/netconnect.pm:395
+#, c-format
+msgid "Which of the following is your ISDN card?"
+msgstr ""
+
+#: network/netconnect.pm:410
+#, c-format
+msgid "Which protocol do you want to use?"
+msgstr ""
+
+#: network/netconnect.pm:412 standalone/drakconnect:116
+#: standalone/drakconnect:527 standalone/drakvpn:1140
+#, c-format
+msgid "Protocol"
+msgstr "Protokoll"
+
+#: network/netconnect.pm:421
+#, c-format
+msgid ""
+"Select your provider.\n"
+"If it isn't listed, choose Unlisted."
+msgstr ""
+
+#: network/netconnect.pm:423 network/netconnect.pm:529
+#: network/netconnect.pm:675
+#, c-format
+msgid "Provider:"
+msgstr ""
+
+#: network/netconnect.pm:438
+#, c-format
+msgid ""
+"Your modem isn't supported by the system.\n"
+"Take a look at http://www.linmodems.org"
+msgstr ""
+
+#: network/netconnect.pm:450
+#, c-format
+msgid "Select the modem to configure:"
+msgstr ""
+
+#: network/netconnect.pm:498
+#, c-format
+msgid "Please choose which serial port your modem is connected to."
+msgstr ""
+
+#: network/netconnect.pm:527
+#, c-format
+msgid "Select your provider:"
+msgstr ""
+
+#: network/netconnect.pm:556
+#, c-format
+msgid "Dialup: account options"
+msgstr ""
+
+#: network/netconnect.pm:559
+#, c-format
+msgid "Connection name"
+msgstr ""
+
+#: network/netconnect.pm:560
+#, c-format
+msgid "Phone number"
+msgstr ""
+
+#: network/netconnect.pm:561
+#, c-format
+msgid "Login ID"
+msgstr ""
+
+#: network/netconnect.pm:576 network/netconnect.pm:609
+#, c-format
+msgid "Dialup: IP parameters"
+msgstr ""
+
+#: network/netconnect.pm:579
+#, c-format
+msgid "IP parameters"
+msgstr ""
+
+#: 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 ""
+
+#: network/netconnect.pm:581
+#, c-format
+msgid "Subnet mask"
+msgstr ""
+
+#: network/netconnect.pm:593
+#, c-format
+msgid "Dialup: DNS parameters"
+msgstr ""
+
+#: network/netconnect.pm:596
+#, c-format
+msgid "DNS"
+msgstr "DNS"
+
+#: network/netconnect.pm:597
+#, c-format
+msgid "Domain name"
+msgstr ""
+
+#: network/netconnect.pm:598 network/netconnect.pm:786
+#: standalone/drakconnect:924
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr ""
+
+#: network/netconnect.pm:599 network/netconnect.pm:787
+#: standalone/drakconnect:925
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr ""
+
+#: network/netconnect.pm:600
+#, c-format
+msgid "Set hostname from IP"
+msgstr ""
+
+#: network/netconnect.pm:612 standalone/drakconnect:336
+#, c-format
+msgid "Gateway"
+msgstr "Portnar"
+
+#: network/netconnect.pm:613
+#, c-format
+msgid "Gateway IP address"
+msgstr "IP-adresse for portnar"
+
+#: network/netconnect.pm:637
+#, c-format
+msgid "ADSL configuration"
+msgstr "ADSL-oppsett"
+
+#: network/netconnect.pm:673
+#, c-format
+msgid "Please choose your ADSL provider"
+msgstr "Vel ADSL-leverandør"
+
+#: network/netconnect.pm:691
+#, c-format
+msgid ""
+"You need the Alcatel microcode.\n"
+"You can provide it now via a floppy or your windows partition,\n"
+"or skip and do it later."
+msgstr ""
+
+#: network/netconnect.pm:695 network/netconnect.pm:700
+#, c-format
+msgid "Use a floppy"
+msgstr "Bruk diskett"
+
+#: network/netconnect.pm:695 network/netconnect.pm:704
+#, c-format
+msgid "Use my Windows partition"
+msgstr "Bruk Windows-partisjon"
+
+#: network/netconnect.pm:695 network/netconnect.pm:708
+#, c-format
+msgid "Do it later"
+msgstr "Gjer det seinare"
+
+#: network/netconnect.pm:715
+#, c-format
+msgid "Firmware copy failed, file %s not found"
+msgstr ""
+
+#: network/netconnect.pm:722
+#, c-format
+msgid "Firmware copy succeeded"
+msgstr ""
+
+#: network/netconnect.pm:737
+#, c-format
+msgid ""
+"You need the Alcatel microcode.\n"
+"Download it at:\n"
+"%s\n"
+"and copy the mgmt.o in /usr/share/speedtouch"
+msgstr ""
+
+#: network/netconnect.pm:790
+#, c-format
+msgid "Virtual Path ID (VPI):"
+msgstr ""
+
+#: network/netconnect.pm:791
+#, c-format
+msgid "Virtual Circuit ID (VCI):"
+msgstr ""
+
+#: network/netconnect.pm:793
+#, c-format
+msgid "Encapsulation :"
+msgstr ""
+
+#: network/netconnect.pm:810
+#, c-format
+msgid ""
+"The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
+"problem.\n"
+"\n"
+"You can find a driver on http://eciadsl.flashtux.org/"
+msgstr ""
+
+#: network/netconnect.pm:837
+#, c-format
+msgid ""
+"WARNING: this device has been previously configured to connect to the "
+"Internet.\n"
+"Simply accept to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
+msgstr ""
+
+#: network/netconnect.pm:850 network/netconnect.pm:1222
+#, c-format
+msgid ""
+"Congratulations, the network and Internet configuration is finished.\n"
+"\n"
+msgstr ""
+
+#: network/netconnect.pm:864
+#, c-format
+msgid "Zeroconf hostname resolution"
+msgstr ""
+
+#: network/netconnect.pm:865 network/netconnect.pm:899
+#, c-format
+msgid "Configuring network device %s (driver %s)"
+msgstr ""
+
+#: network/netconnect.pm:866
+#, c-format
+msgid ""
+"The following protocols can be used to configure an ethernet connection. "
+"Please choose the one you want to use"
+msgstr ""
+
+#: network/netconnect.pm:900
+#, c-format
+msgid ""
+"Please enter the IP configuration for this machine.\n"
+"Each item should be entered as an IP address in dotted-decimal\n"
+"notation (for example, 1.2.3.4)."
+msgstr ""
+
+#: network/netconnect.pm:907
+#, c-format
+msgid "Assign host name from DHCP address"
+msgstr ""
+
+#: network/netconnect.pm:908
+#, c-format
+msgid "DHCP host name"
+msgstr ""
+
+#: network/netconnect.pm:913 standalone/drakconnect:330
+#: standalone/drakconnect:807 standalone/drakgw:321
+#, c-format
+msgid "Netmask"
+msgstr ""
+
+#: network/netconnect.pm:915 standalone/drakconnect:412
+#, c-format
+msgid "Track network card id (useful for laptops)"
+msgstr ""
+
+#: network/netconnect.pm:916 standalone/drakconnect:413
+#, c-format
+msgid "Network Hotplugging"
+msgstr ""
+
+#: network/netconnect.pm:917 standalone/drakconnect:407
+#, c-format
+msgid "Start at boot"
+msgstr ""
+
+#: network/netconnect.pm:919 standalone/drakconnect:810
+#, c-format
+msgid "DHCP client"
+msgstr ""
+
+#: 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 ""
+
+#: network/netconnect.pm:932
+#, c-format
+msgid "Warning : IP address %s is usually reserved !"
+msgstr ""
+
+#: network/netconnect.pm:962 network/netconnect.pm:991
+#, c-format
+msgid "Please enter the wireless parameters for this card:"
+msgstr ""
+
+#: network/netconnect.pm:965 standalone/drakconnect:378
+#, c-format
+msgid "Operating Mode"
+msgstr ""
+
+#: network/netconnect.pm:967 standalone/drakconnect:379
+#, c-format
+msgid "Network name (ESSID)"
+msgstr ""
+
+#: network/netconnect.pm:968 standalone/drakconnect:380
+#, c-format
+msgid "Network ID"
+msgstr ""
+
+#: network/netconnect.pm:969 standalone/drakconnect:381
+#, c-format
+msgid "Operating frequency"
+msgstr ""
+
+#: network/netconnect.pm:970 standalone/drakconnect:382
+#, c-format
+msgid "Sensitivity threshold"
+msgstr ""
+
+#: network/netconnect.pm:971 standalone/drakconnect:383
+#, c-format
+msgid "Bitrate (in b/s)"
+msgstr ""
+
+#: network/netconnect.pm:977
+#, c-format
+msgid ""
+"Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
+"frequency), or add enough '0' (zeroes)."
+msgstr ""
+
+#: network/netconnect.pm:981
+#, c-format
+msgid ""
+"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
+"enough '0' (zeroes)."
+msgstr ""
+
+#: network/netconnect.pm:994 standalone/drakconnect:394
+#, c-format
+msgid "RTS/CTS"
+msgstr ""
+
+#: network/netconnect.pm:995
+#, c-format
+msgid ""
+"RTS/CTS adds a handshake before each packet transmission to make sure that "
+"the\n"
+"channel is clear. This adds overhead, but increase performance in case of "
+"hidden\n"
+"nodes or large number of active nodes. This parameter sets the size of the\n"
+"smallest packet for which the node sends RTS, a value equal to the maximum\n"
+"packet size disable the scheme. You may also set this parameter to auto, "
+"fixed\n"
+"or off."
+msgstr ""
+
+#: network/netconnect.pm:1002 standalone/drakconnect:395
+#, c-format
+msgid "Fragmentation"
+msgstr ""
+
+#: network/netconnect.pm:1003 standalone/drakconnect:396
+#, c-format
+msgid "Iwconfig command extra arguments"
+msgstr ""
+
+#: network/netconnect.pm:1004
+#, c-format
+msgid ""
+"Here, one can configure some extra wireless parameters such as:\n"
+"ap, channel, commit, enc, power, retry, sens, txpower (nick is already set "
+"as the hostname).\n"
+"\n"
+"See iwpconfig(8) man page for further information."
+msgstr ""
+
+#. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
+#: network/netconnect.pm:1011 standalone/drakconnect:397
+#, c-format
+msgid "Iwspy command extra arguments"
+msgstr ""
+
+#: network/netconnect.pm:1012
+#, c-format
+msgid ""
+"Iwspy is used to set a list of addresses in a wireless network\n"
+"interface and to read back quality of link information for each of those.\n"
+"\n"
+"This information is the same as the one available in /proc/net/wireless :\n"
+"quality of the link, signal strength and noise level.\n"
+"\n"
+"See iwpspy(8) man page for further information."
+msgstr ""
+
+#: network/netconnect.pm:1020 standalone/drakconnect:398
+#, c-format
+msgid "Iwpriv command extra arguments"
+msgstr ""
+
+#: network/netconnect.pm:1021
+#, c-format
+msgid ""
+"Iwpriv enable to set up optionals (private) parameters of a wireless "
+"network\n"
+"interface.\n"
+"\n"
+"Iwpriv deals with parameters and setting specific to each driver (as opposed "
+"to\n"
+"iwconfig which deals with generic ones).\n"
+"\n"
+"In theory, the documentation of each device driver should indicate how to "
+"use\n"
+"those interface specific commands and their effect.\n"
+"\n"
+"See iwpriv(8) man page for further information."
+msgstr ""
+
+#: network/netconnect.pm:1048
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+
+#: network/netconnect.pm:1052 standalone/drakgw:261 standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr ""
+
+#: network/netconnect.pm:1053
+#, c-format
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet."
+msgstr ""
+
+#: network/netconnect.pm:1074
+#, c-format
+msgid ""
+"Please enter your host name.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''.\n"
+"You may also enter the IP address of the gateway if you have one."
+msgstr ""
+
+#: network/netconnect.pm:1078
+#, c-format
+msgid "Last but not least you can also type in your DNS server IP addresses."
+msgstr ""
+
+#: network/netconnect.pm:1080 standalone/drakconnect:923
+#, c-format
+msgid "Host name (optional)"
+msgstr ""
+
+#: network/netconnect.pm:1080
+#, c-format
+msgid "Host name"
+msgstr ""
+
+#: network/netconnect.pm:1082
+#, c-format
+msgid "DNS server 1"
+msgstr ""
+
+#: network/netconnect.pm:1083
+#, c-format
+msgid "DNS server 2"
+msgstr ""
+
+#: network/netconnect.pm:1084
+#, c-format
+msgid "DNS server 3"
+msgstr ""
+
+#: network/netconnect.pm:1085
+#, c-format
+msgid "Search domain"
+msgstr ""
+
+#: network/netconnect.pm:1086
+#, c-format
+msgid "By default search domain will be set from the fully-qualified host name"
+msgstr ""
+
+#: network/netconnect.pm:1087
+#, c-format
+msgid "Gateway (e.g. %s)"
+msgstr ""
+
+#: network/netconnect.pm:1089
+#, c-format
+msgid "Gateway device"
+msgstr ""
+
+#: network/netconnect.pm:1098
+#, c-format
+msgid "DNS server address should be in format 1.2.3.4"
+msgstr ""
+
+#: network/netconnect.pm:1103 standalone/drakconnect:611
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr ""
+
+#: network/netconnect.pm:1114
+#, c-format
+msgid ""
+"Enter a Zeroconf host name which will be the one that your machine will get "
+"back to other machines on the network:"
+msgstr ""
+
+#: network/netconnect.pm:1115
+#, c-format
+msgid "Zeroconf Host name"
+msgstr ""
+
+#: network/netconnect.pm:1118
+#, c-format
+msgid "Zeroconf host name must not contain a ."
+msgstr ""
+
+#: network/netconnect.pm:1128
+#, c-format
+msgid ""
+"You have configured multiple ways to connect to the Internet.\n"
+"Choose the one you want to use.\n"
+"\n"
+msgstr ""
+
+#: network/netconnect.pm:1130
+#, c-format
+msgid "Internet connection"
+msgstr ""
+
+#: network/netconnect.pm:1144
+#, c-format
+msgid "Configuration is complete, do you want to apply settings ?"
+msgstr ""
+
+#: network/netconnect.pm:1154
+#, c-format
+msgid "Do you want to start the connection at boot?"
+msgstr ""
+
+#: network/netconnect.pm:1166
+#, c-format
+msgid "The network needs to be restarted. Do you want to restart it ?"
+msgstr ""
+
+#: network/netconnect.pm:1173 network/netconnect.pm:1238
+#, c-format
+msgid "Network Configuration"
+msgstr "Nettverksoppsett"
+
+#: network/netconnect.pm:1174
+#, c-format
+msgid ""
+"A problem occured while restarting the network: \n"
+"\n"
+"%s"
+msgstr ""
+
+#: network/netconnect.pm:1182
+#, c-format
+msgid "Do you want to try to connect to the Internet now?"
+msgstr ""
+
+#: network/netconnect.pm:1190 standalone/drakconnect:955
+#, c-format
+msgid "Testing your connection..."
+msgstr ""
+
+#: network/netconnect.pm:1206
+#, c-format
+msgid "The system is now connected to the Internet."
+msgstr ""
+
+#: network/netconnect.pm:1207
+#, c-format
+msgid "For security reasons, it will be disconnected now."
+msgstr ""
+
+#: network/netconnect.pm:1208
+#, c-format
+msgid ""
+"The system doesn't seem to be connected to the Internet.\n"
+"Try to reconfigure your connection."
+msgstr ""
+
+#: network/netconnect.pm:1225
+#, c-format
+msgid ""
+"After this is done, we recommend that you restart your X environment to "
+"avoid any hostname-related problems."
+msgstr ""
+
+#: network/netconnect.pm:1226
+#, c-format
+msgid ""
+"Problems occured during configuration.\n"
+"Test your connection via net_monitor or mcc. If your connection doesn't "
+"work, you might want to relaunch the configuration."
+msgstr ""
+
+#: network/netconnect.pm:1239
+#, c-format
+msgid ""
+"Because you are doing a network installation, your network is already "
+"configured.\n"
+"Click on Ok to keep your configuration, or cancel to reconfigure your "
+"Internet & Network connection.\n"
+msgstr ""
+
+#: network/netconnect.pm:1327
+#, c-format
+msgid ""
+"An unexpected error has happened:\n"
+"%s"
+msgstr ""
+
+#: network/network.pm:315
+#, c-format
+msgid "Proxies configuration"
+msgstr ""
+
+#: network/network.pm:316
+#, c-format
+msgid "HTTP proxy"
+msgstr ""
+
+#: network/network.pm:317
+#, c-format
+msgid "FTP proxy"
+msgstr ""
+
+#: network/network.pm:320
+#, c-format
+msgid "Proxy should be http://..."
+msgstr ""
+
+#: network/network.pm:321
+#, c-format
+msgid "URL should begin with 'ftp:' or 'http:'"
+msgstr ""
+
+#: network/shorewall.pm:28
+#, c-format
+msgid "Firewalling configuration detected!"
+msgstr ""
+
+#: network/shorewall.pm:29
+#, c-format
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fixes after installation."
+msgstr ""
+
+#: 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"
+"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 ""
+
+#: network/tools.pm:205
+#, c-format
+msgid "Insert floppy"
+msgstr ""
+
+#: network/tools.pm:206
+#, c-format
+msgid ""
+"Insert a FAT formatted floppy in drive %s with %s in root directory and "
+"press %s"
+msgstr ""
+
+#: network/tools.pm:207
+#, c-format
+msgid "Floppy access error, unable to mount device %s"
+msgstr ""
+
+#: partition_table.pm:644
+#, c-format
+msgid "mount failed: "
+msgstr ""
+
+#: partition_table.pm:749
+#, c-format
+msgid "Extended partition not supported on this platform"
+msgstr ""
+
+#: partition_table.pm:767
+#, c-format
+msgid ""
+"You have a hole in your partition table but I can't use it.\n"
+"The only solution is to move your primary partitions to have the hole next "
+"to the extended partitions."
+msgstr ""
+
+#: partition_table.pm:854
+#, c-format
+msgid "Restoring from file %s failed: %s"
+msgstr ""
+
+#: partition_table.pm:856
+#, c-format
+msgid "Bad backup file"
+msgstr ""
+
+#: partition_table.pm:876
+#, c-format
+msgid "Error writing to file %s"
+msgstr ""
+
+#: partition_table/raw.pm:187
+#, c-format
+msgid ""
+"Something bad is happening on your drive. \n"
+"A test to check the integrity of data has failed. \n"
+"It means writing anything on the disk will end up with random, corrupted "
+"data."
+msgstr ""
+
+#: pkgs.pm:24
+#, c-format
+msgid "must have"
+msgstr ""
+
+#: pkgs.pm:25
+#, c-format
+msgid "important"
+msgstr "viktig"
+
+#: pkgs.pm:26
+#, c-format
+msgid "very nice"
+msgstr ""
+
+#: pkgs.pm:27
+#, c-format
+msgid "nice"
+msgstr ""
+
+#: pkgs.pm:28
+#, c-format
+msgid "maybe"
+msgstr ""
+
+#: printer/cups.pm:103
+#, c-format
+msgid "(on %s)"
+msgstr ""
+
+#: printer/cups.pm:103
+#, c-format
+msgid "(on this machine)"
+msgstr ""
+
+#: printer/cups.pm:115 standalone/printerdrake:197
+#, c-format
+msgid "Configured on other machines"
+msgstr ""
+
+#: printer/cups.pm:117
+#, c-format
+msgid "On CUPS server \"%s\""
+msgstr ""
+
+#: 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 ""
+
+#: printer/data.pm:22
+#, c-format
+msgid "PDQ - Print, Don't Queue"
+msgstr ""
+
+#: printer/data.pm:23
+#, c-format
+msgid "PDQ"
+msgstr ""
+
+#: printer/data.pm:34
+#, c-format
+msgid "LPD - Line Printer Daemon"
+msgstr ""
+
+#: printer/data.pm:35
+#, c-format
+msgid "LPD"
+msgstr ""
+
+#: printer/data.pm:56
+#, c-format
+msgid "LPRng - LPR New Generation"
+msgstr ""
+
+#: printer/data.pm:57
+#, c-format
+msgid "LPRng"
+msgstr ""
+
+#: printer/data.pm:82
+#, c-format
+msgid "CUPS - Common Unix Printing System"
+msgstr ""
+
+#: printer/detect.pm:148 printer/detect.pm:226 printer/detect.pm:428
+#: printer/detect.pm:465 printer/printerdrake.pm:686
+#, c-format
+msgid "Unknown Model"
+msgstr ""
+
+#: printer/main.pm:28
+#, c-format
+msgid "Local printer"
+msgstr "Lokal skrivar"
+
+#: printer/main.pm:29
+#, c-format
+msgid "Remote printer"
+msgstr "Nettverksskrivar"
+
+#: printer/main.pm:30
+#, c-format
+msgid "Printer on remote CUPS server"
+msgstr ""
+
+#: printer/main.pm:31 printer/printerdrake.pm:1406
+#, c-format
+msgid "Printer on remote lpd server"
+msgstr ""
+
+#: printer/main.pm:32
+#, c-format
+msgid "Network printer (TCP/Socket)"
+msgstr ""
+
+#: printer/main.pm:33
+#, c-format
+msgid "Printer on SMB/Windows 95/98/NT server"
+msgstr ""
+
+#: printer/main.pm:34
+#, c-format
+msgid "Printer on NetWare server"
+msgstr ""
+
+#: printer/main.pm:35 printer/printerdrake.pm:1410
+#, c-format
+msgid "Enter a printer device URI"
+msgstr ""
+
+#: printer/main.pm:36
+#, c-format
+msgid "Pipe job into a command"
+msgstr ""
+
+#: printer/main.pm:306 printer/main.pm:574 printer/main.pm:1544
+#: printer/main.pm:2228 printer/main.pm:2239 printer/printerdrake.pm:1866
+#: printer/printerdrake.pm:4396
+#, c-format
+msgid "Unknown model"
+msgstr ""
+
+#: printer/main.pm:331 standalone/printerdrake:196
+#, c-format
+msgid "Configured on this machine"
+msgstr ""
+
+#: printer/main.pm:337 printer/printerdrake.pm:963
+#, c-format
+msgid " on parallel port #%s"
+msgstr ""
+
+#: printer/main.pm:340 printer/printerdrake.pm:965
+#, c-format
+msgid ", USB printer #%s"
+msgstr ""
+
+#: printer/main.pm:342
+#, c-format
+msgid ", USB printer"
+msgstr ""
+
+#: printer/main.pm:347
+#, c-format
+msgid ", multi-function device on parallel port #%s"
+msgstr ""
+
+#: printer/main.pm:350
+#, c-format
+msgid ", multi-function device on a parallel port"
+msgstr ""
+
+#: printer/main.pm:352
+#, c-format
+msgid ", multi-function device on USB"
+msgstr ""
+
+#: printer/main.pm:354
+#, c-format
+msgid ", multi-function device on HP JetDirect"
+msgstr ""
+
+#: printer/main.pm:356
+#, c-format
+msgid ", multi-function device"
+msgstr ""
+
+#: printer/main.pm:359
+#, c-format
+msgid ", printing to %s"
+msgstr ""
+
+#: printer/main.pm:361
+#, c-format
+msgid " on LPD server \"%s\", printer \"%s\""
+msgstr ""
+
+#: printer/main.pm:363
+#, c-format
+msgid ", TCP/IP host \"%s\", port %s"
+msgstr ""
+
+#: printer/main.pm:367
+#, c-format
+msgid " on SMB/Windows server \"%s\", share \"%s\""
+msgstr ""
+
+#: printer/main.pm:371
+#, c-format
+msgid " on Novell server \"%s\", printer \"%s\""
+msgstr ""
+
+#: printer/main.pm:373
+#, c-format
+msgid ", using command %s"
+msgstr ""
+
+#: printer/main.pm:388
+#, c-format
+msgid "Parallel port #%s"
+msgstr ""
+
+#: printer/main.pm:391 printer/printerdrake.pm:979
+#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1020
+#, c-format
+msgid "USB printer #%s"
+msgstr ""
+
+#: printer/main.pm:393
+#, c-format
+msgid "USB printer"
+msgstr ""
+
+#: printer/main.pm:398
+#, c-format
+msgid "Multi-function device on parallel port #%s"
+msgstr ""
+
+#: printer/main.pm:401
+#, c-format
+msgid "Multi-function device on a parallel port"
+msgstr ""
+
+#: printer/main.pm:403
+#, c-format
+msgid "Multi-function device on USB"
+msgstr ""
+
+#: printer/main.pm:405
+#, c-format
+msgid "Multi-function device on HP JetDirect"
+msgstr ""
+
+#: printer/main.pm:407
+#, c-format
+msgid "Multi-function device"
+msgstr ""
+
+#: printer/main.pm:410
+#, c-format
+msgid "Prints into %s"
+msgstr ""
+
+#: printer/main.pm:412
+#, c-format
+msgid "LPD server \"%s\", printer \"%s\""
+msgstr ""
+
+#: printer/main.pm:414
+#, c-format
+msgid "TCP/IP host \"%s\", port %s"
+msgstr ""
+
+#: printer/main.pm:418
+#, c-format
+msgid "SMB/Windows server \"%s\", share \"%s\""
+msgstr ""
+
+#: printer/main.pm:422
+#, c-format
+msgid "Novell server \"%s\", printer \"%s\""
+msgstr ""
+
+#: printer/main.pm:424
+#, c-format
+msgid "Uses command %s"
+msgstr ""
+
+#: printer/main.pm:426
+#, c-format
+msgid "URI: %s"
+msgstr ""
+
+#: printer/main.pm:571 printer/printerdrake.pm:732
+#: printer/printerdrake.pm:2463
+#, c-format
+msgid "Raw printer (No driver)"
+msgstr ""
+
+#: printer/main.pm:1085 printer/printerdrake.pm:179
+#: printer/printerdrake.pm:191
+#, c-format
+msgid "Local network(s)"
+msgstr ""
+
+#: printer/main.pm:1087 printer/printerdrake.pm:195
+#, c-format
+msgid "Interface \"%s\""
+msgstr ""
+
+#: printer/main.pm:1089
+#, c-format
+msgid "Network %s"
+msgstr ""
+
+#: printer/main.pm:1091
+#, c-format
+msgid "Host %s"
+msgstr ""
+
+#: printer/main.pm:1120
+#, c-format
+msgid "%s (Port %s)"
+msgstr ""
+
+#: printer/printerdrake.pm:22
+#, c-format
+msgid ""
+"The HP LaserJet 1000 needs its firmware to be uploaded after being turned "
+"on. Download the Windows driver package from the HP web site (the firmware "
+"on the printer's CD does not work) and extract the firmware file from it by "
+"uncompresing the self-extracting '.exe' file with the 'unzip' utility and "
+"searching for the 'sihp1000.img' file. Copy this file into the '/etc/"
+"printer' directory. There it will be found by the automatic uploader script "
+"and uploaded whenever the printer is connected and turned on.\n"
+msgstr ""
+
+#: printer/printerdrake.pm:62
+#, c-format
+msgid "CUPS printer configuration"
+msgstr ""
+
+#: printer/printerdrake.pm:63
+#, c-format
+msgid ""
+"Here you can choose whether the printers connected to this machine should be "
+"accessible by remote machines and by which remote machines."
+msgstr ""
+
+#: printer/printerdrake.pm:64
+#, c-format
+msgid ""
+"You can also decide here whether printers on remote machines should be "
+"automatically made available on this machine."
+msgstr ""
+
+#: printer/printerdrake.pm:67
+#, c-format
+msgid "The printers on this machine are available to other computers"
+msgstr ""
+
+#: printer/printerdrake.pm:69
+#, c-format
+msgid "Automatically find available printers on remote machines"
+msgstr ""
+
+#: printer/printerdrake.pm:71
+#, c-format
+msgid "Printer sharing on hosts/networks: "
+msgstr ""
+
+#: printer/printerdrake.pm:73
+#, c-format
+msgid "Custom configuration"
+msgstr ""
+
+#: printer/printerdrake.pm:78 standalone/scannerdrake:561
+#: standalone/scannerdrake:578
+#, c-format
+msgid "No remote machines"
+msgstr ""
+
+#: printer/printerdrake.pm:88
+#, c-format
+msgid "Additional CUPS servers: "
+msgstr ""
+
+#: printer/printerdrake.pm:93
+#, c-format
+msgid "None"
+msgstr "Ingen"
+
+#: printer/printerdrake.pm:95
+#, c-format
+msgid ""
+"To get access to printers on remote CUPS servers in your local network you "
+"only need to turn on the \"Automatically find available printers on remote "
+"machines\" option; the CUPS servers inform your machine automatically about "
+"their printers. All printers currently known to your machine are listed in "
+"the \"Remote printers\" section in the main window of Printerdrake. If your "
+"CUPS server(s) is/are not in your local network, you have to enter the IP "
+"address(es) and optionally the port number(s) here to get the printer "
+"information from the server(s)."
+msgstr ""
+
+#: printer/printerdrake.pm:100
+#, c-format
+msgid "Japanese text printing mode"
+msgstr ""
+
+#: printer/printerdrake.pm:101
+#, c-format
+msgid ""
+"Turning on this allows to print plain text files in japanese language. Only "
+"use this function if you really want to print text in japanese, if it is "
+"activated you cannot print accentuated characters in latin fonts any more "
+"and you will not be able to adjust the margins, the character size, etc. "
+"This setting only affects printers defined on this machine. If you want to "
+"print japanese text on a printer set up on a remote machine, you have to "
+"activate this function on that remote machine."
+msgstr ""
+
+#: printer/printerdrake.pm:105
+#, c-format
+msgid "Automatic correction of CUPS configuration"
+msgstr ""
+
+#: printer/printerdrake.pm:107
+#, c-format
+msgid ""
+"When this option is turned on, on every startup of CUPS it is automatically "
+"made sure that\n"
+"\n"
+"- if LPD/LPRng is installed, /etc/printcap will not be overwritten by CUPS\n"
+"\n"
+"- if /etc/cups/cupsd.conf is missing, it will be created\n"
+"\n"
+"- when printer information is broadcasted, it does not contain \"localhost\" "
+"as the server name.\n"
+"\n"
+"If some of these measures lead to problems for you, turn this option off, "
+"but then you have to take care of these points."
+msgstr ""
+
+#: printer/printerdrake.pm:129 printer/printerdrake.pm:205
+#, c-format
+msgid "Sharing of local printers"
+msgstr ""
+
+#: printer/printerdrake.pm:130
+#, c-format
+msgid ""
+"These are the machines and networks on which the locally connected printer"
+"(s) should be available:"
+msgstr ""
+
+#: printer/printerdrake.pm:141
+#, c-format
+msgid "Add host/network"
+msgstr ""
+
+#: printer/printerdrake.pm:147
+#, c-format
+msgid "Edit selected host/network"
+msgstr ""
+
+#: printer/printerdrake.pm:156
+#, c-format
+msgid "Remove selected host/network"
+msgstr ""
+
+#: printer/printerdrake.pm:187 printer/printerdrake.pm:197
+#: printer/printerdrake.pm:210 printer/printerdrake.pm:217
+#: printer/printerdrake.pm:248 printer/printerdrake.pm:266
+#, c-format
+msgid "IP address of host/network:"
+msgstr ""
+
+#: printer/printerdrake.pm:206
+#, c-format
+msgid ""
+"Choose the network or host on which the local printers should be made "
+"available:"
+msgstr ""
+
+#: printer/printerdrake.pm:213
+#, c-format
+msgid "Host/network IP address missing."
+msgstr ""
+
+#: printer/printerdrake.pm:221
+#, c-format
+msgid "The entered host/network IP is not correct.\n"
+msgstr ""
+
+#: printer/printerdrake.pm:222 printer/printerdrake.pm:400
+#, c-format
+msgid "Examples for correct IPs:\n"
+msgstr ""
+
+#: printer/printerdrake.pm:246
+#, c-format
+msgid "This host/network is already in the list, it cannot be added again.\n"
+msgstr ""
+
+#: printer/printerdrake.pm:316 printer/printerdrake.pm:387
+#, c-format
+msgid "Accessing printers on remote CUPS servers"
+msgstr ""
+
+#: printer/printerdrake.pm:317
+#, c-format
+msgid ""
+"Add here the CUPS servers whose printers you want to use. You only need to "
+"do this if the servers do not broadcast their printer information into the "
+"local network."
+msgstr ""
+
+#: printer/printerdrake.pm:328
+#, c-format
+msgid "Add server"
+msgstr ""
+
+#: printer/printerdrake.pm:334
+#, c-format
+msgid "Edit selected server"
+msgstr ""
+
+#: printer/printerdrake.pm:343
+#, c-format
+msgid "Remove selected server"
+msgstr ""
+
+#: printer/printerdrake.pm:388
+#, c-format
+msgid "Enter IP address and port of the host whose printers you want to use."
+msgstr ""
+
+#: printer/printerdrake.pm:389
+#, c-format
+msgid "If no port is given, 631 will be taken as default."
+msgstr ""
+
+#: printer/printerdrake.pm:393
+#, c-format
+msgid "Server IP missing!"
+msgstr ""
+
+#: printer/printerdrake.pm:399
+#, c-format
+msgid "The entered IP is not correct.\n"
+msgstr ""
+
+#: printer/printerdrake.pm:411 printer/printerdrake.pm:1629
+#, c-format
+msgid "The port number should be an integer!"
+msgstr ""
+
+#: printer/printerdrake.pm:422
+#, c-format
+msgid "This server is already in the list, it cannot be added again.\n"
+msgstr ""
+
+#: 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: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 ""
+
+#: printer/printerdrake.pm:479
+#, c-format
+msgid "Restarting CUPS..."
+msgstr ""
+
+#: printer/printerdrake.pm:502
+#, c-format
+msgid "Select Printer Connection"
+msgstr ""
+
+#: printer/printerdrake.pm:503
+#, c-format
+msgid "How is the printer connected?"
+msgstr ""
+
+#: printer/printerdrake.pm:505
+#, c-format
+msgid ""
+"\n"
+"Printers on remote CUPS servers do not need to be configured here; these "
+"printers will be automatically detected."
+msgstr ""
+
+#: 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 ""
+
+#: printer/printerdrake.pm:515
+#, c-format
+msgid ""
+"Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
+msgstr ""
+
+#: printer/printerdrake.pm:545
+#, c-format
+msgid "Checking your system..."
+msgstr ""
+
+#: printer/printerdrake.pm:561
+#, c-format
+msgid "and one unknown printer"
+msgstr ""
+
+#: printer/printerdrake.pm:563
+#, c-format
+msgid "and %d unknown printers"
+msgstr ""
+
+#: printer/printerdrake.pm:567
+#, c-format
+msgid ""
+"The following printers\n"
+"\n"
+"%s%s\n"
+"are directly connected to your system"
+msgstr ""
+
+#: printer/printerdrake.pm:569
+#, c-format
+msgid ""
+"The following printer\n"
+"\n"
+"%s%s\n"
+"are directly connected to your system"
+msgstr ""
+
+#: printer/printerdrake.pm:570
+#, c-format
+msgid ""
+"The following printer\n"
+"\n"
+"%s%s\n"
+"is directly connected to your system"
+msgstr ""
+
+#: printer/printerdrake.pm:574
+#, c-format
+msgid ""
+"\n"
+"There is one unknown printer directly connected to your system"
+msgstr ""
+
+#: printer/printerdrake.pm:575
+#, c-format
+msgid ""
+"\n"
+"There are %d unknown printers directly connected to your system"
+msgstr ""
+
+#: printer/printerdrake.pm:578
+#, c-format
+msgid ""
+"There are no printers found which are directly connected to your machine"
+msgstr ""
+
+#: printer/printerdrake.pm:581
+#, c-format
+msgid " (Make sure that all your printers are connected and turned on).\n"
+msgstr ""
+
+#: printer/printerdrake.pm:594
+#, c-format
+msgid ""
+"Do you want to enable printing on the printers mentioned above or on "
+"printers in the local network?\n"
+msgstr ""
+
+#: printer/printerdrake.pm:595
+#, c-format
+msgid "Do you want to enable printing on printers in the local network?\n"
+msgstr ""
+
+#: printer/printerdrake.pm:597
+#, c-format
+msgid "Do you want to enable printing on the printers mentioned above?\n"
+msgstr ""
+
+#: printer/printerdrake.pm:598
+#, c-format
+msgid "Are you sure that you want to set up printing on this machine?\n"
+msgstr ""
+
+#: printer/printerdrake.pm:599
+#, c-format
+msgid ""
+"NOTE: Depending on the printer model and the printing system up to %d MB of "
+"additional software will be installed."
+msgstr ""
+
+#: printer/printerdrake.pm:629
+#, c-format
+msgid "Searching for new printers..."
+msgstr ""
+
+#: printer/printerdrake.pm:713
+#, c-format
+msgid "Configuring printer ..."
+msgstr ""
+
+#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
+#: printer/printerdrake.pm:3790
+#, c-format
+msgid "Configuring printer \"%s\"..."
+msgstr ""
+
+#: printer/printerdrake.pm:734
+#, c-format
+msgid "("
+msgstr "("
+
+#: printer/printerdrake.pm:735
+#, c-format
+msgid " on "
+msgstr ""
+
+#: printer/printerdrake.pm:736 standalone/scannerdrake:136
+#, c-format
+msgid ")"
+msgstr ")"
+
+#: printer/printerdrake.pm:741 printer/printerdrake.pm:2470
+#, c-format
+msgid "Printer model selection"
+msgstr ""
+
+#: printer/printerdrake.pm:742 printer/printerdrake.pm:2471
+#, c-format
+msgid "Which printer model do you have?"
+msgstr ""
+
+#: printer/printerdrake.pm:743
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Printerdrake could not determine which model your printer %s is. Please "
+"choose the correct model from the list."
+msgstr ""
+
+#: 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 "
+"similar one."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: printer/printerdrake.pm:832
+#, c-format
+msgid ""
+"\n"
+"Welcome to the Printer Setup Wizard\n"
+"\n"
+"This wizard allows you to install local or remote printers to be used from "
+"this machine and also from other machines in the network.\n"
+"\n"
+"It asks you for all necessary information to set up the printer and gives "
+"you access to all available printer drivers, driver options, and printer "
+"connection types."
+msgstr ""
+
+#: printer/printerdrake.pm:845
+#, c-format
+msgid ""
+"\n"
+"Welcome to the Printer Setup Wizard\n"
+"\n"
+"This wizard will help you to install your printer(s) connected to this "
+"computer, connected directly to the network or to a remote Windows machine.\n"
+"\n"
+"Please plug in and turn on all printers connected to this machine so that it/"
+"they can be auto-detected. Also your network printer(s) and your Windows "
+"machines must be connected and turned on.\n"
+"\n"
+"Note that auto-detecting printers on the network takes longer than the auto-"
+"detection of only the printers connected to this machine. So turn off the "
+"auto-detection of network and/or Windows-hosted printers when you don't need "
+"it.\n"
+"\n"
+" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
+"to set up your printer(s) now."
+msgstr ""
+
+#: printer/printerdrake.pm:854
+#, c-format
+msgid ""
+"\n"
+"Welcome to the Printer Setup Wizard\n"
+"\n"
+"This wizard will help you to install your printer(s) connected to this "
+"computer.\n"
+"\n"
+"Please plug in and turn on all printers connected to this machine so that it/"
+"they can be auto-detected.\n"
+"\n"
+" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
+"to set up your printer(s) now."
+msgstr ""
+
+#: printer/printerdrake.pm:862
+#, c-format
+msgid ""
+"\n"
+"Welcome to the Printer Setup Wizard\n"
+"\n"
+"This wizard will help you to install your printer(s) connected to this "
+"computer or connected directly to the network.\n"
+"\n"
+"If you have printer(s) connected to this machine, Please plug it/them in on "
+"this computer and turn it/them on so that it/they can be auto-detected. Also "
+"your network printer(s) must be connected and turned on.\n"
+"\n"
+"Note that auto-detecting printers on the network takes longer than the auto-"
+"detection of only the printers connected to this machine. So turn off the "
+"auto-detection of network printers when you don't need it.\n"
+"\n"
+" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
+"to set up your printer(s) now."
+msgstr ""
+
+#: printer/printerdrake.pm:871
+#, c-format
+msgid ""
+"\n"
+"Welcome to the Printer Setup Wizard\n"
+"\n"
+"This wizard will help you to install your printer(s) connected to this "
+"computer.\n"
+"\n"
+"If you have printer(s) connected to this machine, Please plug it/them in on "
+"this computer and turn it/them on so that it/they can be auto-detected.\n"
+"\n"
+" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
+"to set up your printer(s) now."
+msgstr ""
+
+#: printer/printerdrake.pm:880
+#, c-format
+msgid "Auto-detect printers connected to this machine"
+msgstr ""
+
+#: printer/printerdrake.pm:883
+#, c-format
+msgid "Auto-detect printers connected directly to the local network"
+msgstr ""
+
+#: printer/printerdrake.pm:886
+#, c-format
+msgid "Auto-detect printers connected to machines running Microsoft Windows"
+msgstr ""
+
+#: printer/printerdrake.pm:902
+#, c-format
+msgid ""
+"\n"
+"Congratulations, your printer is now installed and configured!\n"
+"\n"
+"You can print using the \"Print\" command of your application (usually in "
+"the \"File\" menu).\n"
+"\n"
+"If you want to add, remove, or rename a printer, or if you want to change "
+"the default option settings (paper input tray, printout quality, ...), "
+"select \"Printer\" in the \"Hardware\" section of the %s Control Center."
+msgstr ""
+
+#: 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 ""
+
+#: printer/printerdrake.pm:939
+#, c-format
+msgid "Skipping Windows/SMB server auto-detection"
+msgstr ""
+
+#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#, c-format
+msgid "Printer auto-detection"
+msgstr ""
+
+#: printer/printerdrake.pm:945
+#, c-format
+msgid "Detecting devices..."
+msgstr ""
+
+#: printer/printerdrake.pm:967
+#, c-format
+msgid ", network printer \"%s\", port %s"
+msgstr ""
+
+#: printer/printerdrake.pm:969
+#, c-format
+msgid ", printer \"%s\" on SMB/Windows server \"%s\""
+msgstr ""
+
+#: printer/printerdrake.pm:973
+#, c-format
+msgid "Detected %s"
+msgstr ""
+
+#: printer/printerdrake.pm:977 printer/printerdrake.pm:1000
+#: printer/printerdrake.pm:1017
+#, c-format
+msgid "Printer on parallel port #%s"
+msgstr ""
+
+#: printer/printerdrake.pm:981
+#, c-format
+msgid "Network printer \"%s\", port %s"
+msgstr ""
+
+#: printer/printerdrake.pm:983
+#, c-format
+msgid "Printer \"%s\" on SMB/Windows server \"%s\""
+msgstr ""
+
+#: printer/printerdrake.pm:1062
+#, c-format
+msgid "Local Printer"
+msgstr ""
+
+#: printer/printerdrake.pm:1063
+#, c-format
+msgid ""
+"No local printer found! To manually install a printer enter a device name/"
+"file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., "
+"equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB "
+"printer: /dev/usb/lp1, ...)."
+msgstr ""
+
+#: printer/printerdrake.pm:1067
+#, c-format
+msgid "You must enter a device or file name!"
+msgstr ""
+
+#: printer/printerdrake.pm:1076
+#, c-format
+msgid "No printer found!"
+msgstr ""
+
+#: printer/printerdrake.pm:1084
+#, c-format
+msgid "Local Printers"
+msgstr ""
+
+#: printer/printerdrake.pm:1085
+#, c-format
+msgid "Available printers"
+msgstr ""
+
+#: printer/printerdrake.pm:1089 printer/printerdrake.pm:1098
+#, c-format
+msgid "The following printer was auto-detected. "
+msgstr ""
+
+#: printer/printerdrake.pm:1091
+#, c-format
+msgid ""
+"If it is not the one you want to configure, enter a device name/file name in "
+"the input line"
+msgstr ""
+
+#: printer/printerdrake.pm:1092
+#, c-format
+msgid ""
+"Alternatively, you can specify a device name/file name in the input line"
+msgstr ""
+
+#: printer/printerdrake.pm:1093 printer/printerdrake.pm:1102
+#, c-format
+msgid "Here is a list of all auto-detected printers. "
+msgstr ""
+
+#: printer/printerdrake.pm:1095
+#, c-format
+msgid ""
+"Please choose the printer you want to set up or enter a device name/file "
+"name in the input line"
+msgstr ""
+
+#: printer/printerdrake.pm:1096
+#, c-format
+msgid ""
+"Please choose the printer to which the print jobs should go or enter a "
+"device name/file name in the input line"
+msgstr ""
+
+#: printer/printerdrake.pm:1100
+#, c-format
+msgid ""
+"The configuration of the printer will work fully automatically. If your "
+"printer was not correctly detected or if you prefer a customized printer "
+"configuration, turn on \"Manual configuration\"."
+msgstr ""
+
+#: printer/printerdrake.pm:1101
+#, c-format
+msgid "Currently, no alternative possibility is available"
+msgstr ""
+
+#: printer/printerdrake.pm:1104
+#, c-format
+msgid ""
+"Please choose the printer you want to set up. The configuration of the "
+"printer will work fully automatically. If your printer was not correctly "
+"detected or if you prefer a customized printer configuration, turn on "
+"\"Manual configuration\"."
+msgstr ""
+
+#: printer/printerdrake.pm:1105
+#, c-format
+msgid "Please choose the printer to which the print jobs should go."
+msgstr ""
+
+#: printer/printerdrake.pm:1107
+#, c-format
+msgid ""
+"Please choose the port that your printer is connected to or enter a device "
+"name/file name in the input line"
+msgstr ""
+
+#: printer/printerdrake.pm:1108
+#, c-format
+msgid "Please choose the port that your printer is connected to."
+msgstr ""
+
+#: printer/printerdrake.pm:1110
+#, c-format
+msgid ""
+" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
+"1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
+msgstr ""
+
+#: printer/printerdrake.pm:1114
+#, c-format
+msgid "You must choose/enter a printer/device!"
+msgstr ""
+
+#: 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 "Avbryter"
+
+#: printer/printerdrake.pm:1189
+#, c-format
+msgid "Remote lpd Printer Options"
+msgstr ""
+
+#: printer/printerdrake.pm:1190
+#, c-format
+msgid ""
+"To use a remote lpd printer, you need to supply the hostname of the printer "
+"server and the printer name on that server."
+msgstr ""
+
+#: printer/printerdrake.pm:1191
+#, c-format
+msgid "Remote host name"
+msgstr ""
+
+#: printer/printerdrake.pm:1192
+#, c-format
+msgid "Remote printer name"
+msgstr ""
+
+#: printer/printerdrake.pm:1195
+#, c-format
+msgid "Remote host name missing!"
+msgstr ""
+
+#: printer/printerdrake.pm:1199
+#, c-format
+msgid "Remote printer name missing!"
+msgstr ""
+
+#: 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 "Informasjon"
+
+#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#, c-format
+msgid "Detected model: %s %s"
+msgstr ""
+
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#, c-format
+msgid "Scanning network..."
+msgstr ""
+
+#: printer/printerdrake.pm:1321 printer/printerdrake.pm:1342
+#, c-format
+msgid ", printer \"%s\" on server \"%s\""
+msgstr ""
+
+#: printer/printerdrake.pm:1324 printer/printerdrake.pm:1345
+#, c-format
+msgid "Printer \"%s\" on server \"%s\""
+msgstr ""
+
+#: printer/printerdrake.pm:1366
+#, c-format
+msgid "SMB (Windows 9x/NT) Printer Options"
+msgstr ""
+
+#: printer/printerdrake.pm:1367
+#, c-format
+msgid ""
+"To print to a SMB printer, you need to provide the SMB host name (Note! It "
+"may be different from its TCP/IP hostname!) and possibly the IP address of "
+"the print server, as well as the share name for the printer you wish to "
+"access and any applicable user name, password, and workgroup information."
+msgstr ""
+
+#: printer/printerdrake.pm:1368
+#, c-format
+msgid ""
+" If the desired printer was auto-detected, simply choose it from the list "
+"and then add user name, password, and/or workgroup if needed."
+msgstr ""
+
+#: printer/printerdrake.pm:1370
+#, c-format
+msgid "SMB server host"
+msgstr ""
+
+#: printer/printerdrake.pm:1371
+#, c-format
+msgid "SMB server IP"
+msgstr ""
+
+#: printer/printerdrake.pm:1372
+#, c-format
+msgid "Share name"
+msgstr ""
+
+#: printer/printerdrake.pm:1375
+#, c-format
+msgid "Workgroup"
+msgstr "Arbeidsgruppe"
+
+#: printer/printerdrake.pm:1377
+#, c-format
+msgid "Auto-detected"
+msgstr ""
+
+#: printer/printerdrake.pm:1387
+#, c-format
+msgid "Either the server name or the server's IP must be given!"
+msgstr ""
+
+#: printer/printerdrake.pm:1391
+#, c-format
+msgid "Samba share name missing!"
+msgstr ""
+
+#: printer/printerdrake.pm:1397
+#, c-format
+msgid "SECURITY WARNING!"
+msgstr ""
+
+#: printer/printerdrake.pm:1398
+#, c-format
+msgid ""
+"You are about to set up printing to a Windows account with password. Due to "
+"a fault in the architecture of the Samba client software the password is put "
+"in clear text into the command line of the Samba client used to transmit the "
+"print job to the Windows server. So it is possible for every user on this "
+"machine to display the password on the screen by issuing commands as \"ps "
+"auxwww\".\n"
+"\n"
+"We recommend to make use of one of the following alternatives (in all cases "
+"you have to make sure that only machines from your local network have access "
+"to your Windows server, for example by means of a firewall):\n"
+"\n"
+"Use a password-less account on your Windows server, as the \"GUEST\" account "
+"or a special account dedicated for printing. Do not remove the password "
+"protection from a personal account or the administrator account.\n"
+"\n"
+"Set up your Windows server to make the printer available under the LPD "
+"protocol. Then set up printing from this machine with the \"%s\" connection "
+"type in Printerdrake.\n"
+"\n"
+msgstr ""
+
+#: printer/printerdrake.pm:1408
+#, c-format
+msgid ""
+"Set up your Windows server to make the printer available under the IPP "
+"protocol and set up printing from this machine with the \"%s\" connection "
+"type in Printerdrake.\n"
+"\n"
+msgstr ""
+
+#: printer/printerdrake.pm:1411
+#, c-format
+msgid ""
+"Connect your printer to a Linux server and let your Windows machine(s) "
+"connect to it as a client.\n"
+"\n"
+"Do you really want to continue setting up this printer as you are doing now?"
+msgstr ""
+
+#: printer/printerdrake.pm:1489
+#, c-format
+msgid "NetWare Printer Options"
+msgstr ""
+
+#: printer/printerdrake.pm:1490
+#, c-format
+msgid ""
+"To print on a NetWare printer, you need to provide the NetWare print server "
+"name (Note! it may be different from its TCP/IP hostname!) as well as the "
+"print queue name for the printer you wish to access and any applicable user "
+"name and password."
+msgstr ""
+
+#: printer/printerdrake.pm:1491
+#, c-format
+msgid "Printer Server"
+msgstr ""
+
+#: printer/printerdrake.pm:1492
+#, c-format
+msgid "Print Queue Name"
+msgstr ""
+
+#: printer/printerdrake.pm:1497
+#, c-format
+msgid "NCP server name missing!"
+msgstr ""
+
+#: printer/printerdrake.pm:1501
+#, c-format
+msgid "NCP queue name missing!"
+msgstr ""
+
+#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
+#, c-format
+msgid ", host \"%s\", port %s"
+msgstr ""
+
+#: printer/printerdrake.pm:1577 printer/printerdrake.pm:1597
+#, c-format
+msgid "Host \"%s\", port %s"
+msgstr ""
+
+#: printer/printerdrake.pm:1618
+#, c-format
+msgid "TCP/Socket Printer Options"
+msgstr ""
+
+#: printer/printerdrake.pm:1620
+#, c-format
+msgid ""
+"Choose one of the auto-detected printers from the list or enter the hostname "
+"or IP and the optional port number (default is 9100) in the input fields."
+msgstr ""
+
+#: printer/printerdrake.pm:1621
+#, c-format
+msgid ""
+"To print to a TCP or socket printer, you need to provide the host name or IP "
+"of the printer and optionally the port number (default is 9100). On HP "
+"JetDirect servers the port number is usually 9100, on other servers it can "
+"vary. See the manual of your hardware."
+msgstr ""
+
+#: printer/printerdrake.pm:1625
+#, c-format
+msgid "Printer host name or IP missing!"
+msgstr ""
+
+#: printer/printerdrake.pm:1648
+#, c-format
+msgid "Printer host name or IP"
+msgstr ""
+
+#: printer/printerdrake.pm:1704
+#, c-format
+msgid "Refreshing Device URI list..."
+msgstr ""
+
+#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#, c-format
+msgid "Printer Device URI"
+msgstr ""
+
+#: printer/printerdrake.pm:1708
+#, c-format
+msgid ""
+"You can specify directly the URI to access the printer. The URI must fulfill "
+"either the CUPS or the Foomatic specifications. Note that not all URI types "
+"are supported by all the spoolers."
+msgstr ""
+
+#: printer/printerdrake.pm:1731
+#, c-format
+msgid "A valid URI must be entered!"
+msgstr ""
+
+#: printer/printerdrake.pm:1834
+#, c-format
+msgid "Pipe into command"
+msgstr ""
+
+#: 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 ""
+
+#: printer/printerdrake.pm:1836
+#, c-format
+msgid "Command line"
+msgstr ""
+
+#: printer/printerdrake.pm:1840
+#, c-format
+msgid "A command line must be entered!"
+msgstr ""
+
+#: printer/printerdrake.pm:1873
+#, c-format
+msgid ""
+"Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
+"LaserJet 1100/1200/1220/3200/3300 with scanner, DeskJet 450, Sony IJP-V100), "
+"an HP PhotoSmart or an HP LaserJet 2200?"
+msgstr ""
+
+#: printer/printerdrake.pm:1887
+#, c-format
+msgid "Installing HPOJ package..."
+msgstr ""
+
+#: printer/printerdrake.pm:1894
+#, c-format
+msgid "Only printing will be possible on the %s."
+msgstr ""
+
+#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
+#, c-format
+msgid "Checking device and configuring HPOJ..."
+msgstr ""
+
+#: printer/printerdrake.pm:1946
+#, c-format
+msgid "Installing SANE packages..."
+msgstr ""
+
+#: printer/printerdrake.pm:1956
+#, c-format
+msgid "Scanning on the %s will not be possible."
+msgstr ""
+
+#: printer/printerdrake.pm:1983
+#, c-format
+msgid "Installing mtools packages..."
+msgstr ""
+
+#: printer/printerdrake.pm:1990
+#, c-format
+msgid "Photo memory card access on the %s will not be possible."
+msgstr ""
+
+#: printer/printerdrake.pm:2005
+#, c-format
+msgid "Scanning on your HP multi-function device"
+msgstr ""
+
+#: printer/printerdrake.pm:2013
+#, c-format
+msgid "Photo memory card access on your HP multi-function device"
+msgstr ""
+
+#: printer/printerdrake.pm:2062
+#, c-format
+msgid "Making printer port available for CUPS..."
+msgstr ""
+
+#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315
+#: printer/printerdrake.pm:2459
+#, c-format
+msgid "Reading printer database..."
+msgstr ""
+
+#: printer/printerdrake.pm:2281
+#, c-format
+msgid "Enter Printer Name and Comments"
+msgstr ""
+
+#: printer/printerdrake.pm:2285 printer/printerdrake.pm:3421
+#, c-format
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr ""
+
+#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3426
+#, c-format
+msgid ""
+"The printer \"%s\" already exists,\n"
+"do you really want to overwrite its configuration?"
+msgstr ""
+
+#: printer/printerdrake.pm:2300
+#, c-format
+msgid ""
+"Every printer needs a name (for example \"printer\"). The Description and "
+"Location fields do not need to be filled in. They are comments for the users."
+msgstr ""
+
+#: printer/printerdrake.pm:2301
+#, c-format
+msgid "Name of printer"
+msgstr ""
+
+#: printer/printerdrake.pm:2302 standalone/drakconnect:557
+#: standalone/harddrake2:40 standalone/printerdrake:212
+#: standalone/printerdrake:219
+#, c-format
+msgid "Description"
+msgstr "Beskriving"
+
+#: printer/printerdrake.pm:2303 standalone/printerdrake:212
+#: standalone/printerdrake:219
+#, c-format
+msgid "Location"
+msgstr "Plassering"
+
+#: printer/printerdrake.pm:2320
+#, c-format
+msgid "Preparing printer database..."
+msgstr ""
+
+#: printer/printerdrake.pm:2438
+#, c-format
+msgid "Your printer model"
+msgstr ""
+
+#: printer/printerdrake.pm:2439
+#, c-format
+msgid ""
+"Printerdrake has compared the model name resulting from the printer auto-"
+"detection with the models listed in its printer database to find the best "
+"match. This choice can be wrong, especially when your printer is not listed "
+"at all in the database. So check whether the choice is correct and click "
+"\"The model is correct\" if so and if not, click \"Select model manually\" "
+"so that you can choose your printer model manually on the next screen.\n"
+"\n"
+"For your printer Printerdrake has found:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
+#, c-format
+msgid "The model is correct"
+msgstr ""
+
+#: printer/printerdrake.pm:2445 printer/printerdrake.pm:2446
+#: printer/printerdrake.pm:2449
+#, c-format
+msgid "Select model manually"
+msgstr ""
+
+#: printer/printerdrake.pm:2472
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Please check whether Printerdrake did the auto-detection of your printer "
+"model correctly. Find the correct model in the list when a wrong model or "
+"\"Raw printer\" is highlighted."
+msgstr ""
+
+#: printer/printerdrake.pm:2491
+#, c-format
+msgid "Install a manufacturer-supplied PPD file"
+msgstr ""
+
+#: printer/printerdrake.pm:2522
+#, c-format
+msgid ""
+"Every PostScript printer is delivered with a PPD file which describes the "
+"printer's options and features."
+msgstr ""
+
+#: printer/printerdrake.pm:2523
+#, c-format
+msgid ""
+"This file is usually somewhere on the CD with the Windows and Mac drivers "
+"delivered with the printer."
+msgstr ""
+
+#: printer/printerdrake.pm:2524
+#, c-format
+msgid "You can find the PPD files also on the manufacturer's web sites."
+msgstr ""
+
+#: printer/printerdrake.pm:2525
+#, c-format
+msgid ""
+"If you have Windows installed on your machine, you can find the PPD file on "
+"your Windows partition, too."
+msgstr ""
+
+#: printer/printerdrake.pm:2526
+#, c-format
+msgid ""
+"Installing the printer's PPD file and using it when setting up the printer "
+"makes all options of the printer available which are provided by the "
+"printer's hardware"
+msgstr ""
+
+#: printer/printerdrake.pm:2527
+#, c-format
+msgid ""
+"Here you can choose the PPD file to be installed on your machine, it will "
+"then be used for the setup of your printer."
+msgstr ""
+
+#: printer/printerdrake.pm:2529
+#, c-format
+msgid "Install PPD file from"
+msgstr ""
+
+#: 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:2532 printer/printerdrake.pm:2540
+#: standalone/scannerdrake:181 standalone/scannerdrake:190
+#: standalone/scannerdrake:240 standalone/scannerdrake:248
+#, c-format
+msgid "Floppy Disk"
+msgstr ""
+
+#: 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 ""
+
+#: printer/printerdrake.pm:2548
+#, c-format
+msgid "Select PPD file"
+msgstr ""
+
+#: printer/printerdrake.pm:2552
+#, c-format
+msgid "The PPD file %s does not exist or is unreadable!"
+msgstr ""
+
+#: printer/printerdrake.pm:2558
+#, c-format
+msgid "The PPD file %s does not conform with the PPD specifications!"
+msgstr ""
+
+#: printer/printerdrake.pm:2569
+#, c-format
+msgid "Installing PPD file..."
+msgstr ""
+
+#: printer/printerdrake.pm:2682
+#, c-format
+msgid "OKI winprinter configuration"
+msgstr ""
+
+#: printer/printerdrake.pm:2683
+#, c-format
+msgid ""
+"You are configuring an OKI laser winprinter. These printers\n"
+"use a very special communication protocol and therefore they work only when "
+"connected to the first parallel port. When your printer is connected to "
+"another port or to a print server box please connect the printer to the "
+"first parallel port before you print a test page. Otherwise the printer will "
+"not work. Your connection type setting will be ignored by the driver."
+msgstr ""
+
+#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#, c-format
+msgid "Lexmark inkjet configuration"
+msgstr ""
+
+#: printer/printerdrake.pm:2708
+#, c-format
+msgid ""
+"The inkjet printer drivers provided by Lexmark only support local printers, "
+"no printers on remote machines or print server boxes. Please connect your "
+"printer to a local port or configure it on the machine where it is connected "
+"to."
+msgstr ""
+
+#: printer/printerdrake.pm:2737
+#, c-format
+msgid ""
+"To be able to print with your Lexmark inkjet and this configuration, you "
+"need the inkjet printer drivers provided by Lexmark (http://www.lexmark."
+"com/). Click on the \"Drivers\" link. Then choose your model and afterwards "
+"\"Linux\" as operating system. The drivers come as RPM packages or shell "
+"scripts with interactive graphical installation. You do not need to do this "
+"configuration by the graphical frontends. Cancel directly after the license "
+"agreement. Then print printhead alignment pages with \"lexmarkmaintain\" and "
+"adjust the head alignment settings with this program."
+msgstr ""
+
+#: printer/printerdrake.pm:2746
+#, c-format
+msgid "Lexmark X125 configuration"
+msgstr "Lexmark X125-oppsett"
+
+#: 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 ""
+
+#: printer/printerdrake.pm:2765
+#, c-format
+msgid "Firmware-Upload for HP LaserJet 1000"
+msgstr ""
+
+#: printer/printerdrake.pm:2878
+#, c-format
+msgid ""
+"Printer default settings\n"
+"\n"
+"You should make sure that the page size and the ink type/printing mode (if "
+"available) and also the hardware configuration of laser printers (memory, "
+"duplex unit, extra trays) are set correctly. Note that with a very high "
+"printout quality/resolution printing can get substantially slower."
+msgstr ""
+
+#: printer/printerdrake.pm:3003
+#, c-format
+msgid "Printer default settings"
+msgstr ""
+
+#: printer/printerdrake.pm:3010
+#, c-format
+msgid "Option %s must be an integer number!"
+msgstr ""
+
+#: printer/printerdrake.pm:3014
+#, c-format
+msgid "Option %s must be a number!"
+msgstr ""
+
+#: printer/printerdrake.pm:3018
+#, c-format
+msgid "Option %s out of range!"
+msgstr ""
+
+#: printer/printerdrake.pm:3069
+#, c-format
+msgid ""
+"Do you want to set this printer (\"%s\")\n"
+"as the default printer?"
+msgstr ""
+
+#: printer/printerdrake.pm:3084
+#, c-format
+msgid "Test pages"
+msgstr ""
+
+#: printer/printerdrake.pm:3085
+#, c-format
+msgid ""
+"Please select the test pages you want to print.\n"
+"Note: the photo test page can take a rather long time to get printed and on "
+"laser printers with too low memory it can even not come out. In most cases "
+"it is enough to print the standard test page."
+msgstr ""
+
+#: printer/printerdrake.pm:3089
+#, c-format
+msgid "No test pages"
+msgstr ""
+
+#: printer/printerdrake.pm:3090
+#, c-format
+msgid "Print"
+msgstr "Skriv ut"
+
+#: printer/printerdrake.pm:3115
+#, c-format
+msgid "Standard test page"
+msgstr ""
+
+#: printer/printerdrake.pm:3118
+#, c-format
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: printer/printerdrake.pm:3121
+#, c-format
+msgid "Alternative test page (A4)"
+msgstr ""
+
+#: printer/printerdrake.pm:3123
+#, c-format
+msgid "Photo test page"
+msgstr ""
+
+#: printer/printerdrake.pm:3127
+#, c-format
+msgid "Do not print any test page"
+msgstr ""
+
+#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#, c-format
+msgid "Printing test page(s)..."
+msgstr ""
+
+#: printer/printerdrake.pm:3150
+#, c-format
+msgid "Could not install the %s package!"
+msgstr ""
+
+#: printer/printerdrake.pm:3152
+#, c-format
+msgid "Skipping photo test page."
+msgstr ""
+
+#: printer/printerdrake.pm:3169
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer.\n"
+"It may take some time before the printer starts.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3173
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer.\n"
+"It may take some time before the printer starts.\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3180
+#, c-format
+msgid "Did it work properly?"
+msgstr ""
+
+#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#, c-format
+msgid "Raw printer"
+msgstr "Rå skrivar"
+
+#: printer/printerdrake.pm:3231
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) you can either use "
+"the command \"%s <file>\" or a graphical printing tool: \"xpp <file>\" or "
+"\"kprinter <file>\". The graphical tools allow you to choose the printer and "
+"to modify the option settings easily.\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3233
+#, c-format
+msgid ""
+"These commands you can also use in the \"Printing command\" field of the "
+"printing dialogs of many applications, but here do not supply the file name "
+"because the file to print is provided by the application.\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3236 printer/printerdrake.pm:3253
+#: printer/printerdrake.pm:3263
+#, c-format
+msgid ""
+"\n"
+"The \"%s\" command also allows to modify the option settings for a "
+"particular printing job. Simply add the desired settings to the command "
+"line, e. g. \"%s <file>\". "
+msgstr ""
+
+#: printer/printerdrake.pm:3239 printer/printerdrake.pm:3279
+#, c-format
+msgid ""
+"To know about the options available for the current printer read either the "
+"list shown below or click on the \"Print option list\" button.%s%s%s\n"
+"\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3243
+#, c-format
+msgid ""
+"Here is a list of the available printing options for the current printer:\n"
+"\n"
+msgstr ""
+
+#: 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 "
+"<file>\".\n"
+msgstr ""
+
+#: 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 "
+"printing dialogs of many applications. But here do not supply the file name "
+"because the file to print is provided by the application.\n"
+msgstr ""
+
+#: 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 "
+"\"Print option list\" button."
+msgstr ""
+
+#: printer/printerdrake.pm:3268
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\" or \"%s <file>\".\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3272
+#, c-format
+msgid ""
+"You can also use the graphical interface \"xpdq\" for setting options and "
+"handling printing jobs.\n"
+"If you are using KDE as desktop environment you have a \"panic button\", an "
+"icon on the desktop, labeled with \"STOP Printer!\", which stops all print "
+"jobs immediately when you click it. This is for example useful for paper "
+"jams.\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3276
+#, c-format
+msgid ""
+"\n"
+"The \"%s\" and \"%s\" commands also allow to modify the option settings for "
+"a particular printing job. Simply add the desired settings to the command "
+"line, e. g. \"%s <file>\".\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3286
+#, c-format
+msgid "Printing/Scanning/Photo Cards on \"%s\""
+msgstr ""
+
+#: printer/printerdrake.pm:3287
+#, c-format
+msgid "Printing/Scanning on \"%s\""
+msgstr ""
+
+#: printer/printerdrake.pm:3289
+#, c-format
+msgid "Printing/Photo Card Access on \"%s\""
+msgstr ""
+
+#: printer/printerdrake.pm:3290
+#, c-format
+msgid "Printing on the printer \"%s\""
+msgstr ""
+
+#: 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 "Lukk"
+
+#: printer/printerdrake.pm:3296
+#, c-format
+msgid "Print option list"
+msgstr ""
+
+#: printer/printerdrake.pm:3317
+#, c-format
+msgid ""
+"Your multi-function device was configured automatically to be able to scan. "
+"Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify the "
+"scanner when you have more than one) from the command line or with the "
+"graphical interfaces \"xscanimage\" or \"xsane\". If you are using the GIMP, "
+"you can also scan by choosing the appropriate point in the \"File\"/\"Acquire"
+"\" menu. Call also \"man scanimage\" on the command line to get more "
+"information.\n"
+"\n"
+"Do not use \"scannerdrake\" for this device!"
+msgstr ""
+
+#: printer/printerdrake.pm:3343
+#, c-format
+msgid ""
+"Your printer was configured automatically to give you access to the photo "
+"card drives from your PC. Now you can access your photo cards using the "
+"graphical program \"MtoolsFM\" (Menu: \"Applications\" -> \"File tools\" -> "
+"\"MTools File Manager\") or the command line utilities \"mtools\" (enter "
+"\"man mtools\" on the command line for more info). You find the card's file "
+"system under the drive letter \"p:\", or subsequent drive letters when you "
+"have more than one HP printer with photo card drives. In \"MtoolsFM\" you "
+"can switch between drive letters with the field at the upper-right corners "
+"of the file lists."
+msgstr ""
+
+#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
+#, c-format
+msgid "Reading printer data..."
+msgstr ""
+
+#: printer/printerdrake.pm:3385 printer/printerdrake.pm:3412
+#: printer/printerdrake.pm:3447
+#, c-format
+msgid "Transfer printer configuration"
+msgstr ""
+
+#: printer/printerdrake.pm:3386
+#, c-format
+msgid ""
+"You can copy the printer configuration which you have done for the spooler %"
+"s to %s, your current spooler. All the configuration data (printer name, "
+"description, location, connection type, and default option settings) is "
+"overtaken, but jobs will not be transferred.\n"
+"Not all queues can be transferred due to the following reasons:\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3389
+#, c-format
+msgid ""
+"CUPS does not support printers on Novell servers or printers sending the "
+"data into a free-formed command.\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3391
+#, c-format
+msgid ""
+"PDQ only supports local printers, remote LPD printers, and Socket/TCP "
+"printers.\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3393
+#, c-format
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3395
+#, c-format
+msgid ""
+"In addition, queues not created with this program or \"foomatic-configure\" "
+"cannot be transferred."
+msgstr ""
+
+#: printer/printerdrake.pm:3396
+#, c-format
+msgid ""
+"\n"
+"Also printers configured with the PPD files provided by their manufacturers "
+"or with native CUPS drivers cannot be transferred."
+msgstr ""
+
+#: printer/printerdrake.pm:3397
+#, c-format
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
+
+#: printer/printerdrake.pm:3400
+#, c-format
+msgid "Do not transfer printers"
+msgstr ""
+
+#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
+#, c-format
+msgid "Transfer"
+msgstr ""
+
+#: printer/printerdrake.pm:3413
+#, c-format
+msgid ""
+"A printer named \"%s\" already exists under %s. \n"
+"Click \"Transfer\" to overwrite it.\n"
+"You can also type a new name or skip this printer."
+msgstr ""
+
+#: printer/printerdrake.pm:3434
+#, c-format
+msgid "New printer name"
+msgstr ""
+
+#: printer/printerdrake.pm:3437
+#, c-format
+msgid "Transferring %s..."
+msgstr ""
+
+#: printer/printerdrake.pm:3448
+#, c-format
+msgid ""
+"You have transferred your former default printer (\"%s\"), Should it be also "
+"the default printer under the new printing system %s?"
+msgstr ""
+
+#: printer/printerdrake.pm:3458
+#, c-format
+msgid "Refreshing printer data..."
+msgstr ""
+
+#: printer/printerdrake.pm:3467
+#, c-format
+msgid "Starting network..."
+msgstr ""
+
+#: printer/printerdrake.pm:3508 printer/printerdrake.pm:3512
+#: printer/printerdrake.pm:3514
+#, c-format
+msgid "Configure the network now"
+msgstr ""
+
+#: printer/printerdrake.pm:3509
+#, c-format
+msgid "Network functionality not configured"
+msgstr ""
+
+#: printer/printerdrake.pm:3510
+#, c-format
+msgid ""
+"You are going to configure a remote printer. This needs working network "
+"access, but your network is not configured yet. If you go on without network "
+"configuration, you will not be able to use the printer which you are "
+"configuring now. How do you want to proceed?"
+msgstr ""
+
+#: printer/printerdrake.pm:3513
+#, c-format
+msgid "Go on without configuring the network"
+msgstr ""
+
+#: printer/printerdrake.pm:3547
+#, c-format
+msgid ""
+"The network configuration done during the installation cannot be started "
+"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\""
+msgstr ""
+
+#: printer/printerdrake.pm:3548
+#, c-format
+msgid ""
+"The network access was not running and could not be started. Please check "
+"your configuration and your hardware. Then try to configure your remote "
+"printer again."
+msgstr ""
+
+#: printer/printerdrake.pm:3558
+#, c-format
+msgid "Restarting printing system..."
+msgstr ""
+
+#: printer/printerdrake.pm:3597
+#, c-format
+msgid "high"
+msgstr "høg"
+
+#: printer/printerdrake.pm:3597
+#, c-format
+msgid "paranoid"
+msgstr ""
+
+#: printer/printerdrake.pm:3598
+#, c-format
+msgid "Installing a printing system in the %s security level"
+msgstr ""
+
+#: 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 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"
+"\n"
+"Do you really want to configure printing on this machine?"
+msgstr ""
+
+#: printer/printerdrake.pm:3633
+#, c-format
+msgid "Starting the printing system at boot time"
+msgstr ""
+
+#: printer/printerdrake.pm:3634
+#, c-format
+msgid ""
+"The printing system (%s) will not be started automatically when the machine "
+"is booted.\n"
+"\n"
+"It is possible that the automatic starting was turned off by changing to a "
+"higher security level, because the printing system is a potential point for "
+"attacks.\n"
+"\n"
+"Do you want to have the automatic starting of the printing system turned on "
+"again?"
+msgstr ""
+
+#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#, c-format
+msgid "Checking installed software..."
+msgstr ""
+
+#: printer/printerdrake.pm:3661
+#, c-format
+msgid "Removing %s ..."
+msgstr ""
+
+#: printer/printerdrake.pm:3665
+#, c-format
+msgid "Could not remove the %s printing system!"
+msgstr ""
+
+#: printer/printerdrake.pm:3674
+#, c-format
+msgid "Installing %s ..."
+msgstr ""
+
+#: printer/printerdrake.pm:3678
+#, c-format
+msgid "Could not install the %s printing system!"
+msgstr ""
+
+#: printer/printerdrake.pm:3727
+#, c-format
+msgid "Setting Default Printer..."
+msgstr ""
+
+#: printer/printerdrake.pm:3747
+#, c-format
+msgid "Select Printer Spooler"
+msgstr ""
+
+#: printer/printerdrake.pm:3748
+#, c-format
+msgid "Which printing system (spooler) do you want to use?"
+msgstr ""
+
+#: printer/printerdrake.pm:3799
+#, c-format
+msgid "Failed to configure printer \"%s\"!"
+msgstr ""
+
+#: printer/printerdrake.pm:3812
+#, c-format
+msgid "Installing Foomatic..."
+msgstr ""
+
+#: printer/printerdrake.pm:3818
+#, c-format
+msgid "Could not install %s packages, %s cannot be started!"
+msgstr ""
+
+#: printer/printerdrake.pm:3910
+#, c-format
+msgid "Could not install necessary packages, %s cannot be started!"
+msgstr ""
+
+#: 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 "
+"it. "
+msgstr ""
+
+#: printer/printerdrake.pm:4039
+#, c-format
+msgid "Display all available remote CUPS printers"
+msgstr ""
+
+#: printer/printerdrake.pm:4040
+#, c-format
+msgid "Refresh printer list (to display all available remote CUPS printers)"
+msgstr ""
+
+#: printer/printerdrake.pm:4050
+#, c-format
+msgid "CUPS configuration"
+msgstr ""
+
+#: printer/printerdrake.pm:4062
+#, c-format
+msgid "Change the printing system"
+msgstr ""
+
+#: printer/printerdrake.pm:4071
+#, c-format
+msgid "Normal Mode"
+msgstr ""
+
+#: printer/printerdrake.pm:4072
+#, c-format
+msgid "Expert Mode"
+msgstr ""
+
+#: printer/printerdrake.pm:4343 printer/printerdrake.pm:4398
+#: printer/printerdrake.pm:4479 printer/printerdrake.pm:4489
+#, c-format
+msgid "Printer options"
+msgstr ""
+
+#: printer/printerdrake.pm:4379
+#, c-format
+msgid "Modify printer configuration"
+msgstr ""
+
+#: printer/printerdrake.pm:4381
+#, c-format
+msgid ""
+"Printer %s\n"
+"What do you want to modify on this printer?"
+msgstr ""
+
+#: printer/printerdrake.pm:4385
+#, c-format
+msgid "Do it!"
+msgstr ""
+
+#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#, c-format
+msgid "Printer connection type"
+msgstr ""
+
+#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
+#, c-format
+msgid "Printer name, description, location"
+msgstr ""
+
+#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#, c-format
+msgid "Printer manufacturer, model, driver"
+msgstr ""
+
+#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#, c-format
+msgid "Printer manufacturer, model"
+msgstr ""
+
+#: printer/printerdrake.pm:4400 printer/printerdrake.pm:4483
+#, c-format
+msgid "Set this printer as the default"
+msgstr ""
+
+#: printer/printerdrake.pm:4402 printer/printerdrake.pm:4490
+#, c-format
+msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
+msgstr ""
+
+#: printer/printerdrake.pm:4403 printer/printerdrake.pm:4495
+#, c-format
+msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
+msgstr ""
+
+#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#, c-format
+msgid "Print test pages"
+msgstr ""
+
+#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4502
+#, c-format
+msgid "Learn how to use this printer"
+msgstr ""
+
+#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#, c-format
+msgid "Remove printer"
+msgstr ""
+
+#: printer/printerdrake.pm:4460
+#, c-format
+msgid "Removing old printer \"%s\"..."
+msgstr ""
+
+#: printer/printerdrake.pm:4491
+#, c-format
+msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
+msgstr ""
+
+#: printer/printerdrake.pm:4493
+#, c-format
+msgid ""
+"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
+msgstr ""
+
+#: printer/printerdrake.pm:4494
+#, c-format
+msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
+msgstr ""
+
+#: printer/printerdrake.pm:4496
+#, c-format
+msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
+msgstr ""
+
+#: printer/printerdrake.pm:4498
+#, c-format
+msgid ""
+"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
+"GIMP."
+msgstr ""
+
+#: printer/printerdrake.pm:4499
+#, c-format
+msgid ""
+"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
+msgstr ""
+
+#: printer/printerdrake.pm:4543
+#, c-format
+msgid "Do you really want to remove the printer \"%s\"?"
+msgstr ""
+
+#: printer/printerdrake.pm:4547
+#, c-format
+msgid "Removing printer \"%s\"..."
+msgstr ""
+
+#: printer/printerdrake.pm:4571
+#, c-format
+msgid "Default printer"
+msgstr "Standardskrivar"
+
+#: printer/printerdrake.pm:4572
+#, c-format
+msgid "The printer \"%s\" is set as the default printer now."
+msgstr ""
+
+#: raid.pm:37
+#, c-format
+msgid "Can't add a partition to _formatted_ RAID md%d"
+msgstr ""
+
+#: raid.pm:139
+#, c-format
+msgid "mkraid failed (maybe raidtools are missing?)"
+msgstr ""
+
+#: raid.pm:139
+#, c-format
+msgid "mkraid failed"
+msgstr ""
+
+#: raid.pm:155
+#, c-format
+msgid "Not enough partitions for RAID level %d\n"
+msgstr ""
+
+#: scanner.pm:96
+#, c-format
+msgid "Could not create directory /usr/share/sane/firmware!"
+msgstr ""
+
+#: scanner.pm:107
+#, c-format
+msgid "Could not create link /usr/share/sane/%s!"
+msgstr ""
+
+#: scanner.pm:114
+#, c-format
+msgid "Could not copy firmware file %s to /usr/share/sane/firmware!"
+msgstr ""
+
+#: scanner.pm:121
+#, c-format
+msgid "Could not set permissions of firmware file %s!"
+msgstr ""
+
+#: 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 ""
+
+#: scanner.pm:201 standalone/scannerdrake:915
+#, c-format
+msgid "Could not install the packages needed to share your scanner(s)."
+msgstr ""
+
+#: scanner.pm:202
+#, c-format
+msgid "Your scanner(s) will not be available for non-root users."
+msgstr ""
+
+#: security/help.pm:11
+#, c-format
+msgid "Accept/Refuse bogus IPv4 error messages."
+msgstr ""
+
+#: security/help.pm:13
+#, c-format
+msgid " Accept/Refuse broadcasted icmp echo."
+msgstr ""
+
+#: security/help.pm:15
+#, c-format
+msgid " Accept/Refuse icmp echo."
+msgstr ""
+
+#: security/help.pm:17
+#, c-format
+msgid "Allow/Forbid autologin."
+msgstr ""
+
+#: security/help.pm:19
+#, c-format
+msgid ""
+"If set to \"ALL\", /etc/issue and /etc/issue.net are allowed to exist.\n"
+"\n"
+"If set to NONE, no issues are allowed.\n"
+"\n"
+"Else only /etc/issue is allowed."
+msgstr ""
+
+#: security/help.pm:25
+#, c-format
+msgid "Allow/Forbid reboot by the console user."
+msgstr ""
+
+#: security/help.pm:27
+#, c-format
+msgid "Allow/Forbid remote root login."
+msgstr ""
+
+#: security/help.pm:29
+#, c-format
+msgid "Allow/Forbid direct root login."
+msgstr ""
+
+#: security/help.pm:31
+#, c-format
+msgid ""
+"Allow/Forbid the list of users on the system on display managers (kdm and "
+"gdm)."
+msgstr ""
+
+#: security/help.pm:33
+#, c-format
+msgid ""
+"Allow/Forbid X connections:\n"
+"\n"
+"- ALL (all connections are allowed),\n"
+"\n"
+"- LOCAL (only connection from local machine),\n"
+"\n"
+"- NONE (no connection)."
+msgstr ""
+
+#: security/help.pm:41
+#, c-format
+msgid ""
+"The argument specifies if clients are authorized to connect\n"
+"to the X server from the network on the tcp port 6000 or not."
+msgstr ""
+
+#: security/help.pm:44
+#, c-format
+msgid ""
+"Authorize:\n"
+"\n"
+"- all services controlled by tcp_wrappers (see hosts.deny(5) man page) if "
+"set to \"ALL\",\n"
+"\n"
+"- only local ones if set to \"LOCAL\"\n"
+"\n"
+"- none if set to \"NONE\".\n"
+"\n"
+"To authorize the services you need, use /etc/hosts.allow (see hosts.allow"
+"(5))."
+msgstr ""
+
+#: security/help.pm:54
+#, c-format
+msgid ""
+"If SERVER_LEVEL (or SECURE_LEVEL if absent)\n"
+"is greater than 3 in /etc/security/msec/security.conf, creates the\n"
+"symlink /etc/security/msec/server to point to\n"
+"/etc/security/msec/server.<SERVER_LEVEL>.\n"
+"\n"
+"The /etc/security/msec/server is used by chkconfig --add to decide to\n"
+"add a service if it is present in the file during the installation of\n"
+"packages."
+msgstr ""
+
+#: security/help.pm:63
+#, c-format
+msgid ""
+"Enable/Disable crontab and at for users.\n"
+"\n"
+"Put allowed users in /etc/cron.allow and /etc/at.allow (see man at(1)\n"
+"and crontab(1))."
+msgstr ""
+
+#: security/help.pm:68
+#, c-format
+msgid "Enable/Disable syslog reports to console 12"
+msgstr ""
+
+#: security/help.pm:70
+#, c-format
+msgid ""
+"Enable/Disable name resolution spoofing protection.  If\n"
+"\"alert\" is true, also reports to syslog."
+msgstr ""
+
+#: security/help.pm:73
+#, c-format
+msgid "Enable/Disable IP spoofing protection."
+msgstr ""
+
+#: security/help.pm:75
+#, c-format
+msgid "Enable/Disable libsafe if libsafe is found on the system."
+msgstr ""
+
+#: security/help.pm:77
+#, c-format
+msgid "Enable/Disable the logging of IPv4 strange packets."
+msgstr ""
+
+#: security/help.pm:79
+#, c-format
+msgid "Enable/Disable msec hourly security check."
+msgstr ""
+
+#: security/help.pm:81
+#, c-format
+msgid ""
+" Enabling su only from members of the wheel group or allow su from any user."
+msgstr ""
+
+#: security/help.pm:83
+#, c-format
+msgid "Use password to authenticate users."
+msgstr ""
+
+#: security/help.pm:85
+#, c-format
+msgid "Activate/Disable ethernet cards promiscuity check."
+msgstr ""
+
+#: security/help.pm:87
+#, c-format
+msgid " Activate/Disable daily security check."
+msgstr ""
+
+#: security/help.pm:89
+#, c-format
+msgid " Enable/Disable sulogin(8) in single user level."
+msgstr ""
+
+#: security/help.pm:91
+#, c-format
+msgid "Add the name as an exception to the handling of password aging by msec."
+msgstr ""
+
+#: security/help.pm:93
+#, c-format
+msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
+msgstr ""
+
+#: security/help.pm:95
+#, c-format
+msgid "Set the password history length to prevent password reuse."
+msgstr ""
+
+#: security/help.pm:97
+#, c-format
+msgid ""
+"Set the password minimum length and minimum number of digit and minimum "
+"number of capitalized letters."
+msgstr ""
+
+#: security/help.pm:99
+#, c-format
+msgid "Set the root umask."
+msgstr ""
+
+#: security/help.pm:100
+#, c-format
+msgid "if set to yes, check open ports."
+msgstr ""
+
+#: security/help.pm:101
+#, c-format
+msgid ""
+"if set to yes, check for :\n"
+"\n"
+"- empty passwords,\n"
+"\n"
+"- no password in /etc/shadow\n"
+"\n"
+"- for users with the 0 id other than root."
+msgstr ""
+
+#: security/help.pm:108
+#, c-format
+msgid "if set to yes, check permissions of files in the users' home."
+msgstr ""
+
+#: security/help.pm:109
+#, c-format
+msgid "if set to yes, check if the network devices are in promiscuous mode."
+msgstr ""
+
+#: security/help.pm:110
+#, c-format
+msgid "if set to yes, run the daily security checks."
+msgstr ""
+
+#: security/help.pm:111
+#, c-format
+msgid "if set to yes, check additions/removals of sgid files."
+msgstr ""
+
+#: security/help.pm:112
+#, c-format
+msgid "if set to yes, check empty password in /etc/shadow."
+msgstr ""
+
+#: security/help.pm:113
+#, c-format
+msgid "if set to yes, verify checksum of the suid/sgid files."
+msgstr ""
+
+#: security/help.pm:114
+#, c-format
+msgid "if set to yes, check additions/removals of suid root files."
+msgstr ""
+
+#: security/help.pm:115
+#, c-format
+msgid "if set to yes, report unowned files."
+msgstr ""
+
+#: security/help.pm:116
+#, c-format
+msgid "if set to yes, check files/directories writable by everybody."
+msgstr ""
+
+#: security/help.pm:117
+#, c-format
+msgid "if set to yes, run chkrootkit checks."
+msgstr ""
+
+#: security/help.pm:118
+#, c-format
+msgid ""
+"if set, send the mail report to this email address else send it to root."
+msgstr ""
+
+#: security/help.pm:119
+#, c-format
+msgid "if set to yes, report check result by mail."
+msgstr ""
+
+#: security/help.pm:120
+#, c-format
+msgid "Do not send mails if there's nothing to warn about"
+msgstr ""
+
+#: security/help.pm:121
+#, c-format
+msgid "if set to yes, run some checks against the rpm database."
+msgstr ""
+
+#: security/help.pm:122
+#, c-format
+msgid "if set to yes, report check result to syslog."
+msgstr ""
+
+#: security/help.pm:123
+#, c-format
+msgid "if set to yes, reports check result to tty."
+msgstr ""
+
+#: security/help.pm:125
+#, c-format
+msgid "Set shell commands history size. A value of -1 means unlimited."
+msgstr ""
+
+#: security/help.pm:127
+#, c-format
+msgid "Set the shell timeout. A value of zero means no timeout."
+msgstr ""
+
+#: security/help.pm:127
+#, c-format
+msgid "Timeout unit is second"
+msgstr ""
+
+#: security/help.pm:129
+#, c-format
+msgid "Set the user umask."
+msgstr ""
+
+#: security/l10n.pm:11
+#, c-format
+msgid "Accept bogus IPv4 error messages"
+msgstr ""
+
+#: security/l10n.pm:12
+#, c-format
+msgid "Accept broadcasted icmp echo"
+msgstr ""
+
+#: security/l10n.pm:13
+#, c-format
+msgid "Accept icmp echo"
+msgstr ""
+
+#: security/l10n.pm:15
+#, c-format
+msgid "/etc/issue* exist"
+msgstr ""
+
+#: security/l10n.pm:16
+#, c-format
+msgid "Reboot by the console user"
+msgstr ""
+
+#: security/l10n.pm:17
+#, c-format
+msgid "Allow remote root login"
+msgstr ""
+
+#: security/l10n.pm:18
+#, c-format
+msgid "Direct root login"
+msgstr ""
+
+#: security/l10n.pm:19
+#, c-format
+msgid "List users on display managers (kdm and gdm)"
+msgstr ""
+
+#: security/l10n.pm:20
+#, c-format
+msgid "Allow X Window connections"
+msgstr ""
+
+#: security/l10n.pm:21
+#, c-format
+msgid "Authorize TCP connections to X Window"
+msgstr ""
+
+#: security/l10n.pm:22
+#, c-format
+msgid "Authorize all services controlled by tcp_wrappers"
+msgstr ""
+
+#: security/l10n.pm:23
+#, c-format
+msgid "Chkconfig obey msec rules"
+msgstr ""
+
+#: security/l10n.pm:24
+#, c-format
+msgid "Enable \"crontab\" and \"at\" for users"
+msgstr ""
+
+#: security/l10n.pm:25
+#, c-format
+msgid "Syslog reports to console 12"
+msgstr ""
+
+#: security/l10n.pm:26
+#, c-format
+msgid "Name resolution spoofing protection"
+msgstr ""
+
+#: security/l10n.pm:27
+#, c-format
+msgid "Enable IP spoofing protection"
+msgstr ""
+
+#: security/l10n.pm:28
+#, c-format
+msgid "Enable libsafe if libsafe is found on the system"
+msgstr ""
+
+#: security/l10n.pm:29
+#, c-format
+msgid "Enable the logging of IPv4 strange packets"
+msgstr ""
+
+#: security/l10n.pm:30
+#, c-format
+msgid "Enable msec hourly security check"
+msgstr ""
+
+#: security/l10n.pm:31
+#, c-format
+msgid "Enable su only from the wheel group members or for any user"
+msgstr ""
+
+#: security/l10n.pm:32
+#, c-format
+msgid "Use password to authenticate users"
+msgstr ""
+
+#: security/l10n.pm:33
+#, c-format
+msgid "Ethernet cards promiscuity check"
+msgstr ""
+
+#: security/l10n.pm:34
+#, c-format
+msgid "Daily security check"
+msgstr ""
+
+#: security/l10n.pm:35
+#, c-format
+msgid "Sulogin(8) in single user level"
+msgstr ""
+
+#: security/l10n.pm:36
+#, c-format
+msgid "No password aging for"
+msgstr ""
+
+#: security/l10n.pm:37
+#, c-format
+msgid "Set password expiration and account inactivation delays"
+msgstr ""
+
+#: security/l10n.pm:38
+#, c-format
+msgid "Password history length"
+msgstr ""
+
+#: security/l10n.pm:39
+#, c-format
+msgid "Password minimum length and number of digits and upcase letters"
+msgstr ""
+
+#: security/l10n.pm:40
+#, c-format
+msgid "Root umask"
+msgstr ""
+
+#: security/l10n.pm:41
+#, c-format
+msgid "Shell history size"
+msgstr ""
+
+#: security/l10n.pm:42
+#, c-format
+msgid "Shell timeout"
+msgstr ""
+
+#: security/l10n.pm:43
+#, c-format
+msgid "User umask"
+msgstr ""
+
+#: security/l10n.pm:44
+#, c-format
+msgid "Check open ports"
+msgstr ""
+
+#: security/l10n.pm:45
+#, c-format
+msgid "Check for unsecured accounts"
+msgstr ""
+
+#: security/l10n.pm:46
+#, c-format
+msgid "Check permissions of files in the users' home"
+msgstr ""
+
+#: security/l10n.pm:47
+#, c-format
+msgid "Check if the network devices are in promiscuous mode"
+msgstr ""
+
+#: security/l10n.pm:48
+#, c-format
+msgid "Run the daily security checks"
+msgstr ""
+
+#: security/l10n.pm:49
+#, c-format
+msgid "Check additions/removals of sgid files"
+msgstr ""
+
+#: security/l10n.pm:50
+#, c-format
+msgid "Check empty password in /etc/shadow"
+msgstr ""
+
+#: security/l10n.pm:51
+#, c-format
+msgid "Verify checksum of the suid/sgid files"
+msgstr ""
+
+#: security/l10n.pm:52
+#, c-format
+msgid "Check additions/removals of suid root files"
+msgstr ""
+
+#: security/l10n.pm:53
+#, c-format
+msgid "Report unowned files"
+msgstr ""
+
+#: security/l10n.pm:54
+#, c-format
+msgid "Check files/directories writable by everybody"
+msgstr ""
+
+#: security/l10n.pm:55
+#, c-format
+msgid "Run chkrootkit checks"
+msgstr ""
+
+#: security/l10n.pm:56
+#, c-format
+msgid "Do not send mails when unneeded"
+msgstr ""
+
+#: security/l10n.pm:57
+#, c-format
+msgid "If set, send the mail report to this email address else send it to root"
+msgstr ""
+
+#: security/l10n.pm:58
+#, c-format
+msgid "Report check result by mail"
+msgstr ""
+
+#: security/l10n.pm:59
+#, c-format
+msgid "Run some checks against the rpm database"
+msgstr ""
+
+#: security/l10n.pm:60
+#, c-format
+msgid "Report check result to syslog"
+msgstr ""
+
+#: security/l10n.pm:61
+#, c-format
+msgid "Reports check result to tty"
+msgstr ""
+
+#: security/level.pm:10
+#, c-format
+msgid "Welcome To Crackers"
+msgstr ""
+
+#: security/level.pm:11
+#, c-format
+msgid "Poor"
+msgstr ""
+
+#: security/level.pm:13
+#, c-format
+msgid "High"
+msgstr "Høg"
+
+#: security/level.pm:14
+#, c-format
+msgid "Higher"
+msgstr ""
+
+#: security/level.pm:15
+#, c-format
+msgid "Paranoid"
+msgstr ""
+
+#: security/level.pm:41
+#, c-format
+msgid ""
+"This level is to be used with care. It makes your system more easy to use,\n"
+"but very sensitive. It must not be used for a machine connected to others\n"
+"or to the Internet. There is no password access."
+msgstr ""
+
+#: security/level.pm:44
+#, c-format
+msgid ""
+"Passwords are now enabled, but use as a networked computer is still not "
+"recommended."
+msgstr ""
+
+#: security/level.pm:45
+#, c-format
+msgid ""
+"This is the standard security recommended for a computer that will be used "
+"to connect to the Internet as a client."
+msgstr ""
+
+#: security/level.pm:46
+#, c-format
+msgid ""
+"There are already some restrictions, and more automatic checks are run every "
+"night."
+msgstr ""
+
+#: security/level.pm:47
+#, c-format
+msgid ""
+"With this security level, the use of this system as a server becomes "
+"possible.\n"
+"The security is now high enough to use the system as a server which can "
+"accept\n"
+"connections from many clients. Note: if your machine is only a client on the "
+"Internet, you should choose a lower level."
+msgstr ""
+
+#: security/level.pm:50
+#, c-format
+msgid ""
+"This is similar to the previous level, but the system is entirely closed and "
+"security features are at their maximum."
+msgstr ""
+
+#: security/level.pm:55
+#, c-format
+msgid "DrakSec Basic Options"
+msgstr ""
+
+#: security/level.pm:56
+#, c-format
+msgid "Please choose the desired security level"
+msgstr ""
+
+#: security/level.pm:60
+#, c-format
+msgid "Security level"
+msgstr ""
+
+#: security/level.pm:62
+#, c-format
+msgid "Use libsafe for servers"
+msgstr ""
+
+#: security/level.pm:63
+#, c-format
+msgid ""
+"A library which defends against buffer overflow and format string attacks."
+msgstr ""
+
+#: security/level.pm:64
+#, c-format
+msgid "Security Administrator (login or email)"
+msgstr ""
+
+#: services.pm:19
+#, c-format
+msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
+msgstr ""
+
+#: services.pm:20
+#, c-format
+msgid "Anacron is a periodic command scheduler."
+msgstr ""
+
+#: services.pm:21
+#, c-format
+msgid ""
+"apmd is used for monitoring battery status and logging it via syslog.\n"
+"It can also be used for shutting down the machine when the battery is low."
+msgstr ""
+
+#: services.pm:23
+#, c-format
+msgid ""
+"Runs commands scheduled by the at command at the time specified when\n"
+"at was run, and runs batch commands when the load average is low enough."
+msgstr ""
+
+#: services.pm:25
+#, c-format
+msgid ""
+"cron is a standard UNIX program that runs user-specified programs\n"
+"at periodic scheduled times. vixie cron adds a number of features to the "
+"basic\n"
+"UNIX cron, including better security and more powerful configuration options."
+msgstr ""
+
+#: services.pm:28
+#, c-format
+msgid ""
+"FAM is a file monitoring daemon. It is used to get reports when files "
+"change.\n"
+"It is used by GNOME and KDE"
+msgstr ""
+
+#: services.pm:30
+#, c-format
+msgid ""
+"GPM adds mouse support to text-based Linux applications such the\n"
+"Midnight Commander. It also allows mouse-based console cut-and-paste "
+"operations,\n"
+"and includes support for pop-up menus on the console."
+msgstr ""
+
+#: services.pm:33
+#, c-format
+msgid ""
+"HardDrake runs a hardware probe, and optionally configures\n"
+"new/changed hardware."
+msgstr ""
+
+#: services.pm:35
+#, c-format
+msgid ""
+"Apache is a World Wide Web server. It is used to serve HTML files and CGI."
+msgstr ""
+
+#: services.pm:36
+#, c-format
+msgid ""
+"The internet superserver daemon (commonly called inetd) starts a\n"
+"variety of other internet services as needed. It is responsible for "
+"starting\n"
+"many services, including telnet, ftp, rsh, and rlogin. Disabling inetd "
+"disables\n"
+"all of the services it is responsible for."
+msgstr ""
+
+#: services.pm:40
+#, c-format
+msgid ""
+"Launch packet filtering for Linux kernel 2.2 series, to set\n"
+"up a firewall to protect your machine from network attacks."
+msgstr ""
+
+#: services.pm:42
+#, c-format
+msgid ""
+"This package loads the selected keyboard map as set in\n"
+"/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
+"You should leave this enabled for most machines."
+msgstr ""
+
+#: services.pm:45
+#, c-format
+msgid ""
+"Automatic regeneration of kernel header in /boot for\n"
+"/usr/include/linux/{autoconf,version}.h"
+msgstr ""
+
+#: services.pm:47
+#, c-format
+msgid "Automatic detection and configuration of hardware at boot."
+msgstr ""
+
+#: services.pm:48
+#, c-format
+msgid ""
+"Linuxconf will sometimes arrange to perform various tasks\n"
+"at boot-time to maintain the system configuration."
+msgstr ""
+
+#: services.pm:50
+#, c-format
+msgid ""
+"lpd is the print daemon required for lpr to work properly. It is\n"
+"basically a server that arbitrates print jobs to printer(s)."
+msgstr ""
+
+#: services.pm:52
+#, c-format
+msgid ""
+"Linux Virtual Server, used to build a high-performance and highly\n"
+"available server."
+msgstr ""
+
+#: services.pm:54
+#, c-format
+msgid ""
+"named (BIND) is a Domain Name Server (DNS) that is used to resolve host "
+"names to IP addresses."
+msgstr ""
+
+#: services.pm:55
+#, c-format
+msgid ""
+"Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
+"Manager/Windows), and NCP (NetWare) mount points."
+msgstr ""
+
+#: services.pm:57
+#, c-format
+msgid ""
+"Activates/Deactivates all network interfaces configured to start\n"
+"at boot time."
+msgstr ""
+
+#: services.pm:59
+#, c-format
+msgid ""
+"NFS is a popular protocol for file sharing across TCP/IP networks.\n"
+"This service provides NFS server functionality, which is configured via the\n"
+"/etc/exports file."
+msgstr ""
+
+#: services.pm:62
+#, c-format
+msgid ""
+"NFS is a popular protocol for file sharing across TCP/IP\n"
+"networks. This service provides NFS file locking functionality."
+msgstr ""
+
+#: services.pm:64
+#, c-format
+msgid ""
+"Automatically switch on numlock key locker under console\n"
+"and XFree at boot."
+msgstr ""
+
+#: services.pm:66
+#, c-format
+msgid "Support the OKI 4w and compatible winprinters."
+msgstr ""
+
+#: services.pm:67
+#, c-format
+msgid ""
+"PCMCIA support is usually to support things like ethernet and\n"
+"modems in laptops.  It won't get started unless configured so it is safe to "
+"have\n"
+"it installed on machines that don't need it."
+msgstr ""
+
+#: services.pm:70
+#, c-format
+msgid ""
+"The portmapper manages RPC connections, which are used by\n"
+"protocols such as NFS and NIS. The portmap server must be running on "
+"machines\n"
+"which act as servers for protocols which make use of the RPC mechanism."
+msgstr ""
+
+#: services.pm:73
+#, c-format
+msgid ""
+"Postfix is a Mail Transport Agent, which is the program that moves mail from "
+"one machine to another."
+msgstr ""
+
+#: services.pm:74
+#, c-format
+msgid ""
+"Saves and restores system entropy pool for higher quality random\n"
+"number generation."
+msgstr ""
+
+#: services.pm:76
+#, c-format
+msgid ""
+"Assign raw devices to block devices (such as hard drive\n"
+"partitions), for the use of applications such as Oracle or DVD players"
+msgstr ""
+
+#: services.pm:78
+#, c-format
+msgid ""
+"The routed daemon allows for automatic IP router table updated via\n"
+"the RIP protocol. While RIP is widely used on small networks, more complex\n"
+"routing protocols are needed for complex networks."
+msgstr ""
+
+#: services.pm:81
+#, c-format
+msgid ""
+"The rstat protocol allows users on a network to retrieve\n"
+"performance metrics for any machine on that network."
+msgstr ""
+
+#: services.pm:83
+#, c-format
+msgid ""
+"The rusers protocol allows users on a network to identify who is\n"
+"logged in on other responding machines."
+msgstr ""
+
+#: services.pm:85
+#, c-format
+msgid ""
+"The rwho protocol lets remote users get a list of all of the users\n"
+"logged into a machine running the rwho daemon (similiar to finger)."
+msgstr ""
+
+#: services.pm:87
+#, c-format
+msgid "Launch the sound system on your machine"
+msgstr ""
+
+#: services.pm:88
+#, c-format
+msgid ""
+"Syslog is the facility by which many daemons use to log messages\n"
+"to various system log files.  It is a good idea to always run syslog."
+msgstr ""
+
+#: services.pm:90
+#, c-format
+msgid "Load the drivers for your usb devices."
+msgstr ""
+
+#: services.pm:91
+#, c-format
+msgid "Starts the X Font Server (this is mandatory for XFree to run)."
+msgstr ""
+
+#: services.pm:117 services.pm:159
+#, c-format
+msgid "Choose which services should be automatically started at boot time"
+msgstr ""
+
+#: services.pm:129
+#, c-format
+msgid "Printing"
+msgstr "Skriv ut"
+
+#: services.pm:130
+#, c-format
+msgid "Internet"
+msgstr "Internett"
+
+#: services.pm:133
+#, c-format
+msgid "File sharing"
+msgstr ""
+
+#: services.pm:140
+#, c-format
+msgid "Remote Administration"
+msgstr ""
+
+#: services.pm:148
+#, c-format
+msgid "Database Server"
+msgstr ""
+
+#: services.pm:211
+#, c-format
+msgid "running"
+msgstr ""
+
+#: services.pm:211
+#, c-format
+msgid "stopped"
+msgstr ""
+
+#: services.pm:215
+#, c-format
+msgid "Services and deamons"
+msgstr ""
+
+#: services.pm:221
+#, c-format
+msgid ""
+"No additional information\n"
+"about this service, sorry."
+msgstr ""
+
+#: services.pm:226 ugtk2.pm:1167
+#, c-format
+msgid "Info"
+msgstr "Informasjon"
+
+#: services.pm:229
+#, c-format
+msgid "Start when requested"
+msgstr ""
+
+#: services.pm:229
+#, c-format
+msgid "On boot"
+msgstr ""
+
+#: services.pm:244
+#, c-format
+msgid "Start"
+msgstr "Start"
+
+#: services.pm:244
+#, c-format
+msgid "Stop"
+msgstr "Stopp"
+
+#: 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 Mandrakelinux!</b>"
+msgstr ""
+
+#: share/advertising/dis-01.pl:15 share/advertising/dwd-01.pl:15
+#: share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15
+#, c-format
+msgid "Welcome to the Open Source world!"
+msgstr ""
+
+#: share/advertising/dis-01.pl:17
+#, c-format
+msgid ""
+"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 ""
+
+#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
+#: share/advertising/ppp-01.pl:19
+#, c-format
+msgid ""
+"We would like to thank everyone who participated in the development of this "
+"latest release."
+msgstr ""
+
+#: share/advertising/dis-02.pl:13
+#, c-format
+msgid "<b>Discovery</b>"
+msgstr ""
+
+#: share/advertising/dis-02.pl:15
+#, c-format
+msgid ""
+"Discovery is the easiest and most user-friendly Linux distribution. It "
+"includes a hand-picked selection of premium software for Office, Multimedia "
+"and Internet activities."
+msgstr ""
+
+#: share/advertising/dis-02.pl:17
+#, c-format
+msgid "The menu is task-oriented, with a single selected application per task."
+msgstr ""
+
+#: share/advertising/dis-03.pl:13
+#, c-format
+msgid "<b>The KDE Choice</b>"
+msgstr ""
+
+#: share/advertising/dis-03.pl:15
+#, c-format
+msgid ""
+"The powerful Open Source graphical desktop environment KDE is the desktop of "
+"choice for the Discovery Pack."
+msgstr ""
+
+#: share/advertising/dis-04.pl:13
+#, c-format
+msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
+msgstr ""
+
+#: share/advertising/dis-04.pl:15
+#, c-format
+msgid ""
+"<b>WRITER</b> is a powerful word processor for creating all types of text "
+"documents. Documents may include images, diagrams and tables."
+msgstr ""
+
+#: share/advertising/dis-04.pl:16
+#, c-format
+msgid ""
+"<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
+"analyze and manage all of your data."
+msgstr ""
+
+#: share/advertising/dis-04.pl:17
+#, c-format
+msgid ""
+"<b>IMPRESS</b> is the fastest, most powerful way to create effective "
+"multimedia presentations."
+msgstr ""
+
+#: share/advertising/dis-04.pl:18
+#, c-format
+msgid ""
+"<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
+"illustrations."
+msgstr ""
+
+#: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
+#, c-format
+msgid "<b>Surf The Internet</b>"
+msgstr ""
+
+#: share/advertising/dis-05.pl:15
+#, c-format
+msgid "Discover the new integrated personal information suite KDE Kontact."
+msgstr ""
+
+#: share/advertising/dis-05.pl:17
+#, c-format
+msgid ""
+"More than just a full-featured email client, <b>Kontact</b> also includes an "
+"address book, a calendar and scheduling program, plus a tool for taking "
+"notes!"
+msgstr ""
+
+#: share/advertising/dis-06.pl:15
+#, c-format
+msgid "You can also:"
+msgstr ""
+
+#: share/advertising/dis-06.pl:16
+#, c-format
+msgid "\t- browse the Web"
+msgstr ""
+
+#: share/advertising/dis-06.pl:17
+#, c-format
+msgid "\t- chat"
+msgstr ""
+
+#: share/advertising/dis-06.pl:18
+#, c-format
+msgid "\t- organize a video-conference"
+msgstr ""
+
+#: share/advertising/dis-06.pl:19
+#, c-format
+msgid "\t- create your own Web site"
+msgstr ""
+
+#: share/advertising/dis-06.pl:20
+#, c-format
+msgid "\t- ..."
+msgstr ""
+
+#: share/advertising/dis-07.pl:13
+#, c-format
+msgid "<b>Multimedia</b>: Software for every need!"
+msgstr ""
+
+#: share/advertising/dis-07.pl:15
+#, c-format
+msgid "Listen to audio CDs with <b>KsCD</b>."
+msgstr ""
+
+#: share/advertising/dis-07.pl:17
+#, c-format
+msgid "Listen to music files and watch videos with <b>Totem</b>."
+msgstr ""
+
+#: share/advertising/dis-07.pl:19
+#, c-format
+msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
+msgstr ""
+
+#: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
+#: share/advertising/pwp-07.pl:13
+#, c-format
+msgid "<b>Mandrake Control Center</b>"
+msgstr ""
+
+#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
+#: share/advertising/pwp-07.pl:15
+#, c-format
+msgid ""
+"The Mandrake Control Center is an essential collection of Mandrake-specific "
+"utilities for simplifying the configuration of your computer."
+msgstr ""
+
+#: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
+#: share/advertising/pwp-07.pl:17
+#, c-format
+msgid ""
+"You will immediately appreciate this collection of handy utilities for "
+"easily configuring hardware devices, defining mount points, setting up "
+"Network and Internet, adjusting the security level of your computer, and "
+"just about everything related to the system."
+msgstr ""
+
+#: share/advertising/dis-09.pl:13 share/advertising/dwd-06.pl:13
+#: share/advertising/ppp-09.pl:13 share/advertising/pwp-08.pl:13
+#, c-format
+msgid "<b>MandrakeStore</b>"
+msgstr ""
+
+#: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
+#: share/advertising/pwp-08.pl:15
+#, c-format
+msgid ""
+"Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
+"full service e-commerce platform."
+msgstr ""
+
+#: share/advertising/dis-09.pl:17 share/advertising/dwd-06.pl:19
+#: share/advertising/ppp-09.pl:17 share/advertising/pwp-08.pl:17
+#, c-format
+msgid "Stop by today at <b>www.mandrakestore.com</b>"
+msgstr ""
+
+#: share/advertising/dis-10.pl:13 share/advertising/ppp-10.pl:13
+#: share/advertising/pwp-09.pl:13
+#, c-format
+msgid "Become a <b>MandrakeClub</b> member!"
+msgstr ""
+
+#: share/advertising/dis-10.pl:15 share/advertising/ppp-10.pl:15
+#: share/advertising/pwp-09.pl:15
+#, c-format
+msgid ""
+"Take advantage of valuable benefits, products and services by joining "
+"MandrakeClub, such as:"
+msgstr ""
+
+#: share/advertising/dis-10.pl:16 share/advertising/dwd-07.pl:16
+#: share/advertising/ppp-10.pl:17 share/advertising/pwp-09.pl:16
+#, c-format
+msgid "\t- Full access to commercial applications"
+msgstr ""
+
+#: share/advertising/dis-10.pl:17 share/advertising/dwd-07.pl:17
+#: share/advertising/ppp-10.pl:18 share/advertising/pwp-09.pl:17
+#, c-format
+msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
+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 Mandrakelinux"
+msgstr ""
+
+#: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
+#: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
+#, c-format
+msgid "\t- Special discounts for products and services at MandrakeStore"
+msgstr ""
+
+#: share/advertising/dis-10.pl:20 share/advertising/dwd-07.pl:20
+#: share/advertising/ppp-04.pl:21 share/advertising/ppp-06.pl:19
+#: share/advertising/ppp-10.pl:21 share/advertising/pwp-04.pl:21
+#: share/advertising/pwp-09.pl:20
+#, c-format
+msgid "\t- Plus much more"
+msgstr ""
+
+#: share/advertising/dis-10.pl:22 share/advertising/dwd-07.pl:22
+#: share/advertising/ppp-10.pl:23 share/advertising/pwp-09.pl:22
+#, c-format
+msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
+msgstr ""
+
+#: share/advertising/dis-11.pl:13
+#, c-format
+msgid "Do you require assistance?"
+msgstr ""
+
+#: share/advertising/dis-11.pl:15 share/advertising/dwd-08.pl:16
+#: share/advertising/ppp-11.pl:15 share/advertising/pwp-10.pl:15
+#, c-format
+msgid "<b>MandrakeExpert</b> is the primary source for technical support."
+msgstr ""
+
+#: share/advertising/dis-11.pl:17 share/advertising/dwd-08.pl:18
+#: share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
+#, c-format
+msgid ""
+"If you have Linux questions, subscribe to MandrakeExpert at <b>www."
+"mandrakeexpert.com</b>"
+msgstr ""
+
+#: share/advertising/dwd-01.pl:17
+#, c-format
+msgid ""
+"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 "
+"Mandrakelinux contributors."
+msgstr ""
+
+#: share/advertising/dwd-02.pl:13
+#, c-format
+msgid "<b>Join the Mandrakelinux community!</b>"
+msgstr ""
+
+#: share/advertising/dwd-02.pl:15
+#, c-format
+msgid ""
+"If you would like to get involved, please subscribe to the \"Cooker\" "
+"mailing list by visiting <b>mandrake-linux.com/cooker</b>"
+msgstr ""
+
+#: share/advertising/dwd-02.pl:17
+#, c-format
+msgid ""
+"To learn more about our dynamic community, please visit <b>www.mandrake-"
+"linux.com</b>!"
+msgstr ""
+
+#: share/advertising/dwd-03.pl:13
+#, c-format
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr ""
+
+#: share/advertising/dwd-03.pl:15
+#, c-format
+msgid ""
+"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 ""
+
+#: share/advertising/dwd-03.pl:17
+#, c-format
+msgid ""
+"Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the "
+"latest versions of the most popular Open Source applications."
+msgstr ""
+
+#: share/advertising/dwd-04.pl:13
+#, c-format
+msgid ""
+"Mandrakelinux is widely known as the most user-friendly and the easiest to "
+"install and easy to use Linux distribution."
+msgstr ""
+
+#: share/advertising/dwd-04.pl:15
+#, c-format
+msgid "Find out about our <b>Personal Solutions</b>:"
+msgstr ""
+
+#: share/advertising/dwd-04.pl:16
+#, c-format
+msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+msgstr ""
+
+#: share/advertising/dwd-04.pl:17
+#, c-format
+msgid ""
+"\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
+"<b>Discovery</b> perfectly meets your needs"
+msgstr ""
+
+#: share/advertising/dwd-04.pl:18
+#, c-format
+msgid ""
+"\t- If you appreciate the largest selection of software including powerful "
+"development tools, <b>PowerPack</b> is for you"
+msgstr ""
+
+#: share/advertising/dwd-04.pl:19
+#, c-format
+msgid ""
+"\t- If you require a full-featured Linux solution customized for small to "
+"medium-sized networks, choose <b>PowerPack+</b>"
+msgstr ""
+
+#: share/advertising/dwd-05.pl:13
+#, c-format
+msgid "Find out also our <b>Business Solutions</b>!"
+msgstr ""
+
+#: share/advertising/dwd-05.pl:15
+#, c-format
+msgid ""
+"<b>Corporate Server</b>: the ideal solution for entreprises. It is a "
+"complete \"all-in-one\" solution that includes everything needed to rapidly "
+"deploy world-class Linux server applications."
+msgstr ""
+
+#: share/advertising/dwd-05.pl:17
+#, c-format
+msgid ""
+"<b>Multi Network Firewall</b>: based on Linux 2.4 \"kernel secure\" to "
+"provide multi-VPN as well as multi-DMZ functionalities. It is the perfect "
+"high performance security solution."
+msgstr ""
+
+#: share/advertising/dwd-05.pl:19
+#, 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 Mandrakelinux "
+"distribution. A unique blend for incomparable HPC performance."
+msgstr ""
+
+#: share/advertising/dwd-06.pl:15
+#, c-format
+msgid ""
+"Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
+"commerce platform."
+msgstr ""
+
+#: share/advertising/dwd-06.pl:17
+#, c-format
+msgid ""
+"Find out also support incidents if you have any problems, from standard to "
+"professional support, from 1 to 50 incidents, take the one which meets "
+"perfectly your needs!"
+msgstr ""
+
+#: share/advertising/dwd-07.pl:13
+#, c-format
+msgid "<b>Become a MandrakeClub member!</b>"
+msgstr ""
+
+#: share/advertising/dwd-07.pl:15
+#, c-format
+msgid ""
+"Take advantage of valuable benefits, products and services by joining "
+"Mandrake Club, such as:"
+msgstr ""
+
+#: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
+#: share/advertising/pwp-10.pl:13
+#, c-format
+msgid "<b>Do you require assistance?</b>"
+msgstr ""
+
+#: share/advertising/dwd-09.pl:16
+#, c-format
+msgid "<b>Note</b>"
+msgstr ""
+
+#: share/advertising/dwd-09.pl:18
+#, c-format
+msgid "This is the Mandrakelinux <b>Download version</b>."
+msgstr ""
+
+#: share/advertising/dwd-09.pl:20
+#, 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 "
+"video cards (such as ATI® and NVIDIA®)."
+msgstr ""
+
+#: share/advertising/ppp-01.pl:17
+#, c-format
+msgid ""
+"Your new Mandrakelinux distribution and its many applications are the result "
+"of collaborative efforts between MandrakeSoft developers and Mandrakelinux "
+"contributors throughout the world."
+msgstr ""
+
+#: share/advertising/ppp-02.pl:13
+#, c-format
+msgid "<b>PowerPack+</b>"
+msgstr ""
+
+#: share/advertising/ppp-02.pl:15
+#, c-format
+msgid ""
+"PowerPack+ is a full-featured Linux solution for small to medium-sized "
+"networks. PowerPack+ increases the value of the standard PowerPack by adding "
+"a comprehensive selection of world-class server applications."
+msgstr ""
+
+#: share/advertising/ppp-02.pl:17
+#, c-format
+msgid ""
+"It is the only Mandrakelinux product that includes the groupware solution."
+msgstr ""
+
+#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
+#, c-format
+msgid "<b>Choose your graphical Desktop environment!</b>"
+msgstr ""
+
+#: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
+#, c-format
+msgid ""
+"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 ""
+
+#: share/advertising/ppp-04.pl:13
+#, c-format
+msgid ""
+"In the Mandrakelinux menu you will find easy-to-use applications for all "
+"tasks:"
+msgstr ""
+
+#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
+#, c-format
+msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
+msgstr ""
+
+#: share/advertising/ppp-04.pl:16
+#, c-format
+msgid ""
+"\t- Take charge of your personal data with the integrated personal "
+"information suites: <b>Kontact</b> and <b>Evolution</b>"
+msgstr ""
+
+#: share/advertising/ppp-04.pl:17
+#, c-format
+msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
+msgstr ""
+
+#: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
+#, c-format
+msgid "\t- Participate in online chat with <b>Kopete</b>"
+msgstr ""
+
+#: share/advertising/ppp-04.pl:19
+#, c-format
+msgid ""
+"\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
+msgstr ""
+
+#: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
+#, c-format
+msgid "\t- Edit images and photos with <b>The Gimp</b>"
+msgstr ""
+
+#: share/advertising/ppp-05.pl:13
+#, c-format
+msgid ""
+"PowerPack+ includes everything needed for developing and creating your own "
+"software, including:"
+msgstr ""
+
+#: share/advertising/ppp-05.pl:15 share/advertising/pwp-05.pl:16
+#, c-format
+msgid ""
+"\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
+"Environment for C++ programming"
+msgstr ""
+
+#: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
+#, c-format
+msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
+msgstr ""
+
+#: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
+#, c-format
+msgid "\t- <b>GDB</b>: the GNU Project debugger"
+msgstr ""
+
+#: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
+#, c-format
+msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
+msgstr ""
+
+#: share/advertising/ppp-05.pl:19
+#, c-format
+msgid ""
+"\t- <b>Xemacs</b>: open source text editor and application development system"
+msgstr ""
+
+#: share/advertising/ppp-05.pl:20
+#, c-format
+msgid ""
+"\t- <b>Vim</b>: advanced text editor with more features than standard Vi"
+msgstr ""
+
+#: share/advertising/ppp-06.pl:13
+#, c-format
+msgid "<b>Discover the full-featured groupware solution!</b>"
+msgstr ""
+
+#: share/advertising/ppp-06.pl:15
+#, c-format
+msgid "It includes both server and client features for:"
+msgstr ""
+
+#: share/advertising/ppp-06.pl:16
+#, c-format
+msgid "\t- Sending and receiving emails"
+msgstr ""
+
+#: share/advertising/ppp-06.pl:17
+#, c-format
+msgid ""
+"\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
+"receiving), Task Requests (sending and receiving)"
+msgstr ""
+
+#: share/advertising/ppp-06.pl:18
+#, c-format
+msgid "\t- Address Book (server and client)"
+msgstr ""
+
+#: share/advertising/ppp-07.pl:13
+#, c-format
+msgid ""
+"Empower your business network with <b>premier server solutions</b> including:"
+msgstr ""
+
+#: share/advertising/ppp-07.pl:15
+#, c-format
+msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
+msgstr ""
+
+#: share/advertising/ppp-07.pl:16
+#, c-format
+msgid "\t- <b>Apache</b>: The most widely used Web server"
+msgstr ""
+
+#: share/advertising/ppp-07.pl:17
+#, c-format
+msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
+msgstr ""
+
+#: share/advertising/ppp-07.pl:18
+#, c-format
+msgid ""
+"\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
+"transparent version control system"
+msgstr ""
+
+#: share/advertising/ppp-07.pl:19
+#, c-format
+msgid ""
+"\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
+msgstr ""
+
+#: share/advertising/ppp-07.pl:20
+#, c-format
+msgid "\t- And others"
+msgstr ""
+
+#: share/advertising/pwp-01.pl:17
+#, c-format
+msgid ""
+"Your new Mandrakelinux distribution is the result of collaborative efforts "
+"between MandrakeSoft developers and Mandrakelinux contributors throughout "
+"the world."
+msgstr ""
+
+#: share/advertising/pwp-01.pl:19
+#, c-format
+msgid ""
+"We would like to thank everyone who participated in the development of our "
+"latest release."
+msgstr ""
+
+#: share/advertising/pwp-02.pl:13
+#, c-format
+msgid "<b>PowerPack</b>"
+msgstr ""
+
+#: share/advertising/pwp-02.pl:15
+#, c-format
+msgid ""
+"PowerPack is MandrakeSoft's premier Linux desktop product. In addition to "
+"being the easiest and the most user-friendly Linux distribution, PowerPack "
+"includes thousands of applications - everything from the most popular to the "
+"most technical."
+msgstr ""
+
+#: share/advertising/pwp-04.pl:13
+#, c-format
+msgid ""
+"In the Mandrakelinux menu you will find easy-to-use applications for all of "
+"your tasks:"
+msgstr ""
+
+#: share/advertising/pwp-04.pl:16
+#, c-format
+msgid ""
+"\t- Take charge of your personal data with the integrated personal "
+"information suites <b>Kontact</b> and <b>Evolution</b>"
+msgstr ""
+
+#: share/advertising/pwp-04.pl:17
+#, c-format
+msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
+msgstr ""
+
+#: share/advertising/pwp-04.pl:19
+#, c-format
+msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
+msgstr ""
+
+#: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
+#, c-format
+msgid "<b>Development tools</b>"
+msgstr ""
+
+#: share/advertising/pwp-05.pl:15
+#, c-format
+msgid ""
+"PowerPack includes everything needed for developing and creating your own "
+"software, including:"
+msgstr ""
+
+#: share/advertising/pwp-06.pl:15
+#, c-format
+msgid "And of course the editors!"
+msgstr ""
+
+#: share/advertising/pwp-06.pl:17
+#, c-format
+msgid ""
+"\t- <b>Xemacs</b>: another open source text editor and application "
+"development system"
+msgstr ""
+
+#: share/advertising/pwp-06.pl:18
+#, c-format
+msgid ""
+"\t- <b>Vim</b>: an advanced text editor with more features than standard Vi"
+msgstr ""
+
+#: standalone.pm:21
+#, c-format
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2, or (at your option)\n"
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+msgstr ""
+
+#: standalone.pm:40
+#, c-format
+msgid ""
+"[--config-info] [--daemon] [--debug] [--default] [--show-conf]\n"
+"Backup and Restore application\n"
+"\n"
+"--default             : save default directories.\n"
+"--debug               : show all debug messages.\n"
+"--show-conf           : list of files or directories to backup.\n"
+"--config-info         : explain configuration file options (for non-X "
+"users).\n"
+"--daemon              : use daemon configuration. \n"
+"--help                : show this message.\n"
+"--version             : show version number.\n"
+msgstr ""
+
+#: standalone.pm:52
+#, c-format
+msgid ""
+"[--boot] [--splash]\n"
+"OPTIONS:\n"
+"  --boot            - enable to configure boot loader\n"
+"  --splash          - enable to configure boot theme\n"
+"default mode: offer to configure autologin feature"
+msgstr ""
+
+#: standalone.pm:57
+#, c-format
+msgid ""
+"[OPTIONS] [PROGRAM_NAME]\n"
+"\n"
+"OPTIONS:\n"
+"  --help            - print this help message.\n"
+"  --report          - program should be one of mandrake tools\n"
+"  --incident        - program should be one of mandrake tools"
+msgstr ""
+
+#: standalone.pm:63
+#, c-format
+msgid ""
+"[--add]\n"
+"  --add             - \"add a network interface\" wizard\n"
+"  --del             - \"delete a network interface\" wizard\n"
+"  --skip-wizard     - manage connections\n"
+"  --internet        - configure internet\n"
+"  --wizard          - like --add"
+msgstr ""
+
+#: standalone.pm:69
+#, c-format
+msgid ""
+"\n"
+"Font Importation and monitoring application\n"
+"\n"
+"OPTIONS:\n"
+"--windows_import : import from all available windows partitions.\n"
+"--xls_fonts      : show all fonts that already exist from xls\n"
+"--install        : accept any font file and any directry.\n"
+"--uninstall      : uninstall any font or any directory of font.\n"
+"--replace        : replace all font if already exist\n"
+"--application    : 0 none application.\n"
+"                 : 1 all application available supported.\n"
+"                 : name_of_application like  so for staroffice \n"
+"                 : and gs for ghostscript for only this one."
+msgstr ""
+
+#: standalone.pm:84
+#, c-format
+msgid ""
+"[OPTIONS]...\n"
+"Mandrake Terminal Server Configurator\n"
+"--enable         : enable MTS\n"
+"--disable        : disable MTS\n"
+"--start          : start MTS\n"
+"--stop           : stop MTS\n"
+"--adduser        : add an existing system user to MTS (requires username)\n"
+"--deluser        : delete an existing system user from MTS (requires "
+"username)\n"
+"--addclient      : add a client machine to MTS (requires MAC address, IP, "
+"nbi image name)\n"
+"--delclient      : delete a client machine from MTS (requires MAC address, "
+"IP, nbi image name)"
+msgstr ""
+
+#: standalone.pm:96
+#, c-format
+msgid "[keyboard]"
+msgstr ""
+
+#: standalone.pm:97
+#, c-format
+msgid "[--file=myfile] [--word=myword] [--explain=regexp] [--alert]"
+msgstr ""
+
+#: standalone.pm:98
+#, c-format
+msgid ""
+"[OPTIONS]\n"
+"Network & Internet connection and monitoring application\n"
+"\n"
+"--defaultintf interface : show this interface by default\n"
+"--connect : connect to internet if not already connected\n"
+"--disconnect : disconnect to internet if already connected\n"
+"--force : used with (dis)connect : force (dis)connection.\n"
+"--status : returns 1 if connected 0 otherwise, then exit.\n"
+"--quiet : don't be interactive. To be used with (dis)connect."
+msgstr ""
+
+#: standalone.pm:107
+#, c-format
+msgid " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
+msgstr ""
+
+#: standalone.pm:108
+#, c-format
+msgid ""
+"[OPTION]...\n"
+"  --no-confirmation      don't ask first confirmation question in "
+"MandrakeUpdate mode\n"
+"  --no-verify-rpm        don't verify packages signatures\n"
+"  --changelog-first      display changelog before filelist in the "
+"description window\n"
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgstr ""
+
+#: standalone.pm:113
+#, c-format
+msgid ""
+"[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-"
+"usbtable] [--dynamic=dev]"
+msgstr ""
+
+#: standalone.pm:114
+#, c-format
+msgid ""
+" [everything]\n"
+"       XFdrake [--noauto] monitor\n"
+"       XFdrake resolution"
+msgstr ""
+
+#: standalone.pm:128
+#, c-format
+msgid ""
+"\n"
+"Usage: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
+"testing] [-v|--version] "
+msgstr ""
+
+#: standalone/XFdrake:87
+#, c-format
+msgid "Please log out and then use Ctrl-Alt-BackSpace"
+msgstr ""
+
+#: standalone/XFdrake:91
+#, c-format
+msgid "You need to log out and back in again for changes to take effect"
+msgstr ""
+
+#: standalone/drakTermServ:77
+#, c-format
+msgid "Useless without Terminal Server"
+msgstr ""
+
+#: standalone/drakTermServ:114 standalone/drakTermServ:121
+#, c-format
+msgid "%s: %s requires a username...\n"
+msgstr ""
+
+#: standalone/drakTermServ:134
+#, c-format
+msgid ""
+"%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
+"0/1 for Local Config...\n"
+msgstr ""
+
+#: standalone/drakTermServ:141
+#, c-format
+msgid "%s: %s requires hostname...\n"
+msgstr ""
+
+#: standalone/drakTermServ:153
+#, c-format
+msgid "You must be root to read configuration file. \n"
+msgstr ""
+
+#: standalone/drakTermServ:238 standalone/drakTermServ:511
+#: standalone/drakfont:575
+#, c-format
+msgid "OK"
+msgstr "OK"
+
+#: standalone/drakTermServ:249 standalone/drakTermServ:252
+#, c-format
+msgid "Terminal Server Configuration"
+msgstr "Oppsett av terminaltenar"
+
+#: standalone/drakTermServ:267
+#, c-format
+msgid "Enable Server"
+msgstr ""
+
+#: standalone/drakTermServ:273
+#, c-format
+msgid "Disable Server"
+msgstr ""
+
+#: standalone/drakTermServ:281
+#, c-format
+msgid "Start Server"
+msgstr "Start tenar"
+
+#: standalone/drakTermServ:287
+#, c-format
+msgid "Stop Server"
+msgstr ""
+
+#: standalone/drakTermServ:295
+#, c-format
+msgid "Etherboot Floppy/ISO"
+msgstr ""
+
+#: standalone/drakTermServ:299
+#, c-format
+msgid "Net Boot Images"
+msgstr ""
+
+#: standalone/drakTermServ:305
+#, c-format
+msgid "Add/Del Users"
+msgstr ""
+
+#: standalone/drakTermServ:309
+#, c-format
+msgid "Add/Del Clients"
+msgstr ""
+
+#: standalone/drakTermServ:320 standalone/drakbug:54
+#, c-format
+msgid "First Time Wizard"
+msgstr ""
+
+#: standalone/drakTermServ:351 standalone/drakTermServ:352
+#, c-format
+msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
+msgstr ""
+
+#: standalone/drakTermServ:358
+#, c-format
+msgid ""
+"\n"
+" This wizard routine will:\n"
+" \t1) Ask you to select either 'thin' or 'fat' clients.\n"
+"\t2) Setup dhcp.\n"
+"\t\n"
+"After doing these steps, the wizard will:\n"
+"\t\n"
+"    a) Make all "
+"nbis.                                                                \n"
+"    b) Activate the "
+"server.                                                          \n"
+"    c) Start the "
+"server.                                                     \n"
+"    d) Synchronize the shadow files so that all users, including root, \n"
+"       are added to the shadow$$CLIENT$$ "
+"file.                                              \n"
+"    e) Ask you to make a boot floppy.\n"
+"    f) If it's thin clients, ask if you want to restart KDM.\n"
+msgstr ""
+
+#: standalone/drakTermServ:403
+#, c-format
+msgid "Cancel Wizard"
+msgstr ""
+
+#: standalone/drakTermServ:415
+#, c-format
+msgid "Please save dhcpd config!"
+msgstr ""
+
+#: standalone/drakTermServ:443
+#, c-format
+msgid "Use thin clients."
+msgstr ""
+
+#: standalone/drakTermServ:445
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: standalone/drakTermServ:457 standalone/drakTermServ:1071
+#, c-format
+msgid "Sync client X keyboard settings with server."
+msgstr ""
+
+#: standalone/drakTermServ:464
+#, c-format
+msgid "Creating net boot images for all kernels"
+msgstr ""
+
+#: standalone/drakTermServ:465 standalone/drakTermServ:763
+#: standalone/drakTermServ:779
+#, c-format
+msgid "This will take a few minutes."
+msgstr ""
+
+#: standalone/drakTermServ:469 standalone/drakTermServ:489
+#, c-format
+msgid "Done!"
+msgstr ""
+
+#: standalone/drakTermServ:475
+#, c-format
+msgid "Syncing server user list with client list, including root."
+msgstr ""
+
+#: standalone/drakTermServ:495
+#, c-format
+msgid ""
+"In order to enable changes made for thin clients, the display manager must "
+"be restarted. Restart now?"
+msgstr ""
+
+#: standalone/drakTermServ:530
+#, c-format
+msgid "Terminal Server Overview"
+msgstr ""
+
+#: standalone/drakTermServ:531
+#, c-format
+msgid ""
+"        - Create Etherboot Enabled Boot Images:\n"
+"        \tTo boot a kernel via etherboot, a special kernel/initrd image must "
+"be created.\n"
+"        \tmkinitrd-net does much of this work and drakTermServ is just a "
+"graphical \n"
+"        \tinterface to help manage/customize these images. To create the "
+"file \n"
+"        \t/etc/dhcpd.conf.etherboot-pcimap.include that is pulled in as an "
+"include in \n"
+"        \tdhcpd.conf, you should create the etherboot images for at least "
+"one full kernel."
+msgstr ""
+
+#: standalone/drakTermServ:537
+#, c-format
+msgid ""
+"        - Maintain /etc/dhcpd.conf:\n"
+"        \tTo net boot clients, each client needs a dhcpd.conf entry, "
+"assigning an IP \n"
+"        \taddress and net boot images to the machine. drakTermServ helps "
+"create/remove \n"
+"        \tthese entries.\n"
+"\t\t\t\n"
+"        \t(PCI cards may omit the image - etherboot will request the correct "
+"image. \n"
+"\t\t\tYou should also consider that when etherboot looks for the images, it "
+"expects \n"
+"\t\t\tnames like boot-3c59x.nbi, rather than boot-3c59x.2.4.19-16mdk.nbi).\n"
+"\t\t\t \n"
+"        \tA typical dhcpd.conf stanza to support a diskless client looks "
+"like:"
+msgstr ""
+
+#: standalone/drakTermServ:555
+#, c-format
+msgid ""
+"        While you can use a pool of IP addresses, rather than setup a "
+"specific entry for\n"
+"        a client machine, using a fixed address scheme facilitates using the "
+"functionality\n"
+"        of client-specific configuration files that ClusterNFS provides.\n"
+"\t\t\t\n"
+"        Note: The '#type' entry is only used by drakTermServ.  Clients can "
+"either be 'thin'\n"
+"        or 'fat'.  Thin clients run most software on the server via xdmcp, "
+"while fat clients run \n"
+"        most software on the client machine. A special inittab, %s is\n"
+"        written for thin clients. System config files xdm-config, kdmrc, and "
+"gdm.conf are \n"
+"        modified if thin clients are used, to enable xdmcp. Since there are "
+"security issues in \n"
+"        using xdmcp, hosts.deny and hosts.allow are modified to limit access "
+"to the local\n"
+"        subnet.\n"
+"\t\t\t\n"
+"        Note: The '#hdw_config' entry is also only used by drakTermServ.  "
+"Clients can either \n"
+"        be 'true' or 'false'.  'true' enables root login at the client "
+"machine and allows local \n"
+"        hardware configuration of sound, mouse, and X, using the 'drak' "
+"tools. This is enabled \n"
+"        by creating separate config files associated with the client's IP "
+"address and creating \n"
+"        read/write mount points to allow the client to alter the file. Once "
+"you are satisfied \n"
+"        with the configuration, you can remove root login privileges from "
+"the client.\n"
+"\t\t\t\n"
+"        Note: You must stop/start the server after adding or changing "
+"clients."
+msgstr ""
+
+#: standalone/drakTermServ:575
+#, c-format
+msgid ""
+"        - Maintain /etc/exports:\n"
+"        \tClusternfs allows export of the root filesystem to diskless "
+"clients. drakTermServ\n"
+"        \tsets up the correct entry to allow anonymous access to the root "
+"filesystem from\n"
+"        \tdiskless clients.\n"
+"\n"
+"        \tA typical exports entry for clusternfs is:\n"
+"        \t\t\n"
+"        \t/\t\t\t\t\t(ro,all_squash)\n"
+"        \t/home\t\t\t\tSUBNET/MASK(rw,root_squash)\n"
+"\t\t\t\n"
+"        \tWith SUBNET/MASK being defined for your network."
+msgstr ""
+
+#: standalone/drakTermServ:587
+#, c-format
+msgid ""
+"        - Maintain %s:\n"
+"        \tFor users to be able to log into the system from a diskless "
+"client, their entry in\n"
+"        \t/etc/shadow needs to be duplicated in %s. drakTermServ\n"
+"        \thelps in this respect by adding or removing system users from this "
+"file."
+msgstr ""
+
+#: standalone/drakTermServ:591
+#, c-format
+msgid ""
+"        - Per client %s:\n"
+"        \tThrough clusternfs, each diskless client can have its own unique "
+"configuration files\n"
+"        \ton the root filesystem of the server. By allowing local client "
+"hardware configuration, \n"
+"        \tdrakTermServ will help create these files."
+msgstr ""
+
+#: standalone/drakTermServ:596
+#, c-format
+msgid ""
+"        - Per client system configuration files:\n"
+"        \tThrough clusternfs, each diskless client can have its own unique "
+"configuration files\n"
+"        \ton the root filesystem of the server. By allowing local client "
+"hardware configuration, \n"
+"        \tclients can customize files such as /etc/modules.conf, /etc/"
+"sysconfig/mouse, \n"
+"        \t/etc/sysconfig/keyboard on a per-client basis.\n"
+"\n"
+"        Note: Enabling local client hardware configuration does enable root "
+"login to the terminal \n"
+"        server on each client machine that has this feature enabled.  Local "
+"configuration can be\n"
+"        turned back off, retaining the configuration files, once the client "
+"machine is configured."
+msgstr ""
+
+#: standalone/drakTermServ:605
+#, c-format
+msgid ""
+"        - /etc/xinetd.d/tftp:\n"
+"        \tdrakTermServ will configure this file to work in conjunction with "
+"the images created\n"
+"        \tby mkinitrd-net, and the entries in /etc/dhcpd.conf, to serve up "
+"the boot image to \n"
+"        \teach diskless client.\n"
+"\n"
+"        \tA typical tftp configuration file looks like:\n"
+"        \t\t\n"
+"        \tservice tftp\n"
+"\t\t\t{\n"
+"                        disable         = no\n"
+"                        socket_type  = dgram\n"
+"                        protocol        = udp\n"
+"                        wait             = yes\n"
+"                        user             = root\n"
+"                        server          = /usr/sbin/in.tftpd\n"
+"                        server_args  = -s /var/lib/tftpboot\n"
+"        \t}\n"
+"        \t\t\n"
+"        \tThe changes here from the default installation are changing the "
+"disable flag to\n"
+"        \t'no' and changing the directory path to /var/lib/tftpboot, where "
+"mkinitrd-net\n"
+"        \tputs its images."
+msgstr ""
+
+#: standalone/drakTermServ:626
+#, c-format
+msgid ""
+"        - Create etherboot floppies/CDs:\n"
+"        \tThe diskless client machines need either ROM images on the NIC, or "
+"a boot floppy\n"
+"        \tor CD to initate the boot sequence.  drakTermServ will help "
+"generate these\n"
+"        \timages, based on the NIC in the client machine.\n"
+"        \t\t\n"
+"        \tA basic example of creating a boot floppy for a 3Com 3c509 "
+"manually:\n"
+"        \t\t\n"
+"        \tcat /usr/lib/etherboot/floppyload.bin \\\n"
+"        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
+"        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
+msgstr ""
+
+#: standalone/drakTermServ:661
+#, c-format
+msgid "Boot Floppy"
+msgstr "Oppstartsdiskett"
+
+#: standalone/drakTermServ:663
+#, c-format
+msgid "Boot ISO"
+msgstr ""
+
+#: standalone/drakTermServ:665
+#, c-format
+msgid "PXE Image"
+msgstr ""
+
+#: standalone/drakTermServ:734
+#, c-format
+msgid "Default kernel version"
+msgstr "Standard kjerneversjon"
+
+#: standalone/drakTermServ:761
+#, c-format
+msgid "Build Whole Kernel -->"
+msgstr ""
+
+#: standalone/drakTermServ:768
+#, c-format
+msgid "No kernel selected!"
+msgstr ""
+
+#: standalone/drakTermServ:771
+#, c-format
+msgid "Build Single NIC -->"
+msgstr ""
+
+#: standalone/drakTermServ:775
+#, c-format
+msgid "No NIC selected!"
+msgstr ""
+
+#: standalone/drakTermServ:778
+#, c-format
+msgid "Build All Kernels -->"
+msgstr ""
+
+#: standalone/drakTermServ:786
+#, c-format
+msgid "<-- Delete"
+msgstr ""
+
+#: standalone/drakTermServ:793
+#, c-format
+msgid "Delete All NBIs"
+msgstr ""
+
+#: standalone/drakTermServ:880
+#, c-format
+msgid ""
+"!!! Indicates the password in the system database is different than\n"
+" the one in the Terminal Server database.\n"
+"Delete/re-add the user to the Terminal Server to enable login."
+msgstr ""
+
+#: standalone/drakTermServ:885
+#, c-format
+msgid "Add User -->"
+msgstr ""
+
+#: standalone/drakTermServ:891
+#, c-format
+msgid "<-- Del User"
+msgstr ""
+
+#: standalone/drakTermServ:927
+#, c-format
+msgid "type: %s"
+msgstr ""
+
+#: standalone/drakTermServ:931
+#, c-format
+msgid "local config: %s"
+msgstr ""
+
+#: standalone/drakTermServ:961
+#, c-format
+msgid ""
+"Allow local hardware\n"
+"configuration."
+msgstr ""
+
+#: standalone/drakTermServ:970
+#, c-format
+msgid "No net boot images created!"
+msgstr ""
+
+#: standalone/drakTermServ:988
+#, c-format
+msgid "Thin Client"
+msgstr ""
+
+#: standalone/drakTermServ:992
+#, c-format
+msgid "Allow Thin Clients"
+msgstr ""
+
+#: standalone/drakTermServ:993
+#, c-format
+msgid "Add Client -->"
+msgstr ""
+
+#: standalone/drakTermServ:1007
+#, c-format
+msgid "type: fat"
+msgstr ""
+
+#: standalone/drakTermServ:1008
+#, c-format
+msgid "type: thin"
+msgstr ""
+
+#: standalone/drakTermServ:1015
+#, c-format
+msgid "local config: false"
+msgstr ""
+
+#: standalone/drakTermServ:1016
+#, c-format
+msgid "local config: true"
+msgstr ""
+
+#: standalone/drakTermServ:1024
+#, c-format
+msgid "<-- Edit Client"
+msgstr ""
+
+#: standalone/drakTermServ:1050
+#, c-format
+msgid "Disable Local Config"
+msgstr ""
+
+#: standalone/drakTermServ:1057
+#, c-format
+msgid "Delete Client"
+msgstr ""
+
+#: standalone/drakTermServ:1066
+#, c-format
+msgid "dhcpd Config..."
+msgstr ""
+
+#: standalone/drakTermServ:1082
+#, c-format
+msgid ""
+"Need to restart the Display Manager for full changes to take effect. \n"
+"(service dm restart - at the console)"
+msgstr ""
+
+#: standalone/drakTermServ:1122
+#, c-format
+msgid "Thin clients won't work with autologin. Disable autologin?"
+msgstr ""
+
+#: standalone/drakTermServ:1138
+#, c-format
+msgid "All clients will use %s"
+msgstr ""
+
+#: standalone/drakTermServ:1168
+#, c-format
+msgid "Subnet:"
+msgstr ""
+
+#: standalone/drakTermServ:1175
+#, c-format
+msgid "Netmask:"
+msgstr "Nettmaske:"
+
+#: standalone/drakTermServ:1182
+#, c-format
+msgid "Routers:"
+msgstr ""
+
+#: standalone/drakTermServ:1189
+#, c-format
+msgid "Subnet Mask:"
+msgstr ""
+
+#: standalone/drakTermServ:1196
+#, c-format
+msgid "Broadcast Address:"
+msgstr ""
+
+#: standalone/drakTermServ:1203
+#, c-format
+msgid "Domain Name:"
+msgstr ""
+
+#: standalone/drakTermServ:1211
+#, c-format
+msgid "Name Servers:"
+msgstr ""
+
+#: standalone/drakTermServ:1222
+#, c-format
+msgid "IP Range Start:"
+msgstr ""
+
+#: standalone/drakTermServ:1223
+#, c-format
+msgid "IP Range End:"
+msgstr ""
+
+#: standalone/drakTermServ:1275
+#, c-format
+msgid "dhcpd Server Configuration"
+msgstr ""
+
+#: standalone/drakTermServ:1276
+#, c-format
+msgid ""
+"Most of these values were extracted\n"
+"from your running system.\n"
+"You can modify as needed."
+msgstr ""
+
+#: standalone/drakTermServ:1279
+#, c-format
+msgid "Dynamic IP Address Pool:"
+msgstr ""
+
+#: standalone/drakTermServ:1292
+#, c-format
+msgid "Write Config"
+msgstr ""
+
+#: standalone/drakTermServ:1411
+#, c-format
+msgid "Please insert floppy disk:"
+msgstr ""
+
+#: standalone/drakTermServ:1415
+#, c-format
+msgid "Couldn't access the floppy!"
+msgstr ""
+
+#: standalone/drakTermServ:1417
+#, c-format
+msgid "Floppy can be removed now"
+msgstr ""
+
+#: standalone/drakTermServ:1420
+#, c-format
+msgid "No floppy drive available!"
+msgstr ""
+
+#: standalone/drakTermServ:1425
+#, c-format
+msgid "PXE image is %s/%s"
+msgstr ""
+
+#: standalone/drakTermServ:1427
+#, c-format
+msgid "Error writing %s/%s"
+msgstr ""
+
+#: standalone/drakTermServ:1436
+#, c-format
+msgid "Etherboot ISO image is %s"
+msgstr ""
+
+#: standalone/drakTermServ:1438
+#, c-format
+msgid "Something went wrong! - Is mkisofs installed?"
+msgstr ""
+
+#: standalone/drakTermServ:1458
+#, c-format
+msgid "Need to create /etc/dhcpd.conf first!"
+msgstr ""
+
+#: standalone/drakTermServ:1619
+#, c-format
+msgid "%s passwd bad in Terminal Server - rewriting...\n"
+msgstr ""
+
+#: standalone/drakTermServ:1637
+#, c-format
+msgid "%s is not a user..\n"
+msgstr ""
+
+#: standalone/drakTermServ:1638
+#, c-format
+msgid "%s is already a Terminal Server user\n"
+msgstr ""
+
+#: standalone/drakTermServ:1640
+#, c-format
+msgid "Addition of %s to Terminal Server failed!\n"
+msgstr ""
+
+#: standalone/drakTermServ:1642
+#, c-format
+msgid "%s added to Terminal Server\n"
+msgstr ""
+
+#: standalone/drakTermServ:1694
+#, c-format
+msgid "Deleted %s...\n"
+msgstr ""
+
+#: standalone/drakTermServ:1696 standalone/drakTermServ:1773
+#, c-format
+msgid "%s not found...\n"
+msgstr ""
+
+#: standalone/drakTermServ:1718 standalone/drakTermServ:1719
+#: standalone/drakTermServ:1720
+#, c-format
+msgid "%s already in use\n"
+msgstr ""
+
+#: standalone/drakTermServ:1744
+#, c-format
+msgid "Can't open %s!"
+msgstr ""
+
+#: standalone/drakTermServ:1801
+#, c-format
+msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
+msgstr ""
+
+#: standalone/drakTermServ:1958
+#, c-format
+msgid "Configuration changed - restart clusternfs/dhcpd?"
+msgstr ""
+
+#: standalone/drakautoinst:38
+#, c-format
+msgid "Error!"
+msgstr "Feil"
+
+#: standalone/drakautoinst:39
+#, c-format
+msgid "I can't find needed image file `%s'."
+msgstr ""
+
+#: standalone/drakautoinst:41
+#, c-format
+msgid "Auto Install Configurator"
+msgstr ""
+
+#: standalone/drakautoinst:42
+#, c-format
+msgid ""
+"You are about to configure an Auto Install floppy. This feature is somewhat "
+"dangerous and must be used circumspectly.\n"
+"\n"
+"With that feature, you will be able to replay the installation you've "
+"performed on this computer, being interactively prompted for some steps, in "
+"order to change their values.\n"
+"\n"
+"For maximum safety, the partitioning and formatting will never be performed "
+"automatically, whatever you chose during the install of this computer.\n"
+"\n"
+"Press ok to continue."
+msgstr ""
+
+#: standalone/drakautoinst:60
+#, c-format
+msgid "replay"
+msgstr ""
+
+#: standalone/drakautoinst:60 standalone/drakautoinst:69
+#, c-format
+msgid "manual"
+msgstr ""
+
+#: standalone/drakautoinst:64
+#, c-format
+msgid "Automatic Steps Configuration"
+msgstr ""
+
+#: standalone/drakautoinst:65
+#, c-format
+msgid ""
+"Please choose for each step whether it will replay like your install, or it "
+"will be manual"
+msgstr ""
+
+#: standalone/drakautoinst:77 standalone/drakautoinst:78
+#: standalone/drakautoinst:92
+#, c-format
+msgid "Creating auto install floppy"
+msgstr ""
+
+#: standalone/drakautoinst:90
+#, c-format
+msgid "Insert another blank floppy in drive %s (for drivers disk)"
+msgstr ""
+
+#: standalone/drakautoinst:91
+#, c-format
+msgid "Creating auto install floppy (drivers disk)"
+msgstr "Lagar diskett for automatisk installasjon ..."
+
+#: standalone/drakautoinst:158
+#, c-format
+msgid ""
+"\n"
+"Welcome.\n"
+"\n"
+"The parameters of the auto-install are available in the sections on the left"
+msgstr ""
+"\n"
+"Velkommen.\n"
+"\n"
+"Vala for autoinstallering finn du i oversikta til venstre"
+
+#: standalone/drakautoinst:252 standalone/drakgw:594 standalone/drakvpn:900
+#: standalone/scannerdrake:374
+#, c-format
+msgid "Congratulations!"
+msgstr "Gratulerer!"
+
+#: standalone/drakautoinst:253
+#, c-format
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
+"Disketten er no klar, og du kan når\n"
+"som helst gjennomføra installasjonen på nytt."
+
+#: standalone/drakautoinst:289
+#, c-format
+msgid "Auto Install"
+msgstr "Autoinstallering"
+
+#: standalone/drakautoinst:358
+#, c-format
+msgid "Add an item"
+msgstr "Legg til element"
+
+#: standalone/drakautoinst:365
+#, c-format
+msgid "Remove the last item"
+msgstr "Fjern siste element"
+
+#: standalone/drakbackup:88
+#, c-format
+msgid "hd"
+msgstr "Harddisk"
+
+#: standalone/drakbackup:88
+#, c-format
+msgid "tape"
+msgstr "Band"
+
+#: standalone/drakbackup:112
+#, c-format
+msgid "No devices found"
+msgstr "Fann ingen einingar"
+
+#: standalone/drakbackup:154
+#, c-format
+msgid ""
+"Expect is an extension to the Tcl scripting language that allows interactive "
+"sessions without user intervention."
+msgstr ""
+"Expect er ei utviding til Tcl-skriptspråket som gjer det mogleg å kjøra "
+"interaktive økter utan manuell brukarstyring."
+
+#: standalone/drakbackup:155
+#, c-format
+msgid "Store the password for this system in drakbackup configuration."
+msgstr "Lagra passordet for systemet i reservekopien."
+
+#: standalone/drakbackup:156
+#, c-format
+msgid ""
+"For a multisession CD, only the first session will erase the cdrw. Otherwise "
+"the cdrw is erased before each backup."
+msgstr ""
+"Med fleirøktsbrenning blir plata berre sletta før første brenning. Elles "
+"blir plata sletta før kvar brenning."
+
+#: standalone/drakbackup:157
+#, c-format
+msgid ""
+"This option will save files that have changed.  Exact behavior depends on "
+"whether incremental or differential mode is used."
+msgstr ""
+"Dette vil lagra alle endra og nye filer. Nøyaktig korleis dette går føre seg "
+"kjem an på om du brukar inkremental- eller differensialkopiering."
+
+#: standalone/drakbackup:158
+#, c-format
+msgid ""
+"Incremental backups only save files that have changed or are new since the "
+"last backup."
+msgstr ""
+"Inkrementalkopiering lagrar berre filer som er endra eller nye frå førre "
+"reservekopi."
+
+#: standalone/drakbackup:159
+#, c-format
+msgid ""
+"Differential backups only save files that have changed or are new since the "
+"original 'base' backup."
+msgstr ""
+"Differensialkopiering lagrar berre filer som er endra eller nye frå første "
+"reservekopi."
+
+#: standalone/drakbackup:160
+#, c-format
+msgid ""
+"This should be a local user or email addresse that you want the backup "
+"results sent to. You will need to define a functioning mail server."
+msgstr ""
+"Dette bør vera ein lokal brukar eller ei e-postadresse du vil senda "
+"rapporten til. Du må òg velja ein fungerande e-posttenar."
+
+#: standalone/drakbackup:161
+#, c-format
+msgid ""
+"Files or wildcards listed in a .backupignore file at the top of a directory "
+"tree will not be backed up."
+msgstr ""
+"Filer eller jokerteikn nemnt i ei «.backupignore»-fil øvst i eit mappetre "
+"blir ikkje tatt med i reservekopien."
+
+#: standalone/drakbackup:162
+#, c-format
+msgid ""
+"For backups to other media, files are still created on the hard drive, then "
+"moved to the other media.  Enabling this option will remove the hard drive "
+"tar files after the backup."
+msgstr ""
+"Ved reservekopiering til andre medium blir filene først laga på harddisken, "
+"og så flytta til media. Med dette valet blir reservekopifilene fjerna frå "
+"harddisken etter kopieringa."
+
+#: standalone/drakbackup:163
+#, c-format
+msgid ""
+"Some protocols, like rsync, may be configured at the server end.  Rather "
+"than using a directory path, you would use the 'module' name for the service "
+"path."
+msgstr ""
+"Nokre protokollar, som «rsync», kan vera sett opp på tenaren. Her må du då "
+"bruka modulnamnet for tenestestigen."
+
+#: standalone/drakbackup:164
+#, c-format
+msgid ""
+"Custom allows you to specify your own day and time.  The other options use "
+"run-parts in /etc/crontab."
+msgstr ""
+
+#: standalone/drakbackup:396
+#, c-format
+msgid "No media selected for cron operation."
+msgstr "Ingen medium valt for cron-operasjon."
+
+#: standalone/drakbackup:400
+#, c-format
+msgid "No interval selected for cron operation."
+msgstr "Ingen intervall valt for cron-operasjon."
+
+#: standalone/drakbackup:447
+#, c-format
+msgid "Interval cron not available as non-root"
+msgstr ""
+
+#: standalone/drakbackup:532 standalone/logdrake:467
+#, c-format
+msgid "\"%s\" neither is a valid email nor is an existing local user!"
+msgstr "«%s» er verken ei gyldig e-postadresse eller ein lokal brukar."
+
+#: 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 "
+"a complete email address!"
+msgstr ""
+"«%s» er ein lokal brukar, må du har ikkje valt nokon lokal SMTP, og du må "
+"derfor bruka ei fullstendig e-postadresse."
+
+#: standalone/drakbackup:545
+#, c-format
+msgid "Valid user list changed, rewriting config file."
+msgstr "Liste over gyldige brukarar er endra. Skriv oppsettfil på nytt."
+
+#: standalone/drakbackup:547
+#, c-format
+msgid "Old user list:\n"
+msgstr "Gammal brukarliste:\n"
+
+#: standalone/drakbackup:549
+#, c-format
+msgid "New user list:\n"
+msgstr "Ny brukarliste:\n"
+
+#: standalone/drakbackup:594
+#, c-format
+msgid ""
+"\n"
+"                      DrakBackup Report \n"
+msgstr ""
+"\n"
+"                      Reservekopirapport \n"
+
+#: standalone/drakbackup:595
+#, c-format
+msgid ""
+"\n"
+"                      DrakBackup Daemon Report\n"
+msgstr ""
+"\n"
+"                      Reservekopinisserapport \n"
+
+#: standalone/drakbackup:601
+#, c-format
+msgid ""
+"\n"
+"                    DrakBackup Report Details\n"
+"\n"
+"\n"
+msgstr ""
+"\n"
+"                    Detaljar for reservekopiering\n"
+"\n"
+"\n"
+
+#: standalone/drakbackup:625 standalone/drakbackup:696
+#: standalone/drakbackup:752
+#, c-format
+msgid "Total progress"
+msgstr "Total framgang"
+
+#: standalone/drakbackup:678
+#, c-format
+msgid ""
+"%s exists, delete?\n"
+"\n"
+"If you've already done this process you'll probably\n"
+" need to purge the entry from authorized_keys on the server."
+msgstr ""
+"«%s» finst allereie? Vil du sletta han?\n"
+"\n"
+"Viss du allerei har gjort dette, må du truleg fjerna oppføringa frå "
+"«authorized_keys» på tenaren."
+
+#: standalone/drakbackup:687
+#, c-format
+msgid "This may take a moment to generate the keys."
+msgstr "Det kan ta ein augneblink å laga nøklane."
+
+#: standalone/drakbackup:694
+#, c-format
+msgid "Cannot spawn %s."
+msgstr "Kan ikkje laga «%s»."
+
+#: standalone/drakbackup:711
+#, c-format
+msgid "No password prompt on %s at port %s"
+msgstr "Ingen passordspørsmål på «%s» på port «%s»"
+
+#: standalone/drakbackup:712
+#, c-format
+msgid "Bad password on %s"
+msgstr "Ugyldig passord på «%s»"
+
+#: standalone/drakbackup:713
+#, c-format
+msgid "Permission denied transferring %s to %s"
+msgstr "Nekta overføring av «%s» til «%s»"
+
+#: standalone/drakbackup:714
+#, c-format
+msgid "Can't find %s on %s"
+msgstr "Finn ikkje «%s» på «%s»"
+
+#: standalone/drakbackup:718
+#, c-format
+msgid "%s not responding"
+msgstr "«%s» svarar ikkje"
+
+#: standalone/drakbackup:722
+#, c-format
+msgid ""
+"Transfer successful\n"
+"You may want to verify you can login to the server with:\n"
+"\n"
+"ssh -i %s %s@%s\n"
+"\n"
+"without being prompted for a password."
+msgstr ""
+"Vellykka overføring\n"
+"Du kan no kontrollera  at du kan logga på tenaren med:\n"
+"\n"
+"ssh -i %s %s@%s\n"
+"\n"
+"utan å bli spurd etter passord."
+
+#: standalone/drakbackup:766
+#, c-format
+msgid "WebDAV remote site already in sync!"
+msgstr "WebDAV-tenaren er alt synkronsiert."
+
+#: standalone/drakbackup:770
+#, c-format
+msgid "WebDAV transfer failed!"
+msgstr "Feil ved WebDAV-overføring."
+
+#: standalone/drakbackup:791
+#, c-format
+msgid "No CD-R/DVD-R in drive!"
+msgstr "Det står ingen CD-R eller DVD-R i stasjonen."
+
+#: standalone/drakbackup:795
+#, c-format
+msgid "Does not appear to be recordable media!"
+msgstr "Ikkje skrivbart medium."
+
+#: standalone/drakbackup:799
+#, c-format
+msgid "Not erasable media!"
+msgstr "Ikkje overskrivbart medium."
+
+#: standalone/drakbackup:840
+#, c-format
+msgid "This may take a moment to erase the media."
+msgstr "Det kan ta ei stund å sletta mediet."
+
+#: standalone/drakbackup:898
+#, c-format
+msgid "Permission problem accessing CD."
+msgstr "Ikkje løyve til å lesa CD-en."
+
+#: standalone/drakbackup:925
+#, c-format
+msgid "No tape in %s!"
+msgstr "Ingen band i «%s»."
+
+#: standalone/drakbackup:1025
+#, c-format
+msgid ""
+"Backup quota exceeded!\n"
+"%d MB used vs %d MB allocated."
+msgstr ""
+"Reservekopikvoten er overskriven.\n"
+"Har brukt %d MiB av %d MiB tilgjengeleg."
+
+#: standalone/drakbackup:1044 standalone/drakbackup:1077
+#, c-format
+msgid "Backup system files..."
+msgstr "Kopierer systemfiler ..."
+
+#: standalone/drakbackup:1078 standalone/drakbackup:1119
+#, c-format
+msgid "Hard Disk Backup files..."
+msgstr ""
+
+#: standalone/drakbackup:1118
+#, c-format
+msgid "Backup User files..."
+msgstr "Kopierer brukarfiler ..."
+
+#: standalone/drakbackup:1153
+#, c-format
+msgid "Backup Other files..."
+msgstr "Kopierer andre filer ..."
+
+#: standalone/drakbackup:1154
+#, c-format
+msgid "Hard Disk Backup Progress..."
+msgstr ""
+
+#: standalone/drakbackup:1159
+#, c-format
+msgid "No changes to backup!"
+msgstr "Det er ingen endringar frå førre kopi."
+
+#: standalone/drakbackup:1177 standalone/drakbackup:1201
+#, c-format
+msgid ""
+"\n"
+"Drakbackup activities via %s:\n"
+"\n"
+msgstr ""
+"\n"
+"Reservekopiaktivitetar via %s:\n"
+"\n"
+
+#: standalone/drakbackup:1186
+#, c-format
+msgid ""
+"\n"
+" FTP connection problem: It was not possible to send your backup files by "
+"FTP.\n"
+msgstr ""
+
+#: standalone/drakbackup:1187
+#, c-format
+msgid ""
+"Error during sending file via FTP. Please correct your FTP configuration."
+msgstr ""
+
+#: standalone/drakbackup:1189
+#, c-format
+msgid "file list sent by FTP: %s\n"
+msgstr "Filliste sendt via FTP: %s\n"
+
+#: standalone/drakbackup:1206
+#, c-format
+msgid ""
+"\n"
+"Drakbackup activities via CD:\n"
+"\n"
+msgstr ""
+"\n"
+"Reservekopiaktivitetar via CD:\n"
+"\n"
+
+#: standalone/drakbackup:1211
+#, c-format
+msgid ""
+"\n"
+"Drakbackup activities via tape:\n"
+"\n"
+msgstr ""
+"\n"
+"Reservekopiaktivitetar via band:\n"
+"\n"
+
+#: standalone/drakbackup:1220
+#, c-format
+msgid "Error sending mail. Your report mail was not sent."
+msgstr "Klarte ikkje senda e-post."
+
+#: standalone/drakbackup:1221
+#, c-format
+msgid " Error while sending mail. \n"
+msgstr "Feil ved sending av e-post.\n"
+
+#: standalone/drakbackup:1249
+#, c-format
+msgid "Can't create catalog!"
+msgstr "Klarte ikkje laga mappe."
+
+#: standalone/drakbackup:1455
+#, c-format
+msgid "Select the files or directories and click on 'OK'"
+msgstr "Vel filer og mapper, og trykk så «OK»"
+
+#: standalone/drakbackup:1484
+#, c-format
+msgid ""
+"\n"
+"Please check all options that you need.\n"
+msgstr ""
+"\n"
+"Kryss av for vala du treng.\n"
+
+#: standalone/drakbackup:1485
+#, c-format
+msgid ""
+"These options can backup and restore all files in your /etc directory.\n"
+msgstr "Her kan du ta kopi av og gjenoppretta alle filer i «/etc»-mappa.\n"
+
+#: standalone/drakbackup:1486
+#, c-format
+msgid "Backup your System files. (/etc directory)"
+msgstr "Ta kopi av systemfiler («/etc»-mappa)"
+
+#: standalone/drakbackup:1487 standalone/drakbackup:1551
+#: standalone/drakbackup:1617
+#, c-format
+msgid "Use Incremental/Differential Backups  (do not replace old backups)"
+msgstr "Berre kopier endra og nye filer"
+
+#: standalone/drakbackup:1489 standalone/drakbackup:1553
+#: standalone/drakbackup:1619
+#, c-format
+msgid "Use Incremental Backups"
+msgstr "Bruk inkrementalkopiering"
+
+#: standalone/drakbackup:1489 standalone/drakbackup:1553
+#: standalone/drakbackup:1619
+#, c-format
+msgid "Use Differential Backups"
+msgstr "Bruk differensialkopiering"
+
+#: standalone/drakbackup:1491
+#, c-format
+msgid "Do not include critical files (passwd, group, fstab)"
+msgstr "Ikkje kopier kritiske filer («passwd», «group» og «fstab»)"
+
+#: standalone/drakbackup:1492
+#, c-format
+msgid ""
+"With this option you will be able to restore any version\n"
+" of your /etc directory."
+msgstr ""
+"Med dette kan du gjenoppretta alle versjonar av\n"
+"«/etc»-mappa."
+
+#: standalone/drakbackup:1523
+#, c-format
+msgid "Please check all users that you want to include in your backup."
+msgstr "Vel kva brukarar du ta reservekopi av."
+
+#: standalone/drakbackup:1550
+#, c-format
+msgid "Do not include the browser cache"
+msgstr "Ta ikkje kopi av mellomlageret til nettlesaren"
+
+#: standalone/drakbackup:1605 standalone/drakfont:656
+#, c-format
+msgid "Remove Selected"
+msgstr "Fjern valde"
+
+#: standalone/drakbackup:1668
+#, c-format
+msgid "Users"
+msgstr "Brukarar"
+
+#: standalone/drakbackup:1688
+#, c-format
+msgid "Use network connection to backup"
+msgstr "Bruk nettverk for reservekopiering"
+
+#: standalone/drakbackup:1690
+#, c-format
+msgid "Net Method:"
+msgstr "Nettmetode:"
+
+#: standalone/drakbackup:1694
+#, c-format
+msgid "Use Expect for SSH"
+msgstr "Bruk Expect for SSH"
+
+#: standalone/drakbackup:1695
+#, c-format
+msgid "Create/Transfer backup keys for SSH"
+msgstr "Lag/overfør kopinøklar for SSH"
+
+#: standalone/drakbackup:1697
+#, c-format
+msgid "Transfer Now"
+msgstr "Overfør no"
+
+#: standalone/drakbackup:1699
+#, c-format
+msgid "Other (not drakbackup) keys in place already"
+msgstr "Det finst allereie (andre) nøklar"
+
+#: standalone/drakbackup:1702
+#, c-format
+msgid "Host name or IP."
+msgstr "Vertsnamn eller IP-adresse:"
+
+#: standalone/drakbackup:1707
+#, c-format
+msgid "Directory (or module) to put the backup on this host."
+msgstr "Mappa (eller modulen) du vil lagra reservekopien:"
+
+#: standalone/drakbackup:1712
+#, c-format
+msgid "Login name"
+msgstr "Brukarnamn:"
+
+#: standalone/drakbackup:1719
+#, c-format
+msgid "Remember this password"
+msgstr "Hugs dette passordet"
+
+#: standalone/drakbackup:1735
+#, c-format
+msgid "Need hostname, username and password!"
+msgstr "Treng vertsnamn, brukarnamn og passord."
+
+#: standalone/drakbackup:1833
+#, c-format