Update Danish translation from Tx

author: Yuri Chornoivan <yurchor@ukr.net> 2017-11-19 22:01:31 +0200
committer: Yuri Chornoivan <yurchor@ukr.net> 2017-11-19 22:01:31 +0200
commit: dc2a2728bca504f383bbf3e69870b5709e881fb9 (patch)
tree: 060252703a238ee0f54eaf8e0727c01db7d01c18 /perl-install/common.pm
parent: 7a306d9a68fc9db3c526fd0769a40632b82f08db (diff)
download: drakx-dc2a2728bca504f383bbf3e69870b5709e881fb9.tar
drakx-dc2a2728bca504f383bbf3e69870b5709e881fb9.tar.gz
drakx-dc2a2728bca504f383bbf3e69870b5709e881fb9.tar.bz2
drakx-dc2a2728bca504f383bbf3e69870b5709e881fb9.tar.xz
drakx-dc2a2728bca504f383bbf3e69870b5709e881fb9.zip
0 files changed, 0 insertions, 0 deletions
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 78d7df9d7..e8b0d8875 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-09-21 14:38+0200\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5751,7 +5751,7 @@ 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>\"."
+"line, e. g. \"%s <file>\". "
 msgstr ""
 
 #: ../../printerdrake.pm_.c:1244 ../../printerdrake.pm_.c:1284
diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po
index 2cdeb4448..cf1b49521 100644
--- a/perl-install/share/po/af.po
+++ b/perl-install/share/po/af.po
@@ -5,66 +5,66 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-02 17:16+0200\n"
-"PO-Revision-Date: Tue Sep 26 2000 08:03:14+0200\n"
-"Last-Translator: Schalk W. Cronj� <schalkc@ntaba.co.za>\n"
-"Language-Team: Afrikaans <lia@af.org.za>\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
+"PO-Revision-Date: 2001-09-09 22:06-0000\n"
+"Last-Translator: Schalk W. Cronj� <schalkc@uk.ntaba.com>\n"
+"Language-Team: Afrikaans <mandrake@af.org.za>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KTranslator v 0.6.0\n"
 
-#: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
-msgstr ""
+#: ../../Xconfigurator.pm_.c:231
+msgid "Configure all heads independently"
+msgstr "Konfigureer skyfkoppe afsonderlik"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
-msgstr ""
+msgstr "Gebruik Xinerama-ekstensies"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
-msgstr ""
+msgstr "Konfigureer net die \"%s\" kaart (%s)"
 
-#: ../../Xconfigurator.pm_.c:239
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
-msgstr "Konfigurasie word gelees"
+msgstr "Multikopkonfigurasie"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:239
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
+"U stelsel onderstuen multikopkonfigurasie.\n"
+"Wat wil u doen?"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "Videokaart"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "Selekteer 'n videokaart"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "Kies 'n X-bediener"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "X server"
 msgstr "X-bediener"
 
-#: ../../Xconfigurator.pm_.c:309 ../../Xconfigurator.pm_.c:316
-#: ../../Xconfigurator.pm_.c:366
+#: ../../Xconfigurator.pm_.c:307 ../../Xconfigurator.pm_.c:313
+#: ../../Xconfigurator.pm_.c:363 ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s"
 msgstr "XFree %s"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:310
 msgid "Which configuration of XFree do you want to have?"
 msgstr "Watter tipe XFree-konfigurasie verlang u?"
 
-#: ../../Xconfigurator.pm_.c:324
+#: ../../Xconfigurator.pm_.c:321
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -73,18 +73,19 @@ msgstr ""
 "U videokaart kan slegs 3D-versnelling onder XFree %s ondersteun.\n"
 "DIt word wel onder XFree %s ondersteun wat dalk beter 2D-ondersteuning het."
 
-#: ../../Xconfigurator.pm_.c:326 ../../Xconfigurator.pm_.c:359
+#: ../../Xconfigurator.pm_.c:323 ../../Xconfigurator.pm_.c:356
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with XFree %s."
 msgstr ""
 "U videokaart kan vir 3D-hardewareversnelling ondestuen word in XFree %s."
 
-#: ../../Xconfigurator.pm_.c:328 ../../Xconfigurator.pm_.c:361
+#: ../../Xconfigurator.pm_.c:325 ../../Xconfigurator.pm_.c:358
+#: ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s with 3D hardware acceleration"
 msgstr "XFree %s met 3D-hardwareversnelling"
 
-#: ../../Xconfigurator.pm_.c:336 ../../Xconfigurator.pm_.c:350
+#: ../../Xconfigurator.pm_.c:333 ../../Xconfigurator.pm_.c:347
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -94,12 +95,12 @@ msgstr ""
 "bied,\n"
 "MAAR LET DAAROP DAT DIT EKSPERIMENTEEL IS EN DIE REKENAAR MAG VRIES."
 
-#: ../../Xconfigurator.pm_.c:338 ../../Xconfigurator.pm_.c:352
+#: ../../Xconfigurator.pm_.c:335 ../../Xconfigurator.pm_.c:349
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "XFree %s met EKSPERIMENTELE 3D-hardewareversnelling"
 
-#: ../../Xconfigurator.pm_.c:347
+#: ../../Xconfigurator.pm_.c:344
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -111,27 +112,31 @@ msgstr ""
 "MAAR LET DAAROP DAT DIT EKSPERIMENTEEL IS EN DIE REKENAAR MAG VRIES.\n"
 "U kaart word deur XFree %s ondersteun, wat beter 2D-ondersteuning bied."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr "Xpmac (installasievertoondrywer)"
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "XFree-konfigurasie"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "Kies die geheue grootte van u videokaart"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "Selekteer opsies vir bediener"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "Kies 'n monitor"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:483
+#: ../../Xconfigurator.pm_.c:519
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -153,40 +158,40 @@ msgstr ""
 "monitor spesifiseer nie, dit kan die monitor beskadig. Indien u twyfel,\n"
 "kies konservatief."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Horisontale verfristempo"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Vertikale verfristempo"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "Monitor is nie opgestel nie"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "Grafikakaart is nog nie konfigureer nie"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "Resolusie is nog nie gekies nie"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "Wil u die konfigurasie toets?"
 
 #
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Waarskuwing: Toetsing is gevaarlik met hierdie videokaart"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Toets konfigurasie"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -194,153 +199,156 @@ msgstr ""
 "\n"
 "probeer van die parameters verander"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "Daar was 'n fout:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "uitgang binne %ds"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "Is dit korrek?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "Hier is fout, probeer van die parameters verander"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Resolusie"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "Kies die resolusie en kleurdiepte"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Videokaart: %s"
 
-#: ../../Xconfigurator.pm_.c:734
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 bediener: %s"
 
-#: ../../Xconfigurator.pm_.c:750 ../../standalone/draknet_.c:280
-#: ../../standalone/draknet_.c:283
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:829 ../../printerdrake.pm_.c:1885
+#: ../../standalone/draknet_.c:298 ../../standalone/draknet_.c:301
 msgid "Expert Mode"
 msgstr "Kundige modus"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "Vertoon almal"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Resolusies"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Sleutelbord uitleg: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Muistipe: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Muistoestel: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1333
+#: ../../Xconfigurator.pm_.c:1440
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1334
+#: ../../Xconfigurator.pm_.c:1441
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitor HoriSink: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor VertVerfris: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Videokaart: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Videokaart: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Video geheue: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Kleurdiepte: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resolusie: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1342
+#: ../../Xconfigurator.pm_.c:1450
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 bediener: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1343
+#: ../../Xconfigurator.pm_.c:1451
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "XFree86-drywer: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "X-Window konfigurasie word opgestel"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "Wat wil u doen?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "Verander monitor"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "Verander videokaart"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "Verander bedienerinstellings"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "Verander resolusie"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "Vertoon inligting"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "Toets weer"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "Verlaat"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -353,20 +361,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Teken asb. weer in %s om veranderinge te aktiveer"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Teken uit en gebruik dan Ctrl-Alt-Backspace"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "X met herlaai"
 
-#: ../../Xconfigurator.pm_.c:1447
+#: ../../Xconfigurator.pm_.c:1556
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -419,217 +427,223 @@ msgid "8 MB"
 msgstr "8 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
-msgstr "16MB of meer"
+msgid "16 MB"
+msgstr "16 MB"
+
+#: ../../Xconfigurator_consts.pm_.c:113
+msgid "32 MB"
+msgstr "32 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:114
+msgid "64 MB or more"
+msgstr "64MB of meer"
+
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standaard VGA,  640x480 teen 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 teen 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514-aanpasbaar, 1024x768 teen 87Hz interverweef (nie 800x600 nie)"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Super VGA, 102x768 teen 87 Hz interverweef, 800x600 teen 56 Hz "
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "Verlengde Super VGA, 800x600 teen 60 Hz, 640x480 teen 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "Nie-interverweefde SVGA, 1024x768 teen 60 Hz, 800x600 teen 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Hod frekwensie SVGA, 1024x768 teen 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:127
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Multi-frekwensie wat 1280x1024 kan doen teen 60Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:128
+#: ../../Xconfigurator_consts.pm_.c:130
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Multi-frekwensie wat 1280x1024 kan doen teen 74Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:129
+#: ../../Xconfigurator_consts.pm_.c:131
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Multi-frekwensie wat 1280x1024 kan doen teen 76Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor wat 1600x1220 kan doen teen 70Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor wat 1600x1220 kan doen teen 76Hz"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124
+#: ../../any.pm_.c:96 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Eerste sektor van herlaaipartisie"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124 ../../any.pm_.c:197
+#: ../../any.pm_.c:96 ../../any.pm_.c:121 ../../any.pm_.c:194
 msgid "First sector of drive (MBR)"
 msgstr "Eerste sektor van skyf (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "SILO installasie"
 
-#: ../../any.pm_.c:104 ../../any.pm_.c:117
+#: ../../any.pm_.c:101 ../../any.pm_.c:114
 msgid "Where do you want to install the bootloader?"
 msgstr "Waar wil u die herlaaistelsel installeer"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "LILO/grub installasie"
 
-#: ../../any.pm_.c:128 ../../any.pm_.c:142
+#: ../../any.pm_.c:125 ../../any.pm_.c:139
 msgid "SILO"
-msgstr ""
+msgstr "SILO"
 
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:127
 msgid "LILO with text menu"
-msgstr ""
+msgstr "LILO met tekskieskaart"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
-msgstr ""
+msgstr "LILO met grafiese kieskaart"
 
-#: ../../any.pm_.c:134
+#: ../../any.pm_.c:131
 msgid "Grub"
-msgstr ""
+msgstr "Grub"
 
-#: ../../any.pm_.c:138
+#: ../../any.pm_.c:135
 msgid "Boot from DOS/Windows (loadlin)"
-msgstr ""
+msgstr "Laai vauit DOS/Windows (loadlin)"
 
-#: ../../any.pm_.c:140 ../../any.pm_.c:142
+#: ../../any.pm_.c:137 ../../any.pm_.c:139
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: ../../any.pm_.c:148 ../../any.pm_.c:180
+#: ../../any.pm_.c:145 ../../any.pm_.c:177
 msgid "Bootloader main options"
 msgstr "Herlaaistelsel hoofopsies"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
-#, fuzzy
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
-msgstr "Herlaaistelsel hoofopsies"
+msgstr "Herlaaistelsel om te gebruik"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "Herlaaiprogram installasie"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "Herlaaitoestel"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
-msgstr "LBA (werk nie op 'n ou BIOS nie)"
+msgstr "LBA (werk nie op 'n ou BIOS'e nie)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Kompak"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "kompak"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Videomodus"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "Wagperiode voro verstekstelsel gelaai word"
 
-#: ../../any.pm_.c:160 ../../any.pm_.c:741
-#: ../../install_steps_interactive.pm_.c:904 ../../netconnect.pm_.c:629
-#: ../../printerdrake.pm_.c:98 ../../printerdrake.pm_.c:132
-#: ../../standalone/draknet_.c:569
+#: ../../any.pm_.c:157 ../../any.pm_.c:730
+#: ../../install_steps_interactive.pm_.c:938 ../../network/modem.pm_.c:46
+#: ../../printerdrake.pm_.c:402 ../../printerdrake.pm_.c:481
+#: ../../standalone/draknet_.c:603
 msgid "Password"
 msgstr "Wagwoord"
 
-#: ../../any.pm_.c:161 ../../any.pm_.c:742
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../any.pm_.c:158 ../../any.pm_.c:731
+#: ../../install_steps_interactive.pm_.c:939
 msgid "Password (again)"
 msgstr "Wagwoord (weer)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Beperk instruksielynopsies"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "beperk"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "Maak /tmp skoon met elke herlaai"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Presiese RAM grootte indien nodig (%d MB bespeur)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
-msgstr "Ontsper multiprofiele"
+msgstr "Gebruik multiprofiele"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Gee die geheuegrootte in MB"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Opsie ``Beperk instruksielynopsies'' kan nie sonder wagwoord gebruikword nie"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "Please try again"
 msgstr "Probeer asb. weer"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "The passwords do not match"
 msgstr "Die wagwoorde stem nie ooreen nie."
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
-msgstr ""
+msgstr "Beginboodskap"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr ""
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
-msgstr ""
+msgstr "Tydsbeperking vir stelselkernlaai"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
-msgstr ""
+msgstr "Laat CD-herlaai toe?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
-msgstr ""
+msgstr "Laat OF-herlaai toe?"
 
-#: ../../any.pm_.c:188
-#, fuzzy
+#: ../../any.pm_.c:185
 msgid "Default OS?"
-msgstr "Verstek"
+msgstr "Verstek bedryfstelsel?"
 
-#: ../../any.pm_.c:210
+#: ../../any.pm_.c:207
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -637,148 +651,144 @@ msgstr ""
 "Hier is die huidige inskrywings\n"
 "U kan byvoeg or verwyder soos nodig."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "Voeg by"
 
-#: ../../any.pm_.c:220 ../../any.pm_.c:729 ../../diskdrake.pm_.c:46
-#: ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217 ../../any.pm_.c:718 ../../diskdrake.pm_.c:161
+#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:1846
+#: ../../printerdrake.pm_.c:1847 ../../printerdrake.pm_.c:1904
+#: ../../printerdrake.pm_.c:1948
 msgid "Done"
 msgstr "Klaar"
 
-#: ../../any.pm_.c:220
-#, fuzzy
+#: ../../any.pm_.c:217
 msgid "Modify"
-msgstr "Verander RAID"
+msgstr "Verander"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "Watter tipe inskrywing wil u byvoeg?"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Other OS (SunOS...)"
 msgstr "Ander bedryfstelsel (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "Ander bedryfstelsel (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "Ander bedryfstelsel (windows...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "Beeld"
 
-#: ../../any.pm_.c:253 ../../any.pm_.c:264
+#: ../../any.pm_.c:247 ../../any.pm_.c:258
 msgid "Root"
 msgstr "Basis"
 
-#: ../../any.pm_.c:254 ../../any.pm_.c:283
+#: ../../any.pm_.c:248 ../../any.pm_.c:277
 msgid "Append"
 msgstr "Aanlas"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "Lees-skryf"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "Tabel"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "Onveilig"
 
-#: ../../any.pm_.c:274 ../../any.pm_.c:279 ../../any.pm_.c:282
+#: ../../any.pm_.c:268 ../../any.pm_.c:273 ../../any.pm_.c:276
 msgid "Label"
 msgstr "Etiket"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "Verstek"
 
-#: ../../any.pm_.c:284
-#, fuzzy
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
-msgstr "Initrd"
+msgstr "Initrd-grootte"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
-msgstr ""
+msgstr "Geen video"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "Verwyder inskrywing"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "Le� etiket word nie toegelaat nie"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "Hierdie etiket is alreeds in gebruik"
 
-#: ../../any.pm_.c:317
-#, fuzzy
-msgid "What type of partitioning?"
-msgstr "Oor watter tipe drukker beskik u?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Het %s %s koppelvlakke gevind"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "Beskik u oor nog?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Het u enige %s koppelvlakke?"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
-#: ../../printerdrake.pm_.c:237
+#: ../../any.pm_.c:601 ../../any.pm_.c:760 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "No"
 msgstr "Nee"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
+#: ../../any.pm_.c:601 ../../any.pm_.c:759 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "Sien hardeware inligting"
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:648
+#: ../../any.pm_.c:637
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "Drywer vir %s kaart %s in installasieproses"
 
-#: ../../any.pm_.c:649
+#: ../../any.pm_.c:638
 #, c-format
 msgid "(module %s)"
 msgstr "(module %s)"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:660
+#: ../../any.pm_.c:649
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Watter %s drywer meot ek probeer?"
 
-#: ../../any.pm_.c:668
+#: ../../any.pm_.c:657
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -791,38 +801,38 @@ msgid ""
 msgstr ""
 "In sekere gevalle sal die %s drywer ekstra inligting benodig, alhoewel in\n"
 "meeste gevalle dit nie nodig wees nie. Wil u ekstra opsies voorsien od moet\n"
-"rekenaar self daarvoor aftas. IN uitsonderlike gevalle mag die rekenaar\n"
+"rekenaar self daarvoor aftas. In uitsonderlike gevalle mag die rekenaar\n"
 "ophang, maar dit sal nie skade veroorsaak nie."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "Aftas"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "Spesifieer opsies"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "U kan die opsies vir module %s hier intik."
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
 "Options are in format ``name=value name2=value2 ...''.\n"
 "For instance, ``io=0x300 irq=7''"
 msgstr ""
-"Ukan noue die opsies voorsien vir module %s.\n"
+"U kan noue die opsies voorsien vir module %s.\n"
 "Opsies is in die formaat ``naam=waarde naam2=waarde2 ...''.\n"
 "Bv. ``io=0x300 irq-7''"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Module opsies:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -831,34 +841,34 @@ msgstr ""
 "Laai van module %s het gefaal.\n"
 "Wil u ander parameters probeer?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s alreeds bygevoeg)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "Die wagwoorde is te eenvoudig"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "Gee asb. 'n gebruikerskode"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "Die gebruikerskode maag alleenlikui kleinletter, nommers, '-' en '_' bestaan"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "Hierdie genruikerskode bestaan alreeds"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "Voeg gebruiker by"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -867,56 +877,68 @@ msgstr ""
 "Tik 'n gebruiker in\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Aanvaar gebruiker"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "Regte naam"
 
-#: ../../any.pm_.c:740 ../../printerdrake.pm_.c:97
-#: ../../printerdrake.pm_.c:131
+#: ../../any.pm_.c:729 ../../printerdrake.pm_.c:401
+#: ../../printerdrake.pm_.c:480
 msgid "User name"
 msgstr "Gebruikerskode"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "Dop"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "Ikoon"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:756
 msgid "Autologin"
 msgstr "Outointeken"
 
-#: ../../any.pm_.c:767
+#: ../../any.pm_.c:757
 msgid ""
 "I can set up your computer to automatically log on one user.\n"
-"If you don't want to use this feature, click on the cancel button."
+"Do you want to use this feature?"
 msgstr ""
 "Ek kan u rekenaar so opstel om X outomaties een gebruiker in te teken.\n"
-"Kliek op kanselleer indien u nie hierdie funksionaliteit verlang nie."
+"Verlang u hierdie funksionaliteit?"
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "Kies die verstek gebruiker:"
 
 #
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "Kies die vensterbestuurder om te loop:"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "Kies asb. 'n taal om te gebruik."
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr "U kan ander tale selekteer wat na installasie beskikbaar sal wees."
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "Alles"
+
 # NOTE: this message will be displayed at boot time; that is
 # only the ascii charset will be available on most machines
 # so use only 7bit for this message (and do transliteration or
 # leave it in English, as it is the best for your language)
-# 
+#
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:262 ../../bootloader.pm_.c:608
-#, fuzzy, c-format
+#: ../../bootloader.pm_.c:259
+#, c-format
 msgid ""
 "Welcome to %s the operating system chooser!\n"
 "\n"
@@ -926,10 +948,8 @@ msgid ""
 msgstr ""
 "Welkom by %s die bedryfstelselkeuseprogram!\n"
 "\n"
-"Om die moontlikehede te vertoon, druk <TAB>.\n"
-"\n"
-"Om 'n spesifieke een te laai, tik die nodige naam en druk <ENTER> of wag\n"
-"%ds en die verstek bedryfstelsel sal laai.\n"
+"Kies u bedryfstelsel uit die bogelyste opsies of wag\n"
+"%d sekonde vir die verstekopsie.\n"
 "\n"
 
 # NOTE: this message will be displayed by grub at boot time; that is
@@ -940,13 +960,13 @@ msgstr ""
 # and only one line per string for the GRUB messages
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:809
+#: ../../bootloader.pm_.c:835
 msgid "Welcome to GRUB the operating system chooser!"
 msgstr "Welkom by GRUB, die bedryfstelselkieskaart!"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:812
+#: ../../bootloader.pm_.c:838
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
 msgstr ""
@@ -955,564 +975,741 @@ msgstr ""
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:815
+#: ../../bootloader.pm_.c:841
 msgid "Press enter to boot the selected OS, 'e' to edit the"
 msgstr "Druk ENTER om die gekose bedryfstelsel te laai, 'e' om te redigeer."
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:818
+#: ../../bootloader.pm_.c:844
 msgid "commands before booting, or 'c' for a command-line."
 msgstr "instruksies voor herlaai, of 'c' vir 'n instruksielyn."
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:821
+#: ../../bootloader.pm_.c:847
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr "Die uitgeligte inskrywing sal outomaties in %ds gelaai word."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
 msgstr "nie genoeg spasie in /boot nie"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
 #. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:918
+#: ../../bootloader.pm_.c:951
 msgid "Desktop"
 msgstr "Werkskerm"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:920
+#: ../../bootloader.pm_.c:953
 msgid "Start Menu"
 msgstr "Beginkieskaart"
 
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "Waar wil u die herlaaistelsel installeer"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
-msgstr ""
+msgstr "Gee hulp beskikbaar nie (nog nie).\n"
 
 #: ../../bootlook.pm_.c:62
-#, fuzzy
 msgid "Boot Style Configuration"
-msgstr "Postinstallasiekonfigurasie"
+msgstr "Herlaaistylkonfigurasie"
 
 #: ../../bootlook.pm_.c:79
-#, fuzzy
 msgid "/_File"
-msgstr "L�ers:\n"
+msgstr "/_L�er"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr ""
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr ""
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr ""
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr ""
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr ""
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr ""
+#: ../../bootlook.pm_.c:80
+msgid "/File/_Quit"
+msgstr "/L�er/_Verlaat"
 
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr ""
+#: ../../bootlook.pm_.c:80
+msgid "<control>Q"
+msgstr "<ctrl>Q"
 
 #: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr ""
+msgid "NewStyle Categorizing Monitor"
+msgstr "Nuwe monitorkategoriasiestyl"
+
+#: ../../bootlook.pm_.c:92
+msgid "NewStyle Monitor"
+msgstr "Nuwe styl monitor"
 
 #: ../../bootlook.pm_.c:93
-msgid "/File/_Quit"
-msgstr ""
+msgid "Traditional Monitor"
+msgstr "Tradisionele monitor"
 
 #: ../../bootlook.pm_.c:94
-msgid "<control>Q"
-msgstr ""
-
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr ""
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr ""
-
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr ""
+msgid "Traditional Gtk+ Monitor"
+msgstr "Tradisionele Gtk+ Monitor"
 
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr ""
+#: ../../bootlook.pm_.c:95
+msgid "Launch Aurora at boot time"
+msgstr "Laai Aurora met herlaaityd"
 
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-#, fuzzy
-msgid "Configure"
-msgstr "Stel X op"
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "LILO/GRUB metode"
 
-#: ../../bootlook.pm_.c:114
-#, fuzzy, c-format
+#: ../../bootlook.pm_.c:102
+#, c-format
 msgid ""
 "You are currently using %s as Boot Manager.\n"
 "Click on Configure to launch the setup wizard."
-msgstr "Internetkonneksiedeling"
-
-#: ../../bootlook.pm_.c:121
-#, fuzzy
-msgid "Lilo/grub mode"
-msgstr "Belmetode"
-
-#: ../../bootlook.pm_.c:131
-msgid "NewStyle Categorizing Monitor"
-msgstr ""
-
-#: ../../bootlook.pm_.c:134
-#, fuzzy
-msgid "NewStyle Monitor"
-msgstr "Monitor"
-
-#: ../../bootlook.pm_.c:137
-#, fuzzy
-msgid "Traditional Monitor"
-msgstr "Verander monitor"
-
-#: ../../bootlook.pm_.c:140
-msgid "Traditional Gtk+ Monitor"
 msgstr ""
+"U gebruik huidig %s as herlaaibestuurder.\n"
+"Kliek op Konfigureer om opstelassistent te laai."
 
-#: ../../bootlook.pm_.c:144
-msgid "Launch Aurora at boot time"
-msgstr ""
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "Konfigureer"
 
-#: ../../bootlook.pm_.c:169
-#, fuzzy
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
-msgstr "Herlaaitoestel"
+msgstr "Herlaaimodus"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "Stelselmode"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
-msgstr ""
+msgstr "Laai X-Windowstelsel met herlaai"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
-msgstr ""
+msgstr "Nee, ek verlang outo-aanteken"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
-msgstr ""
-
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr ""
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "Verstek"
+msgstr "Ja, ek verlang outoaanteken met hierdie (gebruiker,werkskerm)"
 
-#: ../../bootlook.pm_.c:236 ../../standalone/draknet_.c:88
-#: ../../standalone/draknet_.c:120 ../../standalone/draknet_.c:184
-#: ../../standalone/draknet_.c:302 ../../standalone/draknet_.c:396
-#: ../../standalone/draknet_.c:473 ../../standalone/draknet_.c:509
-#: ../../standalone/draknet_.c:617
+#: ../../bootlook.pm_.c:155 ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:140 ../../standalone/draknet_.c:208
+#: ../../standalone/draknet_.c:320 ../../standalone/draknet_.c:433
+#: ../../standalone/draknet_.c:507 ../../standalone/draknet_.c:543
+#: ../../standalone/draknet_.c:644
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
-#: ../../bootlook.pm_.c:238 ../../install_steps_gtk.pm_.c:576
-#: ../../interactive.pm_.c:114 ../../interactive.pm_.c:269
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:357
-#: ../../my_gtk.pm_.c:360 ../../my_gtk.pm_.c:617
-#: ../../standalone/drakgw_.c:639 ../../standalone/draknet_.c:95
-#: ../../standalone/draknet_.c:127 ../../standalone/draknet_.c:295
-#: ../../standalone/draknet_.c:485 ../../standalone/draknet_.c:631
-#: ../../standalone/tinyfirewall_.c:63
+#: ../../bootlook.pm_.c:156 ../../install_steps_gtk.pm_.c:516
+#: ../../interactive.pm_.c:122 ../../interactive.pm_.c:286
+#: ../../interactive.pm_.c:308 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:416 ../../my_gtk.pm_.c:419 ../../my_gtk.pm_.c:716
+#: ../../printerdrake.pm_.c:1158 ../../standalone/drakgw_.c:648
+#: ../../standalone/draknet_.c:115 ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:313 ../../standalone/draknet_.c:519
+#: ../../standalone/draknet_.c:658 ../../standalone/tinyfirewall_.c:63
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr ""
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr ""
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "kan nie /etc/inittab oopmaak vir lees nie: %s"
 
-#: ../../bootlook.pm_.c:435 ../../standalone/drakboot_.c:47
+#: ../../bootlook.pm_.c:336 ../../standalone/drakboot_.c:47
 msgid "Installation of LILO failed. The following error occured:"
 msgstr "LILO installasie het gefaal a.g.v. hierdie fout: "
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Skep"
-
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Ontheg"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Uitwis"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "KB"
 
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "Formatteer"
+#: ../../common.pm_.c:93 ../../install_steps_graphical.pm_.c:287
+#: ../../install_steps_graphical.pm_.c:334
+msgid "MB"
+msgstr "MB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:653
-msgid "Resize"
-msgstr "Verstel Grootte"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr "TB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "Tipe"
+#: ../../common.pm_.c:109
+#, c-format
+msgid "%d minutes"
+msgstr "%d minute"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "Hegpunt"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 minuut"
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "Skryf /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekondes"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "Skakel oor na kundige gebruiksvlak"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "Rugsteun u data eers asb."
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "Skakel oor na normale gebruiksvlak"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "Lees noukeurig!"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "Herstel vanaf lOer"
+#: ../../diskdrake.pm_.c:103
+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 ""
+"Indien u beplan om 'aboot' te gebruik, los spasie aan die begin\n"
+"van die skyf. (2048 sektors is genoeg)."
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Stoor in lOer"
+#: ../../diskdrake.pm_.c:122 ../../diskdrake_interactive.pm_.c:313
+#: ../../diskdrake_interactive.pm_.c:328 ../../install_steps.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:37
+#: ../../install_steps_interactive.pm_.c:310 ../../interactive_http.pm_.c:119
+#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:62
+msgid "Error"
+msgstr "Fout"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "Assistent"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Herstel vanaf floppie"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Nuut"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Stoor op floppie"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+msgid "Remote"
+msgstr "Ekstern"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "Verwydeer almal"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "Hegpunt"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Formatteer almal"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Opsies"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Outo-allokeer"
+#: ../../diskdrake.pm_.c:211 ../../diskdrake.pm_.c:417
+#: ../../diskdrake.pm_.c:534 ../../diskdrake_interactive.pm_.c:353
+#: ../../diskdrake_interactive.pm_.c:488
+msgid "Type"
+msgstr "Tipe"
 
-#: ../../diskdrake.pm_.c:59
-msgid "All primary partitions are used"
-msgstr "Alle primOre partisies is gebruik"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Ontheg"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "Ek kan nie meer partisies byvoeg nie"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Heg"
 
-#: ../../diskdrake.pm_.c:59
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Kies aksie"
+
+#: ../../diskdrake.pm_.c:235
 msgid ""
-"To have more partitions, please delete one to be able to create an extended "
-"partition"
+"You have one big FAT partition\n"
+"(generally used by MicroSoft Dos/Windows).\n"
+"I suggest you first resize that partition\n"
+"(click on it, then click on \"Resize\")"
 msgstr ""
-"Om meer partisies te verkry, verwyder asb. een om 'n ektensiepartisiete kan "
-"skep"
+"U het een massiewe FAT partisie. \n"
+"(gewoonlik deur DOS/Windows gebruik)\n"
+"Ek stel voor u verstel eers die grootte van di� partisie\n"
+"(kliek daarop en kliek dan op \"Verstel Grootte\")"
+
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Kliek asb. op 'n partisie"
 
-#: ../../diskdrake.pm_.c:61
+#: ../../diskdrake.pm_.c:240
 #, fuzzy
-msgid "Not enough space for auto-allocating"
-msgstr "Nie genoeg spasie beskikbaar om nuwe partisies toe te ken nie"
+msgid "Please click on a media"
+msgstr "Kliek asb. op 'n partisie"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Herroep"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "Kliek asb. op 'n partisie"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "Skryf partisietabel"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-#, fuzzy
-msgid "More"
-msgstr "Skuif"
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "Detail"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
+#, fuzzy
+msgid "Journalised FS"
+msgstr "Gejoernaliseer"
+
+#: ../../diskdrake.pm_.c:395
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Swap"
 msgstr "Ruilarea"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:396 ../../diskdrake_interactive.pm_.c:952
 msgid "Empty"
 msgstr "Leeg"
 
-#: ../../diskdrake.pm_.c:117 ../../install_steps_gtk.pm_.c:407
-#: ../../mouse.pm_.c:145
+#: ../../diskdrake.pm_.c:396 ../../install_steps_gtk.pm_.c:373
+#: ../../install_steps_gtk.pm_.c:433 ../../mouse.pm_.c:161
+#: ../../services.pm_.c:161
 msgid "Other"
 msgstr "Ander"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "LOersteltipes:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "Detail"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Skep"
 
-#: ../../diskdrake.pm_.c:147
-msgid ""
-"You have one big FAT partition\n"
-"(generally used by MicroSoft Dos/Windows).\n"
-"I suggest you first resize that partition\n"
-"(click on it, then click on \"Resize\")"
-msgstr ""
-"U het een massiewe FAT partisie. \n"
-"(gewoonlik deur DOS/Windows gebruik)\n"
-"Ek stel voor u verstel eers die grootte van di� partisie\n"
-"(kliek daarop en kliek dan op \"Verstel Grootte\")"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Gebruik ``%s'' instede."
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Rugsteun u data eers asb."
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Uitwis"
 
-#: ../../diskdrake.pm_.c:152 ../../diskdrake.pm_.c:170
-#: ../../diskdrake.pm_.c:179 ../../diskdrake.pm_.c:570
-#: ../../diskdrake.pm_.c:592
-msgid "Read carefully!"
-msgstr "Lees noukeurig!"
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Gebruik ``Ontheg'' eerste"
 
-#: ../../diskdrake.pm_.c:155
+#: ../../diskdrake.pm_.c:424 ../../diskdrake_interactive.pm_.c:480
+#, c-format
 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"
+"After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
-"Indien u beplan om 'aboot' te gebruik, los spasie aan die begin\n"
-"van die skyf. (2048 sektors is genoeg)."
+"Alle data om hierdie partisie %s sal uitgewis word na verandering van die "
+"partisietipe"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "Wees versigtig: hierdie is 'n gevaarlike operasie"
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Waar wil u toestel %s heg?"
 
-#: ../../diskdrake.pm_.c:214 ../../install_steps.pm_.c:72
-#: ../../install_steps_interactive.pm_.c:37
-#: ../../install_steps_interactive.pm_.c:322 ../../standalone/diskdrake_.c:66
-msgid "Error"
-msgstr "Fout"
+#: ../../diskdrake.pm_.c:500
+msgid "Mount options"
+msgstr "Hegopsies:"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Hegpunt:"
+#: ../../diskdrake.pm_.c:507
+msgid "Various"
+msgstr "Verskeie"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Toestel:"
+#: ../../diskdrake.pm_.c:525
+msgid "Removable media"
+msgstr "Verwyderbare media"
 
-#: ../../diskdrake.pm_.c:240
-#, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "DOS-skyfletter: %s ('n raaiskoot)\n"
+#: ../../diskdrake.pm_.c:532
+msgid "Change type"
+msgstr "Verander tipe"
 
-#: ../../diskdrake.pm_.c:244 ../../diskdrake.pm_.c:251
-#: ../../diskdrake.pm_.c:301
-msgid "Type: "
-msgstr "Tipe:"
+#
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Watter l�erstelsel verlang u?"
 
-#: ../../diskdrake.pm_.c:248
-msgid "Name: "
-msgstr "Naam: "
+#: ../../diskdrake.pm_.c:564
+msgid "Scanning available nfs shared resource"
+msgstr "Beskikbare NFS-gede�lde hulpbronne word gesoek"
 
-#: ../../diskdrake.pm_.c:253
+#: ../../diskdrake.pm_.c:569
 #, c-format
-msgid "Start: sector %s\n"
-msgstr "Begin: sektor %s\n"
+msgid "Scanning available nfs shared resource of server %s"
+msgstr "Beskikbare NFS-gede�lde hulpbronne van bediner %s word gesoek."
 
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Size: %s"
-msgstr "Grootte: %s"
+#: ../../diskdrake.pm_.c:578 ../../diskdrake.pm_.c:648
+msgid "If the list above doesn't contain the wanted entry, enter it here:"
+msgstr ""
+"Indien bo-gelyste inskrywings nie die nodige inskrywing bevat nie, voeg dit "
+"hier by:"
 
-#: ../../diskdrake.pm_.c:256
-#, c-format
-msgid ", %s sectors"
-msgstr ", %s sektore"
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "Bediener"
+
+#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
+msgid "Shared resource"
+msgstr "Gede�lde hulpbron"
 
-#: ../../diskdrake.pm_.c:258
+#: ../../diskdrake.pm_.c:615
+msgid "Scanning available samba shared resource"
+msgstr "Beskikbare SAMBA-gede�lde hulpbronne word gesoek"
+
+#: ../../diskdrake.pm_.c:626 ../../diskdrake.pm_.c:639
 #, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Silinder %d na silinder %d\n"
+msgid "Scanning available samba shared resource of server %s"
+msgstr "Beskikbare SAMBA-gede�lde hulpbronnevan bediener %s word gesoek"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Geformateer\n"
+#: ../../diskdrake_interactive.pm_.c:163
+msgid "Choose a partition"
+msgstr "Kies 'n partisie"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "Nie geformatter\n"
+#: ../../diskdrake_interactive.pm_.c:163
+msgid "Choose another partition"
+msgstr "Kies 'n ander partisie"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "Geheg\n"
+#: ../../diskdrake_interactive.pm_.c:188
+msgid "Exit"
+msgstr "Verlaat"
 
-#: ../../diskdrake.pm_.c:262
-#, c-format
-msgid "RAID md%s\n"
-msgstr "RAID md%s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "Skakel oor na kundige gebruiksvlak"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Teruglus l�er(s): %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to normal mode"
+msgstr "Skakel oor na normale gebruiksvlak"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Verstekpartisie vir herlaai\n"
-"  (vir MS_DOS doeleindes, nie LILO s'n nie)\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Herroep"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "Vlak %s\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "Wil u in elk geval voortgaan?"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Blokgrootte %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "Verlaat, maar moenie iets stoor nie"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "RAID-skywe %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "Wil u verlaat, sonder om die partisietabel op te dateer?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Teruglus l�ernaam: %s"
+#: ../../diskdrake_interactive.pm_.c:237
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Wil u die /etc/fstab veranderinge stoor?"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Outo-allokeer"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "Verwydeer almal"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "Nog"
+
+#: ../../diskdrake_interactive.pm_.c:250
+msgid "Hard drive information"
+msgstr "Hardeskyfinligting"
+
+#: ../../diskdrake_interactive.pm_.c:267
+#, fuzzy
+msgid "Not enough space for auto-allocating"
+msgstr "Nie genoeg spasie beskikbaar om nuwe partisies toe te ken nie"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "Alle prim�re partisies is gebruik"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "Ek kan nie meer partisies byvoeg nie"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:275
 msgid ""
-"\n"
-"Chances are, this partition is\n"
-"a Driver partition, you should\n"
-"probably leave it alone.\n"
+"To have more partitions, please delete one to be able to create an extended "
+"partition"
 msgstr ""
+"Om meer partisies te verkry, verwyder asb. een om 'n ektensiepartisiete kan "
+"skep"
+
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "Skryf partisietabel"
+
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "Reddingspartisietabel"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "Reddingspartisietabel"
+
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "Reddingspartisietabel"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "Verwyderbare media"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Selekteer lOer"
+
+#: ../../diskdrake_interactive.pm_.c:308
 msgid ""
-"\n"
-"This special Bootstrap\n"
-"partition is for\n"
-"dual-booting your system.\n"
+"The backup partition table has not the same size\n"
+"Still continue?"
 msgstr ""
+"Die rugsteunpartisietabel het nie dieselfde grootte nie\n"
+"Wil u voortgaan?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Kliek asb. op 'n partisie"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Waarskuwing"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Grootte: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Sit 'n floppie in die aandrywer.\n"
+"Alle data op hierdie floppie sal verloor word."
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geometrie: %s silinders, %s koppe, %s sektore\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "Partisietabel Reddingspoging"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "LVM-skywe %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+msgid "Detailed information"
+msgstr "Gedetaileerde inligting"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Partisietabeltipe: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Verstel Grootte"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "op bus %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Skuif"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Heg"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Formatteer"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Aktief"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Voeg by RAID"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "Verwyder uit RAID"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "Verander RAID"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "Voeg by LVM"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "Verwyder uit RAID"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "Verwyder uit LVM"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "Verander RAID"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "Gebruik vir teruglus"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Kies aksie"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Kies 'n nuwe grootte"
+
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "Kies sektor: "
+
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Grootte in MB: "
+
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "LOerstelseltipe: "
+
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Hegpunt:"
+
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Voorkeure: "
+
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "Teruglusl�er %s word geformateer"
+
+#: ../../diskdrake_interactive.pm_.c:486
+msgid "Change partition type"
+msgstr "Verander partisietipe"
+
+#: ../../diskdrake_interactive.pm_.c:491
+msgid "Switching from ext2 to ext3"
+msgstr "Oorskakeling van ext2 na ext3"
+
+#: ../../diskdrake_interactive.pm_.c:521
+#, c-format
+msgid "Where do you want to mount loopback file %s?"
+msgstr "Waar wil u teruglusl�er %s heg?"
+
+#: ../../diskdrake_interactive.pm_.c:528
+msgid ""
+"Can't unset mount point as this partition is used for loop back.\n"
+"Remove the loopback first"
+msgstr ""
+"Kan nie hegpunt ontset nie, omdat hierdie partisie vir teruglus\n"
+"gebruik word. Verwyder eers die teruglus."
+
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "FAT l�erstelselgrense word bereken"
+
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "Grootteverandering"
+
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "Hierdie partisie se greootte kan nie verstel word nie"
+
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "Alle data om hierdie partisie moet gerugsteun word."
+
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr "Alle data om partisie %s sal uitgewis word met die grootteverandering"
+
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Kies die nuwe grootte"
+
+#: ../../diskdrake_interactive.pm_.c:591
+msgid "New size in MB: "
+msgstr "Nuwe grootte in MB: "
+
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Which disk do you want to move it to?"
+msgstr "Na watter skyf wil u skuif?"
+
+#: ../../diskdrake_interactive.pm_.c:632
+msgid "Sector"
+msgstr "Sektor"
+
+#: ../../diskdrake_interactive.pm_.c:633
+msgid "Which sector do you want to move it to?"
+msgstr "Na watter sektor wil u skuif?"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving"
+msgstr "Verskuiwing"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving partition..."
+msgstr "Partisie word verskuif..."
+
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "Kies 'n bestaande RAID om by toe te voeg"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "nuut"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "Kies 'n bestaande LVM om by toe te voeg"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "LVM naam?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "Hierdie partisie kan nie vir teruglus gebruik word nie."
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Teruglus"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Teruglus l�ernaam:"
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "Regte naam"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "L�er word alreeds deur 'n ander teruglus gebruik,kies 'n ander een"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "L�er bestaan alreeds. Moet dit gebruik word?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "toestel"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "vlak"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "blokgrootte"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "Wees versigtig: hierdie is 'n gevaarlike operasie"
 
-#: ../../diskdrake.pm_.c:435
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "Watter tipe van partisionering?"
+
+#: ../../diskdrake_interactive.pm_.c:834
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -1521,11 +1718,11 @@ msgid ""
 msgstr ""
 "Jammer, ek kan nie die versoek om /boot om hierdie skyf (op 'n silinder > "
 "1024) te skep,\n"
-"aanvaar nie. As u LILO genruik sal dit nie werk nie en as uit nie LILO "
+"aanvaar nie. As u LILO gebruik sal dit nie werk nie en as u nie LILO "
 "gebruik\n"
 "nie, dan het u nie /boot nodig nie."
 
-#: ../../diskdrake.pm_.c:439
+#: ../../diskdrake_interactive.pm_.c:838
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -1538,7 +1735,7 @@ msgstr ""
 "gebruik,moet u\n"
 "asb. 'n /boot partisie skep,"
 
-#: ../../diskdrake.pm_.c:445
+#: ../../diskdrake_interactive.pm_.c:844
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
 "No bootloader is able to handle this without a /boot partition.\n"
@@ -1548,1380 +1745,1068 @@ msgstr ""
 "Geen herlaaistelsel sal dit kan hanteer sonder 'n /boot partisie nie.\n"
 "Onthou om 'n /boot by te voeg."
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "Gebruik ``%s'' instede."
-
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "Gebruik ``Ontheg'' eerste"
-
-#: ../../diskdrake.pm_.c:469 ../../diskdrake.pm_.c:513
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
-msgid ""
-"After changing type of partition %s, all data on this partition will be lost"
-msgstr ""
-"Alle data om hierdie partisie %s sal uitgewis word na verandering van die "
-"partisietipe"
-
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "Wil u in elk geval voortgaan?"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "Verlaat, maar moenie iets stoor nie"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "Wil u verlaat, sonder om die partisietabel op te dateer?"
-
-#: ../../diskdrake.pm_.c:516
-msgid "Change partition type"
-msgstr "Verander partisietipe"
-
-#
-#: ../../diskdrake.pm_.c:517
-#, fuzzy
-msgid "Which filesystem do you want?"
-msgstr "Watter drukkerstelsel verlang u?"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "U kan nie ReiserFS vir partisies kleiner as 32MB gebruik nie"
-
-#: ../../diskdrake.pm_.c:537
-#, c-format
-msgid "Where do you want to mount loopback file %s?"
-msgstr "Waar wil u teruglusl�er %s heg?"
-
-#: ../../diskdrake.pm_.c:538
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Waar wil u toestel %s heg?"
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "Partisietabel van skyf %s gaan opdateer word!"
 
-#: ../../diskdrake.pm_.c:542
-msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
-"Remove the loopback first"
-msgstr ""
-"Kan nie hegpunt ontset nie, omdat hierdie partisie vir teruglus\n"
-"gebruik word. Verwyder eers die teruglus."
+#: ../../diskdrake_interactive.pm_.c:868
+msgid "You'll need to reboot before the modification can take place"
+msgstr "U sal moet herlaai voor die veranderinge geaktiveer kan word"
 
-#: ../../diskdrake.pm_.c:561
+#: ../../diskdrake_interactive.pm_.c:879
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Alle data om partisie %s sal uitgewis word met formatering."
 
-#: ../../diskdrake.pm_.c:563
+#: ../../diskdrake_interactive.pm_.c:881
 msgid "Formatting"
 msgstr "Formatering"
 
-#: ../../diskdrake.pm_.c:564
+#: ../../diskdrake_interactive.pm_.c:882
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Teruglusl�er %s word geformateer"
 
-#: ../../diskdrake.pm_.c:565 ../../install_steps_interactive.pm_.c:430
+#: ../../diskdrake_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:419
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Partisie %s word formateer"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "Na formatering van alle partisies"
-
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "alle data om hierdie partisies sal verloor word"
-
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Skuif"
-
-#: ../../diskdrake.pm_.c:577
-msgid "Which disk do you want to move it to?"
-msgstr "Na watter skyf wil u skuif?"
-
-#: ../../diskdrake.pm_.c:578
-msgid "Sector"
-msgstr "Sektor"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid het gefaal"
 
-#: ../../diskdrake.pm_.c:579
-msgid "Which sector do you want to move it to?"
-msgstr "Na watter sektor wil u skuif?"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "Nie genoeg spasie beskikbaar om nuwe partisies toe te ken nie"
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving"
-msgstr "Verskuiwing"
+#: ../../diskdrake_interactive.pm_.c:895
+#, c-format
+msgid ""
+"Directory %s already contain some data\n"
+"(%s)"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving partition..."
-msgstr "Partisie word verskuif..."
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "Nie genoeg spasie beskikbaar om nuwe partisies toe te ken nie"
 
-#: ../../diskdrake.pm_.c:592
+#: ../../diskdrake_interactive.pm_.c:910
 #, c-format
-msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "Partisietabel van skyf %s gaan opdateer word!"
+msgid "Copying %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:594
-msgid "You'll need to reboot before the modification can take place"
-msgstr "U sal moet herlaai voor die veranderinge geaktiveer kan word"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "LPD word verwyder..."
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "FAT l�erstelselgrense word bereken"
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Toestel:"
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "Grootteverandering"
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "DOS-skyfletter: %s ('n raaiskoot)\n"
 
-#: ../../diskdrake.pm_.c:643
-#, fuzzy
-msgid "This partition is not resizeable"
-msgstr "Watter partisie se grootte wil u verander?"
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Tipe:"
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "Alle data om hierdie partisie moet gerugsteun word."
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Naam: "
 
-#: ../../diskdrake.pm_.c:650
+#: ../../diskdrake_interactive.pm_.c:954
 #, c-format
-msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "Alle data om partisie %s sal uitgewis word met die grootteverandering"
+msgid "Start: sector %s\n"
+msgstr "Begin: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Kies die nuwe grootte"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Grootte: %s"
 
-#: ../../diskdrake.pm_.c:660 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
-msgid "MB"
-msgstr "MB"
+#: ../../diskdrake_interactive.pm_.c:957
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s sektore"
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "Kies 'n nuwe grootte"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Silinder %d na silinder %d\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "Kies sektor: "
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Geformateer\n"
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Grootte in MB: "
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "Nie geformatter\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "LOerstelseltipe: "
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "Geheg\n"
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "Voorkeure: "
+#: ../../diskdrake_interactive.pm_.c:963
+#, c-format
+msgid "RAID md%s\n"
+msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:798
-msgid "This partition can't be used for loopback"
-msgstr "Hierdie partisie kan nie vir teruglus gebruik word nie."
+#: ../../diskdrake_interactive.pm_.c:965
+#, fuzzy, c-format
+msgid ""
+"Loopback file(s):\n"
+"   %s\n"
+msgstr "Teruglus l�er(s): %s\n"
 
-#: ../../diskdrake.pm_.c:808
-msgid "Loopback"
-msgstr "Teruglus"
+#: ../../diskdrake_interactive.pm_.c:966
+msgid ""
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
+msgstr ""
+"Verstekpartisie vir herlaai\n"
+"  (vir MS_DOS doeleindes, nie LILO s'n nie)\n"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Teruglus l�ernaam:"
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "Vlak %s\n"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "L�er word alreeds deur 'n ander teruglus gebruik,kies 'n ander een"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Blokgrootte %s\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "L�er bestaan alreeds. Moet dit gebruik word?"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "RAID-skywe %s\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Selekteer lOer"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Teruglus l�ernaam: %s"
 
-#: ../../diskdrake.pm_.c:876
+#: ../../diskdrake_interactive.pm_.c:975
 msgid ""
-"The backup partition table has not the same size\n"
-"Still continue?"
+"\n"
+"Chances are, this partition is\n"
+"a Driver partition, you should\n"
+"probably leave it alone.\n"
 msgstr ""
-"Die rugsteunpartisietabel het nie dieselfde grootte nie\n"
-"Wil u voortgaan?"
-
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "Waarskuwing"
+"\n"
+"Dis hoogs waarskynlik dat hierdie partisie\n"
+"drywerpartisie is en verkieslik alleen gelos\n"
+"moet word.\n"
 
-#: ../../diskdrake.pm_.c:885
+#: ../../diskdrake_interactive.pm_.c:978
 msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
 msgstr ""
-"Sit 'n floppie in die aandrywer.\n"
-"Alle data op hierdie floppie sal verloor word."
-
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "Partisietabel Reddingspoging"
-
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "toestel"
-
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "vlak"
+"\n"
+"Hierdie spesiale herlaaipartisie\n"
+"is om u stelsel te duolaai.\n"
 
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "blokgrootte"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Grootte: %s\n"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "Kies 'n bestaande RAID om by toe te voeg"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geometrie: %s silinders, %s koppe, %s sektore\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "nuut"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Info:"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "Kies 'n bestaande LVM om by toe te voeg"
-
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr ""
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM-skywe %s\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "Outohegting van verwyderbare media"
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Partisietabeltipe: %s\n"
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "Reddingspartisietabel"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "op bus %d id %d\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "Herlaai"
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Opsies: %s"
 
-#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
-#: ../../fs.pm_.c:113
+#: ../../fs.pm_.c:447 ../../fs.pm_.c:457 ../../fs.pm_.c:461 ../../fs.pm_.c:465
+#: ../../fs.pm_.c:469 ../../fs.pm_.c:473
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s formatering ban %s het gefaal"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "Ek weet nie om %s as tipe %s te formateer nie"
 
-#: ../../fs.pm_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "heg het gefaal"
+
+#: ../../fs.pm_.c:588
+#, c-format
+msgid "fsck failed with exit code %d or signal %d"
+msgstr "fsck het gefaal met kode %d of sein %d"
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
 msgid "mount failed: "
 msgstr "heg het gefaal"
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "fout met onthegting van %s: %s"
 
 #: ../../fsedit.pm_.c:21
-#, fuzzy
 msgid "simple"
-msgstr "L�er"
+msgstr "eenvoudig"
 
 #: ../../fsedit.pm_.c:30
-#, fuzzy
 msgid "server"
-msgstr "X-bediener"
+msgstr "bediener"
+
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "U kan nie JFS vir partisies kleiner as 16MB gebruik nie"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "U kan nie ReiserFS vir partisies kleiner as 32MB gebruik nie"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "Hegpunte moet met 'n / begin"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Daar is alreeds 'n partisie met hegpunt %s\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Sirkul�re heg %s\n"
-
-#: ../../fsedit.pm_.c:285
+#: ../../fsedit.pm_.c:476
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
-msgstr ""
+msgstr "U kan nie  LVM logiese volume vir hegpunt %s gebruik nie."
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
 msgstr "Hierdie l�ergids moet altyd in die wortell�erstelsel bly"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr "U benodig 'n ware l�erstelsel (ext2, reiserfs) vir hierdie hegpunt\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Four om %s in skryfmode te open: %s"
 
-#: ../../fsedit.pm_.c:453
+#: ../../fsedit.pm_.c:681
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
 msgstr ""
-"'n Fout het voorgekom - geen geldige toestelle om die nuwe lOerstelsels op "
-"teskep, is gevind nie. Deursoek asb. die hardeware vir die oorsaak."
+"'n Fout het voorgekom - geen geldige toestelle om die nuwe l�erstelsels op "
+"te skep, is gevind nie. Deursoek asb. die hardeware vir die oorsaak."
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "U get geen partisies nie!"
 
-#: ../../help.pm_.c:9
-#, fuzzy
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr "Kies voorkeurtaal vir installasie en stelselgebruik"
-
-#: ../../help.pm_.c:12
-msgid ""
-"You need to accept the terms of the above license to continue installation.\n"
+#: ../../help.pm_.c:13
+#, fuzzy
+msgid ""
+"GNU/Linux is a multiuser system, and this means that each user can have his\n"
+"own preferences, his own files and so on. You can read the ``User Guide''\n"
+"to learn more. But unlike \"root\", which is the administrator, the users\n"
+"you will add here will not be entitled to change anything except their own\n"
+"files and their own configuration. You will have to create at least one\n"
+"regular user for yourself. That account is where you should log in for\n"
+"routine use. Although it is very practical to log in as \"root\" everyday,\n"
+"it may also be very dangerous! The slightest mistake could mean that your\n"
+"system would not work any more. If you make a serious mistake as a regular\n"
+"user, you may only lose some information, but not the entire system.\n"
+"\n"
+"First, you have to enter your real name. This is not mandatory, of course -\n"
+"as you can actually enter whatever you want. DrakX will then take the first\n"
+"word you have entered in the box and will bring it over to the \"User\n"
+"name\". This is the name this particular user will use to log into the\n"
+"system. You can change it. You then have to enter a password here. A\n"
+"non-privileged (regular) user's password is not as crucial as that of\n"
+"\"root\" from a security point of view, but that is no reason to neglect it\n"
+"- after all, your files are at risk.\n"
+"\n"
+"If you click on \"Accept user\", you can then add as many as you want. Add\n"
+"a user for each one of your friends: your father or your sister, for\n"
+"example. When you finish adding all the users you want, select \"Done\".\n"
+"\n"
+"Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
+"for that user (bash by default)."
+msgstr ""
+"GNU/Linux is 'n multigebruikerstelsel en dit beteken dat elke gebruiker sy "
+"eie\n"
+"voorkeure kan stel, met sy eie l�ers ens. U kan meer hieroor in die "
+"gebruikersgids\n"
+"lees. Maak andersins as 'root', die supergebruiker, kan gebruikers wat u "
+"hier byvoeg\n"
+"niks verander behalwe hul eie l�ers en konfigurasie nie. U moet ten minste "
+"een gewone\n"
+"gebruiker vir u self skep. Hierdie gebruker is die een waaronder u moet "
+"inteken vir\n"
+"normale gebruik van die stelsel. Alhoewel dit baie gemaklik is om as 'root' "
+"in te teken vir\n"
+"daaglikse werk, is dit baie gevaarlik. 'n Eenvoudige fout kan u stelsel "
+"immobiliseer. 'n Fout\n"
+"wat as gewone gebruiker gemaak word sal net daardie gebruiker be�nvloed\n"
+"en nie hele stelsel nie.\n"
+"\n"
+"\n"
+"Eers moet u u eie naam intik. Dit is nie verpligtend nie, want u kan eintlik "
+"enigiets intik as\n"
+"u wil. DrakX sal dan die eerste woord wat u ingetik het in die "
+"gebruikerskode inskrywingsveld\n"
+"plaas. U kan hier verander indien u wil. Dit is die gebruikerskode waarmee "
+"die gebruiker in die\n"
+"stelsel sal inteken. U moet dan ook 'n wagwoord hier invoeg. 'n Gewone "
+"gebruiker se wagwoord\n"
+"is nie so krities as di� van die supergebruiker (uit 'n sekuriteitsoogpunt) "
+"nie, maar daar is geen\n"
+"rede om agterlosig met u data te wees nie.\n"
+"\n"
+"\n"
+"Indien u op Aanvaar kliek sal die gebruiker geskep word en kan u nog "
+"gebruikers byvoeg.\n"
+"U kan vir al u vriende gebruikerskodes skep of sommer een vir pa en ma ook. "
+"Wanneer u\n"
+"klaar is kliek op Klaar.\n"
+"\n"
+"Kliek op die Gevorderd knoppie indien u die verstek instruksiedop vir die "
+"gebruiker wil verander.\n"
+"Dit is bash by verstek."
+
+#: ../../help.pm_.c:41
+msgid ""
+"Listed above are the existing Linux partitions detected on your hard drive.\n"
+"You can keep the choices made by the wizard, they are good for most common\n"
+"installs. If you make any changes, you must at least define a root\n"
+"partition (\"/\"). Do not choose too small a partition or you will not be\n"
+"able to install enough software. If you want to store your data on a\n"
+"separate partition, you will also need to create a partition for \"/home\"\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"
-"Please click on \"Accept\" if you agree with its terms.\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"
-"Please click on \"Refuse\" if you disagree with its terms. Installation will "
-"end without modifying your current\n"
-"configuration."
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc."
 msgstr ""
 
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Kies die sleutelborduitleg uit die bostaande lys"
-
-#: ../../help.pm_.c:25
+#: ../../help.pm_.c:72
 msgid ""
-"If you wish other languages (than the one you choose at\n"
-"beginning of installation) will be available after installation, please "
-"chose\n"
-"them in list above. If you want select all, you just need to select \"All\"."
+"The Mandrake Linux installation is spread out over several CDROMs. DrakX\n"
+"knows if a selected package is located on another CDROM and will eject the\n"
+"current CD and ask you to insert a different one as required."
 msgstr ""
 
-#: ../../help.pm_.c:30
+#: ../../help.pm_.c:77
 msgid ""
-"Please choose \"Install\" if there are no previous version of Linux-"
-"Mandrake\n"
-"installed or if you wish to use several operating systems.\n"
+"It is now time to specify which programs you wish to install on your\n"
+"system. There are thousands of packages available for Mandrake Linux, and\n"
+"you are not supposed to know them all by heart.\n"
 "\n"
+"If you are performing a standard installation from CDROM, you will first be\n"
+"asked to specify the CDs you currently have (in Expert mode only). Check\n"
+"the CD labels and highlight the boxes corresponding to the CDs you have\n"
+"available for installation. Click \"OK\" when you are ready to continue.\n"
 "\n"
-"Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\n"
+"Packages are sorted in groups corresponding to a particular use of your\n"
+"machine. The groups themselves are sorted into four sections:\n"
 "\n"
+" * \"Workstation\": if you plan to use your machine as a workstation, "
+"select\n"
+"one or more of the corresponding groups.\n"
 "\n"
-"Depend of your knowledge in GNU/Linux, you can choose one of the following "
-"levels to install or update your\n"
-"Linux-Mandrake operating system:\n"
+" * \"Development\": if the machine is to be used for programming, choose "
+"the\n"
+"desired group(s).\n"
 "\n"
-"\t* Recommended: if you have never installed a GNU/Linux operating system "
-"choose this. Installation will be\n"
-"\t  be very easy and you will be asked only on few questions.\n"
+" * \"Server\": finally, if the machine is intended to be a server, you will\n"
+"be able to select which of the most common services you wish to see\n"
+"installed on the machine.\n"
 "\n"
+" * \"Graphical Environment\": this is where you will choose your preferred\n"
+"graphical environment. At least one must be selected if you want to have a\n"
+"graphical workstation!\n"
 "\n"
-"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
-"the primary usage (workstation, server,\n"
-"\t  development) of your system. You will need to answer to more questions "
-"than in \"Recommended\" installation\n"
-"\t  class, so you need to know how GNU/Linux works to choose this "
-"installation class.\n"
+"Moving the mouse cursor over a group name will display a short explanatory\n"
+"text about that group.\n"
 "\n"
+"You can check the \"Individual package selection\" box, which is useful if\n"
+"you are familiar with the packages being offered or if you want to have\n"
+"total control over what will be installed.\n"
 "\n"
-"\t* Expert: if you have a good knowledge in GNU/Linux, you can choose this "
-"installation class. As in \"Customized\"\n"
-"\t  installation class, you will be able to choose the primary usage "
-"(workstation, server, development). Be very\n"
-"\t  careful before choose this installation class. You will be able to "
-"perform a higly customized installation.\n"
-"\t  Answer to some questions can be very difficult if you haven't a good "
-"knowledge in GNU/Linux. So, don't choose\n"
-"\t  this installation class unless you know what you are doing."
+"If you started the installation in \"Update\" mode, you can unselect all\n"
+"groups to avoid installing any new package. This is useful for repairing or\n"
+"updating an existing system."
 msgstr ""
 
-#: ../../help.pm_.c:56
+#: ../../help.pm_.c:115
 msgid ""
-"Select:\n"
-"\n"
-"  - Customized: If you are familiar enough with GNU/Linux, you may then "
-"choose\n"
-"    the primary usage for your machine. See below for details.\n"
+"Finally, depending on your choice of whether or not to select individual\n"
+"packages, you will be presented a tree containing all packages classified\n"
+"by groups and subgroups. While browsing the tree, you can select entire\n"
+"groups, subgroups, or individual packages.\n"
 "\n"
+"Whenever you select a package on the tree, a description appears on the\n"
+"right. When your selection is finished, click the \"Install\" button which\n"
+"will then launch the installation process. Depending on the speed of your\n"
+"hardware and the number of packages that need to be installed, it may take\n"
+"a while to complete the process. A time to complete estimate is displayed\n"
+"on the screen to help you gauge if there is sufficient time to enjoy a cup\n"
+"of coffee.\n"
 "\n"
-"  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
-"    perform a highly customized installation. As for a \"Customized\"\n"
-"    installation class, you will be able to select the usage for your "
-"system.\n"
-"    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
-"DOING!"
-msgstr ""
-"Selekteer:\n"
+"!! If a server package has been selected either intentionally or because it\n"
+"was part of a whole group, you will be asked to confirm that you really\n"
+"want those servers to be installed. Under Mandrake Linux, any installed\n"
+"servers are started by default at boot time. Even if they are safe and have\n"
+"no known issues at the time the distribution was shipped, it may happen\n"
+"that security holes are discovered after this version of Mandrake Linux was\n"
+"finalized. If you do not know what a particular service is supposed to do\n"
+"or why it is being installed, then click \"No\". Clicking \"Yes\" will\n"
+"install the listed services and they will be started automatically by\n"
+"default. !!\n"
 "\n"
-"  - Afgemeet: Indien u vertroud genoeg is met GNU/Linux, kan u die prim�re\n"
-"  gebruik van u rekenaar kies. Sien onder vir details.\n"
+"The \"Automatic dependencies\" option simply disables the warning dialog\n"
+"which appears whenever the installer automatically selects a package. This\n"
+"occurs because it has determined that it needs to satisfy a dependency with\n"
+"another package in order to successfully complete the installation.\n"
 "\n"
-"  - Kundige: Indien u vlot is in GNU/Linux en 'n hoogs aangepaste "
-"installasie wil\n"
-"  doen, kan u die deur die gebruik van u rekenaar te kies.\n"
-"  MOET ASB. NIE HIERDIE OPSIE KIES INDIEN U NIE WEET WAT U DOEN NIE."
+"The tiny floppy disc icon at the bottom of the list allows to load the\n"
+"packages list chosen during a previous installation. Clicking on this icon\n"
+"will ask you to insert a floppy disk previously created at the end of\n"
+"another installation. See the second tip of last step on how to create such\n"
+"a floppy."
+msgstr ""
 
-#: ../../help.pm_.c:68
-#, fuzzy
+#: ../../help.pm_.c:151
 msgid ""
-"You must now define your machine usage. Choices are:\n"
-"\n"
-"\t* Workstation: this the ideal choice if you intend to use your machine "
-"primarily for everyday use, at office or\n"
-"\t  at home.\n"
+"If you wish to connect your computer to the Internet or to a local network,\n"
+"please choose the correct option. Please turn on your device before\n"
+"choosing the correct option to let DrakX detect it automatically.\n"
 "\n"
+"Mandrake Linux proposes the configuration of an Internet connection at\n"
+"installation time. Available connections are: traditional modem, ISDN\n"
+"modem, ADSL connection, cable modem, and finally a simple LAN connection\n"
+"(Ethernet).\n"
 "\n"
-"\t* Development: if you intend to use your machine primarily for software "
-"development, it is the good choice. You\n"
-"\t  will then have a complete collection of software installed in order to "
-"compile, debug and format source code,\n"
-"\t  or create software packages.\n"
+"Here, we will not detail each configuration. Simply make sure that you have\n"
+"all the parameters from your Internet Service Provider or system\n"
+"administrator.\n"
 "\n"
+"You can consult the manual chapter about Internet connections for details\n"
+"about the configuration, or simply wait until your system is installed and\n"
+"use the program described there to configure your connection.\n"
 "\n"
-"\t* Server: if you intend to use this machine as a server, it is the good "
-"choice. Either a file server (NFS or\n"
-"\t  SMB), a print server (Unix style or Microsoft Windows style), an "
-"authentication server (NIS), a database\n"
-"\t  server and so on. As such, do not expect any gimmicks (KDE, GNOME, etc.) "
-"to be installed."
+"If you wish to configure the network later after installation or if you\n"
+"have finished configuring your network connection, click \"Cancel\"."
 msgstr ""
-"Die verskillende opsies vir u rekenaar se gebruik (indien u \"Afgemeet\" \n"
-"of  \"Kundige\" sou kies) is die volgende:\n"
-"\n"
-"  - Normaal: Indien die rekenaar prim�r vir daaglikse kantoorgebruik is.\n"
-"     Moenie programmeringspakette verwag nie.\n"
-"\n"
-"  - Ontwikkeling: Indien die rekenaar vir programontwikkel;ing gebruik sal\n"
-"     word. 'n Volledige stel kompileerders, saamstellers en ontfouters sal \n"
-"     opgesit word.\n"
-"\n"
-"  - Bediener: Indien die rekenaar prim�r 'n bediener sal wees, hetsy met "
-"NFS,\n"
-"     SMB, drukkerbediening, NIS magtiging ens.\n"
-"     Moenie vensterstelsels soos KDE en GNOME verwag nie.\n"
 
-#: ../../help.pm_.c:84
+#: ../../help.pm_.c:172
 #, fuzzy
 msgid ""
-"DrakX will attempt to look for PCI SCSI adapter(s). If DrakX\n"
-"finds an SCSI adapter and knows which driver to use, it will be "
-"automatically\n"
-"installed.\n"
+"You may now choose which services you wish to start at boot time.\n"
 "\n"
+"Here are presented all the services available with the current\n"
+"installation. Review them carefully and uncheck those which are not always\n"
+"needed at boot time.\n"
 "\n"
-"If you have no SCSI adapter, an ISA SCSI adapter or a PCI SCSI adapter that\n"
-"DrakX doesn't recognize, you will be asked if a SCSI adapter is present in "
-"your\n"
-"system. If there is no adapter present, you can click on \"No\". If you "
-"click on\n"
-"\"Yes\", a list of drivers will be presented from which you can select your\n"
-"specific adapter.\n"
+"You can get a short explanatory text about a service by selecting a\n"
+"specific service. However, if you are not sure whether a service is useful\n"
+"or not, it is safer to leave the default behavior.\n"
 "\n"
-"\n"
-"If you have to manually specify your adapter, DrakX will ask if you want to\n"
-"specify options for it. You should allow DrakX to probe the hardware for "
-"the\n"
-"options. This usually works well.\n"
-"\n"
-"\n"
-"If not, you will need to provide options to the driver. Please review the "
-"User\n"
-"Guide (chapter 3, section \"Collective informations on your hardware) for "
-"hints\n"
-"on retrieving this information from hardware documentation, from the\n"
-"manufacturer's Web site (if you have Internet access) or from Microsoft "
-"Windows\n"
-"(if you have it on your system)."
+"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."
 msgstr ""
-"DrakX sal probeer om vir PCI SCSI-kaarte te soek.\n"
-"Indien DrakX 'n SCSI-kaart bespeur en weet watter drywer omte gebruik sal "
-"dit outomaties installeer word.\n"
-"\n"
-"Indien u nie oor 'n SCSI-kaart, beskik nie of  oor  'n ISA SCSI-kaart of 'n "
-"PCI SCSI-kaart beskik wat DrakX nie kan herken nie, sal u gevra word of daar "
-"enige SCSI-kaarte in diestelsel is. Indien daar geen is nie kliek op 'Nee', "
-"andersins op 'Ja'. U sal dan uit'n drywerlys kan kies.\n"
-"\n"
-"\n"
-"Indien u self 'n drywer moes spesifiseer, sal DrakX u ook vra vir enige "
-"spesifiekeopsies.\n"
-"U kan egter DrakX toelaat om self die hardeware te ondervra. DIt werk "
-"gewoonlik die beste.\n"
+"U kan nou dienste kies wat by herlaaityd moet afskop.\n"
+"Wanneer u die muis oor 'n item beweeg, sal 'n klein ballon opspring\n"
+"wat die rol van die diens verduidelik.\n"
 "\n"
-"Lees die installasie inligting hoe om hierdie tipe inligting m.b.v. die "
-"Windows-bedryfstelsel te bekom.\n"
-"U kan dit ook vanaf die internet onttrek indien u sulke toegang het."
+"Wees versigtig met hierdie stap. Indien u beplan om di� rekenaar as 'n\n"
+"bediener te gebruik wil u nie dienste afskop wat u nie gaan gebruik nie."
 
-#: ../../help.pm_.c:108
+#: ../../help.pm_.c:188
 msgid ""
-"At this point, you need to choose where to install your\n"
-"Linux-Mandrake operating system on your hard drive. If it is empty or if an\n"
-"existing operating system uses all the space available on it, you need to\n"
-"partition it. Basically, partitioning a hard drive consists of logically\n"
-"dividing it to create space to install your new Linux-Mandrake system.\n"
-"\n"
-"\n"
-"Because the effects of the partitioning process are usually irreversible,\n"
-"partitioning can be intimidating and stressful if you are an inexperienced "
-"user.\n"
-"This wizard simplifies this process. Before beginning, please consult the "
-"manual\n"
-"and take your time.\n"
-"\n"
-"\n"
-"You need at least two partitions. One is for the operating system itself and "
-"the\n"
-"other is for the virtual memory (also called Swap).\n"
-"\n"
-"\n"
-"If partitions have been already defined (from a previous installation or "
-"from\n"
-"another partitioning tool), you just need choose those to use to install "
-"your\n"
-"Linux system.\n"
-"\n"
-"\n"
-"If partitions haven't been already defined, you need to create them. \n"
-"To do that, use the wizard available above. Depending of your hard drive\n"
-"configuration, several solutions can be available:\n"
-"\n"
-"\t* Use existing partition: the wizard has detected one or more existing "
-"Linux partitions on your hard drive. If\n"
-"\t  you want to keep them, choose this option. \n"
-"\n"
-"\n"
-"\t* Erase entire disk: if you want delete all data and all partitions "
-"present on your hard drive and replace them by\n"
-"\t  your new Linux-Mandrake system, you can choose this option. Be careful "
-"with this solution, you will not be\n"
-"\t  able to revert your choice after confirmation.\n"
-"\n"
-"\n"
-"\t* Use the free space on the Windows partition: if Microsoft Windows is "
-"installed on your hard drive and takes\n"
-"\t  all space available on it, you have to create free space for Linux data. "
-"To do that you can delete your\n"
-"\t  Microsoft Windows partition and data (see \"Erase entire disk\" or "
-"\"Expert mode\" solutions) or resize your\n"
-"\t  Microsoft Windows partition. Resizing can be performed without loss of "
-"any data. This solution is\n"
-"\t  recommended if you want use both Linux-Mandrake and Microsoft Windows on "
-"same computer.\n"
-"\n"
-"\n"
-"\t  Before choosing this solution, please understand that the size of your "
-"Microsoft\n"
-"\t  Windows partition will be smaller than at present time. It means that "
-"you will have less free space under\n"
-"\t  Microsoft Windows to store your data or install new software.\n"
-"\n"
-"\n"
-"\t* Expert mode: if you want to partition manually your hard drive, you can "
-"choose this option. Be careful before\n"
-"\t  choosing this solution. It is powerful but it is very dangerous. You can "
-"lose all your data very easily. So,\n"
-"\t  don't choose this solution unless you know what you are doing."
+"GNU/Linux manages time in GMT (Greenwich Manage Time) and translates it in\n"
+"local time according to the time zone you selected."
 msgstr ""
+"GNU/Linux beheer tyd in GMT (Greenwichmeridiaantyd) en vertaal dit dan\n"
+"in u lokale tyd volgends die gekose tydsone."
 
-#: ../../help.pm_.c:160
+#: ../../help.pm_.c:192
 msgid ""
-"At this point, you need to choose what\n"
-"partition(s) to use to install your new Linux-Mandrake system. If "
-"partitions\n"
-"have been already defined (from a previous installation of GNU/Linux or "
-"from\n"
-"another partitioning tool), you can use existing partitions. In other "
-"cases,\n"
-"hard drive partitions must be defined.\n"
-"\n"
-"\n"
-"To create partitions, you must first select a hard drive. You can select "
-"the\n"
-"disk for partitioning by clicking on \"hda\" for the first IDE drive, \"hdb"
-"\" for\n"
-"the second or \"sda\" for the first SCSI drive and so on.\n"
-"\n"
-"\n"
-"To partition the selected hard drive, you can use these options:\n"
-"\n"
-"   * Clear all: this option deletes all partitions available on the selected "
-"hard drive.\n"
-"\n"
-"\n"
-"   * Auto allocate: this option allows you to automatically create Ext2 and "
-"swap partitions in free space of your\n"
-"     hard drive.\n"
-"\n"
-"\n"
-"   * Rescue partition table: if your partition table is damaged, you can try "
-"to recover it using this option. Please\n"
-"     be careful and remember that it can fail.\n"
-"\n"
-"\n"
-"   * Undo: you can use this option to cancel your changes.\n"
-"\n"
-"\n"
-"   * Reload: you can use this option if you wish to undo all changes and "
-"load your initial partitions table\n"
-"\n"
-"\n"
-"   * Wizard: If you wish to use a wizard to partition your hard drive, you "
-"can use this option. It is recommended if\n"
-"     you do not have a good knowledge in partitioning.\n"
-"\n"
-"\n"
-"   * Restore from floppy: if you have saved your partition table on a floppy "
-"during a previous installation, you can\n"
-"     recover it using this option.\n"
-"\n"
+"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
+"on which all the graphics environments (KDE, Gnome, AfterStep,\n"
+"WindowMaker...) bundled with Mandrake Linux rely. In this section, DrakX\n"
+"will try to configure X automatically.\n"
 "\n"
-"   * Save on floppy: if you wish to save your partition table on a floppy to "
-"be able to recover it, you can use this\n"
-"     option. It is strongly recommended to use this option\n"
+"It is extremely rare for it to fail, unless the hardware is very old (or\n"
+"very new). If it succeeds, it will start X automatically with the best\n"
+"resolution possible depending on the size of the monitor. A window will\n"
+"then appear and ask you if you can see it.\n"
 "\n"
+"If you are doing an \"Expert\" install, you will enter the X configuration\n"
+"wizard. See the corresponding section of the manual for more information\n"
+"about this wizard.\n"
 "\n"
-"   * Done: when you have finished partitioning your hard drive, use this "
-"option to save your changes.\n"
-"\n"
-"\n"
-"For information, you can reach any option using the keyboard: navigate "
-"trough the partitions using Tab and Up/Down arrows.\n"
-"\n"
-"\n"
-"When a partition is selected, you can use:\n"
-"\n"
-"           * Ctrl-c to create a new partition (when a empty partition is "
-"selected)\n"
-"\n"
-"           * Ctrl-d to delete a partition\n"
-"\n"
-"           * Ctrl-m to set the mount point\n"
-"           \n"
-"\n"
-"           \n"
-"If you are installing on a PPC Machine, you will want to create a small HFS "
-"'bootstrap' partition of at least 1MB for use\n"
-"by the yaboot bootloader. If you opt to make the partition a bit larger, say "
-"50MB, you may find it a useful place to store \n"
-"a spare kernel and ramdisk image for emergency boot situations."
+"If you can see the message and answer \"Yes\", then DrakX will proceed to\n"
+"the next step. If you cannot see the message, it simply means that the\n"
+"configuration was wrong and the test will automatically end after 10\n"
+"seconds, restoring the screen."
 msgstr ""
 
-#: ../../help.pm_.c:224
+#: ../../help.pm_.c:212
 msgid ""
-"Above are listed the existing Linux partitions detected on\n"
-"your hard drive. You can keep choices make by the wizard, they are good for "
-"a\n"
-"common usage. If you change these choices, you must at least define a root\n"
-"partition (\"/\"). Don't choose a too little partition or you will not be "
-"able\n"
-"to install enough software. If you want store your data on a separate "
-"partition,\n"
-"you need also to choose a \"/home\" (only possible if you have more than "
-"one\n"
-"Linux partition available).\n"
-"\n"
-"\n"
-"For information, each partition is listed as follows: \"Name\", \"Capacity"
-"\".\n"
-"\n"
-"\n"
-"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
-"\n"
-"\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and "
-"\"sd\"\n"
-"if it is an SCSI hard drive.\n"
-"\n"
-"\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE "
-"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"
+"The first time you try the X configuration, you may not be very satisfied\n"
+"with its display (screen is too small, shifted left or right...). Hence,\n"
+"even if X starts up correctly, DrakX then asks you if the configuration\n"
+"suits you. It will also propose to change it by displaying a list of valid\n"
+"modes it could find, asking you to select one.\n"
 "\n"
-"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
-"\n"
-"\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc..."
+"As a last resort, if you still cannot get X to work, choose \"Change\n"
+"graphics card\", select \"Unlisted card\", and when prompted on which\n"
+"server you want, choose \"FBDev\". This is a failsafe option which works\n"
+"with any modern graphics card. Then choose \"Test again\" to be sure."
 msgstr ""
 
-#: ../../help.pm_.c:258
+#: ../../help.pm_.c:224
 msgid ""
-"Choose the hard drive you want to erase to install your\n"
-"new Linux-Mandrake partition. Be careful, all data present on it will be "
-"lost\n"
-"and will not be recoverable."
+"Finally, you will be asked whether you want to see the graphical interface\n"
+"at boot. Note this question will be asked even if you chose not to test the\n"
+"configuration. Obviously, you want to answer \"No\" if your machine is to\n"
+"act as a server, or if you were not successful in getting the display\n"
+"configured."
 msgstr ""
 
-#: ../../help.pm_.c:263
+#: ../../help.pm_.c:231
 msgid ""
-"Click on \"OK\" if you want to delete all data and\n"
-"partitions present on this hard drive. Be careful, after clicking on \"OK\", "
-"you\n"
-"will not be able to recover any data and partitions present on this hard "
-"drive,\n"
-"including any Windows data.\n"
+"The Mandrake Linux CDROM has a built-in rescue mode. You can access it by\n"
+"booting from the CDROM, press the >>F1<< key at boot and type >>rescue<< at\n"
+"the prompt. But in case your computer cannot boot from the CDROM, you\n"
+"should come back to this step for help in at least two situations:\n"
 "\n"
+" * when installing the boot loader, DrakX will rewrite the boot sector "
+"(MBR)\n"
+"of your main disk (unless you are using another boot manager) so that you\n"
+"can start up with either Windows or GNU/Linux (assuming you have Windows in\n"
+"your system). If you need to reinstall Windows, the Microsoft install\n"
+"process will rewrite the boot sector, and then you will not be able to\n"
+"start GNU/Linux!\n"
 "\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
-"partitions present on this hard drive."
+" * if a problem arises and you cannot start up GNU/Linux from the hard "
+"disk,\n"
+"this floppy disk will be the only means of starting up GNU/Linux. It\n"
+"contains a fair number of system tools for restoring a system, which has\n"
+"crashed due to a power failure, an unfortunate typing error, a typo in a\n"
+"password, or any other reason.\n"
+"\n"
+"When you click on this step, you will be asked to enter a disk inside the\n"
+"drive. The floppy disk you will insert must be empty or contain data which\n"
+"you do not need. You will not have to format it since DrakX will rewrite\n"
+"the whole disk."
 msgstr ""
 
-#: ../../help.pm_.c:273
+#: ../../help.pm_.c:255
 msgid ""
-"More than one Microsoft Windows partition have been\n"
-"detected on your hard drive. Please choose the one you want resize to "
-"install\n"
-"your new Linux-Mandrake operating system.\n"
+"At this point you need to choose where on your hard drive to install your\n"
+"Mandrake Linux operating system. If your hard drive is empty or if an\n"
+"existing operating system is using all the space available, you will need\n"
+"to partition it. Basically, partitioning a hard drive consists of logically\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
+"Because the effects of the partitioning process are usually irreversible,\n"
+"partitioning can be intimidating and stressful if you are an inexperienced\n"
+"user. Fortunately, there is a wizard which simplifies this process. Before\n"
+"beginning, please consult the manual and take your time.\n"
 "\n"
-"For information, each partition is listed as follow; \"Linux name\", "
-"\"Windows\n"
-"name\" \"Capacity\".\n"
-"\n"
-"\"Linux name\" is coded as follow: \"hard drive type\", \"hard drive number"
-"\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
+"If you are running the install in Expert mode, you will enter DiskDrake,\n"
+"the Mandrake Linux partitioning tool, which allows you to fine-tune your\n"
+"partitions. See the DiskDrake chapter of the manual. From the installation\n"
+"interface, you can use the wizards as described here by clicking the\n"
+"\"Wizard\" button of the dialog.\n"
 "\n"
+"If partitions have already been defined, either from a previous\n"
+"installation or from another partitioning tool, simply select those to\n"
+"install your Linux system.\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and \"sd"
-"\"\n"
-"if it is an SCSI hard drive.\n"
+"If partitions are not defined, you will need to create them using the\n"
+"wizard. Depending on your hard drive configuration, several options are\n"
+"available:\n"
 "\n"
+" * \"Use free space\": this option will simply lead to an automatic\n"
+"partitioning of your blank drive(s). You will not be prompted further.\n"
 "\n"
-"\"Hard drive number\" is always a letter putted after \"hd\" or \"sd\". With "
-"IDE hard drives:\n"
+" * \"Use existing partition\": the wizard has detected one or more existing\n"
+"Linux partitions on your hard drive. If you want to use them, choose this\n"
+"option.\n"
 "\n"
-"   * \"a\" means \"master hard drive on the primary IDE controller\",\n"
+" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+"installed on your hard drive and takes all the space available on it, you\n"
+"have to create free space for Linux data. To do that, you can delete your\n"
+"Microsoft Windows partition and data (see \"Erase entire disk\" or \"Expert\n"
+"mode\" solutions) or resize your Microsoft Windows partition. Resizing can\n"
+"be performed without the loss of any data. This solution is recommended if\n"
+"you want to use both Mandrake Linux and Microsoft Windows on same computer.\n"
 "\n"
-"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
+"   Before choosing this option, please understand that after this "
+"procedure,\n"
+"the size of your Microsoft Windows partition will be smaller than at the\n"
+"present time. You will have less free space under Microsoft Windows to\n"
+"store your data or to install new software.\n"
 "\n"
-"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
+" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
+"present on your hard drive and replace them with your new Mandrake Linux\n"
+"system, choose this option. Be careful with this solution because you will\n"
+"not be able to revert your choice after confirmation.\n"
 "\n"
-"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc.\n"
+" * \"Remove Windows\": this will simply erase everything on the drive and\n"
+"begin fresh, partitioning everything from scratch. All data on your disk\n"
+"will be lost.\n"
 "\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first "
-"disk\n"
-"or partition is called \"C:\")."
+" * \"Expert mode\": choose this option if you want to manually partition\n"
+"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"can very easily lose all your data. Hence, do not choose this unless you\n"
+"know what you are doing."
 msgstr ""
 
-#: ../../help.pm_.c:306
-msgid "Please be patient. This operation can take several minutes."
-msgstr ""
-
-#: ../../help.pm_.c:309
+#: ../../help.pm_.c:319
 msgid ""
-"Any partitions that have been newly defined must be\n"
-"formatted for use (formatting meaning creating a filesystem).\n"
-"\n"
+"There you are. Installation is now complete and your GNU/Linux system is\n"
+"ready to use. Just click \"OK\" to reboot the system. You can start\n"
+"GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
+"soon as the computer has booted up again.\n"
 "\n"
-"At this time, you may wish to reformat some already existing partitions to "
-"erase\n"
-"the data they contain. If you wish do that, please also select the "
-"partitions\n"
-"you want to format.\n"
+"The \"Advanced\" button (in Expert mode only) shows two more buttons to:\n"
 "\n"
+" * \"generate auto-install floppy\": to create an installation floppy disk\n"
+"which will automatically perform a whole installation without the help of\n"
+"an operator, similar to the installation you just configured.\n"
 "\n"
-"Please note that it is not necessary to reformat all pre-existing "
-"partitions.\n"
-"You must reformat the partitions containing the operating system (such as \"/"
-"\",\n"
-"\"/usr\" or \"/var\") but do you no have to reformat partitions containing "
-"data\n"
-"that you wish to keep (typically /home).\n"
+"   Note that two different options are available after clicking the button:\n"
 "\n"
+"    * \"Replay\". This is a partially automated install as the partitioning\n"
+"step (and only this one) remains interactive.\n"
 "\n"
-"Please be careful selecting partitions, after formatting, all data will be\n"
-"deleted and you will not be able to recover any of them.\n"
+"    * \"Automated\". Fully automated install: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
 "\n"
+"   This feature is very handy when installing a great number of similar\n"
+"machines. See the Auto install section at our web site.\n"
 "\n"
-"Click on \"OK\" when you are ready to format partitions.\n"
-"\n"
+" * \"Save packages selection\"(*): saves the packages selection as made\n"
+"previously. Then, when doing another installation, insert the floppy inside\n"
+"the driver and run the installation going to the help screen by pressing on\n"
+"the [F1] key, and by issuing >>linux defcfg=\"floppy\"<<.\n"
 "\n"
-"Click on \"Cancel\" if you want to choose other partitions to install your "
-"new\n"
-"Linux-Mandrake operating system."
+"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
+"\"mformat a:\")"
 msgstr ""
 
-#: ../../help.pm_.c:335
-#, fuzzy
+#: ../../help.pm_.c:350
 msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
+"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"
-"DrakX will then check whether you have enough room to install them all. If "
-"not,\n"
-"it will warn you about it. If you want to go on anyway, it will proceed onto "
-"the\n"
-"installation of all selected groups but will drop some packages of lesser\n"
-"interest. At the bottom of the list you can select the option \n"
-"\"Individual package selection\"; in this case you will have to browse "
-"through\n"
-"more than 1000 packages..."
-msgstr ""
-"U kan nou die pakketgroepe kies wat u wil installeer of opgradeer.\n"
-"\n"
-"DrakX sal dan kyk of daar genoegsame spasie is vir die volledige "
-"installasie.\n"
-"Indien nie sal u verwittig word. Indien u voortgaan, sal van die minder "
-"belangrike\n"
-"pakkette nie installeer word nie.Heel onder kan u die opsie \"Individuele "
-"pakketkeuses\"\n"
-"kies waarna u deur meer as 'n 1000 pakkette sal moet blaai....."
-
-#: ../../help.pm_.c:347
-msgid ""
-"You can now choose individually all the packages you\n"
-"wish to install.\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"
-"You can expand or collapse the tree by clicking on options in the left "
-"corner of\n"
-"the packages window.\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"
+"any of them.\n"
 "\n"
+"Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
-"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
-"\"Toggle flat and group sorted\".\n"
-"\n"
+"Click on \"Cancel\" if you want to choose another partition for your new\n"
+"Mandrake Linux operating system installation.\n"
 "\n"
-"If you want not to be warned on dependencies, click on \"Automatic\n"
-"dependencies\". If you do this, note that unselecting one package may "
-"silently\n"
-"unselect several other packages which depend on it."
-msgstr ""
-
-#: ../../help.pm_.c:364
-#, fuzzy
-msgid ""
-"If you have all the CDs in the list above, click Ok. If you have\n"
-"none of those CDs, click Cancel. If only some CDs are missing, unselect "
-"them,\n"
-"then click Ok."
+"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
+"for bad blocks on the disc."
 msgstr ""
-"Indienu al die CDs in die bogenoemde lys het, kliek OK.\n"
-"Indien u geen het nie, kliek Kanselleer.\n"
-"Indien sekere CDs weg is, onselekteer hulle en kliek dan OK."
 
-#: ../../help.pm_.c:369
+#: ../../help.pm_.c:376
 msgid ""
-"Your new Linux-Mandrake operating system is currently being\n"
-"installed. This operation should take a few minutes (it depends on size you\n"
-"choose to install and the speed of your computer).\n"
-"\n"
+"Your new Mandrake Linux operating system is currently being installed.\n"
+"Depending on the number of packages you will be installing and the speed of\n"
+"your computer, this operation could take from a few minutes to a\n"
+"significant amount of time.\n"
 "\n"
 "Please be patient."
 msgstr ""
 
-#: ../../help.pm_.c:377
-msgid ""
-"You can now test your mouse. Use buttons and wheel to verify\n"
-"if settings are good. If not, you can click on \"Cancel\" to choose another\n"
-"driver."
-msgstr ""
-
-#: ../../help.pm_.c:382
+#: ../../help.pm_.c:384
 #, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1\n"
-"port under MS Windows is named ttyS0 under GNU/Linux."
+"Before continuing you should read carefully the terms of the license. It\n"
+"covers the whole Mandrake Linux distribution, and if you do not agree with\n"
+"all the terms in it, click on the \"Refuse\" button which will immediately\n"
+"terminate the installation. To continue with the installation, click the\n"
+"\"Accept\" button."
 msgstr ""
-"Kies asb. die korrekte poort. Onthou dat COM1 onder MS Windows \n"
-"ttyS0 onder GNU/Linux is."
+"Voordat u voortgaan, lees asb die lisensieterme noukeurig deur. Dit dek\n"
+"die hele Mandrake Lnux distirbusie, and indien u nie saamstem met al die\n"
+"terme daarin bevat nie, kliek om die Weier knoppie. Dit sal onmiddelik die\n"
+"installasie stop sit. Om met die installasie voort te gaan kliek op die "
+"Aanvaar\n"
+"knoppie."
 
-#: ../../help.pm_.c:386
+#: ../../help.pm_.c:391
 msgid ""
-"If you wish to connect your computer to the Internet or\n"
-"to a local network please choose the correct option. Please turn on your "
-"device\n"
-"before choosing the correct option to let DrakX detect it automatically.\n"
+"At this point, it is time to choose the security level desired for the\n"
+"machine. As a rule of thumb, the more exposed the machine is, and the more\n"
+"the data stored in it is crucial, the higher the security level should be.\n"
+"However, a higher security level is generally obtained at the expenses of\n"
+"easiness of use. Refer to the MSEC chapter of the ``Reference Manual'' to\n"
+"get more information about the meaning of these levels.\n"
 "\n"
-"\n"
-"If you do not have any connection to the Internet or a local network, "
-"choose\n"
-"\"Disable networking\".\n"
-"\n"
-"\n"
-"If you wish to configure the network later after installation or if you "
-"have\n"
-"finished to configure your network connection, choose \"Done\"."
+"If you do not know what to choose, keep the default option."
 msgstr ""
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:401
 msgid ""
-"No modem has been detected. Please select the serial port on which it is "
-"plugged.\n"
+"At this point, you need to choose what partition(s) will be used for the\n"
+"installation of your Mandrake Linux system. If partitions have been already\n"
+"defined, either from a previous installation of GNU/Linux or from 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"
-"For information, the first serial port (called \"COM1\" under Microsoft\n"
-"Windows) is called \"ttyS0\" under Linux."
-msgstr ""
-
-#: ../../help.pm_.c:406
-msgid ""
-"You may now enter dialup options. If you don't know\n"
-"or are not sure what to enter, the correct informations can be obtained "
-"from\n"
-"your Internet Service Provider. If you do not enter the DNS (name server)\n"
-"information here, this information will be obtained from your Internet "
-"Service\n"
-"Provider at connection time."
-msgstr ""
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr ""
-
-#: ../../help.pm_.c:419
-msgid ""
-"If you are not sure if informations above are\n"
-"correct or if you don't know or are not sure what to enter, the correct\n"
-"informations can be obtained from your Internet Service Provider. If you do "
-"not\n"
-"enter the DNS (name server) information here, this information will be "
-"obtained\n"
-"from your Internet Service Provider at connection time."
-msgstr ""
-
-#: ../../help.pm_.c:426
-#, fuzzy
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, the correct informations can be\n"
-"obtained from your Internet Service Provider."
-msgstr ""
-"U kan nou die opbelopsie invul. Indien u\n"
-"twyfel kry die korrekte inligting van u ISP."
-
-#: ../../help.pm_.c:431
-#, fuzzy
-msgid ""
-"You may now configure your network device.\n"
+"To partition the selected hard drive, you can use these options:\n"
 "\n"
-"   * IP address: if you don't know or are not sure what to enter, ask your "
-"network administrator.\n"
-"     You should not enter an IP address if you select the option \"Automatic "
-"IP\" below.\n"
+" * \"Clear all\": this option deletes all partitions on the selected hard\n"
+"drive.\n"
 "\n"
-"   * Netmask: \"255.255.255.0\" is generally a good choice. If you don't "
-"know or are not sure what to enter,\n"
-"     ask your network administrator.\n"
+" * \"Auto allocate\": this option allows you to automatically create Ext2\n"
+"and swap partitions in free space of your hard drive.\n"
 "\n"
-"   * Automatic IP: if your network uses BOOTP or DHCP protocol, select this "
-"option. If selected, no value is needed in\n"
-"    \"IP address\". If you don't know or are not sure if you need to select "
-"this option, ask your network administrator."
-msgstr ""
-"Sleutel in:\n"
+" * \"Rescue partition table\": if your partition table is damaged, you can\n"
+"try to recover it using this option. Please be careful and remember that it\n"
+"can fail.\n"
 "\n"
-"  - IP-adres: Indien u dit nie weet nie vra u netwerkadministrateur of ISP.\n"
+" * \"Undo\": use this option to cancel your changes.\n"
 "\n"
+" * \"Reload\": you can use this option if you wish to undo all changes and\n"
+"load your initial partitions table.\n"
 "\n"
-"  - Netmasker: \"255.255.255.0\" is gewoonlik 'n goeie keuse. Indien u "
-"twyfel,\n"
-"     vra die netwerkadministrateur of ISP.\n"
+" * \"Wizard\": 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 knowledge of\n"
+"partitioning.\n"
 "\n"
+" * \"Restore from floppy\": this option will allow you to restore a\n"
+"previously saved partition table from floppy disk.\n"
 "\n"
-"  - Outomatiese IP: Indien u netwerk bootp of dhcp protokolle ondersteun, "
-"kies\n"
-"     hierdie opsie. In so 'n geval is 'n IP-adresinskrywing nie nodig nie. "
-"Indien u\n"
-"     twyfel, vra die netwerkadministrateur of ISP.\n"
-
-#: ../../help.pm_.c:443
-#, fuzzy
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, ask your network administrator."
-msgstr ""
-"Indien u netwerk NIS gebruik, kies \"Gebruik NIS\". Indien u twyfel vra\n"
-"die netwerkadministrateur."
-
-#: ../../help.pm_.c:447
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, leave blank."
-msgstr ""
-
-#: ../../help.pm_.c:451
-msgid ""
-"You may now enter dialup options. If you're not sure what to enter, the\n"
-"correct information can be obtained from your ISP."
-msgstr ""
-"U kan nou die opbelopsie invul. Indien u\n"
-"twyfel kry die korrekte inligting van u ISP."
-
-#: ../../help.pm_.c:455
-msgid ""
-"If you will use proxies, please configure them now. If you don't know if\n"
-"you should use proxies, ask your network administrator or your ISP."
-msgstr ""
-"Indien u instaanbedieners wil gebruik, stel hulle hier op.. Indien u twyfel "
-"vra\n"
-"die netwerkadministrateur of ISP."
-
-#: ../../help.pm_.c:459
-#, fuzzy
-msgid ""
-"You can install cryptographic package if your internet connection has been\n"
-"set up correctly. First choose a mirror where you wish to download packages "
-"and\n"
-"after that select the packages to install.\n"
+" * \"Save to floppy\": saves the partition table to a floppy. Useful for\n"
+"later partition-table recovery if necessary. It is strongly recommended to\n"
+"perform this step.\n"
 "\n"
+" * \"Done\": when you have finished partitioning your hard drive, this will\n"
+"save your changes back to disc.\n"
 "\n"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
-msgstr ""
-"U kan 'n kriptografiese pakket installeer indien u internetkonneksie reg "
-"opgestel is.\n"
-"Kies eers die spie�l waar u die pakket vanaf wil aflaai en kies dan die "
-"pakkette\n"
-"om te installeer.\n"
+"Note: you can reach any option using the keyboard. Navigate through the\n"
+"partitions using [Tab] and [Up/Down] arrows.\n"
 "\n"
-"Let wel: U moet 'n spie�l en pakkette selekteer n.a.l plaaslike wetgewing."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr ""
-
-#: ../../help.pm_.c:471
-#, fuzzy
-msgid ""
-"GNU/Linux manages time in GMT (Greenwich Manage\n"
-"Time) and translates it in local time according to the time zone you have\n"
-"selected.\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"
-"If you use Microsoft Windows on this computer, choose \"No\"."
-msgstr ""
-"U kan nou u tydsone kies.\n"
+" * Ctrl-d to delete a partition;\n"
 "\n"
+" * Ctrl-m to set the mount point.\n"
 "\n"
-"GNU/Linux beheer tyd in GMT (Greenwichmeridiaantyd) en vertaal dit dan\n"
-"in u lokale tyd volgends die gekose tydsone."
+"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"
+"boot loader. 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_.c:479
-#, fuzzy
+#: ../../help.pm_.c:460
 msgid ""
-"You may now choose which services you want to start at boot time.\n"
+"More than one Microsoft Windows partition has been detected on your hard\n"
+"drive. Please choose the one you want 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"
-"When your mouse comes over an item, a small balloon help will popup which\n"
-"describes the role of the service.\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"
-"Be very careful in this step if you intend to use your machine as a server: "
-"you\n"
-"will probably want not to start any services that you don't need. Please\n"
-"remember that several services can be dangerous if they are enable on a "
-"server.\n"
-"In general, select only the services that you really need."
-msgstr ""
-"U kan nou dienste kies wat by herlaaityd moet afskop.\n"
-"Wanneer u die muis oor 'n item beweeg, sal 'n klein ballon opspring\n"
-"wat die rol van die diens verduidelik.\n"
-"\n"
-"Wees versigtig met hierdie stap. Indien u beplan om di� rekenaar as 'n\n"
-"bediener te gebruik wil u nie dienste afskop wat u nie gaan gebruik nie."
-
-#: ../../help.pm_.c:492
-msgid ""
-"You can configure a local printer (connected to your computer) or remote\n"
-"printer (accessible via a Unix, Netware or Microsoft Windows network)."
-msgstr ""
-
-#: ../../help.pm_.c:496
-msgid ""
-"If you wish to be able to print, please choose one printing system between\n"
-"CUPS and LPR.\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"
-"CUPS is a new, powerful and flexible printing system for Unix systems (CUPS\n"
-"means \"Common Unix Printing System\"). It is the default printing system "
-"in\n"
-"Linux-Mandrake.\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"
-"LPR is the old printing system used in previous Linux-Mandrake "
-"distributions.\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"
-"If you don't have printer, click on \"None\"."
+"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"disk or partition is called \"C:\")."
 msgstr ""
 
-#: ../../help.pm_.c:511
-msgid ""
-"GNU/Linux can deal with many types of printer. Each of these types requires\n"
-"a different setup.\n"
-"\n"
-"\n"
-"If your printer is physically connected to your computer, select \"Local\n"
-"printer\".\n"
-"\n"
-"\n"
-"If you want to access a printer located on a remote Unix machine, select\n"
-"\"Remote printer\".\n"
-"\n"
-"\n"
-"If you want to access a printer located on a remote Microsoft Windows "
-"machine\n"
-"(or on Unix machine using SMB protocol), select \"SMB/Windows 95/98/NT\"."
+#: ../../help.pm_.c:491
+msgid "Please be patient. This operation can take several minutes."
 msgstr ""
 
-#: ../../help.pm_.c:527
+#: ../../help.pm_.c:494
+#, fuzzy
 msgid ""
-"Please turn on your printer before continuing to let DrakX detect it.\n"
-"\n"
-"You have to enter some informations here.\n"
-"\n"
+"DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
+"installation or if you want to have greater control (\"Expert\"). You also\n"
+"have the choice of performing a new install or an upgrade of an existing\n"
+"Mandrake Linux system. Clicking \"Install\" will completely wipe out the\n"
+"old system. Select \"Upgrade\" if you are upgrading or repairing an\n"
+"existing system.\n"
 "\n"
-"   * Name of printer: the print spooler uses \"lp\" as default printer name. "
-"So, you must have a printer named \"lp\".\n"
-"     If you have only one printer, you can use several names for it. You "
-"just need to separate them by a pipe\n"
-"     character (a \"|\"). So, if you prefer a more meaningful name, you have "
-"to put it first, eg: \"My printer|lp\".\n"
-"     The printer having \"lp\" in its name(s) will be the default printer.\n"
+"Please choose \"Install\" if there are no previous version of Mandrake\n"
+"Linux installed or if you wish to boot between various operating systems.\n"
 "\n"
+"Please choose \"Update\" if you wish to update or repair an already\n"
+"installed version of Mandrake Linux.\n"
 "\n"
-"   * Description: this is optional but can be useful if several printers are "
-"connected to your computer or if you allow\n"
-"     other computers to access to this printer.\n"
+"Depending on your knowledge of GNU/Linux, please choose one of the\n"
+"following to install or update your Mandrake Linux operating system:\n"
 "\n"
+" * Recommended: choose this if you have never installed a GNU/Linux\n"
+"operating system. The installation will be very easy and you will only be\n"
+"asked a few questions.\n"
 "\n"
-"   * Location: if you want to put some information on your\n"
-"     printer location, put it here (you are free to write what\n"
-"     you want, for example \"2nd floor\").\n"
-msgstr ""
+" * Expert: if you have a good knowledge of GNU/Linux, you can choose this\n"
+"installation class. The expert installation will allow you to perform a\n"
+"highly customized installation. Answering some of the questions can be\n"
+"difficult if you do not have a good knowledge of GNU/Linux so do not choose\n"
+"this unless you know what you are doing."
+msgstr "Kies asb. "
 
-#: ../../help.pm_.c:548
+#: ../../help.pm_.c:521
 msgid ""
-"You need to enter some informations here.\n"
-"\n"
-"\n"
-"   * Name of queue: the print spooler uses \"lp\" as default printer name. "
-"So, you need have a printer named \"lp\".\n"
-"    If you have only one printer, you can use several names for it. You just "
-"need to separate them by a pipe\n"
-"    character (a \"|\"). So, if you prefer to have a more meaningful name, "
-"you have to put it first, eg: \"My printer|lp\".\n"
-"    The printer having \"lp\" in its name(s) will be the default printer.\n"
+"Normally, DrakX selects the right keyboard for you (depending on the\n"
+"language you have chosen) and you will not even see this step. However, you\n"
+"might not have a keyboard that corresponds exactly to your language: for\n"
+"example, if you are an English speaking Swiss person, you may still want\n"
+"your keyboard to be a Swiss keyboard. Or if you speak English but are\n"
+"located in Quebec, you may find yourself in the same situation. In both\n"
+"cases, you will have to go back to this installation step and select an\n"
+"appropriate keyboard from the list.\n"
 "\n"
-"  \n"
-"   * Spool directory: it is in this directory that printing jobs are stored. "
-"Keep the default choice\n"
-"     if you don't know what to use\n"
-"\n"
-"\n"
-"   * Printer Connection: If your printer is physically connected to your "
-"computer, select \"Local printer\".\n"
-"     If you want to access a printer located on a remote Unix machine, "
-"select \"Remote lpd printer\".\n"
-"\n"
-"\n"
-"     If you want to access a printer located on a remote Microsoft Windows "
-"machine (or on Unix machine using SMB\n"
-"     protocol), select \"SMB/Windows 95/98/NT\".\n"
-"\n"
-"\n"
-"     If you want to acces a printer located on NetWare network, select "
-"\"NetWare\".\n"
+"Click on the \"More\" button to be presented with the complete list of\n"
+"supported keyboards."
 msgstr ""
 
-#: ../../help.pm_.c:573
+#: ../../help.pm_.c:534
 msgid ""
-"Your printer has not been detected. Please enter the name of the device on\n"
-"which it is connected.\n"
+"Please choose your preferred language for installation and system usage.\n"
 "\n"
+"Clicking on the \"Advanced\" button will allow you to select other\n"
+"languages to be installed on your workstation. Selecting other languages\n"
+"will install the language-specific files for system documentation and\n"
+"applications. For example, if you will host users from Spain on your\n"
+"machine, select English as the main language in the tree view and in the\n"
+"Advanced section click on the grey star corresponding to \"Spanish|Spain\".\n"
 "\n"
-"For information, most printers are connected on the first parallel port. "
-"This\n"
-"one is called \"/dev/lp0\" under GNU/Linux and \"LPT1\" under Microsoft "
-"Windows."
+"Note that multiple languages may be installed. Once you have selected any\n"
+"additional locales click the \"OK\" button to continue."
 msgstr ""
 
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr ""
-
-#: ../../help.pm_.c:584
+#: ../../help.pm_.c:547
 msgid ""
-"Please select the right options according to your printer.\n"
-"Please see its documentation if you don't know what choose here.\n"
+"By default, DrakX assumes you have a two-button mouse and will set it up\n"
+"for third-button emulation. DrakX will automatically know whether it is a\n"
+"PS/2, serial or USB mouse.\n"
 "\n"
+"If you wish to specify a different type of mouse select the appropriate\n"
+"type from the list provided.\n"
 "\n"
-"You will be able to test your configuration in next step and you will be "
-"able to modify it if it doesn't work as you want."
+"If you choose a mouse other than the default you will be presented with a\n"
+"mouse test screen. Use the buttons and wheel to verify that the settings\n"
+"are good. If the mouse is not working correctly press the space bar or\n"
+"RETURN to \"Cancel\" and choose again."
 msgstr ""
 
-#: ../../help.pm_.c:591
+#: ../../help.pm_.c:560
 #, fuzzy
 msgid ""
-"You can now enter the root password for your Linux-Mandrake system.\n"
-"The password must be entered twice to verify that both password entries are "
-"identical.\n"
-"\n"
-"\n"
-"Root is the system's administrator and is the only user allowed to modify "
-"the\n"
-"system configuration. Therefore, choose this password carefully. \n"
-"Unauthorized use of the root account can be extemely dangerous to the "
-"integrity\n"
-"of the system, its data and other system connected to it.\n"
-"\n"
+"Please select the correct port. For example, the COM1 port under MS Windows\n"
+"is named ttyS0 under GNU/Linux."
+msgstr ""
+"Kies asb. die korrekte poort. Onthou dat COM1 onder MS Windows \n"
+"ttyS0 onder GNU/Linux is."
+
+#: ../../help.pm_.c:564
+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 one authorized to make updates, add users,\n"
+"change the overall system configuration, and so on. In short, \"root\" can\n"
+"do everything! That is why you must choose a password that is difficult to\n"
+"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
+"choose not to enter a password, but we strongly advise you against this if\n"
+"only for one reason: do not think that because you booted GNU/Linux that\n"
+"your other operating systems are safe from mistakes. Since \"root\" can\n"
+"overcome all limitations and unintentionally erase all data on partitions\n"
+"by carelessly accessing the partitions themselves, it is important for it\n"
+"to be difficult to become \"root\".\n"
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. It should never be written down.\n"
+"characters long. Never write down the \"root\" password - it makes it too\n"
+"easy to compromise a system.\n"
 "\n"
+"However, please do not make the password too long or complicated because\n"
+"you must be able to remember it without too much effort.\n"
 "\n"
-"Do not make the password too long or complicated, though: you must be able "
-"to\n"
-"remember it without too much effort."
-msgstr ""
-"U kan nou die 'root' wagwoord voorsien vir u Linux-Mandrake stelsel.\n"
-"Die wagworod moet twee keer ingevoer word en te verfi�er dat dit\n"
-"korrek is.\n"
+"The password will not be displayed on screen as you type it in. Hence, you\n"
+"will have to type the password twice to reduce the chance of a typing\n"
+"error. If you do happen to make the same typing error twice, this\n"
+"\"incorrect\" password will have to be used the first time you connect.\n"
 "\n"
+"In expert mode, you will be asked if you will be connecting to an\n"
+"authentication server, like NIS or LDAP.\n"
 "\n"
-"Root is die administrateur van die stelsel en is die enigste gebruiker\n"
-"wat toegelaat wiord om die stelselkonfigurasie te verander. In di� lig,\n"
-"kies asb. die wagwoord sorgvuldig. Ongemagtigde gebruik van die root\n"
-"rekening kan uitermatiglik nadelig wees vir die integriteit van die\n"
-"stelsel. Die wagwoord moet alfanumeries wees en ten minste 8 karakters\n"
-"lank. MOENIE die wagwoord �rens neerskryf nie. Moet dit nie te lank of te\n"
-"ingwikkeld maak nie, u moet dit met min moeite onthou."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"Om 'n veiliger stelsel te bou, moet u \"Gebruik skadul�er\" \n"
-"en \"Gebruik MD5 wagwoorde\" kies."
-
-#: ../../help.pm_.c:613
-msgid ""
-"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
-"network administrator."
+"If your network uses LDAP (or NIS) protocol for authentication, select\n"
+"\"LDAP\" (or \"NIS\") as authentication. If you do not know, ask your\n"
+"network administrator.\n"
+"\n"
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"Indien u netwerk NIS gebruik, kies \"Gebruik NIS\". Indien u twyfel vra\n"
-"die netwerkadministrateur."
 
-#: ../../help.pm_.c:617
+#: ../../help.pm_.c:600
 msgid ""
-"You may now create one or more \"regular\" user account(s), as\n"
-"opposed to the \"privileged\" user account, root. You can create\n"
-"one or more account(s) for each person you want to allow to use\n"
-"the computer. Note that each user account will have its own\n"
-"preferences (graphical environment, program settings, etc.)\n"
-"and its own \"home directory\", in which these preferences are\n"
-"stored.\n"
+"LILO and GRUB are boot loaders for GNU/Linux. This stage, normally, is\n"
+"totally automated. In fact, DrakX analyzes the disk boot sector and acts\n"
+"accordingly, depending on what it finds here:\n"
 "\n"
+" * if Windows boot sector is found, it will replace it with a GRUB/LILO "
+"boot\n"
+"sector. Hence, you will be able to load either GNU/Linux or another OS;\n"
 "\n"
-"First of all, create an account for yourself! Even if you will be the only "
-"user\n"
-"of the machine, you may NOT connect as root for daily use of the system: "
-"it's a\n"
-"very high security risk. Making the system unusable is very often a typo "
-"away.\n"
+" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
+"one;\n"
 "\n"
+"If in doubt, DrakX will display a dialog with various options.\n"
 "\n"
-"Therefore, you should connect to the system using the user account\n"
-"you will have created here, and login as root only for administration\n"
-"and maintenance purposes."
-msgstr ""
-"U mag nou een of meer gewone gebruikersrekeninge skep. Dit is in\n"
-"teenstelling met die bevoorregte 'root' rekening. Elke gebruikersrekening\n"
-"sal oor sy eie voorkeure (grafiese omgewing, programstelling, ens.) en\n"
-"tuisgids (waar hierdie instellings gestoor word) beskik.\n"
+" * \"Boot loader to use\": you have three choices:\n"
 "\n"
+"    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
+"interface.\n"
 "\n"
-"Derhalwe moet u in die stelsel intkeen met u eie gebruikerskode en slegs\n"
-"'root' gebruik vir administratiewe doeleindes.\n"
+"    * \"GRUB\": if you prefer GRUB (text menu).\n"
 "\n"
-"Skep eerstens 'n rekening vir uself. Selfs indien u die enigste gebruiker\n"
-"op die stelsel sal wees, moet u NIE as 'root' vir u daaglikse gebruik\n"
-"inteken NIE. 'n Onbruikbare stelsel kan net een tikfout ver weg wees.\n"
+"    * \"LILO with text menu\": if you prefer LILO with its text menu "
+"interface.\n"
 "\n"
+" * \"Boot device\": in most cases, you will not change the default\n"
+"(\"/dev/hda\"), but if you prefer, the boot loader can be installed on the\n"
+"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\").\n"
 "\n"
-"Derhalwe moet u aanteken met die gebruikerskode wat u hier skep en 'root'\n"
-"net vir admintratiewe doeleindes gebruik."
-
-#: ../../help.pm_.c:636
-msgid ""
-"Creating a boot disk is strongly recommended. If you can't\n"
-"boot your computer, it's the only way to rescue your system without\n"
-"reinstalling it."
-msgstr ""
-
-#: ../../help.pm_.c:641
-msgid ""
-"You need to indicate where you wish\n"
-"to place the information required to boot to GNU/Linux.\n"
+" * \"Delay before booting the default image\": when rebooting the computer,\n"
+"this is the delay granted to the user to choose - in the boot loader menu,\n"
+"another boot entry than the default one.\n"
 "\n"
+"!! Beware that if you choose not to install a boot loader (by selecting\n"
+"\"Cancel\" here), you must ensure that you have a way to boot your Mandrake\n"
+"Linux system! Also be sure you know what you do before changing any of the\n"
+"options. !!\n"
 "\n"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"U moet aandui waar u die informasie om Linux te herlaai, wil plaas.\n"
+"Clicking the \"Advanced\" button in this dialog will offer many advanced\n"
+"options, which are reserved to the expert user.\n"
 "\n"
+"Mandrake Linux installs its own boot loader, which will let you boot either\n"
+"GNU/Linux or any other operating systems which you have on your system.\n"
 "\n"
-"Behalwe as u werklik weet wat u doen moet u \"Eerste sektor van skyf (MBR)\" "
-"kies."
-
-#: ../../help.pm_.c:649
-msgid ""
-"Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
-" (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+"If there is another operating system installed on your machine, it will be\n"
+"automatically added to the boot menu. Here, you can choose to fine-tune the\n"
+"existing options. Double-clicking on an existing entry allows you to change\n"
+"its parameters or remove it; \"Add\" creates a new entry; and \"Done\" goes\n"
+"on to the next installation step."
 msgstr ""
-"Indien u spesifiek anders weet, is die gewone keuse \"/dev/hda\"\n"
-"(prim�re meester IDE-skyf) of \"/dev/sda\" (eerste SCSI-skyf)."
 
-#: ../../help.pm_.c:653
+#: ../../help.pm_.c:647
+#, fuzzy
 msgid ""
-"LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
+"LILO (the LInux LOader) and GRUB are boot loaders: they are able to boot\n"
 "either GNU/Linux or any other operating system present on your computer.\n"
 "Normally, these other operating systems are correctly detected and\n"
 "installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
-"\n"
+"screen. Be careful to choose the correct parameters.\n"
 "\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
+"You may also not want to give access to these other operating systems to\n"
+"anyone. In which case, you can delete the corresponding entries. But then,\n"
+"you will need a boot disk in order to boot those other operating systems!"
 msgstr ""
 "LILO (Die LInux LOader) en Grub is herlaaistelsels. Beide kan GNU/Linux of "
 "enige ander\n"
@@ -2935,379 +2820,243 @@ msgstr ""
 "inskrywings kan uitvee. Maar dan het u die nodige herlaaiskywe nodig om die\n"
 "betrokke bedryfstelsels te laai."
 
-#: ../../help.pm_.c:665
+#: ../../help.pm_.c:658
 #, fuzzy
 msgid ""
-"LILO and grub main options are:\n"
-"  - Boot device: Sets the name of the device (e.g. a hard disk\n"
-"partition) that contains the boot sector. Unless you know specifically\n"
-"otherwise, choose \"/dev/hda\".\n"
-"\n"
-"\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero.\n"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\n"
 "\n"
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
+msgstr ""
+"U moet aandui waar u die informasie om Linux te herlaai, wil plaas.\n"
 "\n"
-"  - Video mode: This specifies the VGA text mode that should be selected\n"
-"when booting. The following values are available: \n"
-"\n"
-"    * normal: select normal 80x25 text mode.\n"
 "\n"
-"    * <number>:  use the corresponding text mode.\n"
+"Behalwe as u werklik weet wat u doen moet u \"Eerste sektor van skyf (MBR)\" "
+"kies."
+
+#: ../../help.pm_.c:665
+msgid ""
+"Here we select a printing system for your computer to use. Other OSes may\n"
+"offer you one, but Mandrake offers three.\n"
 "\n"
+" * \"pdq\" - which means ``print, don't queue'', is the choice if you have "
+"a\n"
+"direct connection to your printer and you want to be able to panic out of\n"
+"printer jams, and you do not have any networked printers. It will handle\n"
+"only very simple network cases and is somewhat slow for networks. Pick\n"
+"\"pdq\" if this is your maiden voyage to GNU/Linux. You can change your\n"
+"choices after install by running PrinterDrake from the Mandrake Control\n"
+"Center and clicking the expert button.\n"
+"\n"
+" * \"CUPS\" - ``Common Unix Printing System'' is excellent at printing to\n"
+"your local printer and also halfway round the planet. It is simple and can\n"
+"act like a server or a client for the ancient \"lpd\" printing system, so\n"
+"it is compatible with the systems that went before. It can do many tricks,\n"
+"but the basic setup is almost as easy as \"pdq\". If you need this to\n"
+"emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
+"graphical front-ends for printing or choosing printer options.\n"
+"\n"
+" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
+"approximately the same things the others can do, but it will print to\n"
+"printers mounted on a Novell Network, because it supports IPX protocol, and\n"
+"it can print directly to shell commands. If you have need of Novell or\n"
+"printing to commands without using a separate pipe construct, use lprNG.\n"
+"Otherwise, CUPS is preferable as it is simpler and better at working over\n"
+"networks."
+msgstr ""
+
+#: ../../help.pm_.c:693
+#, fuzzy
+msgid ""
+"DrakX is now detecting any IDE devices present in your computer. It will\n"
+"also scan for one or more PCI SCSI card(s) on your system. If a SCSI card\n"
+"is found DrakX will automatically install the appropriate driver.\n"
+"\n"
+"Because hardware detection will sometimes not detect a piece of hardware\n"
+"DrakX will ask you to confirm if a PCI SCSI card is present. Click \"Yes\"\n"
+"if you know that there is a SCSI card installed in your machine. You will\n"
+"be presented a list of SCSI cards to choose from. Click \"No\" if you have\n"
+"no SCSI hardware. If you are unsure you can check the list of hardware\n"
+"detected in your machine by selecting \"See hardware info\" and clicking\n"
+"\"OK\". Examine the list of hardware and then click on the \"OK\" button to\n"
+"return to the SCSI interface question.\n"
 "\n"
-"  - Clean \"/tmp\" at each boot: if you want delete all files and "
-"directories\n"
-"stored in \"/tmp\" when you boot your system, select this option.\n"
+"If you have to manually specify your adapter, DrakX will ask if you want to\n"
+"specify options for it. You should allow DrakX to probe the hardware for\n"
+"the card-specific options that the hardware needs to initialize. This\n"
+"usually works well.\n"
+"\n"
+"If DrakX is not able to probe for the options that need to be passed, you\n"
+"will need to manually provide options to the driver. Please review the\n"
+"``User Guide'' (chapter 3, section \"Collecting information on your\n"
+"hardware\") for hints on retrieving the parameters required from hardware\n"
+"documentation, from the manufacturer's web site (if you have Internet\n"
+"access) or from Microsoft Windows (if you used this hardware with Windows\n"
+"on your system)."
+msgstr ""
+"DrakX sal probeer om vir PCI SCSI-kaarte te soek.\n"
+"Indien DrakX 'n SCSI-kaart bespeur en weet watter drywer omte gebruik sal "
+"dit outomaties installeer word.\n"
 "\n"
+"Indien u nie oor 'n SCSI-kaart, beskik nie of  oor  'n ISA SCSI-kaart of 'n "
+"PCI SCSI-kaart beskik wat DrakX nie kan herken nie, sal u gevra word of daar "
+"enige SCSI-kaarte in diestelsel is. Indien daar geen is nie kliek op 'Nee', "
+"andersins op 'Ja'. U sal dan uit'n drywerlys kan kies.\n"
 "\n"
-"  - Precise RAM if needed: unfortunately, there is no standard method to ask "
-"the\n"
-"BIOS about the amount of RAM present in your computer. As consequence, Linux "
-"may\n"
-"fail to detect your amount of RAM correctly. If this is the case, you can\n"
-"specify the correct amount or RAM here. Please note that a difference of 2 "
-"or 4\n"
-"MB between detected memory and memory present in your system is normal."
-msgstr ""
-"LILO en Grub hoof opsies is:\n"
-"  - Herlaaitoestel: Stel die naam van die toestel (bv. hardeskyfpartisie\n"
-"     wat die herlaaisektor bevat. Indien u spesifiek anders weet\n"
-"     kies \"/dev/hda\".\n"
-"\n"
-"\n"
-"  - Wagperiode voor verstekbedryfstelsel gelaai word. Kies die syfer in\n"
-"     tiendes van 'n sekonde at die herlaaistelsel moet wag.\n"
-"     Hierdie is handig op stelsels wat onmiddelik die hardeskyf skop na die\n"
-"     sleutelbord geaktiveer is. Die herlaaistelsel sal nie wag nie indien "
-"die\n"
-"     wagperiode nul is.\n"
 "\n"
+"Indien u self 'n drywer moes spesifiseer, sal DrakX u ook vra vir enige "
+"spesifiekeopsies.\n"
+"U kan egter DrakX toelaat om self die hardeware te ondervra. DIt werk "
+"gewoonlik die beste.\n"
 "\n"
-"  - Videomode: Kies die spesifieke VGA teksmode wat gebruik moet word met\n"
-"      herlaai. Die volgende waardes is beskikbaar:\n"
-"      * normaal: selekteer normale 80x25 mode.\n"
-"      * syfer: die ooreenstemmende teksmode."
+"Lees die installasie inligting hoe om hierdie tipe inligting m.b.v. die "
+"Windows-bedryfstelsel te bekom.\n"
+"U kan dit ook vanaf die internet onttrek indien u sulke toegang het."
 
-#: ../../help.pm_.c:697
+#: ../../help.pm_.c:720
 msgid ""
-"Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able\n"
-"to boot either GNU/Linux, MacOS, or MacOSX, if present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
+"You can add additional entries for yaboot, either for other operating\n"
+"systems, alternate kernels, or for an emergency boot image.\n"
 "\n"
+"For other OS's, the entry consists only of a label and the root partition.\n"
 "\n"
-"Yaboot main options are:\n"
+"For Linux, there are a few possible options:\n"
 "\n"
+" * Label: this is simply the name you will have to type at the yaboot "
+"prompt\n"
+"to select this boot option.\n"
 "\n"
-"  - Init Message: A simple text message that is displayed before the boot\n"
-"prompt.\n"
+" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
+"or a variation of vmlinux with an extension.\n"
 "\n"
+" * Root: the \"root\" device or \"/\" for your Linux installation.\n"
 "\n"
-"  - Boot Device: Indicate where you want to place the information required "
-"to \n"
-"boot to GNU/Linux. Generally, you will have setup a bootstrap partition "
-"earlier \n"
-"to hold this information.\n"
+" * Append: on Apple hardware, the kernel append option is used quite often\n"
+"to assist in initializing video hardware, or to enable keyboard mouse\n"
+"button emulation for the often lacking 2nd and 3rd mouse buttons on a stock\n"
+"Apple mouse. The following are some examples:\n"
 "\n"
+"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"hda=autotune\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"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-"  - Kernel Boot Timeout: This timeout is similar to the LILO boot delay.  "
-"After \n"
-"selecting Linux, you will have this delay in 0.1 seconds before your "
-"default\n"
-"kernel description is selected.\n"
+" * 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 4,096 bytes. If you\n"
+"need to allocate a large ramdisk, this option can be used.\n"
 "\n"
-"  - Enable CD Boot?: Checking this option will allow you to choose 'C' for "
-"CD at\n"
-"the first boot prompt.\n"
+" * Read-write: normally the \"root\" partition is initially brought up in\n"
+"read-only, to allow a file system check before the system becomes \"live\".\n"
+"Here, you can override 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"
-"  - Enable OF Boot?: Checking this option will allow you to choose 'N' for "
-"Open\n"
-"Firmware at the first boot prompt.\n"
-"\n"
-"\n"
-"  - Default OS: You can select which OS will boot by default when the Open "
-"Firmware \n"
-"Delay expires."
+" * Default: selects this entry as being the default Linux selection,\n"
+"selectable by just pressing ENTER at the yaboot prompt. This entry will\n"
+"also be highlighted with a \"*\", if you press [Tab] to see the boot\n"
+"selections."
 msgstr ""
 
-#: ../../help.pm_.c:738
+#: ../../help.pm_.c:765
 msgid ""
-"You can add additional entries for yaboot, either for other operating "
-"systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"\n"
-"For other OS's - the entry consists only of a label and the root partition.\n"
-"\n"
-"\n"
-"For Linux, there are a few possible options: \n"
-"\n"
-"\n"
-"  - Label: This is simply the name will type at the yaboot prompt to select "
-"this \n"
-"boot option.\n"
-"\n"
+"Yaboot is a boot loader for NewWorld MacIntosh hardware. It is able to boot\n"
+"either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
+"these other operating systems are correctly detected and installed. If this\n"
+"is not the case, you can add an entry by hand in this screen. Be careful as\n"
+"to choose the correct parameters.\n"
 "\n"
-"  - Image: This would be the name of the kernel to boot.  Typically vmlinux "
-"or\n"
-"a variation of vmlinux with an extension.\n"
-"\n"
-"\n"
-"  - Root: The root device or '/' for your Linux installation.\n"
+"Yaboot's main options are:\n"
 "\n"
+" * Init Message: a simple text message that is displayed before the boot\n"
+"prompt.\n"
 "\n"
-"  \n"
-"  - Append: On Apple hardware, the kernel append option is used quite often "
+" * Boot Device: indicate where you want to place the information required "
 "to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button "
-"emulation\n"
-"for the often lacking 2nd and 3rd mouse buttons on a stock Apple mouse.  The "
-"following \n"
-"are some examples:\n"
-"\n"
-"\n"
-"\t\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
-"hda=autotune\n"
-"\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
-"\n"
-"\n"
-" \n"
-"  - Initrd: This option can be used either to load initial modules, before "
-"the boot \n"
-"device is available, or to load a ramdisk image for an emergency boot "
-"situation.\n"
-"\n"
-"\n"
-"  - Initrd-size: The default ramdisk size is generally 4096 bytes.  If you "
-"should need\n"
-"to allocate a large ramdisk, this option can be used.\n"
-"\n"
+"boot to GNU/Linux. Generally, you setup a bootstrap partition earlier to\n"
+"hold this information.\n"
 "\n"
-"  - Read-write: Normally the 'root' partition is initially brought up read-"
-"only, to allow\n"
-"a filesystem check before the system becomes 'live'.  You can override this "
-"option here.\n"
+" * 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 before your\n"
+"default kernel description is selected.\n"
 "\n"
-"  - NoVideo: Should the Apple video hardware prove to be exceptionally "
-"problematic, you can\n"
-"select this option to boot in 'novideo' mode, with native framebuffer "
-"support.\n"
+" * 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 "
+"Open\n"
+"Firmware at the first boot prompt.\n"
 "\n"
-"  - Default: Selects this entry as being the default Linux selection, "
-"selectable by just\n"
-"pressing ENTER at the yaboot prompt.  This entry will also be highlighted "
-"with a '*', if you\n"
-"press TAB to see the boot selections."
+" * Default OS: you can select which OS will boot by default when the Open\n"
+"Firmware Delay expires."
 msgstr ""
 
-#: ../../help.pm_.c:793
+#: ../../help.pm_.c:798
 msgid ""
-"SILO is a bootloader for SPARC: it is able to boot\n"
-"either GNU/Linux or any other operating system present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
-"\n"
+"Here are presented various parameters concerning your machine. Depending on\n"
+"your installed hardware, you may - or not, see the following entries:\n"
 "\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
-msgstr ""
-"SILO 'n herlaaiprogram vir SPARC. Dir kan GNU/Linux of enige ander\n"
-"bedryfstelsel wat op u rekenar teenwoordig is, laai. Gewoonlik word hierdie\n"
-"bedryfstelsels reg bespeur en bygevoeg. Indien nie, kan u 'n inskrywing "
-"maak\n"
-"op hierdie skerm. Maak seker u kies die korrekte paramters.\n"
-"\n"
-"\n"
-"U mag dalk toegang tot ander bedryfstelsels beperk, in welke geval u die "
-"nodige\n"
-"inskrywings kan uitvee. Maar dan het u die nodige herlaaiskywe nodig om die\n"
-"betrokke bedryfstelsels te laai."
-
-#: ../../help.pm_.c:805
-msgid ""
-"SILO main options are:\n"
-"  - Bootloader installation: Indicate where you want to place the\n"
-"information required to boot to GNU/Linux. Unless you know exactly\n"
-"what you are doing, choose \"First sector of drive (MBR)\".\n"
+" * \"Mouse\": mouse check the current mouse configuration and click on the\n"
+"button to change it if necessary.\n"
 "\n"
+" * \"Keyboard\": keyboard check the current keyboard map configuration and\n"
+"click on the button to change that if necessary.\n"
 "\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero."
-msgstr ""
-"SILO hoofkeuses is:\n"
-"  - Herlaaitoestel: Waar wil u die inligting om GNU/Linux te laai plaas? Die "
-"beste is\n"
-"gewoonlik om \"Eerste hardeskyfsektor (MBR)\" te kies.\n"
+" * \"Timezone\": time zoneDrakX, by default, guesses your time zone from "
+"the\n"
+"language you have chosen. But here again, as for the choice of a keyboard,\n"
+"you may not be in the country for which the chosen language should\n"
+"correspond. Hence, you may need to click on the \"Timezone\" button in\n"
+"order to configure the clock according to the time zone you are in.\n"
 "\n"
+" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
+"configuration wizard.\n"
 "\n"
-"  - Wagperiode voor verstekbedryfstelsel gelaai word. Kies die syfer in\n"
-"     tiendes van 'n sekonde at die herlaaistelsel moet wag.\n"
-"     Hierdie is handig op stelsels wat onmiddelik die hardeskyf skop na die\n"
-"     sleutelbord geaktiveer is. Die herlaaistelsel sal nie wag nie indien "
-"die\n"
-"     wagperiode nul is."
-
-#: ../../help.pm_.c:818
-msgid ""
-"Now it's time to configure the X Window System, which is the\n"
-"core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
-"you must configure your video card and monitor. Most of these\n"
-"steps are automated, though, therefore your work may only consist\n"
-"of verifying what has been done and accept the settings :)\n"
+" * \"Sound card\": if a sound card is detected on your system, it is\n"
+"displayed here. No modification possible at installation time.\n"
 "\n"
+" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
+"here. No modification possible at installation time.\n"
 "\n"
-"When the configuration is over, X will be started (unless you\n"
-"ask DrakX not to) so that you can check and see if the\n"
-"settings suit you. If they don't, you can come back and\n"
-"change them, as many times as necessary."
+" * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
+"displayed here. You can click on the button to change the parameters\n"
+"associated to it."
 msgstr ""
-"Dit is tyd om die X-vensterstelsel op te stel. Hierdie is die kern van\n"
-"die GNU/Linux grafiese omgewing. Vir hierdie doeleindes, moet u 'n "
-"videokaart\n"
-"en monitor kies. Meeste van hierdie stappe is outomaties en u moet net\n"
-"verifi�er of dit korrek is.\n"
-"\n"
-"\n"
-"Na konfigurasie sal X outmaties gelaai word, behalwe as u DrakX andersins\n"
-"aans�. Indien die stelling u nie pas nie, kom terug en verander so veel\n"
-"keer soos nodig."
 
-#: ../../help.pm_.c:831
+#: ../../help.pm_.c:827
 msgid ""
-"If something is wrong in X configuration, use these options to correctly\n"
-"configure the X Window System."
+"Choose the hard drive you want to erase to install your new Mandrake Linux\n"
+"partition. Be careful, all data present on it will be lost and will not be\n"
+"recoverable!"
 msgstr ""
-"Indien iets verkeerd is in die X-konfigurasie, gebruik hierdie opsies om\n"
-"die X-vensterstelsel reg op te stel."
 
-#: ../../help.pm_.c:835
+#: ../../help.pm_.c:832
 msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
-msgstr ""
-"Indien u verkies om 'n grafiese intekenarea te kry, kies \"Ja\", andersins "
-"\"Nee\"."
-
-#: ../../help.pm_.c:839
-msgid ""
-"You can choose a security level for your system. Please refer to the manual "
-"for complete\n"
-"  information. Basically, if you don't know what to choose, keep the default "
-"option.\n"
-msgstr ""
-
-#: ../../help.pm_.c:844
-msgid ""
-"Your system is going to reboot.\n"
+"Click on \"OK\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
 "\n"
-"After rebooting, your new Linux Mandrake system will load automatically.\n"
-"If you want to boot into another existing operating system, please read\n"
-"the additional instructions."
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
-"U stelsel gaan nou herlaai.\n"
-"\n"
-"U nuwe Linux-Mandrake stelsel sal outomaties laai. Indien u 'n ander\n"
-" bedryfstelsel wil laai, lees die ekstra instruksies noukeurig deur."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Kies u taal"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Kies installasieklas"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Hardeskyfdeteksie."
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Stel muistoestel op"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Kies u sleutelbord"
-
-#: ../../install2.pm_.c:42
-#, fuzzy
-msgid "Security"
-msgstr "krul"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Stel l�erstelsels op"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Formateer partisies"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Kies pakkette om te installeer"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Installeer stelsel"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "Kies 'root' se wagwoord"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Voeg 'n gebruiker by"
 
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Stel netwerk op"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
+#: ../../install2.pm_.c:114
+#, c-format
+msgid ""
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
 
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Konfigureer dienste"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Maar 'n herlaaiskyf"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Installeer herlaaistelsel"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Stel X op"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Verlaay installasie"
-
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3322,52 +3071,41 @@ msgid ""
 "Do you really want to install these servers?\n"
 msgstr ""
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Kan nie uitsaau sonder 'n NIS-domein nie"
 
-#: ../../install_any.pm_.c:676
-#, fuzzy, c-format
+#: ../../install_any.pm_.c:793
+#, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
-msgstr "Sit 'n skyf in aandrywer %s"
+msgstr "Sit 'n FAT-geformatteerde skyf in aandrywer %s"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
-msgstr ""
+msgstr "Hierdie floppie is nie in FAT-formaat nie"
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 msgstr ""
+"Om hierdie gestoorde pakketkeuse te gebruik, herlaai die installasie met "
+"\"linux defcfg=floppy\""
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "Fout met lees van l�er $f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "Fout met die les van l�er %s"
 
-#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:310
-#: ../../interactive.pm_.c:99 ../../interactive.pm_.c:114
-#: ../../interactive.pm_.c:269 ../../interactive_newt.pm_.c:166
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:356
-#: ../../my_gtk.pm_.c:617 ../../my_gtk.pm_.c:640
+#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:325
+#: ../../interactive.pm_.c:107 ../../interactive.pm_.c:122
+#: ../../interactive.pm_.c:286 ../../interactive.pm_.c:308
+#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:170
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:415
+#: ../../my_gtk.pm_.c:716 ../../my_gtk.pm_.c:738
 msgid "Ok"
 msgstr "OK"
 
-#
-#: ../../install_gtk.pm_.c:423
-msgid "Please test the mouse"
-msgstr "Toets asb. die muis"
-
-#
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-#, fuzzy
-msgid "To activate the mouse,"
-msgstr "Toets asb. die muis"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr ""
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -3377,7 +3115,7 @@ msgstr ""
 "Sekere hardeware op u rekenaar benodig geslote drywers.\n"
 " U kan inligting hieroorvind by %s"
 
-#: ../../install_interactive.pm_.c:41
+#: ../../install_interactive.pm_.c:44
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -3387,11 +3125,11 @@ msgstr ""
 "Skep 'n partisie of kliek op 'n bestaande een.\n"
 "Kies dan Hegpunt en stel dit dan '/'."
 
-#: ../../install_interactive.pm_.c:46 ../../install_steps_graphical.pm_.c:259
+#: ../../install_interactive.pm_.c:49 ../../install_steps_graphical.pm_.c:259
 msgid "You must have a swap partition"
 msgstr "U moet oor 'n ruilpartisie beskik"
 
-#: ../../install_interactive.pm_.c:47 ../../install_steps_graphical.pm_.c:261
+#: ../../install_interactive.pm_.c:50 ../../install_steps_graphical.pm_.c:261
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -3401,56 +3139,59 @@ msgstr ""
 "\n"
 "Wil u steeds voortgaan?"
 
-#: ../../install_interactive.pm_.c:68
+#: ../../install_interactive.pm_.c:53 ../../install_steps.pm_.c:165
+msgid "You must have a FAT partition mounted in /boot/efi"
+msgstr "U moet oor 'n FAT partisie wat as /boot/efi geheg is, beskik"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Gebruik beskikbare spasie"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "Nie genoeg spasie beskikbaar om nuwe partisies toe te ken nie"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "Gebruik bestaande partisies"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "Daar is geen bestaande partisies om te gebruik nie"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "Gebruik vir die Windows-partisie vir teruglus"
 
-#: ../../install_interactive.pm_.c:90
-#, fuzzy
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
-msgstr "In watter partisie wil u Linux4Win plaas?"
+msgstr "Watter partisie wil u vir Linux4Win gebruik?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "Kies die groottes"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "Basispartisiegrootte in MB:"
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "Ruilpartisiegrootte in MB: "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "Gebruik die beskikbare spasie op die Windowspartisie"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "Watter partisie se grootte wil u verander?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "Windowsl�erstelselgrense word bereken"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -3459,11 +3200,11 @@ msgstr ""
 "Die FAT-verstellingsprogram kan nie u partisie hanteer nie.\n"
 "Fout: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr "U Windows-partisie is te gefragmenteer. Loop eers 'defrag' asb."
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -3483,21 +3224,21 @@ msgstr ""
 "hierdie installasie. Rugstuen ook u data. Insien u skeer is van u saak, kies "
 "OK."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "Watter grootte wil u vir Windows behou?"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "partisie %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "FAT-grootteverandering het gefaal: %s"
 
-#: ../../install_interactive.pm_.c:145
+#: ../../install_interactive.pm_.c:154
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
@@ -3505,33 +3246,32 @@ msgstr ""
 "Daar is geen FAT partisies om te verander of om as teruglus (nie genoeg "
 "spasie nie) te gebruik nie"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "Wis hele skyf"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "Verwyder Windows(TM)"
 
-#: ../../install_interactive.pm_.c:154
+#: ../../install_interactive.pm_.c:163
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "U het meer as een hardeskyf, waar wil u Linux installeer?"
 
-#: ../../install_interactive.pm_.c:157
+#: ../../install_interactive.pm_.c:166
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "Alle bestaande partisies en data sal uitgewis word op skyf %s"
 
-#: ../../install_interactive.pm_.c:165
-#, fuzzy
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
-msgstr "Gebruik bestaande partisies"
+msgstr "Gespesialiseerde skyfpartisionering"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "Gebruik fdisk"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -3540,30 +3280,28 @@ msgstr ""
 "U het nou partisie %s partisioneer.\n"
 "Wanneer u klaar is, stoor u veranderinge met 'w'."
 
-#: ../../install_interactive.pm_.c:201
-#, fuzzy
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
-msgstr "Gebruik die beskikbare spasie op die Windowspartisie"
+msgstr "Die Windowspartisie beskik nie oor die nodige spasie nie."
 
-#: ../../install_interactive.pm_.c:217
-#, fuzzy
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
-msgstr "Ek kan nie meer partisies byvoeg nie"
+msgstr "Ek kon geen plek vir installasie vind nie."
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "Die DrakX partisioneringsassistent het die volgende oplossings:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Partisionering het misluk: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "Netwerk op pad op"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "Netwerk op pad af"
 
@@ -3575,12 +3313,12 @@ msgstr ""
 "'n Fout het plaasgevind en ek weet nie hoe om dit veilig te hanteer\n"
 "nie. Gaan op u eie risiko voort."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Duplikaat hegpunt %s"
 
-#: ../../install_steps.pm_.c:385
+#: ../../install_steps.pm_.c:384
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
@@ -3592,16 +3330,16 @@ msgstr ""
 "Toets die CD op 'n werkende Linux installasie met \"rpm -qpl Mandrake/RPMS/*."
 "rpm\"\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "Welkom by %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "Geen sagteskyaandrywer beskikbaar nie"
 
-#: ../../install_steps_auto_install.pm_.c:51
+#: ../../install_steps_auto_install.pm_.c:77
 #: ../../install_steps_stdio.pm_.c:23
 #, c-format
 msgid "Entering step `%s'\n"
@@ -3615,32 +3353,32 @@ msgstr "Kies die grootte van die installasie"
 msgid "Total size: "
 msgstr "Totale grootte: "
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:437
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:387
 #, c-format
 msgid "Version: %s\n"
 msgstr "Weergawe: %s\n"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:438
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:388
 #, c-format
 msgid "Size: %d KB\n"
 msgstr "Groote: %d KB\n"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:337
-#: ../../install_steps_interactive.pm_.c:520
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:509
 msgid "Choose the packages you want to install"
 msgstr "Kies die pakkette wat u wil installeer"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:340
+#: ../../install_steps_graphical.pm_.c:465 ../../interactive_gtk.pm_.c:571
 msgid "Info"
 msgstr "Info"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:345
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:457
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Install"
 msgstr "Installasie"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:558
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:497
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Installing"
 msgstr "Besig met installasie"
 
@@ -3648,7 +3386,7 @@ msgstr "Besig met installasie"
 msgid "Please wait, "
 msgstr "Wag asb.,"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:570
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:510
 msgid "Time remaining "
 msgstr "Tyd oor "
 
@@ -3657,21 +3395,21 @@ msgid "Total time "
 msgstr "Totale tyd "
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "Berei installasie voor"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:618
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:558
 #, c-format
 msgid "Installing package %s"
 msgstr "Installeer pakket %s"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
+#: ../../install_steps_gtk.pm_.c:646
 msgid "Go on anyway?"
 msgstr "Gaan steeds voort?"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
 msgid "There was an error ordering packages:"
 msgstr "Daar was 'n fout met pakkette:"
 
@@ -3679,31 +3417,35 @@ msgstr "Daar was 'n fout met pakkette:"
 msgid "Use existing configuration for X11?"
 msgstr "Gebruik bestaande konfigurasie vir X11?"
 
-#: ../../install_steps_gtk.pm_.c:142
+#: ../../install_steps_gtk.pm_.c:148
 msgid ""
 "Your system is low on resource. You may have some problem installing\n"
-"Linux-Mandrake. If that occurs, you can try a text install instead. For "
+"Mandrake Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "U stelsel het min hulpbronne beskikbaar. U mag dalk probleme ondervind met "
 "die installering\n"
-"van Linux-Mandrake. In so 'n geval probeer eerder die teksinstallasie. "
+"van Mandrake Linux. In so 'n geval probeer eerder die teksinstallasie. "
 "Daarvoor moet u\n"
 "'F1' druk wanneer u vanaf die CDROM herlaai en dan 'text' op die "
 "instruksielyn intik."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Installasieklas"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "Kies asb. een van die volgende installasieklasse:"
 
-#: ../../install_steps_gtk.pm_.c:222
+#: ../../install_steps_gtk.pm_.c:228
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr "Die totale grootte vir die gekose groepe is naastenby %d MB.\n"
 
-#: ../../install_steps_gtk.pm_.c:224
+#: ../../install_steps_gtk.pm_.c:230
 #, c-format
 msgid ""
 "If you wish to install less than this size,\n"
@@ -3718,7 +3460,7 @@ msgstr ""
 "'n Lae persentasie sal net die belangrikste pakkette installeer;\n"
 "'n persentasie van 100%% sal alles gekose pakkette installeer."
 
-#: ../../install_steps_gtk.pm_.c:229
+#: ../../install_steps_gtk.pm_.c:235
 #, c-format
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
@@ -3734,58 +3476,42 @@ msgstr ""
 "'n Lae persentasie sal net die belangrikste pakkette installeer;\n"
 "'n Persentasie van %d%% sal soveel moontlik probeer installeer."
 
-#: ../../install_steps_gtk.pm_.c:235
+#: ../../install_steps_gtk.pm_.c:241
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "U sal met meer akkuraatheid in die volgende stap kan kies."
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "Persentasie pakkette om te installeer"
 
-#: ../../install_steps_gtk.pm_.c:285 ../../install_steps_interactive.pm_.c:599
+#: ../../install_steps_gtk.pm_.c:291 ../../install_steps_interactive.pm_.c:619
 msgid "Package Group Selection"
 msgstr "Kies pakketgroepe"
 
-#: ../../install_steps_gtk.pm_.c:305 ../../install_steps_interactive.pm_.c:614
+#: ../../install_steps_gtk.pm_.c:320 ../../install_steps_interactive.pm_.c:634
 msgid "Individual package selection"
 msgstr "Individuele pakketseleksie"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "Maak boom oop"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Maak boom toe"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Skakel tussen plat- en groepsortering"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Totale grootte: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Foutiewe pakket"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Naam: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Belangrikheid: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Totale grootte: %d / %d MB"
-
-#: ../../install_steps_gtk.pm_.c:467
+#: ../../install_steps_gtk.pm_.c:411
 msgid ""
 "You can't select this package as there is not enough space left to install it"
 msgstr ""
@@ -3793,28 +3519,28 @@ msgstr ""
 "beskikbaar is nie"
 
 #
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "Die volgende pakkette gaan installeer word"
 
 #
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "Dei volgende pakkette gaan verwyder word"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "U kan nie hierdie pakket selekteer/deselekteer nie"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Hierdie is 'n verpligte pakket. Dit kan nie uitgehaal word nie."
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
 msgstr "U kan nie heirdie pakket verwyder nie. Dis alreeds ge�nstalleer"
 
-#: ../../install_steps_gtk.pm_.c:507
+#: ../../install_steps_gtk.pm_.c:447
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -3822,25 +3548,40 @@ msgstr ""
 "Hierdie pakket moet opgradeer word\n"
 "Is u seker u wil dit deselekteer?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "U kan nie hierdie pakket deselekteer nie. Dit moet opgradeer word."
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr "Wys outogeselekteerde pakkette."
+
+#: ../../install_steps_gtk.pm_.c:460
+msgid "Load/Save on floppy"
+msgstr "Laai/Stoor op floppie"
+
+#: ../../install_steps_gtk.pm_.c:461
+msgid "Updating package selection"
+msgstr "Pakketseleksie word opgedateer"
+
+#: ../../install_steps_gtk.pm_.c:466
+msgid "Minimal install"
+msgstr "Minimale installasie"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "Skatting"
 
-#: ../../install_steps_gtk.pm_.c:582
-#, fuzzy
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
-msgstr "Berei installasie voor"
+msgstr "Wag asb. installasie word voorberei"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d pakkette"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -3873,16 +3614,16 @@ msgid ""
 msgstr ""
 
 #
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Accept"
 msgstr "Aanvaar "
 
 #
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Refuse"
 msgstr "Weier"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -3897,7 +3638,7 @@ msgstr ""
 "nie\n"
 "hieroor beskik nie, druk Kanselleer om installasies vanaf di� CDROM te vermy."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "Daar was 'n fout met die installasie van die pakkette:"
 
@@ -3905,34 +3646,21 @@ msgstr "Daar was 'n fout met die installasie van die pakkette:"
 msgid "An error occurred"
 msgstr "'n Fout het voorgekom"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "Kies asb. 'n taal om te gebruik."
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr "U kan ander tale selekteer wat na installasie beskikbaar sal wees."
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "Alles"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
-msgstr ""
+msgstr "Lisensieooreenkoms"
 
-#: ../../install_steps_interactive.pm_.c:87
+#: ../../install_steps_interactive.pm_.c:72
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Linux-"
-"Mandrake distribution \n"
+"The operating system and the different components available in the Mandrake "
+"Linux 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 Linux-Mandrake distribution.\n"
+"system and the different components of the Mandrake Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -3986,7 +3714,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 Linux-Mandrake sites  which are prohibited or restricted in some "
+"from one of Mandrake Linux 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"
@@ -4023,7 +3751,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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
 "MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -4043,106 +3771,99 @@ msgid ""
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:182
-#: ../../install_steps_interactive.pm_.c:822
+#: ../../install_steps_interactive.pm_.c:168
+#: ../../install_steps_interactive.pm_.c:871
 #: ../../standalone/keyboarddrake_.c:28
 msgid "Keyboard"
 msgstr "Sleutelbord"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "Wat is u sleutelborduitleg?"
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
-msgstr ""
+msgstr "Hierdie is die volledige lys van beskikbare sleutelborde"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Installasieklas"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "Watter installasieklas verlang u?"
 
-#: ../../install_steps_interactive.pm_.c:203
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
 msgstr "Installeer/Opgradeer"
 
-#: ../../install_steps_interactive.pm_.c:203
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
-msgstr "Is hierdie 'n installasie of reddingspoging?"
+msgstr "Is hierdie 'n installasie of opgradering?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Aanbevole"
 
-#: ../../install_steps_interactive.pm_.c:215
-#: ../../install_steps_interactive.pm_.c:218
+#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:204
 msgid "Expert"
 msgstr "Kundige"
 
-#: ../../install_steps_interactive.pm_.c:226
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Update"
 msgstr "Opgradeer"
 
-#: ../../install_steps_interactive.pm_.c:238 ../../standalone/mousedrake_.c:41
+#: ../../install_steps_interactive.pm_.c:224 ../../standalone/mousedrake_.c:48
 msgid "Please, choose the type of your mouse."
 msgstr "Wat is u muistoestel?"
 
-#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:57
+#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
 msgid "Mouse Port"
 msgstr "Muispoort"
 
-#: ../../install_steps_interactive.pm_.c:245 ../../standalone/mousedrake_.c:58
+#: ../../install_steps_interactive.pm_.c:231 ../../standalone/mousedrake_.c:65
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Aan watter seriaalpoort is u muis gekoppel?"
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
-msgstr ""
+msgstr "Knoppie-emulasie"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
-msgstr ""
+msgstr "Knop-2 Emulasie"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
-msgstr ""
+msgstr "Knop-3 emulasie"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "Stel PCMCIA op..."
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "Configuring IDE"
 msgstr "IDE word opgestel"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:295
+#: ../../install_steps_interactive.pm_.c:281
 msgid "no available partitions"
 msgstr "geen beskikbare partisies"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
-msgstr ""
+msgstr "Hegpunte vir partisies word nou gesoek"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "Kies die hegpunte"
 
-#: ../../install_steps_interactive.pm_.c:323
+#: ../../install_steps_interactive.pm_.c:311
 #, c-format
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
@@ -4159,7 +3880,7 @@ msgstr ""
 "\n"
 "Will u al die partisies verwyder?\n"
 
-#: ../../install_steps_interactive.pm_.c:336
+#: ../../install_steps_interactive.pm_.c:324
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
@@ -4167,79 +3888,120 @@ msgstr ""
 "DrakX kon nie die partisietabel korrek interpreteer nie.\n"
 "Gaan aan op u eie risiko!"
 
-#: ../../install_steps_interactive.pm_.c:361
+#: ../../install_steps_interactive.pm_.c:340
+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 ""
+"Geen beskikbare 1MB herlaaipartisie nie! Installasie sal voortgaan, maar u "
+"sal  herlaaipartisie met DiskDrake moet skep indien u die stelsel wil "
+"herlaai."
+
+#: ../../install_steps_interactive.pm_.c:349
+msgid "No root partition found to perform an upgrade"
+msgstr "Geen wortell�erstelsel gevind nie"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "Basispartisie"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
 msgstr "Wat is die basispartisie (/) van u stelsel?"
 
-#: ../../install_steps_interactive.pm_.c:376
+#: ../../install_steps_interactive.pm_.c:365
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "U moet herlaai om die partisietabelveranderinge te aktiveer"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "Kies die partisies om te formatteer"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "Toets vir foutiewe areas?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "Partisies word formateer"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "L�er %s word geskep en formatteer"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Nie genoeg ruilarea om die installasie te voltooi. Voeg asb. by."
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "Soek vir beskikbare pakkette"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "Soek vir pakkette om op te gradeer."
 
-#: ../../install_steps_interactive.pm_.c:461
+#: ../../install_steps_interactive.pm_.c:450
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
 "U stelsel het nie genoeg plek vir 'n installasie of opgradering nie (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Klaar (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "Minimum (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Aanbevole (%dMB)"
 
 #
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "Aangepaste"
 
-#: ../../install_steps_interactive.pm_.c:585
-msgid "Selected size is larger than available space"
+#: ../../install_steps_interactive.pm_.c:522
+msgid ""
+"Please choose load or save package selection on floppy.\n"
+"The format is the same as auto_install generated floppies."
 msgstr ""
+"Kies asb. die laai of stoor pakketkeuse op die floppie.\n"
+"Die formaat is dieselfde as outoinstallasie-genereerde floppies."
+
+#: ../../install_steps_interactive.pm_.c:525
+msgid "Load from floppy"
+msgstr "Laai vanaf floppie"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Loading from floppy"
+msgstr "Oplaai vanaf floppie"
 
-#: ../../install_steps_interactive.pm_.c:650
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Package selection"
+msgstr "Pakketkeuse"
+
+#: ../../install_steps_interactive.pm_.c:532
+msgid "Insert a floppy containing package selection"
+msgstr "Sit 'n floppie met die pakketkeuse in aandrywer "
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Stoor op floppie"
+
+#: ../../install_steps_interactive.pm_.c:605
+msgid "Selected size is larger than available space"
+msgstr "Geselekteerde grootte is groter as beskikbare spasie."
+
+#: ../../install_steps_interactive.pm_.c:670
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -4249,12 +4011,12 @@ msgstr ""
 "Indien u oor geen van die gelyste CD's beskik nie, kliek Kanselleer.\n"
 "Indien u net oor sekere CDs beskik, deselekteer die ander en kliek OK."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CDROM getiteld \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -4263,11 +4025,21 @@ msgstr ""
 "Installeer nou pakket %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "Postinstallasiekonfigurasie"
 
-#: ../../install_steps_interactive.pm_.c:718
+#: ../../install_steps_interactive.pm_.c:719
+#, c-format
+msgid "Please insert the Boot floppy used in drive %s"
+msgstr "Sit 'n herlaaiskyf wat gebruik is, in aandrywer %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "Sit asb. die module-opdateringsfloppie in aandrywer %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -4337,100 +4109,135 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:750
+#: ../../install_steps_interactive.pm_.c:782
 msgid "Choose a mirror from which to get the packages"
 msgstr "Kies 'n spie�l waar die pakkette verkry kan word"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Spie�l word gekontak vir die lys van pakkette"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "Kies die pakkette wat u wil installeer"
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "Wat is u tydsone?"
 
-#: ../../install_steps_interactive.pm_.c:778
-msgid "Is your hardware clock set to GMT?"
-msgstr "Is die hardewareklok gestel vir GMT?"
+#: ../../install_steps_interactive.pm_.c:813
+msgid "Hardware clock set to GMT"
+msgstr "Hardewareklok gestel vir GMT"
+
+#: ../../install_steps_interactive.pm_.c:814
+msgid "Automatic time synchronization (using NTP)"
+msgstr "Outotydsinkronisasie met NTP"
+
+#: ../../install_steps_interactive.pm_.c:821
+msgid "NTP Server"
+msgstr "NTP-bediener"
 
 #
-#: ../../install_steps_interactive.pm_.c:806 ../../printer.pm_.c:22
-#: ../../printerdrake.pm_.c:415
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
 msgstr "Verwyder CUPS-bediener"
 
-#: ../../install_steps_interactive.pm_.c:807
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
-msgstr "Drukkernaam"
+msgstr "Geen drukker"
 
-#: ../../install_steps_interactive.pm_.c:821
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Opsomming"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
-msgstr "USB Muis"
+msgstr "Muis"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
-msgstr ""
+msgstr "Tydsone"
 
-#: ../../install_steps_interactive.pm_.c:824 ../../printerdrake.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:873 ../../printerdrake.pm_.c:1773
+#: ../../printerdrake.pm_.c:1844
 msgid "Printer"
 msgstr "Drukker"
 
-#: ../../install_steps_interactive.pm_.c:826
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:875
 msgid "ISDN card"
-msgstr "Interne ISDN-kaart"
+msgstr "ISDN-kaart"
 
-#: ../../install_steps_interactive.pm_.c:829
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
-msgstr "Standaard"
+msgstr "Klankkaart"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
-msgstr ""
-
-#
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "Watter drukkerstelsel verlang u?"
+msgstr "TV-kaaer"
+
+#: ../../install_steps_interactive.pm_.c:917
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:945
+msgid "LDAP"
+msgstr "KDAP"
+
+#: ../../install_steps_interactive.pm_.c:918
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:954
+msgid "NIS"
+msgstr "NIS"
+
+#: ../../install_steps_interactive.pm_.c:919
+#: ../../install_steps_interactive.pm_.c:941
+msgid "Local files"
+msgstr "Plaaslike l�ers"
+
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "Kies 'root' se wagwoord"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Geen wagwoord"
 
-#: ../../install_steps_interactive.pm_.c:901
+#: ../../install_steps_interactive.pm_.c:935
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr ""
 "Hierdie wagwoord is te eenvoudig. Dit moet ten minste %d karakters bevat."
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "Gebruik NIS"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Magtiging"
+
+#: ../../install_steps_interactive.pm_.c:949
+msgid "Authentication LDAP"
+msgstr "LDAP-magtiging"
+
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr "LDAP Basis-dn"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "geel bladsye"
+#: ../../install_steps_interactive.pm_.c:951
+msgid "LDAP Server"
+msgstr "LDAP-bediener"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
-msgstr "NIS-bemagtiging"
+#: ../../install_steps_interactive.pm_.c:957
+msgid "Authentication NIS"
+msgstr "NIS-magtiging"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "NIS-domein"
 
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:959
 msgid "NIS Server"
 msgstr "NIS-bediener"
 
-#: ../../install_steps_interactive.pm_.c:951
+#: ../../install_steps_interactive.pm_.c:994
 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 "
@@ -4457,19 +4264,19 @@ msgstr ""
 "Indien u 'n herlaaiskyf wil maak,\n"
 "plaas 'n skyf in die aandrywer en druk \"OK\"."
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Eerste sagteskyfaandrywer"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Tweede sagteskyfaandrywer"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "Mis hierdie stap"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:1017
 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 "
@@ -4490,32 +4297,40 @@ msgstr ""
 "met die Mandrake reddingsbeeld gebruik word, wat dit makliker maak om van\n"
 "ernstige stelselfalings te herstel. Wil u 'n herlaaiskyf maak?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "Jammer, geen sagteskyfaandrywer beskikbaar nie"
 
-#: ../../install_steps_interactive.pm_.c:987
+#: ../../install_steps_interactive.pm_.c:1030
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Kies die sagteskyfaandrywer wat u wil gebruik"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Sit 'n skyf in aandrywer %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "Herlaaiskyf word geskryf"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "Herlaaistelsel word voorberei"
 
-#: ../../install_steps_interactive.pm_.c:1010
+#: ../../install_steps_interactive.pm_.c:1055
+msgid ""
+"You appear to have an OldWorld or Unknown\n"
+" machine, the yaboot bootloader will not work for you.\n"
+"The install will continue, but you'll\n"
+" need to use BootX to boot your machine"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:1060
 msgid "Do you want to use aboot?"
 msgstr "Wil u aboot gebruik?"
 
-#: ../../install_steps_interactive.pm_.c:1013
+#: ../../install_steps_interactive.pm_.c:1063
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -4523,51 +4338,53 @@ msgstr ""
 "Die 'aboot' installasie het gefaal. Wil u 'n installasie afwurg al\n"
 "word die eerste partisie vernietig?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+msgid "Installing bootloader"
+msgstr "Herlaaistelselinstallasie"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Installasie van herlaaiprogram het gefaal a.g.v. hierdie fout: "
 
-#: ../../install_steps_interactive.pm_.c:1030
+#: ../../install_steps_interactive.pm_.c:1084
+#, 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 $of_boot,\\\\:tbxi\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_.c:1038 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1092 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "Laag"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Medium"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Hoog"
 
-#: ../../install_steps_interactive.pm_.c:1044 ../../standalone/draksec_.c:49
+#: ../../install_steps_interactive.pm_.c:1098 ../../standalone/draksec_.c:62
 msgid "Choose security level"
 msgstr "Gebruik sekuriteitsvlak"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr "Wil u 'n outoinstallasieskyf maak vir Linux replikasie?"
-
-#: ../../install_steps_interactive.pm_.c:1082
+#: ../../install_steps_interactive.pm_.c:1134
+#: ../../standalone/drakautoinst_.c:80
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sit 'n le� floppie in aandrywer %s"
 
-#: ../../install_steps_interactive.pm_.c:1096
-#: ../../install_steps_interactive.pm_.c:1128
+#: ../../install_steps_interactive.pm_.c:1138
+#: ../../standalone/drakautoinst_.c:82
 msgid "Creating auto install floppy"
 msgstr "Outoinstallasieskyf word geskep."
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -4577,32 +4394,31 @@ msgstr ""
 "\n"
 "Wil u werklik nou aborteer?"
 
-#: ../../install_steps_interactive.pm_.c:1167
+#: ../../install_steps_interactive.pm_.c:1160
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
-"For information on fixes which are available for this release of Linux-"
-"Mandrake,\n"
-"consult the Errata available from http://www.linux-mandrake.com/.\n"
+"For information on fixes which are available for this release of Mandrake "
+"Linux,\n"
+"consult the Errata available from http://www.mandrakelinux.com/.\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Linux-Mandrake User's Guide."
+"install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
 "Geluk, installasie is afgehandel.\n"
 "Verwyder die herlaaimedium en druk 'enter' om te herlaai.\n"
 "\n"
-"Vir lapinligting oor hierdie vrystelling vanLinux-Mandrake,\n"
-"bekyk die errata beskikbaar op http://www.linux-mandrake.com/.\n"
+"Vir lapinligting oor hierdie vrystelling vanMandrake Linux,\n"
+"bekyk die errata beskikbaar op http://www.mandrakelinux.com/.\n"
 "Inligting oor stelskonfigurasie is beskikbaar in die postinstallasie-\n"
 "hoofstuk in die Offisi�le Liux-Mandrake Gebruikersgids."
 
-#: ../../install_steps_interactive.pm_.c:1179
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
-msgstr "Outoinstallasieskyf word geskep."
+msgstr "Skep outoinstallasieskyf"
 
-#: ../../install_steps_interactive.pm_.c:1181
+#: ../../install_steps_interactive.pm_.c:1174
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -4611,43 +4427,57 @@ msgid ""
 "You may prefer to replay the installation.\n"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "Outomaties"
 
-#: ../../install_steps_interactive.pm_.c:1186
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
-msgstr "Herlaai"
+msgstr "Herspeel"
 
-#: ../../install_steps_interactive.pm_.c:1189
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
-msgstr "Individuele pakketseleksie"
+msgstr "Stoor pakketseleksie"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Linux-Mandrake Installasie %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "Mandrake Linux Installasie %s"
 
-#: ../../install_steps_newt.pm_.c:33
+#: ../../install_steps_newt.pm_.c:34
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 " <Tab>/<Alt-Tab> tussen elemente  | <Space> selekteer | <F12> volgende skerm "
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
-msgstr ""
+msgstr "kdesu is weg"
+
+#: ../../interactive.pm_.c:132
+msgid "Choose a file"
+msgstr "Kies 'n l�er"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
-msgstr ""
+msgstr "Gevorderd"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "Wag asb."
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Maak boom oop"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Maak boom toe"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Skakel tussen plat- en groepsortering"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -4673,271 +4503,286 @@ msgstr "U keuse? (verstek %s) "
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "U keuse? (Verstek %s tik 'none' vir geen)"
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "Tseggies (QWERTZ)"
 
-#: ../../keyboard.pm_.c:125 ../../keyboard.pm_.c:138 ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:141 ../../keyboard.pm_.c:155 ../../keyboard.pm_.c:180
 msgid "German"
 msgstr "Duits"
 
-#: ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:142
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:127 ../../keyboard.pm_.c:164
+#: ../../keyboard.pm_.c:143 ../../keyboard.pm_.c:186
 msgid "Spanish"
 msgstr "Spaans"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "Finnies"
 
-#: ../../keyboard.pm_.c:129 ../../keyboard.pm_.c:139 ../../keyboard.pm_.c:166
+#: ../../keyboard.pm_.c:145 ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:188
 msgid "French"
 msgstr "Frans"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
 msgstr "Norweegs"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "Pools"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "Russies"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "Sweeds"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "VK sleutelbord"
 
-#: ../../keyboard.pm_.c:134 ../../keyboard.pm_.c:137 ../../keyboard.pm_.c:204
+#: ../../keyboard.pm_.c:152 ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:237
 msgid "US keyboard"
 msgstr "VSA sleutelbord"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+msgid "Albanian"
+msgstr "Albanies"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "Armenies (oud)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "Armenies (tikmasjien)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "Armenies (Foneties)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "Azerbaidjani (latyns)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Azerbaidjani (kirillies)"
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "Belgies"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "Bulgaars"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "Brasiliaans (ABNT-2)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Belarussies"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "Switsers (Duitse uitleg)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "Switsers (Franse uitleg)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "Tseggies (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr ""
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "Duits (geen dooie sleutels)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "Deens"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:183
 msgid "Dvorak (US)"
 msgstr "Dvorak (VSA)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:184
 msgid "Dvorak (Norwegian)"
 msgstr "Dvorak (Norweegs)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Estoniaans"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgies (Russiese uitleg)"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgies (Latynse uitleg)"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "Grieks"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "Hongaars"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Kroaties"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "Israelies"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "Israelies (Foneties)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Iranies"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "Yslandies"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "Italiaans"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "Japanees 106 sleutels"
 
-#: ../../keyboard.pm_.c:178
-#, fuzzy
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
-msgstr "VK sleutelbord"
+msgstr "Koreaanse sleutelbord"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "Latyns-Amerikaans"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr ""
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "Nederlands"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lituanies AZERTY (oud)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lituanies AZERTY (nuut)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lituanies \"nommerry\" QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lituanies \"foneties\" QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+msgid "Latvian"
+msgstr "Latvies"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Masedonies"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "Nederlands"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Pools (QWERTY uitleg)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Pools (QWERTZ uitleg)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "Portugees"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "Kanadees (Quebec)"
 
-#: ../../keyboard.pm_.c:193
+#: ../../keyboard.pm_.c:217
+msgid "Romanian (qwertz)"
+msgstr "Romanies (QWERTZ)"
+
+#: ../../keyboard.pm_.c:218
+msgid "Romanian (qwerty)"
+msgstr "Romanies (QWERTY)"
+
+#: ../../keyboard.pm_.c:220
 msgid "Russian (Yawerty)"
 msgstr "Russue (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "Sweeds"
-
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "Sloveens"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "Slovaaks (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "Slovaaks (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr ""
+#: ../../keyboard.pm_.c:229
+msgid "Serbian (cyrillic)"
+msgstr "Serwies (Kirillies)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Thai sleutelbord"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+msgid "Tajik keyboard"
+msgstr "Tajik sleutelbord"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turks (tradisionele \"F\" model)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turks (moderne \"Q\" modem)"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ukranies"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "VSA internasionale sleutelbord"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vi�tnamees \"nommerry\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
-#, fuzzy
-msgid "Yugoslavian (latin/cyrillic)"
+#: ../../keyboard.pm_.c:240
+msgid "Yugoslavian (latin)"
 msgstr "Jugoslaavs (latynse uitleg)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Sirkul�re heg %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
-msgstr ""
+msgstr "Verwyder eers die logiese volumes\n"
 
 #: ../../mouse.pm_.c:25
 msgid "Sun - Mouse"
@@ -4952,9 +4797,8 @@ msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
 #: ../../mouse.pm_.c:33
-#, fuzzy
 msgid "Generic PS2 Wheel Mouse"
-msgstr "Generiese Muis"
+msgstr "Generiese PS2 wielmuis"
 
 #: ../../mouse.pm_.c:34
 msgid "GlidePoint"
@@ -4973,9 +4817,8 @@ msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
 #: ../../mouse.pm_.c:43 ../../mouse.pm_.c:67
-#, fuzzy
 msgid "1 button"
-msgstr "2 knoppies"
+msgstr "1 knop"
 
 #: ../../mouse.pm_.c:44
 msgid "Generic"
@@ -5031,9 +4874,8 @@ msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Muis (seriaal, ou C7 tipe)"
 
 #: ../../mouse.pm_.c:65
-#, fuzzy
 msgid "busmouse"
-msgstr "Geen muis"
+msgstr "busmuis"
 
 #: ../../mouse.pm_.c:68
 msgid "2 buttons"
@@ -5051,174 +4893,218 @@ msgstr "niks"
 msgid "No mouse"
 msgstr "Geen muis"
 
-#: ../../my_gtk.pm_.c:356
-#, fuzzy
+#
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Toets asb. die muis"
+
+#
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "Om die muis te aktiveer"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "BEWEEG DIE WIEL!"
+
+#: ../../my_gtk.pm_.c:380
+msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+
+#: ../../my_gtk.pm_.c:415
 msgid "Finish"
 msgstr "Finnies"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "Volgende ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
-msgstr ""
+msgstr "<- Vorige"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "Is dit korrek?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Internetkonfigurasie"
-
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "Wil u nou aan die internet konnekteer?"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Konnekteer aan die internet"
 
-#: ../../netconnect.pm_.c:148
-#, fuzzy
-msgid "Testing your connection..."
-msgstr "Konfigureer internetkonneksie"
+#: ../../network/adsl.pm_.c:20
+msgid ""
+"The most common way to connect with adsl is pppoe.\n"
+"Some connections use pptp, a few ones use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"Die mees algemene metode vir ADSL is om  pppoe te gebruik.\n"
+"Daar is wel sekere konneksie wat pptp of DHCP gebruik.\n"
+"Indien u nie weet nie, kies 'gebruik pppoe'."
 
-#: ../../netconnect.pm_.c:154 ../../standalone/draknet_.c:196
+#: ../../network/adsl.pm_.c:22
 #, fuzzy
-msgid "The system is now connected to Internet."
-msgstr "Hoe wil u aan die internet konnekteer?"
+msgid "Alcatel speedtouch usb"
+msgstr "speedtouch USB"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr ""
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "gebruik dhcp"
 
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
-#, fuzzy
-msgid ""
-"The system doesn't seem to be connected to internet.\n"
-"Try to reconfigure your connection."
-msgstr "Konnekteer aan die internet / Konfigureer LAN"
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "gebruik pppoe"
 
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "Netwerkkonfigurasie"
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "gebruik pptp"
 
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
-msgid "ISDN Configuration"
-msgstr "ISDN Konfigurasie"
+#: ../../network/ethernet.pm_.c:37
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpcd"
+msgstr ""
+"Watter DCHP-kli�nt wil u gebruik?\n"
+"Verstek is dhcpcd"
 
-#: ../../netconnect.pm_.c:222
+#: ../../network/ethernet.pm_.c:88
 msgid ""
-"Select your provider.\n"
-" If it's not in the list, choose Unlisted"
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
-"Kies u internetdiensvoorsiener.\n"
-"Indien nie in die lys nie kies Ongelys"
+"Geen ethernetkaart is op die stelsel gevind nie.\n"
+"Ek kan nie hierdie konneksietipe opstel nie."
 
-#
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Konneksiekonfigurasie"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Kies die netwerkkoppelvlak"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Vul asb. die velde hieronder in"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "Kies asb. die netwerkkoppelvlak wat u wil gebruik vir die internet."
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "Kaart IRQ"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "geen netwerkkaart gevind nie"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "Kaartgeheue (DMA)"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "Stel netwerk op"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "Kaart I/O"
+#: ../../network/ethernet.pm_.c:203
+msgid ""
+"Please enter your host name if you know it.\n"
+"Some DHCP servers require the hostname to work.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''."
+msgstr ""
+"Tik asb die rekenaarnaam in.\n"
+"Sekere DHCP-bedieners benodig die rekenaarnaam.\n"
+"Dit moet 'n volle gekwalifiseerde naam wees,\n"
+"bv. ``myne.mywerk.co.za''."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "Kaart IO_0"
+#
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "Rekenaarnaam"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "Kaart IO_1"
+#: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
+#: ../../network/netconnect.pm_.c:91 ../../network/netconnect.pm_.c:105
+#: ../../network/netconnect.pm_.c:154 ../../network/netconnect.pm_.c:164
+#: ../../network/netconnect.pm_.c:190 ../../network/netconnect.pm_.c:213
+#: ../../network/netconnect.pm_.c:221
+msgid "Network Configuration Wizard"
+msgstr "Netwerkkonfigurasie-assistent"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "U persoonlike telefoonnommer"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "Eksterne ISDN-kaart"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Voorsienernaam (bv voorsiener.co.za)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Interne ISDN-kaart"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "Voorsiener se telefoonnommer"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "Watter tipe is u ISDN-konneksie?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "Voorsiener DNS 1"
+#: ../../network/isdn.pm_.c:45
+msgid ""
+"Which ISDN configuration do you prefer?\n"
+"\n"
+"* The Old configuration uses isdn4net. It contains powerfull\n"
+"  tools, but is tricky to configure, and not standard.\n"
+"\n"
+"* The New configuration is easier to understand, more\n"
+"  standard, but with less tools.\n"
+"\n"
+"We recommand the light configuration.\n"
+msgstr ""
 
-#: ../../netconnect.pm_.c:248
-msgid "Provider dns 2"
-msgstr "Voorsiener DNS 2"
+#: ../../network/isdn.pm_.c:54
+msgid "New configuration (isdn-light)"
+msgstr "Nuwe konfigurasie (Ligte ISDN/isdn-light)"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "Belmetode"
+#: ../../network/isdn.pm_.c:54
+msgid "Old configuration (isdn4net)"
+msgstr "Ou konfigurasie (isdn4net)"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Gebruikerskode"
+#: ../../network/isdn.pm_.c:169 ../../network/isdn.pm_.c:187
+#: ../../network/isdn.pm_.c:197 ../../network/isdn.pm_.c:204
+#: ../../network/isdn.pm_.c:214
+msgid "ISDN Configuration"
+msgstr "ISDN Konfigurasie"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Wagwoord"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Kies u internetdiensvoorsiener.\n"
+"Indien nie in die lys nie kies Ongelys"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Europa"
+#: ../../network/isdn.pm_.c:182
+msgid "Europe protocol"
+msgstr "Europese protokol"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe (EDSS1)"
-msgstr "Europa (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+msgid "Europe protocol (EDSS1)"
+msgstr "Europese protokol (EDSS1)"
 
 #
-#: ../../netconnect.pm_.c:263
-msgid "Rest of the world"
-msgstr "Res van die w�reld"
+#: ../../network/isdn.pm_.c:184
+msgid "Protocol for the rest of the world"
+msgstr "Protokol vir die res van die w�reld"
 
-#: ../../netconnect.pm_.c:263
+#: ../../network/isdn.pm_.c:184
 msgid ""
-"Rest of the world \n"
+"Protocol for the rest of the world \n"
 " no D-Channel (leased lines)"
 msgstr ""
-"Res vd w�reld \n"
-" geen D-Kanaal (bruikhuurlyne)"
+"Protokol vir die res vd w�reld \n"
+" geen D-Kanaal nie (bruikhuurlyne)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Watter protokol verlang u?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Oor watter tipe kaart beskik u?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "Ek weet nie"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../netconnect.pm_.c:284
+#: ../../network/isdn.pm_.c:205
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -5231,19 +5117,19 @@ msgstr ""
 "\n"
 "Indien u 'n PCMCIA kaart het, moet u die IRQ en I/O van u kaart weet.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "Aborteer"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "Gaan voort"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "Wat is u ISDN-kaart?"
 
-#: ../../netconnect.pm_.c:314
+#: ../../network/isdn.pm_.c:234
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
@@ -5251,353 +5137,273 @@ msgstr ""
 "Ek het 'n ISDB PCI-kaart gevind, maar ek ken nie die tipe nie. Kies asb.'n "
 "PCI-kaart op die volgende skerm."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "Geen ISDN PCI-kaart gevind nie. Kies asb. een op die volgende skerm."
 
-#: ../../netconnect.pm_.c:371
-#, fuzzy
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Geen ethernetkaart is op die stelsel gevind nie. Gebruik asb. die "
-"hardewarekonfigurasieprogram."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "Kies die netwerkkoppelvlak"
-
-#: ../../netconnect.pm_.c:376
-#, fuzzy
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr ""
-"Kies asb. die netwerkkoppelvlak wat u wil gebruik vir die internet.\n"
-"Indien u nie weet nie, kies eth0.\n"
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "Netwerkkoppelvlak"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-
-#: ../../netconnect.pm_.c:386
-#, fuzzy
-msgid "I'm about to restart the network device:\n"
-msgstr "Ek gaan nou die netwerkkoppelvlak herlaai. Stem u saam?"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "ADSL konfigurasie"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "Wil u die konneksie by herlaaityd aanskakel?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Op watter seriaalpoort is u modem gekoppel?"
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Opbelopsies"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "Konneksienaam"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "Telefoonnommer"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "Aantekenkode"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "Magtiging"
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
+msgid "CHAP"
+msgstr "CHAP"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Script-based"
 msgstr "Skriptipe"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Terminaaltipe"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Domeinnaam"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
-#, fuzzy
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
-msgstr "Eerste DNS bediener"
+msgstr "Eerste DNS-bediener (opsioneel)"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
-#, fuzzy
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 msgid "Second DNS Server (optional)"
-msgstr "Tweede DNS bediener"
-
-#: ../../netconnect.pm_.c:701
-#, fuzzy
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr "Ek gaan nou die netwerkkoppelvlak herlaai. Stem u saam?"
+msgstr "Tweede DNS-bediener (opsioneel)"
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
 msgstr ""
+"\n"
+"U kan diskonnekteer or herkonfigureer."
 
-#: ../../netconnect.pm_.c:745 ../../netconnect.pm_.c:748
-#, fuzzy
+#: ../../network/netconnect.pm_.c:33 ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can reconfigure your connection."
-msgstr "Konfigureer internetkonneksie"
+msgstr ""
+"\n"
+"U kan u konneksie herkonfigureer."
 
-#: ../../netconnect.pm_.c:745
-#, fuzzy
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
-msgstr "Hoe wil u aan die internet konnekteer?"
+msgstr "U is tans aan die internet gekonnekteer."
 
-#: ../../netconnect.pm_.c:748
-#, fuzzy
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
-msgstr "Konnekteer aan die internet / Konfigureer LAN"
+msgstr ""
+"\n"
+"U kan aan die internet konnekter of u konneksie herkonfigureer."
 
-#: ../../netconnect.pm_.c:748
-#, fuzzy
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
-msgstr "Hoe wil u aan die internet konnekteer?"
+msgstr "U is nie tans aan die internet gekonnekteer nie."
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "Konnekteer aan die internet"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "Diskonnekteer van die internet"
 
-#: ../../netconnect.pm_.c:756
-#, fuzzy
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
-msgstr "Konfigureer internetkonneksie"
+msgstr "Konfigureer netwerkkonneksie (LAN or internet)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Internetkonneksie en konfigurasie"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-#, fuzzy
-msgid "Network Configuration Wizard"
-msgstr "Netwerkkonfigurasie"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "Eksterne ISDN-kaart"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Interne ISDN-kaart"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "Watter tipe is u ISDN-konneksie?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Konnekteer aan die internet"
-
-#: ../../netconnect.pm_.c:834
-#, fuzzy
-msgid ""
-"The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few ones use dhcp.\n"
-"If you don't know, choose 'use pppoe'"
-msgstr ""
-"Die mees algemene metode vir ADSL is om DHCP + pppoe te gebruik.\n"
-"Daar is wel sekere konneksie wat net DHCP gebruik. Indien u nie weet nie,\n"
-"kies 'gebruik pppoe'"
-
-#: ../../netconnect.pm_.c:836
-#, fuzzy
-msgid "use dhcp"
-msgstr "dhcpd"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "gebruik pppoe"
-
-#: ../../netconnect.pm_.c:836
-#, fuzzy
-msgid "use pptp"
-msgstr "gebruik pppoe"
-
-#: ../../netconnect.pm_.c:846
-#, fuzzy, c-format
-msgid "I'm about to restart the network device %s. Do you agree?"
-msgstr "Ek gaan nou die netwerkkoppelvlak herlaai. Stem u saam?"
+#: ../../network/netconnect.pm_.c:96
+#, c-format
+msgid "We are now going to configure the %s connection."
+msgstr "Ons gaan nou die %s konneksie herkonfigureer."
 
-#: ../../netconnect.pm_.c:883
+#: ../../network/netconnect.pm_.c:105
+#, c-format
 msgid ""
-"Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
+"\n"
+"\n"
+"\n"
+"We are now going to configure the %s connection.\n"
+"\n"
+"\n"
+"Press OK to continue."
 msgstr ""
-"Watter DCHP-kli�nt wil u gebruik?\n"
-"Verstek is dhcpcd"
+"\n"
+"\n"
+"\n"
+"Ons gan nou die %s konneksie konfigureer.\n"
+"\n"
+"\n"
+"Drk OK om voort te gaan."
 
-#: ../../netconnect.pm_.c:900
-#, fuzzy
-msgid "Network configuration"
+#: ../../network/netconnect.pm_.c:129 ../../network/netconnect.pm_.c:243
+#: ../../network/netconnect.pm_.c:255 ../../network/tools.pm_.c:56
+msgid "Network Configuration"
 msgstr "Netwerkkonfigurasie"
 
-#: ../../netconnect.pm_.c:901
-#, fuzzy
-msgid "Do you want to restart the network"
-msgstr "Wil u die konfigurasie toets?"
-
-#: ../../netconnect.pm_.c:904
-#, fuzzy, c-format
-msgid ""
-"A problem occured while restarting the network: \n"
-"\n"
-"%s"
-msgstr "Wil u die konfigurasie toets?"
-
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:130
 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 ""
+"Omdat u  netwerk installasie doen, is u netwerk aslreeds opgestel.\n"
+"Kliek op OK om hierdee konfigurasie te behou, of op Kanselleer om u Internet "
+"& Netwerkkonneksie te herkonfigureer.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 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 ""
+"Welkom by die Netwerkkonfigurasie-assistent\n"
+"\n"
+"Ons gaan nou u internet/netwerkkonneksie konfigureer.\n"
+"Iniden u nie outobespeuring verlang nie, deselekteer die opsie.\n"
 
-#: ../../netconnect.pm_.c:964
-#, fuzzy
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
-msgstr "Kies die verstek gebruiker:"
+msgstr "Kies die profiel om te konfigureer"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
-msgstr ""
+msgstr "Gebruik outobespeuring"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "Toestel word afgetas..."
 
-#: ../../netconnect.pm_.c:978
-#, fuzzy
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
-msgstr "Konfigureer internetkonneksie"
+msgstr "Normale modemkonneksie"
 
-#: ../../netconnect.pm_.c:978
-#, fuzzy, c-format
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
+#, c-format
 msgid "detected on port %s"
-msgstr "Duplikaat hegpunt %s"
+msgstr "Op poort %s bespeur"
 
-#: ../../netconnect.pm_.c:979
-#, fuzzy
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
-msgstr "Kabelkonneksie"
+msgstr "ISDN konneksie"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
-msgstr ""
+msgstr "%s bespeur"
 
-#: ../../netconnect.pm_.c:980
-#, fuzzy
-msgid "DSL (or ADSL) connection"
-msgstr "Konfigureer internetkonneksie"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+msgid "ADSL connection"
+msgstr "ADSL konneksie"
 
-#: ../../netconnect.pm_.c:980
-#, fuzzy, c-format
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+#, c-format
 msgid "detected on interface %s"
-msgstr "Netwerkkoppelvlak"
+msgstr "op koppelvlak %s bespeur"
 
-#: ../../netconnect.pm_.c:981
-#, fuzzy
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "Kabelkonneksie"
 
-#: ../../netconnect.pm_.c:982
-#, fuzzy
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+msgid "cable connection detected"
+msgstr "Kabelkonneksie bespeur"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
-msgstr "Kabelkonneksie"
+msgstr "LAN konneksie"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
-msgstr ""
+msgstr "ethernet kaart(e) bespeur"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "Hoe wil u aan die internet konnekteer?"
+#: ../../network/netconnect.pm_.c:190
+msgid "Choose the connection you want to configure"
+msgstr "Kies die konneksie wat u wil konfigureer"
 
-#: ../../netconnect.pm_.c:1004
+#: ../../network/netconnect.pm_.c:214
 msgid ""
-"Congratulation, The network and internet configuration is finished.\n"
+"You have configured multiple ways to connect to the Internet.\n"
+"Choose the one you want to use.\n"
 "\n"
-"The configuration will now be applied to your system."
 msgstr ""
+"U het meer as een internetkonneksiemetode opgste.\n"
+"Kies die een wat u verlang.\n"
+"\n"
 
-#: ../../netconnect.pm_.c:1007
-msgid ""
-"After that is done, we recommend you to restart your X\n"
-"environnement to avoid hostname changing problem."
-msgstr ""
+#: ../../network/netconnect.pm_.c:215
+msgid "Internet connection"
+msgstr "Internetkonneksie"
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "geen netwerkkaart gevind nie"
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "Wil u die konneksie met herlaaityd aanskakel?"
 
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "Stel netwerk op"
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "Netwerkkonfigurasie"
+
+#: ../../network/netconnect.pm_.c:240
+msgid "The network needs to be restarted"
+msgstr ""
 
-#: ../../network.pm_.c:278
+#: ../../network/netconnect.pm_.c:243
+#, c-format
 msgid ""
-"Please enter your host name if you know it.\n"
-"Some DHCP servers require the hostname to work.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''."
+"A problem occured while restarting the network: \n"
+"\n"
+"%s"
 msgstr ""
-"Tik asb die rekenaarnaam in.\n"
-"Sekere DHCP-bedieners benodig die rekenaarnaam.\n"
-"Dit moet 'n volle gekwalifiseerde naam wees,\n"
-"bv. ``myne.mywerk.co.za''."
+"Daar was 'n probleem met die herlaai van die netwerk.\n"
+"\n"
+"%s"
 
-#
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "Rekenaarnaam"
+#: ../../network/netconnect.pm_.c:247
+msgid ""
+"Congratulations, the network and internet configuration is finished.\n"
+"\n"
+"The configuration will now be applied to your system.\n"
+msgstr ""
+"Geluk, die netwerk en internetkonfigurasie is voltooi.\n"
+"\n"
+"Die kongiurasie gaan op u stelsel toegepas word.\n"
 
-#: ../../network.pm_.c:319
-#, fuzzy
+#: ../../network/netconnect.pm_.c:250
+msgid ""
+"After that is done, we recommend you to restart your X\n"
+"environnement to avoid hostname changing problem."
+msgstr ""
+"Nadat dit klaar is, sal dit beter wes om u X-omgewing te herlaai\n"
+"om die rekenaarnaamveranderingprobleem te voorkom."
+
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -5606,10 +5412,10 @@ msgid ""
 msgstr ""
 "WAARSKUWING: Die toestel is alreeds opgestel om aan die internette "
 "konnekteer.\n"
-"Druk OK om die toetsel so te hou.\n"
+"U kan die toestel net so aanvaar.\n"
 "Veranderinge aan onderstaande velde sal hierdie konfigurasie oorskryf."
 
-#: ../../network.pm_.c:324
+#: ../../network/network.pm_.c:288
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
@@ -5619,40 +5425,40 @@ msgstr ""
 "Elke item moet as 'n IP-adres in dotdesimalenotasie\n"
 "(1.2.3.4) gegee word."
 
-#: ../../network.pm_.c:333 ../../network.pm_.c:334
+#: ../../network/network.pm_.c:297 ../../network/network.pm_.c:298
 #, c-format
 msgid "Configuring network device %s"
 msgstr "Konfigureer netwerktoestel %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr ""
+#: ../../network/network.pm_.c:298
+#, c-format
+msgid " (driver %s)"
+msgstr "(drywer %s)"
 
 #
-#: ../../network.pm_.c:336 ../../standalone/draknet_.c:231
-#: ../../standalone/draknet_.c:427
+#: ../../network/network.pm_.c:300 ../../standalone/draknet_.c:255
+#: ../../standalone/draknet_.c:461
 msgid "IP address"
 msgstr "IP adres"
 
 #
-#: ../../network.pm_.c:337 ../../standalone/draknet_.c:428
+#: ../../network/network.pm_.c:301 ../../standalone/draknet_.c:462
 msgid "Netmask"
 msgstr "Netmasker"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "(bootp/dhcp)"
 msgstr "(bootp/dhcp)"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "Automatic IP"
 msgstr "Outomatiese IP"
 
-#: ../../network.pm_.c:359 ../../printerdrake.pm_.c:102
-#: ../../printerdrake.pm_.c:425
+#: ../../network/network.pm_.c:323 ../../printerdrake.pm_.c:406
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-adres moet in 1.2.3.4. formaat wees"
 
-#: ../../network.pm_.c:388
+#: ../../network/network.pm_.c:351
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -5664,43 +5470,148 @@ msgstr ""
 "bv. ``myne.mywerk.co.za''.\n"
 "U mag ook die netwerkhek byvoeg indien daar een is"
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "DNS bediener"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
 msgstr "Portaal"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "Netwerkportaaltoestel"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Instaanbedienerkonfigurasie"
 
-#: ../../network.pm_.c:408
+#: ../../network/network.pm_.c:372
 msgid "HTTP proxy"
 msgstr "HTTP instaanbediener"
 
-#: ../../network.pm_.c:409
+#: ../../network/network.pm_.c:373
 msgid "FTP proxy"
 msgstr "FTP instaanbediener"
 
-#: ../../network.pm_.c:412
+#: ../../network/network.pm_.c:374
+msgid "Track network card id (usefull for laptops)"
+msgstr "Volg netwerkkart ID. (nuttig vir skootrekenaars)"
+
+#: ../../network/network.pm_.c:377
 msgid "Proxy should be http://..."
 msgstr "Instaanbediener moet begin met http://"
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "Instaanbediener moet begin met ftp://"
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Internetkonfigurasie"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Wil u nou aan die internet konnekteer?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "Konneksie word getoets..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "Die stelsel is nou aan die internet gekonnekteer."
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr "Vir sekuriteitsredes, word u nou gediskonnekteer."
+
+#: ../../network/tools.pm_.c:51 ../../standalone/draknet_.c:220
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr ""
+"Die tselsel blyk nie aan die internet gekonnekteer te wees nie.\n"
+"Probeer om u stelsel te herkonfigureer."
+
+#
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Konneksiekonfigurasie"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Vul asb. die velde hieronder in"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "Kaart IRQ"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "Kaartgeheue (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "Kaart I/O"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "Kaart IO_0"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "Kaart IO_1"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "U persoonlike telefoonnommer"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Voorsienernaam (bv voorsiener.co.za)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "Voorsiener se telefoonnommer"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "Voorsiener DNS 1 (opsioneel)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "Voorsiener DNS 2 (opsioneel)"
+
+#: ../../network/tools.pm_.c:88
+msgid "Choose your country"
+msgstr "Kies u land"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "Belmetode"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+msgid "Connection speed"
+msgstr "Konneksiespoed"
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+msgid "Connection timeout (in sec)"
+msgstr "Konneksie tydlimiet (in sekondes)"
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Gebruikerskode"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Wagwoord"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
 msgstr "Ekstensiepartisie word nie op hierdie platform ondersteun nie"
 
-#: ../../partition_table.pm_.c:581
+#: ../../partition_table.pm_.c:640
 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 "
@@ -5710,31 +5621,30 @@ msgstr ""
 "Die enigste oplossing is om die prim�re partisie te skuif sodat die gat\n"
 "langs die ekstensie partisies is"
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "Fout met die les van l�er %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Herstel van l�er %s het gefaal: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "Korrupte rugsteunl�er"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Fout in die skryf van %s"
 
-#: ../../partition_table_raw.pm_.c:161
+#: ../../partition_table_raw.pm_.c:154
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
 "It means writing anything on the disk will end up with random trash"
 msgstr ""
+"Iets vrots gebeur op u hardeskyf.\n"
+"'n Dataintegriteitstoets het misluk.\n"
+"Dit beteken dat enigiets wat na u hardeskyf geskryf word as gemors sal "
+"eindig."
 
 #: ../../pkgs.pm_.c:24
 msgid "must have"
@@ -5756,52 +5666,207 @@ msgstr "oulik"
 msgid "maybe"
 msgstr "moontlik"
 
-#: ../../printer.pm_.c:20
+#: ../../printer.pm_.c:23
+msgid "CUPS - Common Unix Printing System"
+msgstr "CUPS - Generiese Unixdrukstelsel (Common Unix Printing System) "
+
+#: ../../printer.pm_.c:24
+msgid "LPRng - LPR New Generation"
+msgstr "LPRng - Nuwe generasie LPR"
+
+#: ../../printer.pm_.c:25
+msgid "LPD - Line Printer Daemon"
+msgstr "LPD - Lyndrukkerdiensprogram"
+
+#: ../../printer.pm_.c:26
+msgid "PDQ - Print, Don't Queue"
+msgstr "PDQ - Druk sonder drukkertou"
+
+#: ../../printer.pm_.c:32
+msgid "CUPS"
+msgstr "CUPS"
+
+#: ../../printer.pm_.c:33
+msgid "LPRng"
+msgstr "LPRng"
+
+#: ../../printer.pm_.c:34
+msgid "LPD"
+msgstr "LPD"
+
+#: ../../printer.pm_.c:35
+msgid "PDQ"
+msgstr "PDQ"
+
+#: ../../printer.pm_.c:40
 msgid "Local printer"
 msgstr "Plaaslike drukker"
 
 #
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "Eksterne drukker"
 
 #
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
-msgstr "Eksterne lpd-bediener"
+#: ../../printer.pm_.c:42
+msgid "Printer on remote CUPS server"
+msgstr "Eksterne CUPS-drukker"
 
 #
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:43
+msgid "Printer on remote lpd server"
+msgstr "Eksterne LPD-drukker"
+
+#
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "Netwerkdrukker (sok)"
 
-#: ../../printer.pm_.c:25
-msgid "SMB/Windows 95/98/NT"
-msgstr "SMB/Windows 95/98/NT"
+#: ../../printer.pm_.c:45
+msgid "Printer on SMB/Windows 95/98/NT server"
+msgstr "Eksterne SMB/Windows 95/98/NT-drukker"
 
-#: ../../printer.pm_.c:26
-msgid "NetWare"
-msgstr "NetWare"
+#: ../../printer.pm_.c:46
+msgid "Printer on NetWare server"
+msgstr "Eksterne Netware-drukker"
 
-#: ../../printer.pm_.c:27 ../../printerdrake.pm_.c:158
-#: ../../printerdrake.pm_.c:160
-msgid "Printer Device URI"
-msgstr "Drukkertoestel URI"
+#: ../../printer.pm_.c:47
+msgid "Enter a printer device URI"
+msgstr "Tik  drukkertoestel URI in"
+
+#: ../../printer.pm_.c:48
+msgid "Pipe job into a command"
+msgstr "Pyk drukstuk na program"
+
+#: ../../printer.pm_.c:418 ../../printer.pm_.c:839
+#: ../../printerdrake.pm_.c:1227 ../../printerdrake.pm_.c:2023
+msgid "Unknown model"
+msgstr "Onbekende model"
+
+#: ../../printer.pm_.c:546 ../../printerdrake.pm_.c:790
+msgid "Raw printer (No driver)"
+msgstr ""
+
+#: ../../printer.pm_.c:693
+#, c-format
+msgid "(on %s)"
+msgstr "(op %s)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr "(op hierdie rekenaar)"
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "Kies drukkerkonneksie"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "Hoe is die drukker gekonekteer?"
+
+#: ../../printerdrake.pm_.c:25
+msgid ""
+"\n"
+"Printers on remote CUPS servers you do not have to configure\n"
+"here; these printers will be automatically detected. Please\n"
+"select \"Printer on remote CUPS server\" in this case."
+msgstr ""
+"\n"
+"Met 'n eksterne CUPS-bediener, hoef u glad nie 'n drukker hier\n"
+"op te stel nie; drukkers wod outomaties bespeur.\n"
+"Indien u twyfel, kies \"Eksterne CUPS-drukker\"."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+msgid "None"
+msgstr "Geen"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Kies die verstek gebruiker:"
+
+#: ../../printerdrake.pm_.c:105
+msgid ""
+"With remote CUPS servers, you do not have to configure any \n"
+"printer here; CUPS servers inform your machine automatically\n"
+"about their printers. All printers known to your machine\n"
+"currently are listed in the \"Default printer\" field. Choose\n"
+"the default printer for your machine there and click the\n"
+"\"Apply/Re-read printers\" button. Click the same button to\n"
+"refresh the list (it can take up to 30 seconds after the start\n"
+"of CUPS until all remote printers are visible).\n"
+"When your CUPS server is in a different network, you have to \n"
+"give the CUPS server IP address and optionally the port number\n"
+"to get the printer information from the server, otherwise leave\n"
+"these fields blank."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:117
+msgid ""
+"\n"
+"Normally, CUPS is automatically configured according to your\n"
+"network environment, so that you can access the printers on the\n"
+"CUPS servers in your local network. If this does not work \n"
+"correctly, turn off \"Automatic CUPS configuration\" and edit\n"
+"your file /etc/cups/cupsd.conf manually. Do not forget to restart\n"
+"CUPS afterwards (command: \"service cups restart\")."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:124 ../../printerdrake.pm_.c:1290
+#: ../../printerdrake.pm_.c:1294 ../../printerdrake.pm_.c:1295
+#: ../../printerdrake.pm_.c:1296 ../../printerdrake.pm_.c:2011
+msgid "Close"
+msgstr "Sluit af"
+
+#
+#: ../../printerdrake.pm_.c:125
+msgid "Apply/Re-read printers"
+msgstr "Pas toe/herlees drukkers"
 
-#: ../../printerdrake.pm_.c:19
+#: ../../printerdrake.pm_.c:129
+msgid "The IP address should look like 192.168.1.20"
+msgstr "IP-adres moet iets soos 192.168.1.20. lyk"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+msgid "The port number should be an integer!"
+msgstr "Die poortnommer moet  heeltal wees."
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+msgid "Default printer"
+msgstr "Verstek drukker"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "CUPS-bediener IP:"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Poort"
+
+#: ../../printerdrake.pm_.c:149
+msgid "Automatic CUPS configuration"
+msgstr "Outomatiese CUPS konfigurasie"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "Toestel word afgetas..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "Toets poorte"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "'n Drukker, model \"%s\", is opgespoor op "
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Plaaslikte drukkertoestel"
 
-#: ../../printerdrake.pm_.c:53
+#: ../../printerdrake.pm_.c:256
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -5809,37 +5874,56 @@ msgstr ""
 "Watter toestel is die drukker aan gekoppel?\n"
 "(let op dat /dev/lp0 ekwiwalent is aan LPT1:)\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Drukkertoestel:"
 
-#: ../../printerdrake.pm_.c:74
+#: ../../printerdrake.pm_.c:261
+msgid "Device/file name missing!"
+msgstr "Toestel/L�ernaam ontbreek"
+
+#: ../../printerdrake.pm_.c:274 ../../printerdrake.pm_.c:698
+#: ../../printerdrake.pm_.c:786
+#, fuzzy
+msgid "Reading printer database ..."
+msgstr "Drukkerdata word gelees..."
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "Eksterne lpd drukkeropsies"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:313
 msgid ""
-"To use a remote lpd print queue, you need to supply\n"
-"the hostname of the printer server and the queue name\n"
-"on that server which jobs should be placed in."
+"To use a remote lpd printer, you need to supply\n"
+"the hostname of the printer server and the printer name\n"
+"on that server."
 msgstr ""
-"Om 'n eksterne lpd drukkertou te gebruik, het die naam\n"
+"Om 'n eksterne lpd drukkertou te gebruik,moett die naam\n"
 "van die drukkkerbediener en die naam van die drukkertou\n"
-"nodig."
+"voorsien word."
+
+#: ../../printerdrake.pm_.c:316
+msgid "Remote host name"
+msgstr "Eksterne bedienernaam"
+
+#
+#: ../../printerdrake.pm_.c:317
+msgid "Remote printer name"
+msgstr "Eksterne drukkernaam"
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
-msgstr "Eksterne bediener:"
+#: ../../printerdrake.pm_.c:320
+msgid "Remote host name missing!"
+msgstr "Eksterne bedienernaam ontbreek!"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Eksterne drukkertou"
+#: ../../printerdrake.pm_.c:324
+msgid "Remote printer name missing!"
+msgstr "Eksterne drukkernam ontbreek!"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) drukkeropsies"
 
-#: ../../printerdrake.pm_.c:89
+#: ../../printerdrake.pm_.c:393
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -5852,29 +5936,37 @@ msgstr ""
 "nie); moontlik die IP adres van die drukkerbediener; die drukkernaam; \n"
 "toepaslike gebruikerskode en wagwoord; werkgroepnaam."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "SMB-bedienernaam"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "SMB-bediener IP:"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "Drukkernaam:"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "Werkgroep:"
 
-#: ../../printerdrake.pm_.c:124
+#: ../../printerdrake.pm_.c:410
+msgid "Either the server name or the server's IP must be given!"
+msgstr "�f die bedienernaam �f die bediener-IP moet verskaf word!"
+
+#: ../../printerdrake.pm_.c:414
+msgid "Samba share name missing!"
+msgstr "SAMBA-deelnaam ontbreek!"
+
+#: ../../printerdrake.pm_.c:473
 msgid "NetWare Printer Options"
 msgstr "NetWare drukkeropsies"
 
-#: ../../printerdrake.pm_.c:125
+#: ../../printerdrake.pm_.c:474
 msgid ""
-"To print to a NetWare printer, you need to provide the\n"
+"To print on a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
 "TCP/IP hostname!) as well as the print queue name for the printer you\n"
 "wish to access and any applicable user name and password."
@@ -5884,298 +5976,823 @@ msgstr ""
 "rekenaarnaam nie); moontlik die IP adres van die drukkerbediener;\n"
 "die drukkernaam; toepaslike gebruikerskode en wagwoord."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Drukkerbediener"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "Drukkertounaam"
 
-#: ../../printerdrake.pm_.c:142
+#: ../../printerdrake.pm_.c:484
+msgid "NCP server name missing!"
+msgstr "NCP-bedienernaam ontbreek!"
+
+#: ../../printerdrake.pm_.c:488
+msgid "NCP queue name missing!"
+msgstr "NCP-tounaam ontbreek!"
+
+#: ../../printerdrake.pm_.c:527
 msgid "Socket Printer Options"
 msgstr "Sokdrukkeropsies"
 
-#: ../../printerdrake.pm_.c:143
+#: ../../printerdrake.pm_.c:528
 msgid ""
 "To print to a socket printer, you need to provide the\n"
-"hostname of the printer and optionally the port number."
+"host name of the printer and optionally the port number.\n"
+"On HP JetDirect servers the port number is usually 9100,\n"
+"on other servers it can vary. See the manual of your\n"
+"hardware."
 msgstr ""
 "Om aan 'n sokdrukker te konnekteer, moet u die rekenaarnaam van die\n"
-"drukker voorsien en dalk ook 'n poortnommer."
+"drukker voorsien en dalk ook 'n poortnommer voorsien.\n"
+"Met HP JetDirect-bedieners is die poortnommer gewoonlik 9100,\n"
+"maar dit mag anders wees met ander bedieners. Raadpleeg die handleiding\n"
+"wat saam met die hardeware gekom het."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
-msgstr "Drukkerrekenaarnaam"
+#: ../../printerdrake.pm_.c:533
+msgid "Printer host name"
+msgstr "Drukkerbedienernaam"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Poort"
+#: ../../printerdrake.pm_.c:537
+msgid "Printer host name missing!"
+msgstr "Drukkerbedienernaam ontbreek!"
+
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "Drukkertoestel URI"
+
+#: ../../printerdrake.pm_.c:567
+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 ""
+"U kan die URI om die drukker te bereik direk spesifiseer. Die URI moet in "
+"CUPS- of Foomatic-formaat wees. Nie alle UTI-tipes moet deur al die "
+"spoelprogramme ondersteun nie."
+
+#: ../../printerdrake.pm_.c:582
+msgid "A valid URI must be entered!"
+msgstr "'n Geldige URI moet verskaf word!"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "U kan die URI, om die drukker via CUPS te gebruik, direk spesifiseer"
+#: ../../printerdrake.pm_.c:682
+msgid ""
+"Every printer needs a name (for example lp).\n"
+"The Description and Location fields do not need \n"
+"to be filled in. They are comments for the users."
+msgstr ""
+"Elke drukker benodig  naam (bv. lp).\n"
+"Die Beskrywing- en Liggingvelde is opsioneel.\n"
+"Hulle dien as inligting vir gebruikers."
+
+#: ../../printerdrake.pm_.c:685
+msgid "Name of printer"
+msgstr "Drukkernaam"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Beskrywing"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Ligging"
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "Drukkerdata word gelees..."
+
+#: ../../printerdrake.pm_.c:793
+msgid "Printer model selection"
+msgstr "Drukkermodelkeuse"
+
+#: ../../printerdrake.pm_.c:794
+msgid "Which printer model do you have?"
 msgstr "Oor watter tipe drukker beskik u?"
 
-#: ../../printerdrake.pm_.c:204 ../../printerdrake.pm_.c:305
-msgid "Do you want to test printing?"
-msgstr "Wil u drukwerk toets?"
+#: ../../printerdrake.pm_.c:866
+#, fuzzy
+msgid "OKI winprinter configuration"
+msgstr "Verander drukkerkonfigurasie"
+
+#: ../../printerdrake.pm_.c:867
+msgid ""
+"You are configuring an OKI laser winprinter. These printers\n"
+"use a very special communication protocol and therefore they\n"
+"work only when connected to the first parallel port. When\n"
+"your printer is connected to another port or to a print\n"
+"server box please connect the printer to the first parallel\n"
+"port before you print a test page. Otherwise the printer\n"
+"will not work. Your connection type setting will be ignored\n"
+"by the driver."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:916 ../../printerdrake.pm_.c:946
+#, fuzzy
+msgid "Lexmark inkjet configuration"
+msgstr "Internetkonfigurasie"
+
+#: ../../printerdrake.pm_.c:917
+msgid ""
+"The inkjet printer drivers provided by Lexmark only support\n"
+"local printers, no printers on remote machines or print server\n"
+"boxes. Please connect your printer to a local port or\n"
+"configure it on the machine where it is connected to."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:947
+msgid ""
+"To be able to print with your Lexmark inkjet and this\n"
+"configuration, you need the inkjet printer drivers\n"
+"provided by Lexmark (http://www.lexmark.com/). Go to\n"
+"the US site and click on the \"Drivers\" button. Then\n"
+"choose your model and afterwards \"Linux\" as\n"
+"operating system. The drivers come as RPM packages\n"
+"or shell scripts with interactive graphical installation.\n"
+"You do not need to do this configuration by the\n"
+"graphical frontends. Cancel directly after the license\n"
+"agreement. Then print printhead alignment pages with\n"
+"\"lexmarkmaintain\" and adjust the head alignment\n"
+"settings with this program."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1079
+msgid ""
+"Printer default settings\n"
+"You should make sure that the page size and the\n"
+"ink type (if available) are set correctly. Note\n"
+"that with a very high printout quality printing\n"
+"can get substantially slower."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1090
+#, c-format
+msgid "Option %s must be an integer number!"
+msgstr "Opsie %s moet 'n heeltal wees!"
+
+#: ../../printerdrake.pm_.c:1094
+#, c-format
+msgid "Option %s must be a number!"
+msgstr "Opsie %s moet 'n nommer wees"
+
+#: ../../printerdrake.pm_.c:1099
+#, c-format
+msgid "Option %s out of range!"
+msgstr "Opsie %s is buite bereik!"
+
+#: ../../printerdrake.pm_.c:1136
+#, c-format
+msgid ""
+"Do you want to set this printer (\"%s\")\n"
+"as the default printer?"
+msgstr ""
+"Wil u hierdie drukker (\"%s\")\n"
+"die verstek drukker maak?"
+
+#: ../../printerdrake.pm_.c:1152
+msgid "Test pages"
+msgstr "Toetsbladsye"
+
+#: ../../printerdrake.pm_.c:1153
+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\n"
+"and on laser printers with too low memory it can even not come out.\n"
+"In most cases it is enough to print the standard test page."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1158
+msgid "No test pages"
+msgstr "Geen toetsbladsye"
+
+#: ../../printerdrake.pm_.c:1159
+msgid "Print"
+msgstr "Druk"
+
+#: ../../printerdrake.pm_.c:1161
+msgid "Standard test page"
+msgstr "Standaard toetsbladsy"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr "Alternatiewe toetsbladsy (Lettergrootte)"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1167
+msgid "Alternative test page (A4)"
+msgstr "Alternatiewe toetsbladsy (A4)"
+
+#: ../../printerdrake.pm_.c:1169
+msgid "Photo test page"
+msgstr "Fototoetsbladsy"
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "Toetsbladsy(e) word gedruk..."
 
-#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:324
+#: ../../printerdrake.pm_.c:1200
 #, c-format
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
+"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"
-"Does it work properly?"
 msgstr ""
 "Toetsbladsy(e) is na die drukkerstelsel gestuur.\n"
 "Dit mag 'n tydjie neem voordat drukwerk begin.\n"
 "Drukstatus:\n"
 "%s\n"
 "\n"
-"Het dit reg gedruk?"
 
-#: ../../printerdrake.pm_.c:218 ../../printerdrake.pm_.c:328
+#: ../../printerdrake.pm_.c:1204
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Does it work properly?"
+"Test page(s) have been sent to the printer.\n"
+"It may take some time before the printer starts.\n"
 msgstr ""
-"Toetsbladsy(e) is na die drukkerstelsel gestuur.\n"
+"Toetsbladsy(e) is na die drukker gestuur.\n"
 "Dit mag 'n tydjie neem voordat drukwerk begin.\n"
-"Het dit reg gedruk?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "Ja, druk die ASCII toetsbladsy"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr "Het dit reg gewerk?"
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "Ja, druk die PostScript toetsbladsy"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Geen drukker"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "Ja, druk albei toetsbladsye"
+#: ../../printerdrake.pm_.c:1237
+#, 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 "
+"\"qtcups <file>\". The graphical tools allow you to choose the printer and "
+"to modify the option settings easily.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:243
-msgid "Configure Printer"
-msgstr "Stel drukker op"
+#: ../../printerdrake.pm_.c:1239
+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 ""
 
-#: ../../printerdrake.pm_.c:273
-msgid "Printer options"
+#: ../../printerdrake.pm_.c:1242 ../../printerdrake.pm_.c:1254
+#: ../../printerdrake.pm_.c:1266
+#, 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 ""
+
+#: ../../printerdrake.pm_.c:1244 ../../printerdrake.pm_.c:1284
+msgid ""
+"To get a list of the options available for the current printer read either "
+"the list shown below or click on the \"Print option list\" button.\n"
+"\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1249 ../../printerdrake.pm_.c:1261
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\".\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1251 ../../printerdrake.pm_.c:1263
+#: ../../printerdrake.pm_.c:1275
+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 ""
+
+#: ../../printerdrake.pm_.c:1256 ../../printerdrake.pm_.c:1268
+msgid ""
+"To get a list of the options available for the current printer click on the "
+"\"Print option list\" button.\n"
+"\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1273
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\" or \"%s <file>\".\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1277
+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 ""
+
+#: ../../printerdrake.pm_.c:1281
+#, 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 ""
+
+#: ../../printerdrake.pm_.c:1292
+#, fuzzy, c-format
+msgid "Printing on the printer \"%s\""
+msgstr "Netwerk op pad af"
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
 msgstr "Drukkeropsies"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Papiergrootte"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+msgid "Reading printer data ..."
+msgstr "Drukkerdata word gelees..."
+
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+msgid "Transfer printer configuration"
+msgstr "Dra drukkerkonfigurasie oor"
+
+#: ../../printerdrake.pm_.c:1339
+#, c-format
+msgid ""
+"You can copy the printer configuration which you have done \n"
+"for the spooler %s to %s, your current spooler. All the\n"
+"configuration data (printer name, description, location, \n"
+"connection type, and default option settings) is overtaken,\n"
+"but jobs will not be transferred.\n"
+"Not all queues can be transferred due to the following \n"
+"reasons:\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1347
+msgid ""
+"CUPS does not support printers on Novell servers or printers\n"
+"sending the data into a free-formed command.\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1350
+msgid ""
+"PDQ only supports local printers, remote LPD printers, and\n"
+"Socket/TCP printers.\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1353
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr "LPD en LPRng ondersteun nie IPP-drukkers nie.\n"
+
+#: ../../printerdrake.pm_.c:1355
+msgid ""
+"In addition, queues not created with this program or\n"
+"\"foomatic-configure\" cannot be transferred."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1357
+msgid ""
+"\n"
+"Also printers configured with the PPD files provided by\n"
+"their manufacturers or with native CUPS drivers can not be\n"
+"transferred."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "Stoot papier uit na voltooiing?"
+#: ../../printerdrake.pm_.c:1360
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Uniprint dryweropsies"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr "Moet nie drukkers oordra nie"
 
-#: ../../printerdrake.pm_.c:281
-msgid "Color depth options"
-msgstr "Kleurdiepte opsies"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr "Oordrag"
 
-#: ../../printerdrake.pm_.c:283
-msgid "Print text as PostScript?"
-msgstr "Druk teks as PostScript?"
+#: ../../printerdrake.pm_.c:1377
+#, 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 ""
 
-#: ../../printerdrake.pm_.c:285
-msgid "Fix stair-stepping text?"
-msgstr "Korrigeer trapsgewyse teks?"
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:287
-msgid "Number of pages per output pages"
-msgstr "Aantal bladsye per uitsetblad?"
+#: ../../printerdrake.pm_.c:1390
+#, c-format
+msgid ""
+"The printer \"%s\" already exists,\n"
+"do you really want to overwrite its configuration?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1398
+msgid "New printer name"
+msgstr "Nuwe drukkernaam"
 
-#: ../../printerdrake.pm_.c:288
-msgid "Right/Left margins in points (1/72 of inch)"
-msgstr "Regs/Links kantlyne in punte (1/72 van 'n duim)"
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
+msgstr "%s word oorgedra..."
 
-#: ../../printerdrake.pm_.c:289
-msgid "Top/Bottom margins in points (1/72 of inch)"
-msgstr "Bo/Onder kantlyne in punte (1/72 van 'n duim)"
+#: ../../printerdrake.pm_.c:1412
+#, c-format
+msgid ""
+"You have transferred your former default printer (\"%s\"),\n"
+"Should it be also the default printer under the\n"
+"new printing system %s?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:291
-msgid "Extra GhostScript options"
-msgstr "Ekstra GhostScriptopsies"
+#: ../../printerdrake.pm_.c:1423
+#, fuzzy
+msgid "Refreshing printer data ..."
+msgstr "Drukkerdata word gelees..."
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "Ekstra teksopsies"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+#, fuzzy
+msgid "Configuration of a remote printer"
+msgstr "Konfigureer drukker"
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "Omgekeerde bladsyorde"
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "Konneksie word begin..."
 
-#: ../../printerdrake.pm_.c:345
-msgid "Would you like to configure a printer?"
-msgstr "Wil u 'n drukker opstel?"
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "Stel netwerk op"
 
-#: ../../printerdrake.pm_.c:351
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "Monitor is nie opgestel nie"
+
+#: ../../printerdrake.pm_.c:1456
 msgid ""
-"Here are the following print queues.\n"
-"You can add some more or change the existing ones."
+"You are going to configure a remote printer. This needs working\n"
+"network access, but your network is not configured yet. If you\n"
+"go on without network configuration, you will not be able to use\n"
+"the printer which you are configuring now. How do you want \n"
+"to proceed?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "Stel netwerk op"
+
+#: ../../printerdrake.pm_.c:1496
+msgid ""
+"The network configuration done during the installation \n"
+"cannot be started now. Please check whether the network\n"
+"gets accessable after booting your system and correct the\n"
+"configuration using the Mandrake Control Center, section\n"
+"\"Network & Internet\"/\"Connection\", and afterwards set\n"
+"up the printer, also using the Mandrake Control Center,\n"
+"section \"Hardware\"/\"Printer\""
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1503
+msgid ""
+"The network access was not running and could not be \n"
+"started. Please check your configuration and your \n"
+"hardware. Then try to configure your remote printer\n"
+"again."
 msgstr ""
-"Hier is die bestaande drukkertoue.\n"
-"U kan byvoeg or verwyder soos nodig."
 
 #
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "CUPS word gelaai"
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
+msgstr "Watter drukkerstelsel verlang u?"
 
-#: ../../printerdrake.pm_.c:370
-msgid "Reading CUPS drivers database..."
-msgstr "CUPS-drywerdatagbasis word gelees"
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "Hoog"
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "Kies drukkerkonneksie"
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Parano�es"
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "Hoe is die drukker gekonekteer?"
+#: ../../printerdrake.pm_.c:1549
+#, c-format
+msgid "Installing a printing system in the %s security level"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1550
+#, c-format
+msgid ""
+"You are about to install the printing system %s on\n"
+"a system running in the %s security level.\n"
+"\n"
+"This printing system runs a daemon (background process)\n"
+"which waits for print jobs and handles them. This daemon\n"
+"is also accessable by remote machines through the network\n"
+"and so it is a possible point for attacks. Therefore only\n"
+"a few selected daemons are started by default in this\n"
+"security level.\n"
+"\n"
+"Do you really want to configure printing on this\n"
+"machine?"
+msgstr ""
 
 #
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "Kies eksterne drukkerkonneksie"
+#: ../../printerdrake.pm_.c:1584
+#, fuzzy
+msgid "Starting the printing system at boot time"
+msgstr "Watter drukkerstelsel verlang u?"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1585
+#, c-format
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected.\n"
-"In case of doubt, select \"Remote CUPS server\"."
+"The printing system (%s) will not be started automatically\n"
+"when the machine is booted.\n"
+"\n"
+"It is possible that the automatic starting was turned off \n"
+"by changing to a higher security level, because the printing\n"
+"system is a potential point for attacks.\n"
+"\n"
+"Do you want to have the automatic starting of the printing\n"
+"system turned on again?"
 msgstr ""
-"Met 'n eksterne CUPS-bediener, hoef u glad nie 'n drukker hier\n"
-"op te stel nie; drukkers wod outomaties bespeur.\n"
-"Indien u twyfel, kies \"Eksterne CUPS-bediener\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1612 ../../printerdrake.pm_.c:1644
+#: ../../printerdrake.pm_.c:1671 ../../printerdrake.pm_.c:1701
+#: ../../printerdrake.pm_.c:1778
+msgid "Checking installed software..."
+msgstr "Installeerde sagteware word deursoek..."
+
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr "LPRng word verwyder..."
+
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr "LPD word verwyder..."
+
+#: ../../printerdrake.pm_.c:1727
+msgid "Select Printer Spooler"
+msgstr "Kies drukkerspoelprogram"
+
+#
+#: ../../printerdrake.pm_.c:1728
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Watter drukkerstelsel (spoelprogram) verlang u?"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Konfigureer drukker"
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Drukkeropsies"
+
+#: ../../printerdrake.pm_.c:1815
 #, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "Drukkerdata word gelees..."
+
+#: ../../printerdrake.pm_.c:1845
+msgid "Would you like to configure printing?"
+msgstr "Wil u 'n drukwerk nou konfigureer?"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr "Drukkerstelsel:"
+
+#: ../../printerdrake.pm_.c:1879
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected\n"
-"unless you have a server on a different network; in the\n"
-"latter case, you have to give the CUPS server IP address\n"
-"and optionally the port number."
+"The following printers are configured.\n"
+"Click on one of them to modify it or\n"
+"to get information about it or on \n"
+"\"Add Printer\" to add a new printer."
 msgstr ""
-"Met 'n eksterne CUPS-bediener, hoef u glad nie 'n drukker hier\n"
-"op te stel nie; drukkers wod outomaties bespeur.\n"
-"Indien u twyfel, kies \"Eksterne CUPS-bediener\"."
 
-#: ../../printerdrake.pm_.c:421
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "Normale modus"
+
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Verstek)"
+
+#
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "Drukkers op eksterne CUPS-bediener(s)"
+
+#
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
 #, fuzzy
-msgid "CUPS server IP"
-msgstr "SMB-bediener IP:"
+msgid "Printer(s) on remote server(s)"
+msgstr "Drukkers op eksterne CUPS-bediener(s)"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+msgid "Add printer"
+msgstr "Voeg drukker by"
 
-#: ../../printerdrake.pm_.c:429
-msgid "Port number should be numeric"
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "Wil u die konfigurasie toets?"
+
+#: ../../printerdrake.pm_.c:2003
+msgid "Modify printer configuration"
+msgstr "Verander drukkerkonfigurasie"
+
+#: ../../printerdrake.pm_.c:2004
+#, c-format
+msgid ""
+"Printer %s: %s %s\n"
+"What do you want to modify on this printer?"
 msgstr ""
+"Drukker %s: %s %s\n"
+"Wil u hierdie drukker verander?"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "Verwyder drukkertou"
+#: ../../printerdrake.pm_.c:2012
+msgid "Do it!"
+msgstr "Gaan voort!"
 
-#: ../../printerdrake.pm_.c:454
+#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+msgid "Printer connection type"
+msgstr "Drukkerkonneksietipe"
+
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+msgid "Printer name, description, location"
+msgstr "Drukkernaam,. beskrywing, ligging"
+
+#: ../../printerdrake.pm_.c:2018 ../../printerdrake.pm_.c:2081
+msgid "Printer manufacturer, model, driver"
+msgstr "Drukkervervaardiger, model, drywer"
+
+#: ../../printerdrake.pm_.c:2019 ../../printerdrake.pm_.c:2082
+msgid "Printer manufacturer, model"
+msgstr "Drukkervervaardiger, model"
+
+#: ../../printerdrake.pm_.c:2028 ../../printerdrake.pm_.c:2092
+msgid "Set this printer as the default"
+msgstr "Maak hierdie die verstekdrukker"
+
+#: ../../printerdrake.pm_.c:2029 ../../printerdrake.pm_.c:2097
+msgid "Print test pages"
+msgstr "Druk toetsbladsy(e)"
+
+#: ../../printerdrake.pm_.c:2030 ../../printerdrake.pm_.c:2099
+msgid "Know how to print with this printer"
+msgstr ""
+
+#
+#: ../../printerdrake.pm_.c:2031 ../../printerdrake.pm_.c:2101
+msgid "Remove printer"
+msgstr "Verwyder drukker"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "Drukkerdata word gelees..."
+
+#: ../../printerdrake.pm_.c:2096
+#, c-format
+msgid "The printer \"%s\" is set as the default printer now."
+msgstr "Drukker \"%s\" is nou die verstekdrukker"
+
+#: ../../printerdrake.pm_.c:2103
+#, fuzzy, c-format
+msgid "Do you really want to remove the printer \"%s\"?"
+msgstr "Wil u die werklik die drukker verwyder?"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "Drukkerdata word gelees..."
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+msgid "Proxy configuration"
+msgstr "Instaanbedienerkonfigurasie"
+
+#: ../../proxy.pm_.c:30
 msgid ""
-"Name of printer should contains only letters, numbers and the underscore"
+"Welcome to the proxy configuration utility.\n"
+"\n"
+"Here, you'll be able to set up your http and ftp proxies\n"
+"with or without login and password\n"
 msgstr ""
+"Welkom by die proksiekonfigurasienutsprogram.\n"
+"\n"
+"Hier kan u die HTTP en FTP-instaanbedieners\n"
+"opstel met of sonder aantekenkodes en wagwoorde\n"
 
-#: ../../printerdrake.pm_.c:461
+#: ../../proxy.pm_.c:38
 msgid ""
-"Every printer need a name (for example lp).\n"
-"Other parameters such as the description of the printer or its location\n"
-"can be defined. What name should be used for this printer and\n"
-"how is the printer connected?"
+"Please fill in the http proxy informations\n"
+"Leave it blank if you don't want an http proxy"
 msgstr ""
-"Elke drukker benodig 'n naam (bv. lp)\n"
-"Ander parameters soos 'n beskrywing en 'n ligging kan ook gegee word.\n"
-"Wat is die drukker se naam en wat is die konneksietipe?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Drukkernaam"
+#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
+msgid "URL"
+msgstr "URL"
 
-#: ../../printerdrake.pm_.c:466
-msgid "Description"
-msgstr "Beskrywing"
+#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
+msgid "port"
+msgstr "Poort"
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Ligging"
+#: ../../proxy.pm_.c:44
+msgid "Url should begin with 'http:'"
+msgstr "Instaanbediener moet begin met http://"
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+msgid "The port part should be numeric"
+msgstr "Die poortgedeelte moet numeries wees"
+
+#: ../../proxy.pm_.c:59
+msgid ""
+"Please fill in the ftp proxy informations\n"
+"Leave it blank if you don't want an ftp proxy"
+msgstr ""
+"Vul asb. die FTP-instaanbediener inligting in\n"
+"Los dit oop indien u nie  FTP-instaanbediener verlang nie"
+
+#: ../../proxy.pm_.c:65
+msgid "Url should begin with 'ftp:'"
+msgstr "Instaanbediener moet begin met ftp://"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../proxy.pm_.c:79
 msgid ""
-"Every print queue (which print jobs are directed to) needs a\n"
-"name (often lp) and a spool directory associated with it. What\n"
-"name and directory should be used for this queue and how is the printer "
-"connected?"
+"Please enter proxy login and password, if any.\n"
+"Leave it blank if you don't want login/passwd"
 msgstr ""
-"Elke drukkertou (waar drukstukke heengaan) het 'n naam nodig \n"
-"(baie keer 'lp') and 'n gekoppelde spoelgids. Watter naam en\n"
-"spoelgids moet gebruik word?"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "Naam van drukkertou"
+#: ../../proxy.pm_.c:80
+msgid "login"
+msgstr "Gebruikerskode"
+
+#: ../../proxy.pm_.c:82
+msgid "password"
+msgstr "Herhaal wagwoord"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "Spoelgids"
+#: ../../proxy.pm_.c:84
+msgid "re-type password"
+msgstr "Geen wagwoord"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
-msgstr "Drukkerkonneksie"
+#: ../../proxy.pm_.c:88
+msgid "The passwords don't match. Try again!"
+msgstr "Die wagwoorde stem nie ooreen nie. Probeer weer!"
 
-#: ../../raid.pm_.c:33
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Kan nie 'n partisie by geformatteerde RAID md%d byvoeg nie"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "Kan nie l�er $file skryf nie"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "Kan nie l�er %s skryf nie"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid het gefaal"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid het gefaal. Dalk is 'raidtools' nie beskikbaar nie."
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Nie genoeg partisies vir RAID vlak %d nie\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
-msgstr ""
+msgstr "Loop die ALSA (Gevorderde Linux Klankargitektuur) klankstelsel"
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron is skeduleerder vir periodiese instruksies."
 
-#: ../../services.pm_.c:18
+#: ../../services.pm_.c:17
 msgid ""
 "apmd is used for monitoring batery status and logging it via syslog.\n"
 "It can also be used for shutting down the machine when the battery is low."
@@ -6185,15 +6802,15 @@ msgstr ""
 "Dit kan ook gebruik word om die rekenaar af te bring wanneer die battery "
 "swak is."
 
-#: ../../services.pm_.c:20
+#: ../../services.pm_.c:19
 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 ""
 "Loop instruksies deur 'at' geskeduleer op die tyd deur 'at' gespesifiseer. "
-"Loop ookinstruksiebondels wanneer die stelsellas laag genoeg is."
+"Loop ook instruksiebondels wanneer die stelsellas laag genoeg is."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:21
 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 "
@@ -6206,7 +6823,7 @@ msgstr ""
 "by die standaard UNIX cron, insluitende beter sekuriteit en 'n kragtiger "
 "konfigurasie."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:24
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -6217,13 +6834,13 @@ msgstr ""
 "Midnight Commander. Dit laat muisgebaseerde knip-en-plak aksies op die\n"
 "konsole toe asook opspringkieskaarte."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr ""
 
-#: ../../services.pm_.c:30
+#: ../../services.pm_.c:29
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -6231,7 +6848,7 @@ msgstr ""
 "Apache is 'n WWW-bediener.\n"
 "Dit kan HTML-l�ers uitstuur en CGI's hanteer"
 
-#: ../../services.pm_.c:32
+#: ../../services.pm_.c:31
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -6247,13 +6864,13 @@ msgstr ""
 "waarvoor\n"
 "inetd verantwoordelik is."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:35
 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_.c:38
+#: ../../services.pm_.c:37
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -6265,23 +6882,23 @@ msgstr ""
 "dit\n"
 "op meeste rekenaars ongesper laat."
 
-#: ../../services.pm_.c:41
+#: ../../services.pm_.c:40
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
 msgstr ""
 
-#: ../../services.pm_.c:43
+#: ../../services.pm_.c:42
 msgid "Automatic detection and configuration of hardware at boot."
-msgstr ""
+msgstr "Outobespeuring en hardewarekonfigurasie met herlaaityd."
 
-#: ../../services.pm_.c:44
+#: ../../services.pm_.c:43
 msgid ""
 "Linuxconf will sometimes arrange to perform various tasks\n"
 "at boot-time to maintain the system configuration."
 msgstr ""
 
-#: ../../services.pm_.c:46
+#: ../../services.pm_.c:45
 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)."
@@ -6289,13 +6906,13 @@ msgstr ""
 "lpd is die drukkerdiensprogram en is nodig vir lpr om te funksioneer.\n"
 "Dit is 'n diens wat drukstukke na drukkers toe reguleer."
 
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:47
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
 msgstr ""
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:49
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -6303,7 +6920,7 @@ msgstr ""
 "named (BIND) is die domeinnaamdiens (DNS) wat gebruik word om\n"
 "rekenaarname na IP-adresse toe om te skakel."
 
-#: ../../services.pm_.c:52
+#: ../../services.pm_.c:51
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -6311,7 +6928,7 @@ msgstr ""
 "Heg en ontheg all netwerkl�erstels (NFS), SMB (Lan Manger/Windows)\n"
 "en NCP (Netware) hegpunte."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -6319,7 +6936,7 @@ msgstr ""
 "Aktiveer/Deaktiveer all netwerkkoppelvlakke wat opgestel is om by\n"
 "herlaaityf te begin."
 
-#: ../../services.pm_.c:56
+#: ../../services.pm_.c:55
 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"
@@ -6329,7 +6946,7 @@ msgstr ""
 "Hierdie diens voorsien NFS-bedienerfunksionaliteit. Dit word via\n"
 "die /etc/exports l�er opgestel."
 
-#: ../../services.pm_.c:59
+#: ../../services.pm_.c:58
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -6337,17 +6954,17 @@ msgstr ""
 "NFS is 'n popul�re protokol vir l�erdeling oor TCP/IP netwerke.\n"
 "Hierdie diens vorosien die NFS-l�ersluitfunksionaliteit."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
 msgstr ""
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
-msgstr ""
+msgstr "Ondersteun die OKI-4W en aanpasbare WIN-drukkers"
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:63
 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 "
@@ -6359,7 +6976,7 @@ msgstr ""
 "gelaai word, behalwe as dit konfigureer is nie en dit is derhalwe\n"
 "veilig om op rekenaars te h� wat dit nie nodig het nie."
 
-#: ../../services.pm_.c:67
+#: ../../services.pm_.c:66
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -6370,7 +6987,7 @@ msgstr ""
 "gebruik word. Portmap moet loop op rekenaars wat as bedieners vir hierdie\n"
 "protokolle, en ander protokolle wat die RPC meganisme gebruik, dien."
 
-#: ../../services.pm_.c:70
+#: ../../services.pm_.c:69
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -6378,7 +6995,7 @@ msgstr ""
 "POstfix is 'n E-posoordragagent (MTA). Dit is die program wat E-pos\n"
 "van een bediener na 'n ander oordra."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -6386,13 +7003,13 @@ msgstr ""
 "Stoor en herstel die stelselentropiepoel vir ho� kwaliteit,\n"
 "lukraaknommergenerasie."
 
-#: ../../services.pm_.c:74
+#: ../../services.pm_.c:73
 msgid ""
 "Assign raw devices to block devices (such as hard drive\n"
 "partitions), for the use of applications such as Oracle"
 msgstr ""
 
-#: ../../services.pm_.c:76
+#: ../../services.pm_.c:75
 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"
@@ -6402,7 +7019,7 @@ msgstr ""
 "via die RIP protokol. Alhoewel RIP baie gebruik word in klein netwerke, is\n"
 "meer komplekse protokolle nodig vir komplekse netwerke."
 
-#: ../../services.pm_.c:79
+#: ../../services.pm_.c:78
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -6410,7 +7027,7 @@ msgstr ""
 "Die 'rstat' protokol laat gebruikers op 'n netwerk toe om\n"
 "werksverrigtinginligting oor enige rekenaar op die netwerk te onttrek."
 
-#: ../../services.pm_.c:81
+#: ../../services.pm_.c:80
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -6418,7 +7035,7 @@ msgstr ""
 "Die 'rusers' protokol laat netwerkgebruikers toe om te bepaal wie\n"
 "aangeteken is op ander samewerkende rekenaars."
 
-#: ../../services.pm_.c:83
+#: ../../services.pm_.c:82
 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)."
@@ -6427,11 +7044,11 @@ msgstr ""
 "ingeteken is op 'n rkeneaar wat die 'rwho' diensprogram loop.  (Amper soos "
 "'finger')."
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:84
 msgid "Launch the sound system on your machine"
-msgstr ""
+msgstr "Laai die klankstelsel op u rekenaar"
 
-#: ../../services.pm_.c:86
+#: ../../services.pm_.c:85
 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."
@@ -6439,45 +7056,83 @@ msgstr ""
 "Syslog is die fasiliteit wat baie diensprogramme gebruik om boodskappe\n"
 "te log na 'n verskeidenheid logl�ers. Dit is altyd goed om syslog te loop."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
-msgstr ""
+msgstr "Laai die drywers vir u USB-toestelle"
 
-#: ../../services.pm_.c:89
-#, fuzzy
+#: ../../services.pm_.c:88
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "Stop en begin die X-fontbediener met herlaaityd en afsittyd."
+msgstr "Laai die X-fontbediener (dis nodig vir XFree)."
 
-#: ../../services.pm_.c:118
+#: ../../services.pm_.c:114 ../../services.pm_.c:156
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Kies watter dienste moet outomaties begin met herlaaityd."
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:126
 #, fuzzy
-msgid "running"
-msgstr "Waarskuwing"
+msgid "Printing"
+msgstr "Druk"
+
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "Internet"
+
+#: ../../services.pm_.c:130
+msgid "File sharing"
+msgstr ""
+
+#: ../../services.pm_.c:132
+#, fuzzy
+msgid "System"
+msgstr "Stelselmode"
 
 #: ../../services.pm_.c:137
 #, fuzzy
+msgid "Remote Administration"
+msgstr "Eksterne lpd drukkeropsies"
+
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Datbasis"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+msgid "Services"
+msgstr "Dienste"
+
+#: ../../services.pm_.c:198
+msgid "running"
+msgstr "aktief"
+
+#: ../../services.pm_.c:198
 msgid "stopped"
-msgstr "Aanlas"
+msgstr "onaktief"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr ""
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
 msgstr ""
 
-#: ../../services.pm_.c:163
-#, fuzzy
+#: ../../services.pm_.c:224
 msgid "On boot"
-msgstr "Yaboot"
+msgstr "met herlaai"
+
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "Installeer pakket %s"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone/diskdrake_.c:63
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
 "I'll try to go on blanking bad partitions"
@@ -6485,83 +7140,125 @@ msgstr ""
 "Ek kan nie u partisietabel lees nie, dit is te korrup.\n"
 "Ek sal die nodige partisies skoonmak."
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+msgid "Error!"
+msgstr "Fout!"
+
+#: ../../standalone/drakautoinst_.c:45
+#, c-format
+msgid "I can't find needed image file `%s'."
+msgstr "Ek kan nie die nodige herlaaibeeld '%s' kry nie."
+
+#: ../../standalone/drakautoinst_.c:47
+msgid "Auto Install Configurator"
+msgstr "Outoinstallasiekonfigurasieprogram"
+
+#: ../../standalone/drakautoinst_.c:48
+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"
+"Do you want to continue?"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:70
+msgid "Automatic Steps Configuration"
+msgstr "Outomatiese Stappe Konfigurasie"
+
+#: ../../standalone/drakautoinst_.c:71
+msgid ""
+"Please choose for each step whether it will replay like your install, or it "
+"will be manual"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:112 ../../standalone/drakgw_.c:599
+msgid "Congratulations!"
+msgstr "Geluk!"
+
+#: ../../standalone/drakautoinst_.c:113
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
+"Die floppie is sukselvol geskep.\n"
+"U kan nou weer 'n installasie uitspeel."
+
+#: ../../standalone/drakgw_.c:36 ../../standalone/drakgw_.c:181
 msgid "Internet Connection Sharing"
 msgstr "Internetkonneksiedeling"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Internetkonneksiedeling is ontsper"
 
-#: ../../standalone/drakgw_.c:119
-#, fuzzy
+#: ../../standalone/drakgw_.c:120
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
 "\n"
 "What would you like to do?"
-msgstr "Die opstelling van die Internetkonnkesiedeling is alreeds gedoen.\n"
+msgstr ""
+"Die opstelling van die Internetkonnkesiedeling is alreeds gedoen.\n"
+"Dis tans aktief.\n"
+"\n"
+"Wat wil u doen?"
 
-#: ../../standalone/drakgw_.c:123
-#, fuzzy
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
-msgstr "Tabel"
+msgstr "deaktiveer"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
-msgstr ""
+msgstr "ignoreer/sien oor"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
-#, fuzzy
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
-msgstr "Stel X op"
+msgstr "herkonfigureer"
 
-#: ../../standalone/drakgw_.c:126
-#, fuzzy
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
-msgstr "Toestel word afgetas..."
+msgstr "Bedieners word gedeaktiveer..."
 
-#: ../../standalone/drakgw_.c:134
-#, fuzzy
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
-msgstr "Internetkonneksiedeling is gesper"
+msgstr "Internetkonneksiedeling is gedeaktiveer"
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Internetkonneksiedeling is gesper"
 
-#: ../../standalone/drakgw_.c:144
-#, fuzzy
+#: ../../standalone/drakgw_.c:145
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
 "\n"
 "What would you like to do?"
-msgstr "Die opstelling van die Internetkonnkesiedeling is alreeds gedoen.\n"
+msgstr ""
+"Die opstelling van die Internetkonnkesiedeling is alreeds gedoen.\n"
+"Dis tans gedeaktiveer.\n"
+"\n"
+"Wat wil u doen?"
 
-#: ../../standalone/drakgw_.c:148
-#, fuzzy
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
-msgstr "Tabel"
+msgstr "Aktiveer"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
-msgstr ""
+msgstr "Bedieneers word aktiveer..."
 
-#: ../../standalone/drakgw_.c:160
-#, fuzzy
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
-msgstr "Internetkonneksiedeling is ontsper"
+msgstr "Internetkonneksiedeling is geaktiveer"
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "Konfigurasiel�erinhoud is onverstaanbaar"
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr ""
-
-#: ../../standalone/drakgw_.c:181
+#: ../../standalone/drakgw_.c:182
 #, fuzzy
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -6578,21 +7275,21 @@ msgstr ""
 "\n"
 "Wil u internetdeling opstel?\n"
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
-msgstr ""
+msgstr "Koppelvlak %s (met module %s)"
 
-#: ../../standalone/drakgw_.c:208
-#, fuzzy, c-format
+#: ../../standalone/drakgw_.c:209
+#, c-format
 msgid "Interface %s"
-msgstr "interessant"
+msgstr "Koppelvlak %s"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:217
 msgid "No network adapter on your system!"
 msgstr "Daar is geen netwerkkaart op hierdie rekenaar nie!"
 
-#: ../../standalone/drakgw_.c:217
+#: ../../standalone/drakgw_.c:218
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
@@ -6600,9 +7297,13 @@ msgstr ""
 "Geen ethernetkaart is op die stelsel gevind nie. Gebruik asb. die "
 "hardewarekonfigurasieprogram."
 
-#
 #: ../../standalone/drakgw_.c:224
-#, fuzzy, c-format
+msgid "Network interface"
+msgstr "Netwerkkoppelvlak"
+
+#
+#: ../../standalone/drakgw_.c:225
+#, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
 "\n"
@@ -6612,33 +7313,34 @@ msgid ""
 msgstr ""
 "Daar is net een konfigureerde netwerkkaart op u stelsel.\n"
 "\n"
-"$interface\n"
+"%s\n"
 "\n"
-"Wil u dit gebruik vir die LAN?"
+"Ek gaan nou u LAN met daardie kaart opstel."
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr ""
 "Kies asb. die netwerkkaart wat aan die loakel area netwerk gekoppel is."
 
-#: ../../standalone/drakgw_.c:242
-#, fuzzy
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
-"Waarskuwing! Die netwerkkaart is alreeds opgestel.]nWil u dit ooropstel?"
+"Waarskuwing! Die netwerkkaart is alreeds opgestel. Ek gaan dit "
+"herkonfigureer?"
 
-#: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
-msgstr "Moontlike LAN-adresbotsing gevind in konfigurasie $_!\n"
+#: ../../standalone/drakgw_.c:254
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr "Moontlike LAN-adresbotsing gevind in konfigurasie %s!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "Vuurmuurkonfigurasie gevind!"
 
-#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:263 ../../standalone/drakgw_.c:269
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
@@ -6646,53 +7348,44 @@ msgstr ""
 "Waarskuwing! 'n Bestaande vuurmuurkonfigurasie is bespeur. U sal dalk na "
 "dietyd self regstellings moet aanbring."
 
-#: ../../standalone/drakgw_.c:276
-#, fuzzy
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
-msgstr "IDE word opgestel"
+msgstr "Konfigurasie in aabou..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 "Skrips word konfigureer, sagterware installeer en bedieners afgeskop..."
 
-#: ../../standalone/drakgw_.c:307
-#, fuzzy
-msgid "Problems installing package $_"
-msgstr "Installeer pakket %s"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "Geluk!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Probleme met Installasue van pakket %s"
 
-#: ../../standalone/drakgw_.c:591
+#: ../../standalone/drakgw_.c:600
 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 ""
 
-#: ../../standalone/drakgw_.c:608
-#, fuzzy
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
-msgstr "Die opstelling van die Internetkonnkesiedeling is alreeds gedoen.\n"
+msgstr "Die opstelling van is alreeds gedoen, maar is tans gedeaktiveer."
 
-#: ../../standalone/drakgw_.c:609
-#, fuzzy
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
-msgstr "Die opstelling van die Internetkonnkesiedeling is alreeds gedoen.\n"
+msgstr "Die opstelling is alreeds gedoen en is alreeds ook geaktiveer."
 
-#: ../../standalone/drakgw_.c:610
-#, fuzzy
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
-msgstr "Internetkonneksiedeling is ontsper"
+msgstr "Geen internetkonneksiedeling is al gekonfigureer nie."
 
-#: ../../standalone/drakgw_.c:615
-#, fuzzy
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
-msgstr "Internetkonneksie en konfigurasie"
+msgstr "Internetkonneksiedelingkonfigurasie"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, fuzzy, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -6702,92 +7395,82 @@ msgid ""
 "Click on Configure to launch the setup wizard."
 msgstr "Internetkonneksiedeling"
 
-#: ../../standalone/draknet_.c:59
-#, fuzzy, c-format
+#: ../../standalone/draknet_.c:79
+#, c-format
 msgid "Network configuration (%d adapters)"
-msgstr "Netwerkkonfigurasie"
+msgstr "Netwerkkonfigurasie (%d toestelle)"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:539
-#, fuzzy
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 msgid "Profile: "
-msgstr "heg het gefaal"
+msgstr "Profiel:"
 
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:94
 msgid "Del profile..."
-msgstr ""
+msgstr "Vee profiel uit..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
-msgstr ""
+msgstr "Profiel om uit te vee..."
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
-msgstr ""
+msgstr "Nuwe profiel..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
+#: ../../standalone/draknet_.c:134
+msgid ""
+"Name of the profile to create (the new profile is created as a copy of the "
+"current one) :"
 msgstr ""
 
-#: ../../standalone/draknet_.c:140
-#, fuzzy
+#: ../../standalone/draknet_.c:160
 msgid "Hostname: "
-msgstr "Rekenaarnaam:"
+msgstr "Bedienernaam:"
 
-#: ../../standalone/draknet_.c:147
-#, fuzzy
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
-msgstr "interessant"
+msgstr "Internettoegang"
 
-#: ../../standalone/draknet_.c:160
-#, fuzzy
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
 msgstr "Tipe:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "Portaal:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
-#, fuzzy
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Interface:"
-msgstr "interessant"
+msgstr "Koppelvlak:"
 
-#: ../../standalone/draknet_.c:168
+#: ../../standalone/draknet_.c:192
 msgid "Status:"
-msgstr ""
+msgstr "Status:"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:122 ../../standalone/net_monitor_.c:224
-#, fuzzy
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 msgid "Connected"
-msgstr "Konneksienaam"
+msgstr "Gekonnekteer"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:83 ../../standalone/net_monitor_.c:122
-#: ../../standalone/net_monitor_.c:224
-#, fuzzy
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 msgid "Not connected"
-msgstr "Kabelkonneksie"
+msgstr "Nie gekonnekteer nieKabelkonneksie"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
-msgstr ""
+msgstr "Konnekteer..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Disconnect..."
-msgstr ""
+msgstr "Diskonnekteer..."
 
-#: ../../standalone/draknet_.c:191
-#, fuzzy
+#: ../../standalone/draknet_.c:215
 msgid "Starting your connection..."
-msgstr "Konfigureer internetkonneksie"
+msgstr "Konneksie word begin..."
 
-#: ../../standalone/draknet_.c:199
-#, fuzzy
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
-msgstr "Konfigureer internetkonneksie"
+msgstr "Konneksie word afgesluit..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -6795,139 +7478,114 @@ msgid ""
 "in root."
 msgstr ""
 
-#: ../../standalone/draknet_.c:207
-#, fuzzy
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
-msgstr "Hoe wil u aan die internet konnekteer?"
+msgstr "Die stelsel is nou ontkoppel."
 
-#: ../../standalone/draknet_.c:219
-#, fuzzy
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
-msgstr "Konfigureer dienste"
+msgstr "Konfigureer internettoegang..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
-#, fuzzy
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
-msgstr "ADSL konfigurasie"
-
-#: ../../standalone/draknet_.c:231
-#, fuzzy
-msgid "Adapter"
-msgstr "Opgradeer"
+msgstr "LAN-konfigurasie"
 
-#: ../../standalone/draknet_.c:231
-#, fuzzy
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
-msgstr "Bediener"
+msgstr "Drywer"
 
-#: ../../standalone/draknet_.c:231
-#, fuzzy
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
-msgstr "interessant"
+msgstr "Koppelvlak"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
-msgstr ""
+msgstr "Protokol"
 
-#: ../../standalone/draknet_.c:250
-#, fuzzy
+#: ../../standalone/draknet_.c:255
+msgid "State"
+msgstr "Toestand"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
-msgstr "Stel plaaslike netwerk op"
+msgstr "Stel plaaslike netwerk op..."
 
-#: ../../standalone/draknet_.c:283
-#, fuzzy
-msgid "Normal Mode"
-msgstr "Normaal"
+#: ../../standalone/draknet_.c:279
+msgid "Click here to launch the wizard ->"
+msgstr ""
 
-#: ../../standalone/draknet_.c:288
+#: ../../standalone/draknet_.c:306
 msgid "Apply"
-msgstr ""
+msgstr "Pas toe"
 
-#: ../../standalone/draknet_.c:307
-#, fuzzy
+#: ../../standalone/draknet_.c:325
 msgid "Please Wait... Applying the configuration"
-msgstr "Toets konfigurasie"
+msgstr "Wag asb... Konfigurasie word toegpas"
 
-#: ../../standalone/draknet_.c:391
+#: ../../standalone/draknet_.c:428
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 
-#: ../../standalone/draknet_.c:415
-#, fuzzy
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
-msgstr "ADSL konfigurasie"
+msgstr "LAN konfigurasie"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
-msgstr ""
+msgstr "Toestel %s: %s"
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
-msgstr ""
+msgstr "Herlaaiprotokol"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
-msgstr ""
+msgstr "Gelaai tydens herlaaityd"
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
-msgstr ""
+msgstr "DHCP-kli�nt"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-#, fuzzy
-msgid "Disable"
-msgstr "Tabel"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+msgid "activate now"
+msgstr "Aktiveer nou dadelik"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-#, fuzzy
-msgid "Enable"
-msgstr "Tabel"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+msgid "desactivate now"
+msgstr "deaktiveer nou dadelik"
 
-#: ../../standalone/draknet_.c:504
+#: ../../standalone/draknet_.c:538
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
 msgstr ""
 
-#: ../../standalone/draknet_.c:528
-#, fuzzy
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
-msgstr "Internetkonneksie en konfigurasie"
+msgstr "Internetkonneksiekonfigurasie"
 
-#: ../../standalone/draknet_.c:532
-#, fuzzy
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
-msgstr "Internetkonneksie en konfigurasie"
+msgstr "Internetkonneksiekonfigurasie"
 
-#: ../../standalone/draknet_.c:541
-#, fuzzy
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
-msgstr "Konneksienaam"
+msgstr "Konneksietipe:"
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
-msgstr ""
-
-#: ../../standalone/draknet_.c:560
-#, fuzzy
-msgid "Provider dns 1 (optional)"
-msgstr "Voorsiener DNS 1"
-
-#: ../../standalone/draknet_.c:561
-#, fuzzy
-msgid "Provider dns 2 (optional)"
-msgstr "Voorsiener DNS 2"
+msgstr "Parameters"
 
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
-msgstr ""
+msgstr "Ethernetkaart"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
-msgstr ""
+msgstr "DHCP-Kli�nt"
 
 #: ../../standalone/draksec_.c:21
 msgid "Welcome To Crackers"
@@ -6997,133 +7655,67 @@ msgstr ""
 "Hierdie is Vlak-4 sekuriteit, maar die stelsel is afgeslote.\n"
 "Sekuriteitseienskappe is maksimaal."
 
-#: ../../standalone/draksec_.c:52
-msgid "Setting security level"
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
 msgstr "Sekuriteitsvlak word gestel."
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/draksec_.c:67
 #, fuzzy
+msgid "Use libsafe for servers"
+msgstr "Selekteer opsies vir bediener"
+
+#: ../../standalone/draksec_.c:68
+msgid ""
+"A library which defends against buffer overflow and format string attacks."
+msgstr ""
+
+#: ../../standalone/draksec_.c:72
+msgid "Setting security level"
+msgstr "Sekuriteitsvlak word gestel."
+
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
-msgstr "Konnekteer aan die internet"
+msgstr "Beheersentrum"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "Kies die instrument wat u wil gebruik"
 
 #: ../../standalone/keyboarddrake_.c:16
 msgid "usage: keyboarddrake [--expert] [keyboard]\n"
-msgstr ""
+msgstr "gebruik: keyboarddrake [--expert] [SleutelbordNaam]\n"
 
 #: ../../standalone/keyboarddrake_.c:36
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr ""
+"Wil u h� dat die 'BackSpace' sleutel moet uitvee in die konsole ('n 'Delete' "
+"terugstuur)?"
 
 #: ../../standalone/livedrake_.c:23
-#, fuzzy
 msgid "Change Cd-Rom"
-msgstr "Verander resolusie"
+msgstr "Verander CDROM"
 
 #: ../../standalone/livedrake_.c:24
-#, fuzzy
 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 ""
-"Verander u CDROM!\n"
-"\n"
-"Sit asb. die CDROM getiteld \"%s\" in die aandrywer en druk OK. Indien u "
-"nie\n"
-"hieroor beskik nie, druk Kanselleer om installasies vanaf di� CDROM te vermy."
+"Dit asb. die instasllasie CDROM in die aandrywer en druk OK. Indien u nie\n"
+"hieroor beskik nie, druk Kanselleer om die intydse opgradering te vermy."
 
 #: ../../standalone/livedrake_.c:34
 msgid "Unable to start live upgrade !!!\n"
-msgstr ""
+msgstr "Kon nie die intydse opgradering begin nie !!!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "Geen 'serial_usb' gevind nie\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "Emuleer derde knop?"
 
-#
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "Toets asb. die muis"
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-#, fuzzy
-msgid "Network Monitoring"
-msgstr "Netwerkkonfigurasie"
-
-#: ../../standalone/net_monitor_.c:56
-msgid "Statistics"
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:59
-msgid "Sending Speed: "
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:61
-msgid "Receiving Speed: "
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:66
-#, fuzzy
-msgid "Close"
-msgstr "USB Muis"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Connecting to Internet "
-msgstr "Konnekteer aan die internet"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Disconnecting from Internet "
-msgstr "Diskonnekteer van die internet"
-
-#: ../../standalone/net_monitor_.c:114
-#, fuzzy
-msgid "Disconnection from Internet failed."
-msgstr "Diskonnekteer van die internet"
-
-#: ../../standalone/net_monitor_.c:115
-#, fuzzy
-msgid "Disconnection from Internet complete."
-msgstr "Diskonnekteer van die internet"
-
-#: ../../standalone/net_monitor_.c:117
-#, fuzzy
-msgid "Connection complete."
-msgstr "Konneksienaam"
-
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:222
-#, fuzzy
-msgid "Connect"
-msgstr "Konneksienaam"
-
-#: ../../standalone/net_monitor_.c:222
-#, fuzzy
-msgid "Disconnect"
-msgstr "Kabelkonneksie"
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "Vuurmuurkonfigurasie"
@@ -7146,17 +7738,88 @@ msgid ""
 "\n"
 "Click on Configure to set up a standard firewall"
 msgstr ""
+"Vuurmuur\n"
+"\n"
+"Kliek op Konfigureer om die standaard vuurmuur op te stel."
+
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "Kies u taal"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Kies installasieklas"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Hardeskyfdeteksie."
 
-#: ../../tinyfirewall.pm_.c:10
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Stel muistoestel op"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Kies u sleutelbord"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "Sekuriteit"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Stel l�erstelsels op"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Formateer partisies"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Kies pakkette om te installeer"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Installeer stelsel"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "Voeg 'n gebruiker by"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Stel netwerk op"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Konfigureer dienste"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Maar 'n herlaaiskyf"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Installeer herlaaistelsel"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Stel X op"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Verlaay installasie"
+
+#: ../../tinyfirewall.pm_.c:9
 msgid ""
 "tinyfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Linux Mandrake machine.\n"
+"This configures a personal firewall for this Mandrake Linux machine.\n"
 "For a powerful dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:15
+#: ../../tinyfirewall.pm_.c:14
 msgid ""
 "We'll now ask you questions about which services you'd like to allow\n"
 "the Internet to connect to.  Please think carefully about these\n"
@@ -7167,7 +7830,7 @@ msgid ""
 "re-running this application!"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:22
+#: ../../tinyfirewall.pm_.c:21
 msgid ""
 "Are you running a web server on this machine that you need the whole\n"
 "Internet to see? If you are running a webserver that only needs to be\n"
@@ -7175,7 +7838,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:27
+#: ../../tinyfirewall.pm_.c:26
 msgid ""
 "Are you running a name server on this machine? If you didn't set one\n"
 "up to give away IP and zone information to the whole Internet, please\n"
@@ -7183,7 +7846,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:32
+#: ../../tinyfirewall.pm_.c:31
 msgid ""
 "Do you want to allow incoming Secure Shell (ssh) connections? This\n"
 "is a telnet-replacement that you might use to login. If you're using\n"
@@ -7192,7 +7855,7 @@ msgid ""
 "it. ssh is encrypted and doesn't allow for this eavesdropping."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:37
+#: ../../tinyfirewall.pm_.c:36
 msgid ""
 "Do you want to allow incoming telnet connections?\n"
 "This is horribly unsafe, as we explained in the previous screen. We\n"
@@ -7200,7 +7863,7 @@ msgid ""
 "telnet.\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:42
+#: ../../tinyfirewall.pm_.c:41
 msgid ""
 "Are you running an FTP server here that you need accessible to the\n"
 "Internet? If you are, we strongly recommend that you only use it for\n"
@@ -7208,7 +7871,7 @@ msgid ""
 "attackers, since FTP also uses no encryption for transferring passwords.\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:47
+#: ../../tinyfirewall.pm_.c:46
 msgid ""
 "Are you running a mail server here? If you're sending you \n"
 "messages through pine, mutt or any other text-based mail client,\n"
@@ -7216,7 +7879,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:52
+#: ../../tinyfirewall.pm_.c:51
 msgid ""
 "Are you running a POP or IMAP server here? This would\n"
 "be used to host non-web-based mail accounts for people via \n"
@@ -7224,7 +7887,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:57
+#: ../../tinyfirewall.pm_.c:56
 msgid ""
 "You appear to be running a 2.2 kernel.  If your network IP\n"
 "is automatically set by a computer in your home or office \n"
@@ -7232,7 +7895,7 @@ msgid ""
 "this the case?\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:62
+#: ../../tinyfirewall.pm_.c:61
 msgid ""
 "Is your computer getting time syncronized to another computer?\n"
 "Mostly, this is used by medium-large Unix/Linux organizations\n"
@@ -7241,308 +7904,1012 @@ msgid ""
 "aren't."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
 "\n"
 "\n"
 msgstr ""
+"Konfigurasie is voltooi. Moet ons hierdie veranderinge na skyf skryf?\n"
+"\n"
+"\n"
+"\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
-msgstr ""
+msgstr "Kan nie %s oopmaak nie: %s\n"
 
-#: ../../tinyfirewall.pm_.c:85
-#, fuzzy, c-format
+#: ../../tinyfirewall.pm_.c:84
+#, c-format
 msgid "Can't open %s for writing: %s\n"
-msgstr "Four om %s in skryfmode te open: %s"
+msgstr "Kon nie %s in skryfmode oopmaak nie: %s\n"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr ""
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
+#
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Development"
-msgstr "Ontwikkeling"
+msgid "Network Computer (client)"
+msgstr "Netwerkrekenaar (kli�nt)"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Workstation"
-msgstr "Werkstasie"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS, SMB, Instaan- , SSH (Bedieners)"
 
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr ""
+msgid "Office"
+msgstr "Kantoor"
 
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr ""
+msgid "Gnome Workstation"
+msgstr "Gnome werkstasie"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia - Graphics"
-msgstr "Multimedia"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Nutsprogramme vir PalmPilot en/of Visor"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet"
-msgstr "interessant"
+msgid "Workstation"
+msgstr "Werkstasie"
 
-#
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer (client)"
-msgstr "Netwerkdrukker (sok)"
+msgid "Firewall/Router"
+msgstr "Vuurmuur/Netwerkroteerder"
 
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgid "Domain Name and Network Information Server"
+msgstr "Domeinnaam en Netwerk Informasie Bediener (DNS/NIS)"
+
+#: ../../share/compssUsers:999
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
+"Kantoorprogramme: Woordverwerkers( kword, abiword), spreistate (kspread, "
+"gnumeric), PDF-sigprogramme, ens."
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet station"
-msgstr "Internetkonfigurasie"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Klankprogramme: MP3- of MIDI-spelers, mengers, ens."
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Kantoor"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Boeke en HOWTO's oor Linux en Vrye Sagteware"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia station"
-msgstr "Multimedia"
+msgid "KDE Workstation"
+msgstr "KDE werkstasie"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ens."
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
+msgid "Multimedia - Video"
+msgstr "Multimedia - Video"
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr ""
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Hulpprogramme vir e-pos, netnuus, web, FTP en netpraat"
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr ""
+msgid "Database"
+msgstr "Datbasis"
 
 #: ../../share/compssUsers:999
 msgid "PostgreSQL or MySQL database server"
-msgstr ""
+msgstr "PostgreSQL of MySQL databasisbediener"
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
+msgid "Tools to ease the configuration of your computer"
+msgstr "Hulpprogramme vir u rekenaarkonfigurasie te vergemaklik"
+
+#: ../../share/compssUsers:999
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Klank"
+
+#: ../../share/compssUsers:999
+msgid "Utilities"
+msgstr "Nutsprogramme"
 
 #: ../../share/compssUsers:999
 msgid "Documentation"
-msgstr "Dokumentasie"
+msgstr "dokumentasie"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr ""
+msgid "Console Tools"
+msgstr "Konsole hulpprogramme"
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr ""
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix e-posbediener, Inn netnuusbediener"
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr ""
+msgid "Internet station"
+msgstr "Internetstasie"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr ""
+msgid "Multimedia station"
+msgstr "Multimediastasie"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia - Sound"
-msgstr "Multimedia"
+msgid "Configuration"
+msgstr "Konfigurasie"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr ""
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Addisionele grafiese werkskerms (Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr ""
+"Die K-werkskermomgewing (KDE), die basiese grafiese omgewing met 'n "
+"versameling bygaande hulpprogramme"
 
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr ""
+msgid "Graphical Environment"
+msgstr "Grafiese omgewing"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr ""
+msgid "Development"
+msgstr "Ontwikkeling"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Scientific Workstation"
-msgstr "Werkstasie"
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr ""
+msgid "Tools to create and burn CD's"
+msgstr "Hulpprogramme vir die skep en brand van CDs"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr ""
+msgid "Office Workstation"
+msgstr "Kantoorwerkstasie"
 
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, ens."
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr ""
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafiese programme soos Die GIMP"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Games"
-msgstr "Gnome"
+msgid "DNS/NIS "
+msgstr "DNS/NIS "
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia - Video"
-msgstr "Multimedia"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C en C++ ontwikkelingsprogrammateke, programme en insluitl�ers"
 
 #
 #: ../../share/compssUsers:999
-#, fuzzy
 msgid "Network Computer server"
-msgstr "Netwerkdrukker (sok)"
+msgstr "Netwerkrekenaarbediener"
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr ""
+msgid "Mail/Groupware/News"
+msgstr "E-pos/Groepware/Netnuus"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Office Workstation"
-msgstr "Werkstasie"
+msgid "Game station"
+msgstr "Speletjiesrekenaar"
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
+msgid "Video players and editors"
+msgstr "Videospelers en -redigeerders"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr ""
+msgid "Multimedia - Graphics"
+msgstr "Multimedia - Grafika"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr ""
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Vermaak: Arkade, Bordspel, Strategie ens."
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Stel hulpprogramme om e-pos en netnuus te lees en te stuur (pine, mutt, tin) "
+"en om ook die web deur te blaai."
 
 #: ../../share/compssUsers:999
 msgid "Archiving, emulators, monitoring"
-msgstr ""
+msgstr "Aaaargivering, emulators, monitorprogramme"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr ""
+msgid "Personal Finance"
+msgstr "Persoonlike finansies"
 
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
 msgstr ""
+"'n Grafiese omgewing met  gebruikersvriendelike stel applikasies en "
+"werkskermhulpprogramme"
 
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr ""
+msgid "Clients for different protocols including ssh"
+msgstr "Kli�ntprogramme vir 'n verkeidenheid protokolle insluitende SSH"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Server"
-msgstr "X-bediener"
+msgid "Internet gateway"
+msgstr "Internetpoort"
 
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr ""
+msgid "Sound and video playing/editing programs"
+msgstr "Klank- en videospelers/redigeerders"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfigurasie"
+msgid "Other Graphical Desktops"
+msgstr "Ander grafiese werkskerms"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "KDE Workstation"
-msgstr "Werkstasie"
+msgid "Editors, shells, file tools, terminals"
+msgstr ""
+"Redigeerders. teksverwerkers, instruksiedoppe, l�ernutsprogramme, "
+"terminaalprogramme"
 
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr ""
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programme om u finansies te bestuur, soos GNUcash"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr ""
+msgid "Games"
+msgstr "Speletjies"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr ""
+msgid "Personal Information Management"
+msgstr "Persoonlike Inligtingbestuur."
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Gnome Workstation"
-msgstr "Werkstasie"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - CD Sny"
 
 #: ../../share/compssUsers:999
+msgid "Scientific Workstation"
+msgstr "Wetenskaplike werkstasie"
+
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "kan nie /etc/sysconfig/autologin oopmaak vir lees nie: %s"
+
+#~ msgid "Do you want to restart the network"
+#~ msgstr "Wil u die netwerk herlaai?"
+
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "Stem u saam?"
+
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "Ek gaan nou die netwerktoestel herlaai: \n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "Ek gaan nou die netwerktoestel %s herlaai. Stem u saam?"
+
 #, fuzzy
-msgid "Internet gateway"
-msgstr "interessant"
+#~ msgid ""
+#~ "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
+#~ "(primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+#~ msgstr ""
+#~ "Indien u spesifiek anders weet, is die gewone keuse \"/dev/hda\"\n"
+#~ "(prim�re meester IDE-skyf) of \"/dev/sda\" (eerste SCSI-skyf)."
 
-#: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr ""
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "Hier is die bestaande drukkertoue.\n"
+#~ "U kan byvoeg or verwyder soos nodig."
+
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr ""
+#~ "Konneksie tydlimiet (in sekondes) [ beta, nog nie ge�mplementeer nie ]"
+
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "Kon nie \"%s\" die verstek drukker maak nie!"
+
+#
+#~ msgid "Test the mouse here."
+#~ msgstr "Toets die muis hier."
+
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ msgstr "Kies voorkeurtaal vir installasie en stelselgebruik."
+
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr "Kies die sleutelborduitleg uit die bostaande lys"
+
+#~ msgid ""
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Customized: If you are familiar enough with GNU/Linux, you may then "
+#~ "choose\n"
+#~ "    the primary usage for your machine. See below for details.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
+#~ "    perform a highly customized installation. As for a \"Customized\"\n"
+#~ "    installation class, you will be able to select the usage for your "
+#~ "system.\n"
+#~ "    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
+#~ "DOING!"
+#~ msgstr ""
+#~ "Selekteer:\n"
+#~ "\n"
+#~ "  - Afgemeet: Indien u vertroud genoeg is met GNU/Linux, kan u die "
+#~ "prim�re\n"
+#~ "  gebruik van u rekenaar kies. Sien onder vir details.\n"
+#~ "\n"
+#~ "  - Kundige: Indien u vlot is in GNU/Linux en 'n hoogs aangepaste "
+#~ "installasie wil\n"
+#~ "  doen, kan u die deur die gebruik van u rekenaar te kies.\n"
+#~ "  MOET ASB. NIE HIERDIE OPSIE KIES INDIEN U NIE WEET WAT U DOEN NIE."
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Game station"
-msgstr "Dokumentasie"
+#~ msgid ""
+#~ "You must now define your machine usage. Choices are:\n"
+#~ "\n"
+#~ "* Workstation: this the ideal choice if you intend to use your machine "
+#~ "primarily for everyday use, at office or\n"
+#~ "  at home.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Development: if you intend to use your machine primarily for software "
+#~ "development, it is the good choice. You\n"
+#~ "  will then have a complete collection of software installed in order to "
+#~ "compile, debug and format source code,\n"
+#~ "  or create software packages.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Server: if you intend to use this machine as a server, it is the good "
+#~ "choice. Either a file server (NFS or\n"
+#~ "  SMB), a print server (Unix style or Microsoft Windows style), an "
+#~ "authentication server (NIS), a database\n"
+#~ "  server and so on. As such, do not expect any gimmicks (KDE, GNOME, "
+#~ "etc.) to be installed."
+#~ msgstr ""
+#~ "Die verskillende opsies vir u rekenaar se gebruik (indien u \"Afgemeet"
+#~ "\" \n"
+#~ "of  \"Kundige\" sou kies) is die volgende:\n"
+#~ "\n"
+#~ "  - Normaal: Indien die rekenaar prim�r vir daaglikse kantoorgebruik is.\n"
+#~ "     Moenie programmeringspakette verwag nie.\n"
+#~ "\n"
+#~ "  - Ontwikkeling: Indien die rekenaar vir programontwikkel;ing gebruik "
+#~ "sal\n"
+#~ "     word. 'n Volledige stel kompileerders, saamstellers en ontfouters "
+#~ "sal \n"
+#~ "     opgesit word.\n"
+#~ "\n"
+#~ "  - Bediener: Indien die rekenaar prim�r 'n bediener sal wees, hetsy met "
+#~ "NFS,\n"
+#~ "     SMB, drukkerbediening, NIS magtiging ens.\n"
+#~ "     Moenie vensterstelsels soos KDE en GNOME verwag nie.\n"
 
-#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "You may now select the group of packages you wish to\n"
+#~ "install or upgrade.\n"
+#~ "\n"
+#~ "\n"
+#~ "DrakX will then check whether you have enough room to install them all. "
+#~ "If not,\n"
+#~ "it will warn you about it. If you want to go on anyway, it will proceed "
+#~ "onto the\n"
+#~ "installation of all selected groups but will drop some packages of "
+#~ "lesser\n"
+#~ "interest. At the bottom of the list you can select the option \n"
+#~ "\"Individual package selection\"; in this case you will have to browse "
+#~ "through\n"
+#~ "more than 1000 packages..."
+#~ msgstr ""
+#~ "U kan nou die pakketgroepe kies wat u wil installeer of opgradeer.\n"
+#~ "\n"
+#~ "DrakX sal dan kyk of daar genoegsame spasie is vir die volledige "
+#~ "installasie.\n"
+#~ "Indien nie sal u verwittig word. Indien u voortgaan, sal van die minder "
+#~ "belangrike\n"
+#~ "pakkette nie installeer word nie.Heel onder kan u die opsie \"Individuele "
+#~ "pakketkeuses\"\n"
+#~ "kies waarna u deur meer as 'n 1000 pakkette sal moet blaai....."
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Tools to ease the configuration of your computer"
-msgstr "Wil u die konfigurasie toets?"
+#~ msgid ""
+#~ "If you have all the CDs in the list above, click Ok. If you have\n"
+#~ "none of those CDs, click Cancel. If only some CDs are missing, unselect "
+#~ "them,\n"
+#~ "then click Ok."
+#~ msgstr ""
+#~ "Indienu al die CDs in die bogenoemde lys het, kliek OK.\n"
+#~ "Indien u geen het nie, kliek Kanselleer.\n"
+#~ "Indien sekere CDs weg is, onselekteer hulle en kliek dan OK."
 
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, the correct informations can "
+#~ "be\n"
+#~ "obtained from your Internet Service Provider."
+#~ msgstr ""
+#~ "U kan nou die opbelopsie invul. Indien u\n"
+#~ "twyfel kry die korrekte inligting van u ISP."
+
+#, fuzzy
+#~ msgid ""
+#~ "You may now configure your network device.\n"
+#~ "\n"
+#~ "   * IP address: if you don't know or are not sure what to enter, ask "
+#~ "your network administrator.\n"
+#~ "     You should not enter an IP address if you select the option "
+#~ "\"Automatic IP\" below.\n"
+#~ "\n"
+#~ "   * Netmask: \"255.255.255.0\" is generally a good choice. If you don't "
+#~ "know or are not sure what to enter,\n"
+#~ "     ask your network administrator.\n"
+#~ "\n"
+#~ "   * Automatic IP: if your network uses BOOTP or DHCP protocol, select "
+#~ "this option. If selected, no value is needed in\n"
+#~ "    \"IP address\". If you don't know or are not sure if you need to "
+#~ "select this option, ask your network administrator."
+#~ msgstr ""
+#~ "Sleutel in:\n"
+#~ "\n"
+#~ "  - IP-adres: Indien u dit nie weet nie vra u netwerkadministrateur of "
+#~ "ISP.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Netmasker: \"255.255.255.0\" is gewoonlik 'n goeie keuse. Indien u "
+#~ "twyfel,\n"
+#~ "     vra die netwerkadministrateur of ISP.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Outomatiese IP: Indien u netwerk bootp of dhcp protokolle ondersteun, "
+#~ "kies\n"
+#~ "     hierdie opsie. In so 'n geval is 'n IP-adresinskrywing nie nodig "
+#~ "nie. Indien u\n"
+#~ "     twyfel, vra die netwerkadministrateur of ISP.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, ask your network administrator."
+#~ msgstr ""
+#~ "Indien u netwerk NIS gebruik, kies \"Gebruik NIS\". Indien u twyfel vra\n"
+#~ "die netwerkadministrateur."
 
-#~ msgid "%d minutes"
-#~ msgstr "%d minute"
+#~ msgid ""
+#~ "You may now enter dialup options. If you're not sure what to enter, the\n"
+#~ "correct information can be obtained from your ISP."
+#~ msgstr ""
+#~ "U kan nou die opbelopsie invul. Indien u\n"
+#~ "twyfel kry die korrekte inligting van u ISP."
 
-#~ msgid "1 minute"
-#~ msgstr "1 minuut"
+#~ msgid ""
+#~ "If you will use proxies, please configure them now. If you don't know if\n"
+#~ "you should use proxies, ask your network administrator or your ISP."
+#~ msgstr ""
+#~ "Indien u instaanbedieners wil gebruik, stel hulle hier op.. Indien u "
+#~ "twyfel vra\n"
+#~ "die netwerkadministrateur of ISP."
 
-#~ msgid "%d seconds"
-#~ msgstr "%d sekondes"
+#, fuzzy
+#~ msgid ""
+#~ "You can install cryptographic package if your internet connection has "
+#~ "been\n"
+#~ "set up correctly. First choose a mirror where you wish to download "
+#~ "packages and\n"
+#~ "after that select the packages to install.\n"
+#~ "\n"
+#~ "\n"
+#~ "Note you have to select mirror and cryptographic packages according\n"
+#~ "to your legislation."
+#~ msgstr ""
+#~ "U kan 'n kriptografiese pakket installeer indien u internetkonneksie reg "
+#~ "opgestel is.\n"
+#~ "Kies eers die spie�l waar u die pakket vanaf wil aflaai en kies dan die "
+#~ "pakkette\n"
+#~ "om te installeer.\n"
+#~ "\n"
+#~ "Let wel: U moet 'n spie�l en pakkette selekteer n.a.l plaaslike wetgewing."
 
 #, fuzzy
-#~ msgid "Lilo/Grub configuration"
+#~ msgid ""
+#~ "You can now enter the root password for your Mandrake Linux system.\n"
+#~ "The password must be entered twice to verify that both password entries "
+#~ "are identical.\n"
+#~ "\n"
+#~ "\n"
+#~ "Root is the system's administrator and is the only user allowed to modify "
+#~ "the\n"
+#~ "system configuration. Therefore, choose this password carefully. \n"
+#~ "Unauthorized use of the root account can be extemely dangerous to the "
+#~ "integrity\n"
+#~ "of the system, its data and other system connected to it.\n"
+#~ "\n"
+#~ "\n"
+#~ "The password should be a mixture of alphanumeric characters and at least "
+#~ "8\n"
+#~ "characters long. It should never be written down.\n"
+#~ "\n"
+#~ "\n"
+#~ "Do not make the password too long or complicated, though: you must be "
+#~ "able to\n"
+#~ "remember it without too much effort."
+#~ msgstr ""
+#~ "U kan nou die 'root' wagwoord voorsien vir u Mandrake Linux stelsel.\n"
+#~ "Die wagworod moet twee keer ingevoer word en te verfi�er dat dit\n"
+#~ "korrek is.\n"
+#~ "\n"
+#~ "\n"
+#~ "Root is die administrateur van die stelsel en is die enigste gebruiker\n"
+#~ "wat toegelaat wiord om die stelselkonfigurasie te verander. In di� lig,\n"
+#~ "kies asb. die wagwoord sorgvuldig. Ongemagtigde gebruik van die root\n"
+#~ "rekening kan uitermatiglik nadelig wees vir die integriteit van die\n"
+#~ "stelsel. Die wagwoord moet alfanumeries wees en ten minste 8 karakters\n"
+#~ "lank. MOENIE die wagwoord �rens neerskryf nie. Moet dit nie te lank of "
+#~ "te\n"
+#~ "ingwikkeld maak nie, u moet dit met min moeite onthou."
+
+#~ msgid ""
+#~ "You may now create one or more \"regular\" user account(s), as\n"
+#~ "opposed to the \"privileged\" user account, root. You can create\n"
+#~ "one or more account(s) for each person you want to allow to use\n"
+#~ "the computer. Note that each user account will have its own\n"
+#~ "preferences (graphical environment, program settings, etc.)\n"
+#~ "and its own \"home directory\", in which these preferences are\n"
+#~ "stored.\n"
+#~ "\n"
+#~ "\n"
+#~ "First of all, create an account for yourself! Even if you will be the "
+#~ "only user\n"
+#~ "of the machine, you may NOT connect as root for daily use of the system: "
+#~ "it's a\n"
+#~ "very high security risk. Making the system unusable is very often a typo "
+#~ "away.\n"
+#~ "\n"
+#~ "\n"
+#~ "Therefore, you should connect to the system using the user account\n"
+#~ "you will have created here, and login as root only for administration\n"
+#~ "and maintenance purposes."
+#~ msgstr ""
+#~ "U mag nou een of meer gewone gebruikersrekeninge skep. Dit is in\n"
+#~ "teenstelling met die bevoorregte 'root' rekening. Elke "
+#~ "gebruikersrekening\n"
+#~ "sal oor sy eie voorkeure (grafiese omgewing, programstelling, ens.) en\n"
+#~ "tuisgids (waar hierdie instellings gestoor word) beskik.\n"
+#~ "\n"
+#~ "\n"
+#~ "Derhalwe moet u in die stelsel intkeen met u eie gebruikerskode en slegs\n"
+#~ "'root' gebruik vir administratiewe doeleindes.\n"
+#~ "\n"
+#~ "Skep eerstens 'n rekening vir uself. Selfs indien u die enigste "
+#~ "gebruiker\n"
+#~ "op die stelsel sal wees, moet u NIE as 'root' vir u daaglikse gebruik\n"
+#~ "inteken NIE. 'n Onbruikbare stelsel kan net een tikfout ver weg wees.\n"
+#~ "\n"
+#~ "\n"
+#~ "Derhalwe moet u aanteken met die gebruikerskode wat u hier skep en "
+#~ "'root'\n"
+#~ "net vir admintratiewe doeleindes gebruik."
+
+#, fuzzy
+#~ msgid ""
+#~ "LILO and grub main options are:\n"
+#~ "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
+#~ "partition) that contains the boot sector. Unless you know specifically\n"
+#~ "otherwise, choose \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Delay before booting default image: Specifies the number in tenths\n"
+#~ "of a second the boot loader should wait before booting the first image.\n"
+#~ "This is useful on systems that immediately boot from the hard disk after\n"
+#~ "enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+#~ "omitted or is set to zero.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Video mode: This specifies the VGA text mode that should be selected\n"
+#~ "when booting. The following values are available: \n"
+#~ "\n"
+#~ "    * normal: select normal 80x25 text mode.\n"
+#~ "\n"
+#~ "    * <number>:  use the corresponding text mode.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Clean \"/tmp\" at each boot: if you want delete all files and "
+#~ "directories\n"
+#~ "stored in \"/tmp\" when you boot your system, select this option.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Precise RAM if needed: unfortunately, there is no standard method to "
+#~ "ask the\n"
+#~ "BIOS about the amount of RAM present in your computer. As consequence, "
+#~ "Linux may\n"
+#~ "fail to detect your amount of RAM correctly. If this is the case, you "
+#~ "can\n"
+#~ "specify the correct amount or RAM here. Please note that a difference of "
+#~ "2 or 4\n"
+#~ "MB between detected memory and memory present in your system is normal."
+#~ msgstr ""
+#~ "LILO en Grub hoof opsies is:\n"
+#~ "  - Herlaaitoestel: Stel die naam van die toestel (bv. hardeskyfpartisie\n"
+#~ "     wat die herlaaisektor bevat. Indien u spesifiek anders weet\n"
+#~ "     kies \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Wagperiode voor verstekbedryfstelsel gelaai word. Kies die syfer in\n"
+#~ "     tiendes van 'n sekonde at die herlaaistelsel moet wag.\n"
+#~ "     Hierdie is handig op stelsels wat onmiddelik die hardeskyf skop na "
+#~ "die\n"
+#~ "     sleutelbord geaktiveer is. Die herlaaistelsel sal nie wag nie indien "
+#~ "die\n"
+#~ "     wagperiode nul is.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Videomode: Kies die spesifieke VGA teksmode wat gebruik moet word "
+#~ "met\n"
+#~ "      herlaai. Die volgende waardes is beskikbaar:\n"
+#~ "      * normaal: selekteer normale 80x25 mode.\n"
+#~ "      * syfer: die ooreenstemmende teksmode."
+
+#~ msgid ""
+#~ "SILO is a bootloader for SPARC: it is able to boot\n"
+#~ "either GNU/Linux or any other operating system present on your computer.\n"
+#~ "Normally, these other operating systems are correctly detected and\n"
+#~ "installed. If this is not the case, you can add an entry by hand in this\n"
+#~ "screen. Be careful as to choose the correct parameters.\n"
+#~ "\n"
+#~ "\n"
+#~ "You may also want not to give access to these other operating systems to\n"
+#~ "anyone, in which case you can delete the corresponding entries. But\n"
+#~ "in this case, you will need a boot disk in order to boot them!"
+#~ msgstr ""
+#~ "SILO 'n herlaaiprogram vir SPARC. Dir kan GNU/Linux of enige ander\n"
+#~ "bedryfstelsel wat op u rekenar teenwoordig is, laai. Gewoonlik word "
+#~ "hierdie\n"
+#~ "bedryfstelsels reg bespeur en bygevoeg. Indien nie, kan u 'n inskrywing "
+#~ "maak\n"
+#~ "op hierdie skerm. Maak seker u kies die korrekte paramters.\n"
+#~ "\n"
+#~ "\n"
+#~ "U mag dalk toegang tot ander bedryfstelsels beperk, in welke geval u die "
+#~ "nodige\n"
+#~ "inskrywings kan uitvee. Maar dan het u die nodige herlaaiskywe nodig om "
+#~ "die\n"
+#~ "betrokke bedryfstelsels te laai."
+
+#~ msgid ""
+#~ "SILO main options are:\n"
+#~ "  - Bootloader installation: Indicate where you want to place the\n"
+#~ "information required to boot to GNU/Linux. Unless you know exactly\n"
+#~ "what you are doing, choose \"First sector of drive (MBR)\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Delay before booting default image: Specifies the number in tenths\n"
+#~ "of a second the boot loader should wait before booting the first image.\n"
+#~ "This is useful on systems that immediately boot from the hard disk after\n"
+#~ "enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+#~ "omitted or is set to zero."
+#~ msgstr ""
+#~ "SILO hoofkeuses is:\n"
+#~ "  - Herlaaitoestel: Waar wil u die inligting om GNU/Linux te laai plaas? "
+#~ "Die beste is\n"
+#~ "gewoonlik om \"Eerste hardeskyfsektor (MBR)\" te kies.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Wagperiode voor verstekbedryfstelsel gelaai word. Kies die syfer in\n"
+#~ "     tiendes van 'n sekonde at die herlaaistelsel moet wag.\n"
+#~ "     Hierdie is handig op stelsels wat onmiddelik die hardeskyf skop na "
+#~ "die\n"
+#~ "     sleutelbord geaktiveer is. Die herlaaistelsel sal nie wag nie indien "
+#~ "die\n"
+#~ "     wagperiode nul is."
+
+#~ msgid ""
+#~ "Now it's time to configure the X Window System, which is the\n"
+#~ "core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
+#~ "you must configure your video card and monitor. Most of these\n"
+#~ "steps are automated, though, therefore your work may only consist\n"
+#~ "of verifying what has been done and accept the settings :)\n"
+#~ "\n"
+#~ "\n"
+#~ "When the configuration is over, X will be started (unless you\n"
+#~ "ask DrakX not to) so that you can check and see if the\n"
+#~ "settings suit you. If they don't, you can come back and\n"
+#~ "change them, as many times as necessary."
+#~ msgstr ""
+#~ "Dit is tyd om die X-vensterstelsel op te stel. Hierdie is die kern van\n"
+#~ "die GNU/Linux grafiese omgewing. Vir hierdie doeleindes, moet u 'n "
+#~ "videokaart\n"
+#~ "en monitor kies. Meeste van hierdie stappe is outomaties en u moet net\n"
+#~ "verifi�er of dit korrek is.\n"
+#~ "\n"
+#~ "\n"
+#~ "Na konfigurasie sal X outmaties gelaai word, behalwe as u DrakX "
+#~ "andersins\n"
+#~ "aans�. Indien die stelling u nie pas nie, kom terug en verander so veel\n"
+#~ "keer soos nodig."
+
+#~ msgid ""
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
+#~ msgstr ""
+#~ "Indien iets verkeerd is in die X-konfigurasie, gebruik hierdie opsies om\n"
+#~ "die X-vensterstelsel reg op te stel."
+
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "Indien u verkies om 'n grafiese intekenarea te kry, kies \"Ja\", "
+#~ "andersins \"Nee\"."
+
+#~ msgid ""
+#~ "Your system is going to reboot.\n"
+#~ "\n"
+#~ "After rebooting, your new Mandrake Linux system will load automatically.\n"
+#~ "If you want to boot into another existing operating system, please read\n"
+#~ "the additional instructions."
+#~ msgstr ""
+#~ "U stelsel gaan nou herlaai.\n"
+#~ "\n"
+#~ "U nuwe Mandrake Linux stelsel sal outomaties laai. Indien u 'n ander\n"
+#~ " bedryfstelsel wil laai, lees die ekstra instruksies noukeurig deur."
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "Skryf /etc/fstab"
+
+#~ msgid "Restore from file"
+#~ msgstr "Herstel vanaf l�er"
+
+#~ msgid "Save in file"
+#~ msgstr "Stoor in l�er"
+
+#~ msgid "Restore from floppy"
+#~ msgstr "Herstel vanaf floppie"
+
+#~ msgid "Format all"
+#~ msgstr "Formatteer almal"
+
+#~ msgid "After formatting all partitions,"
+#~ msgstr "Na formatering van alle partisies"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "alle data om hierdie partisies sal verloor word"
+
+#~ msgid "Reload"
+#~ msgstr "Herlaai"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr "Wil u 'n outoinstallasieskyf maak vir Linux replikasie?"
+
+#~ msgid "ADSL configuration"
 #~ msgstr "ADSL konfigurasie"
 
 #, fuzzy
+#~ msgid ""
+#~ "With a remote CUPS server, you do not have to configure\n"
+#~ "any printer here; printers will be automatically detected\n"
+#~ "unless you have a server on a different network; in the\n"
+#~ "latter case, you have to give the CUPS server IP address\n"
+#~ "and optionally the port number."
+#~ msgstr ""
+#~ "Met 'n eksterne CUPS-bediener, hoef u glad nie 'n drukker hier\n"
+#~ "op te stel nie; drukkers wod outomaties bespeur.\n"
+#~ "Indien u twyfel, kies \"Eksterne CUPS-bediener\"."
+
+#~ msgid "Remote queue"
+#~ msgstr "Eksterne drukkertou"
+
+#~ msgid "Remote queue name missing!"
+#~ msgstr "Eksterne tounaam ontbreek!"
+
+#~ msgid "Command line"
+#~ msgstr "Instruksielyn"
+
+#~ msgid "Modify printer"
+#~ msgstr "Verander drukker"
+
+#~ msgid "start it"
+#~ msgstr "Laai dit"
+
+#~ msgid "Network Monitoring"
+#~ msgstr "Netwerkmonitor"
+
+#~ msgid "Profile "
+#~ msgstr "Profiel"
+
+#~ msgid "Connection Time: "
+#~ msgstr "Konneksietyd"
+
+#~ msgid "Connecting to Internet "
+#~ msgstr "Internetkonneksie"
+
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "Internetdiskonneksie"
+
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "Diskonnekteer van die internet het misluk."
+
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "Diskonneksie van die internet sukssevol"
+
+#~ msgid "Connection complete."
+#~ msgstr "Konneksie suksesvol"
+
+#~ msgid "Color configuration"
+#~ msgstr "Kleurkonfigurasie"
+
+#~ msgid "Connect"
+#~ msgstr "Konnekteer"
+
+#~ msgid "Disconnect"
+#~ msgstr "Diskonnekteer"
+
+#~ msgid "Default Runlevel"
+#~ msgstr "Verstek loopvlak"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#~ msgid "Remove queue"
+#~ msgstr "Verwyder tou"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "Konfigurasiel�erinhoud is onverstaanbaar"
+
+#~ msgid "Adapter"
+#~ msgstr "Toestel"
+
+#~ msgid "Disable network"
+#~ msgstr "Sper netwerkstelsel"
+
+#~ msgid "Enable network"
+#~ msgstr "Aktiveer netwerk"
+
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "DSL (of ADSL) konneksie"
+
+#~ msgid "Choose"
+#~ msgstr "kies"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr ""
+#~ "U kan die URI, om die drukker via CUPS te gebruik, direk spesifiseer"
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "Ja, druk ASCII toetsbladsy"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "Ja, druk die PostScript toetsbladsy"
+
+#~ msgid "Paper Size"
+#~ msgstr "Papiergrootte"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "Stoot papier uit na voltooiing?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "Uniprint-dryweropsies"
+
+#~ msgid "Color depth options"
+#~ msgstr "Kleurdiepte opsies"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "Druk teks as PostScript?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Korrigeer trapsgewyse teks?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "Aantal bladsye per uitsetblad?"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "Regs/Links kantlyne in punte (1/72 van 'n duim)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "Bo/Onder kantlyne in punte (1/72 van 'n duim)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "Ekstra GhostScriptopsies"
+
+#~ msgid "Extra Text options"
+#~ msgstr "Ekstra teksopsies"
+
+#~ msgid "Reverse page order"
+#~ msgstr "Omgekeerde bladsyorde"
+
+#~ msgid "CUPS starting"
+#~ msgstr "CUPS word gelaai"
+
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Kies eksterne drukkerkonneksie"
+
+#~ msgid ""
+#~ "Every printer need a name (for example lp).\n"
+#~ "Other parameters such as the description of the printer or its location\n"
+#~ "can be defined. What name should be used for this printer and\n"
+#~ "how is the printer connected?"
+#~ msgstr ""
+#~ "Elke drukker benodig 'n naam (bv. lp)\n"
+#~ "Ander parameters soos 'n beskrywing en 'n ligging kan ook gegee word.\n"
+#~ "Wat is die drukker se naam en wat is die konneksietipe?"
+
+#~ msgid ""
+#~ "Every print queue (which print jobs are directed to) needs a\n"
+#~ "name (often lp) and a spool directory associated with it. What\n"
+#~ "name and directory should be used for this queue and how is the printer "
+#~ "connected?"
+#~ msgstr ""
+#~ "Elke drukkertou (waar drukstukke heengaan) het 'n naam nodig \n"
+#~ "(baie keer 'lp') and 'n gekoppelde spoelgids. Watter naam en\n"
+#~ "spoelgids moet gebruik word?"
+
+#~ msgid "Name of queue"
+#~ msgstr "Tounaam"
+
+#~ msgid "Spool directory"
+#~ msgstr "Spoelgids"
+
+#~ msgid "Disable"
+#~ msgstr "Deaktiveer"
+
+#~ msgid "Enable"
+#~ msgstr "Aktiveer"
+
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "Om 'n veiliger stelsel te bou, moet u \"Gebruik skadul�er\" \n"
+#~ "en \"Gebruik MD5 wagwoorde\" kies."
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "Indien u netwerk NIS wil gebruik, kies \"Gebruik NIS\" hier. Indien u "
+#~ "twyfel vra\n"
+#~ "die sysadmin.."
+
+#~ msgid "yellow pages"
+#~ msgstr "geelbladsye"
+
+#~ msgid "Light configuration"
+#~ msgstr "Ligte konfigurasie"
+
+#~ msgid "Provider dns 1"
+#~ msgstr "Voorsiener DNS 1"
+
+#~ msgid "Provider dns 2"
+#~ msgstr "Voorsiener DNS 2"
+
+#, fuzzy
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "Wil u nou aan die internet konnekteer?"
+
+#, fuzzy
+#~ msgid "Lilo/Grub configuration"
+#~ msgstr "Konfigurasie"
+
+#, fuzzy
 #~ msgid "Selected size %d%s"
 #~ msgstr "Selekteer lOer"
 
@@ -7552,19 +8919,16 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Configure..."
-#~ msgstr "IDE word opgestel"
-
-#, fuzzy
-#~ msgid "Standard tools"
-#~ msgstr "Standaard"
+#~ msgstr "Stel X op"
 
 #, fuzzy
 #~ msgid "Configuration de Lilo/Grub"
-#~ msgstr "Konfigurasie: Voeg area by"
+#~ msgstr "Stel netwerk op"
 
 #~ msgid "This startup script try to load your modules for your usb mouse."
 #~ msgstr "Hierdie skrip laai de nodige modules vir 'n USB-muis."
 
+#, fuzzy
 #~ msgid ""
 #~ "Now that your Internet connection is configured,\n"
 #~ "your computer can be configured to share its Internet connection.\n"
@@ -7583,8 +8947,9 @@ msgstr ""
 #~ msgid "Automatic dependencies"
 #~ msgstr "Outomatiese afhanklikhede"
 
+#, fuzzy
 #~ msgid "Configure LILO/GRUB"
-#~ msgstr "Stel LILO/GRUB op"
+#~ msgstr "Stel X op"
 
 #~ msgid "Create a boot floppy"
 #~ msgstr "Maar 'n herlaaiskyf"
@@ -7678,9 +9043,7 @@ msgstr ""
 #~ msgstr "Diverse vrae"
 
 #~ msgid "Can't use supermount in high security level"
-#~ msgstr ""
-#~ "Superhegting (supermount) kan nie met 'n ho� sekuriteitsvlak gebruik word "
-#~ "nie"
+#~ msgstr "U kan nie supermount in  ho� sekuriteitsvlak gebruik nie."
 
 #~ msgid ""
 #~ "beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
@@ -7710,23 +9073,17 @@ msgstr ""
 #~ msgid "loopback"
 #~ msgstr "teruglus"
 
-#~ msgid "None"
-#~ msgstr "Niks"
-
 #~ msgid "Which bootloader(s) do you want to use?"
-#~ msgstr "Watter herlaaistelsel(s) wil u gebruik?"
+#~ msgstr "Watter herlaaistelsel(s) verlang u?"
 
 #~ msgid "Auto install floppy"
-#~ msgstr "Outoinstalleer floppie"
+#~ msgstr "Outoinstallasieskyf"
 
 #~ msgid "Try to find a modem?"
 #~ msgstr "Soekj vir 'n modem?"
 
 #~ msgid "Configure local network"
-#~ msgstr "Stel plaaslike netwerk op"
-
-#~ msgid "Disable networking"
-#~ msgstr "Sper netwerkstelsel"
+#~ msgstr "Stel netwerk op"
 
 #~ msgid ""
 #~ "Local networking has already been configured.\n"
@@ -7743,16 +9100,13 @@ msgstr ""
 #~ msgstr "Gnome"
 
 #~ msgid "Configure timezone"
-#~ msgstr "Stel tydsone op"
-
-#~ msgid "Configure printer"
-#~ msgstr "Stel drukker op"
+#~ msgstr "Konfigureer tydsone"
 
 #~ msgid "(may cause data corruption)"
 #~ msgstr "(kan data korrupteer)"
 
 #~ msgid "Use hard drive optimisations?"
-#~ msgstr "Gebruik skyfoptimisasie?"
+#~ msgstr "gebruik hardeksyfoptimisasie?"
 
 #~ msgid "Enable num lock at startup"
 #~ msgstr "Aansit van NumLock met herlaai"
@@ -7761,10 +9115,10 @@ msgstr ""
 #~ msgstr "Bevestig wagwoord"
 
 #~ msgid "default"
-#~ msgstr "Verstek"
+#~ msgstr "verstek"
 
 #~ msgid "What is your system used for?"
-#~ msgstr "Wat is die gebruik van u stelsel?"
+#~ msgstr "Waarvoor word u stelsel gebruik?"
 
 #~ msgid "Select the size you want to install"
 #~ msgstr "Kies die grootte van die installasie"
@@ -7772,8 +9126,9 @@ msgstr ""
 #~ msgid "Use diskdrake"
 #~ msgstr "Gebruik diskdrake"
 
+#
 #~ msgid "Customized"
-#~ msgstr "Aangepaste"
+#~ msgstr "Gespesialiseerde"
 
 #~ msgid ""
 #~ "Are you sure you are an expert? \n"
@@ -7798,7 +9153,7 @@ msgstr ""
 #~ msgstr "MD5"
 
 #~ msgid "Use MD5 passwords"
-#~ msgstr "gebruik MD5 wagwoorde"
+#~ msgstr "Gebruik MD5 wagwoorde"
 
 #~ msgid "Search"
 #~ msgstr "Soek"
@@ -7831,19 +9186,16 @@ msgstr ""
 #~ msgstr "Wys net eindnodes"
 
 #~ msgid "Expand all"
-#~ msgstr "Brei alles uit"
+#~ msgstr "Maak boom oop"
 
 #~ msgid "Collapse all"
-#~ msgstr "Trek alles in"
+#~ msgstr "Maak boom toe"
 
 #~ msgid "Add location of packages"
 #~ msgstr "Voeg pakketareas by"
 
 #~ msgid "Update location"
-#~ msgstr "Dateer area op"
-
-#~ msgid "Remove"
-#~ msgstr "Verwyder "
+#~ msgstr "Dateer ligging op"
 
 #~ msgid "Find Package"
 #~ msgstr "Soek pakket"
@@ -7854,9 +9206,6 @@ msgstr ""
 #~ msgid "Toggle between Installed and Available"
 #~ msgstr "Skakel tussen installeerde en beskikbare"
 
-#~ msgid "Uninstall"
-#~ msgstr "Verwyder"
-
 #~ msgid "Choose package to install"
 #~ msgstr "Kies pakket om te installeer"
 
@@ -7866,11 +9215,12 @@ msgstr ""
 #~ msgid "Wait"
 #~ msgstr "Wag"
 
+#
 #~ msgid "The following packages are going to be uninstalled"
 #~ msgstr "Die volgende pakkette gaan verwyder word"
 
 #~ msgid "Uninstalling the RPMs"
-#~ msgstr "RPM's word verwyder."
+#~ msgstr "De�nstallasie van RPMs"
 
 #~ msgid "Regexp"
 #~ msgstr "Regex"
@@ -7894,8 +9244,9 @@ msgstr ""
 #~ "rpmdrake is in lae-geheue opstelling.\n"
 #~ "Ek gaan rpmdrake herlaai om soektogte toe te laat."
 
+#
 #~ msgid "Which file are you looking for?"
-#~ msgstr "Watter l�er soek u vir?"
+#~ msgstr "Watter l�er verlang u?"
 
 #~ msgid "What are looking for?"
 #~ msgstr "Wat soek vir?"
@@ -7920,10 +9271,10 @@ msgstr ""
 #~ "Dit moet relatief tot bg. URL wees."
 
 #~ msgid "Please submit the following information"
-#~ msgstr "Verskaf asb. die volgende inligting"
+#~ msgstr "Voorsien asb. die volgende inligting"
 
 #~ msgid "%s is already in use"
-#~ msgstr "%s is alreeds in gebruik"
+#~ msgstr "%s is lareeds in gebruik"
 
 #~ msgid "Updating the RPMs base"
 #~ msgstr "Die RPM's se basis word opgedateer"
@@ -7961,7 +9312,7 @@ msgstr ""
 #~ msgstr "Indien u ADSL-modem 'n Alcatel is, kies Alcatel, andersins ECI."
 
 #~ msgid "don't use pppoe"
-#~ msgstr "moenie pppoe gebruik nie"
+#~ msgstr "moenie pppoe gebruik  nie"
 
 #~ msgid "mandatory"
 #~ msgstr "verpligtend"
@@ -8003,29 +9354,27 @@ msgstr ""
 #~ msgstr "Kon nie caching-nameserver RPM m.b.v. urpmi installeer nie.  "
 
 #~ msgid "Reconfigure local network"
-#~ msgstr "Herkonfigureer netwerk nou"
+#~ msgstr "Herkonfigureer plaaslike netwerk"
 
 #~ msgid ""
 #~ "Your computer can be configured to share its Internet connection.\n"
 #~ "\n"
-#~ msgstr ""
-#~ "U rekenaar kan opgestel word om sy internetkonneksie te deel.\n"
-#~ "\n"
+#~ msgstr "U rekenaar is opgestel om sy internet konneksie te deel.\n"
 
 #~ msgid "Everything has been configured.\n"
-#~ msgstr "Alles is opgestel.\n"
+#~ msgstr "Internetkonneksiedeling is ontsper.\n"
 
 #~ msgid "Connect to Internet with a normal modem"
-#~ msgstr "Konnekteer aan die internet met 'n gewone modem"
+#~ msgstr "Konnekteer aan die internet met  gewone modem"
 
 #~ msgid "Connect to Internet using ISDN"
 #~ msgstr "Konnekteer aan die internet met ISDN"
 
 #~ msgid "Connect to Internet using DSL (or ADSL)"
-#~ msgstr "Konnekteer aan die internet met DSL of ASDL"
+#~ msgstr "Konnekteer aan die internet met DSL (of ADSL)"
 
 #~ msgid "Connect to Internet using Cable"
-#~ msgstr "Konnekteer aan die internet met 'n kabelmodem"
+#~ msgstr "Konnekteer aan die internet met kabel"
 
 #~ msgid ""
 #~ "Time (secs) of inactivity after which\n"
@@ -8034,12 +9383,11 @@ msgstr ""
 #~ "Tyd, in sekondes, van onaktiwiteit voor diskonneksie.\n"
 #~ "Los oop om di� funksie te sper."
 
-#
 #~ msgid "Germany"
 #~ msgstr "Duitsland"
 
 #~ msgid "Germany (1TR6)"
-#~ msgstr "Duits (1TR6)"
+#~ msgstr "Duitsland (1TR6)"
 
 #~ msgid "What do you wish to do?"
 #~ msgstr "Wat wil u doen?"
@@ -8053,12 +9401,12 @@ msgstr ""
 #~ msgid "Which partition type do you want?"
 #~ msgstr "Watter partisietipe verlang u?"
 
-#
+#, fuzzy
 #~ msgid ""
 #~ "Choose \"Install\" if there are no previous versions of GNU/Linux\n"
 #~ "installed, or if you wish to use multiple distributions or versions.\n"
 #~ "\n"
-#~ "Choose \"Rescue\" if you wish to rescue a version of Linux-Mandrake "
+#~ "Choose \"Rescue\" if you wish to rescue a version of Mandrake Linux "
 #~ "already installed.\n"
 #~ "\n"
 #~ "\n"
@@ -8078,31 +9426,20 @@ msgstr ""
 #~ "    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
 #~ "DOING!\n"
 #~ msgstr ""
-#~ "Kies \"Installeer\" indien daar geen vorige weergawe van GNU/Linux\n"
-#~ "op is nie, of indien u 'n multidistribusie wil laat realiseer.\n"
-#~ "\n"
-#~ "Kies \"Redding\" indien u 'n bestaande weergawe van Mandrake Linux wil "
-#~ "red:\n"
-#~ "\n"
-#~ "\n"
 #~ "Selekteer:\n"
 #~ "\n"
-#~ "  - Aanbevole: Indien u nooit Linux vantevore installeer het nie,kies "
-#~ "hierdie een. \n"
-#~ "\n"
-#~ "  - Aangepas: Indien u vertroud genoeg is met GNU/Linux, kan u die "
+#~ "  - Afgemeet: Indien u vertroud genoeg is met GNU/Linux, kan u die "
 #~ "prim�re\n"
 #~ "  gebruik van u rekenaar kies. Sien onder vir details.\n"
 #~ "\n"
-#~ "  - Kundige: Indien u vlot is in GNU/Linux en 'n hoogs aangepaste  "
+#~ "  - Kundige: Indien u vlot is in GNU/Linux en 'n hoogs aangepaste "
 #~ "installasie wil\n"
 #~ "  doen, kan u die deur die gebruik van u rekenaar te kies.\n"
-#~ "  MOET ASB. NIE HIERDIE OPSIE KIES INDIEN U WERKLIK WEET WAAROOR DIT GAAN "
-#~ "NIE!\n"
+#~ "  MOET ASB. NIE HIERDIE OPSIE KIES INDIEN U NIE WEET WAT U DOEN NIE."
 
 #~ msgid ""
 #~ "At this point, you may choose what partition(s) to use to install\n"
-#~ "your Linux-Mandrake system if they have been already defined (from a\n"
+#~ "your Mandrake Linux system if they have been already defined (from a\n"
 #~ "previous install of GNU/Linux or from another partitioning tool). In "
 #~ "other\n"
 #~ "cases, hard drive partitions must be defined. This operation consists of\n"
@@ -8142,7 +9479,7 @@ msgstr ""
 #~ "\n"
 #~ "- Ctrl-m  to set the mount point\n"
 #~ msgstr ""
-#~ "U kan nou kies watter partisie(s) gebruik kan word om Linux-Mandrake\n"
+#~ "U kan nou kies watter partisie(s) gebruik kan word om Mandrake Linux\n"
 #~ "op te installeer indien hulle reeds bestaan (geskep uit 'n vorige "
 #~ "installasie,\n"
 #~ "of met 'n ander partisieprogram). In ander gevalle moet die partisies nog "
@@ -8255,7 +9592,7 @@ msgstr ""
 #~ "hardware.\n"
 #~ "\n"
 #~ "\n"
-#~ "If you install a Linux-Mandrake system on a machine which is part\n"
+#~ "If you install a Mandrake Linux system on a machine which is part\n"
 #~ "of an already existing network, the network administrator will\n"
 #~ "have given you all necessary information (IP address, network\n"
 #~ "submask or netmask for short, and hostname). If you're setting\n"
@@ -8277,7 +9614,7 @@ msgstr ""
 #~ "vertoon word waaruit u dan u kaart moet selekteer.\n"
 #~ "\n"
 #~ "\n"
-#~ "indien u Linux-Mandrake installeer op 'n stelsel wat deel is van 'n\n"
+#~ "indien u Mandrake Linux installeer op 'n stelsel wat deel is van 'n\n"
 #~ "bestaande netwerk, sal due netwerk administrateur u alreeds met die\n"
 #~ "nodige inligting (IP adres, netmasker en rekenaarnaam) voorsien het.\n"
 #~ "Indien u 'n privaat netwerk opstel (sso by die huis), dan moet u die\n"
@@ -8364,10 +9701,10 @@ msgstr ""
 #~ msgstr "Vergeet van die veranderinge?"
 
 #~ msgid "What is the type of your mouse?"
-#~ msgstr "Wat is u muistoestel?"
+#~ msgstr "Wat is u muistipe?"
 
 #~ msgid "Automatic resolutions"
-#~ msgstr "Outomatiese resolusies"
+#~ msgstr "OUtomatiese resolusies"
 
 #~ msgid ""
 #~ "To find the available resolutions I will try different ones.\n"
@@ -8434,10 +9771,10 @@ msgstr ""
 #~ msgstr "ATI Busmuis"
 
 #~ msgid "Microsoft Bus Mouse"
-#~ msgstr "Microsoft Busmuis"
+#~ msgstr "Microsoft busmuis"
 
 #~ msgid "Logitech Bus Mouse"
-#~ msgstr "Logitech Busmuis"
+#~ msgstr "Logitech busmuis"
 
 #~ msgid "USB Mouse (3 buttons or more)"
 #~ msgstr "USB Muis (3 knoppe of meer)"
@@ -8461,7 +9798,7 @@ msgstr ""
 #~ msgstr "Microsoft aanpasbaar (seriaal)"
 
 #~ msgid "Generic 3 Button Mouse (serial)"
-#~ msgstr "Generiese 3-knop Muis (seriaal)"
+#~ msgstr "Generiese 3-knopmuis (seriaal)"
 
 #~ msgid "Kensington Thinking Mouse (serial)"
 #~ msgstr "Kensington Thinking Mouse (seriaal)"
@@ -8469,14 +9806,12 @@ msgstr ""
 #~ msgid ""
 #~ "I need to configure your network adapter to be able to connect to "
 #~ "internet."
-#~ msgstr "Ek moet nou u netwerkkaart konfigureer vir die internet"
+#~ msgstr ""
+#~ "Ek moet u netwerkkaart konfigureer om aan die internet te konnekteer."
 
 #~ msgid "nfs mount failed"
 #~ msgstr "NFS heg het gefaal"
 
-#~ msgid "CHAP"
-#~ msgstr "CHAP"
-
 #~ msgid "Socket"
 #~ msgstr "Sok"
 
@@ -8496,10 +9831,10 @@ msgstr ""
 #~ "Wil u XFree 3.3 behou?"
 
 #~ msgid "Configure LAN"
-#~ msgstr "Konfigureer LAN"
+#~ msgstr "Stel LAN op"
 
 #~ msgid "End configuration"
-#~ msgstr "Be�indig konfigurasie"
+#~ msgstr "Sluit konfigurasie af"
 
 #~ msgid "Do not set up networking"
 #~ msgstr "Moenie netwerk opstel nie"
@@ -8513,8 +9848,9 @@ msgstr ""
 #~ msgid "Show more"
 #~ msgstr "Vertoon meer"
 
+#, fuzzy
 #~ msgid "tie"
-#~ msgstr "das"
+#~ msgstr "koppel"
 
 #~ msgid "brunette"
 #~ msgstr "brunette"
@@ -8525,55 +9861,51 @@ msgstr ""
 #~ msgid "woman-blond"
 #~ msgstr "blondine"
 
+#, fuzzy
 #~ msgid "automagic"
-#~ msgstr "outowonder"
+#~ msgstr "automagic"
 
 #~ msgid "What is your keyboard layout?"
 #~ msgstr "Wat is u sleutelborduitleg?"
 
 #~ msgid "Try to find PCMCIA cards?"
-#~ msgstr "Wil u PCMCIA-kaarte soek?"
+#~ msgstr "Soek PCMCIA-kaarte?"
 
 #~ msgid "Try to find %s devices?"
 #~ msgstr "Soek vir %s-toestelle?"
 
-#~ msgid "Modem Configuration"
-#~ msgstr "Modemkonfigurasie"
-
 #~ msgid ""
 #~ "Do you want to configure a dialup connection with modem for your system?"
-#~ msgstr "Wil u 'n opbelkonneksie (modem) vir u stelsel opstel?"
+#~ msgstr "Wil u die opbelkonneksie (modem) konfigureer?"
 
 #~ msgid "Try to find PCI devices?"
 #~ msgstr "Soek vir PCI-toestelle?"
 
 #~ msgid "Searching root partition."
-#~ msgstr "Deursoek wortell�erstelsel"
+#~ msgstr "Wortelpartisisie word gesoek."
 
 #~ msgid "%s: This is not a root partition, please select another one."
 #~ msgstr ""
 #~ "%s: Hierdie is nie 'n wortell�erstelsel nie, kies asb. 'n ander een."
 
-#~ msgid "No root partition found"
-#~ msgstr "Geen basisl�erstelsel gevind nie"
-
 #~ msgid "Please choose a partition to use as your root partition."
 #~ msgstr "Watter partisie moet u wortelpartisie wees?"
 
 #~ msgid "You don't have any windows partitions!"
-#~ msgstr "U het geen Windowspartisies nie!"
+#~ msgstr "U het geen Windows-partisies nie!"
 
 #~ msgid "You don't have any enough room for Lnx4win"
-#~ msgstr "U het nie genoeg plek vir Lnx4win nie"
+#~ msgstr "U het nie genoeg spasie vir Lnx4win nie."
 
 #~ msgid ", %U MB"
 #~ msgstr ", %U MB"
 
-# NOTE: this message will be displayed by lilo at boot time; that is
-# using the BIOS font; that means cp437 charset on 99.99% of PC computers
-# out there. It is then suggested that for non latin languages an ascii
-# transliteration be used; or maybe the english text be used; as it is best
-# When possible cp437 accentuated letters can be used too.
+# 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)
+#
+#, fuzzy
 #~ msgid ""
 #~ "Welcome to LILO the operating system chooser!\n"
 #~ "\n"
@@ -8583,17 +9915,20 @@ msgstr ""
 #~ "for default boot.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Welkom by LILO die bedryfstelselkeuseprogram!\n"
+#~ "Welkom by %s die bedryfstelselkeuseprogram!\n"
 #~ "\n"
-#~ "Om die moontlikehede te vertoon, druk <TAB>.\n"
+#~ "Om die moontlikhede te vertoon, druk <TAB>.\n"
 #~ "\n"
 #~ "Om 'n spesifieke een te laai, tik die nodige naam en druk <ENTER> of wag\n"
-#~ "%ds en dit verstek bedryfstelsel sal laai.\n"
+#~ "%ds en die verstek bedryfstelsel sal laai.\n"
 #~ "\n"
 
-# 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
+# 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)
+#
+#, fuzzy
 #~ msgid ""
 #~ "Welcome to SILO the operating system chooser!\n"
 #~ "\n"
@@ -8603,9 +9938,9 @@ msgstr ""
 #~ "wait %d seconds for default boot.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Welkom by SILO die bedryfstelselkeuseprogram!\n"
+#~ "Welkom by %s die bedryfstelselkeuseprogram!\n"
 #~ "\n"
-#~ "Om die moontlikehede te vertoon, druk <TAB>.\n"
+#~ "Om die moontlikhede te vertoon, druk <TAB>.\n"
 #~ "\n"
 #~ "Om 'n spesifieke een te laai, tik die nodige naam en druk <ENTER> of wag\n"
 #~ "%ds en die verstek bedryfstelsel sal laai.\n"
@@ -8618,7 +9953,7 @@ msgstr ""
 #~ "Here are the following entries in SILO.\n"
 #~ "You can add some more or change the existing ones."
 #~ msgstr ""
-#~ "Hier is die huidige inskrywings in SILO.\n"
+#~ "Hier is die huidige SILO-inskrywings\n"
 #~ "U kan byvoeg or verwyder soos nodig."
 
 #~ msgid "This label is already in use"
diff --git a/perl-install/share/po/az.po b/perl-install/share/po/az.po
index d214825bb..ece4a28e4 100644
--- a/perl-install/share/po/az.po
+++ b/perl-install/share/po/az.po
@@ -4,137 +4,142 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-10 18:32+0200\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
 "PO-Revision-Date: 2001-06-09 23:30GMT +0200\n"
-"Last-Translator: Vasif �smay�lo�lu MD <azerb_linux@hotmail.com>\n"
+"Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkish <linuxaz@azerimal.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-9E\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
-msgstr "B�t�n ba�l�qlar� ayr� ayr� qura�d�r"
+#: ../../Xconfigurator.pm_.c:231
+msgid "Configure all heads independently"
+msgstr "Bütün başlıqları ayrı ayrı quraşdır"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
-msgstr "Xinerama ifad�l�rini i�l�t"
+msgstr "Xinerama ifadələrini işlət"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
-msgstr "T�kc� \"%s\" kart�n� qur (%s)"
+msgstr "Təkcə \"%s\" kartını qur (%s)"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
-msgstr "�oxlu Ba�l�q qura�d�r�lmas�"
+msgstr "Çoxlu Başlıq quraşdırılması"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:239
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
-"Sizin sisteminiz �oxlu ba�l�q qura�d�rmas�n� d�st�kl�yir.\n"
-"N� etm�k ist�yirsiniz?"
+"Sizin sisteminiz çoxlu başlıq quraşdırmasını dəstəkləyir.\n"
+"Nə etmək istəyirsiniz?"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
-msgstr "Ekran kart�"
+msgstr "Ekran kartı"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
-msgstr "Ekran kart�n�z� se�in"
+msgstr "Ekran kartınızı seçin"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
-msgstr "Bir X vericisi se�in"
+msgstr "Bir X vericisi seçin"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "X server"
 msgstr "X verici"
 
-#: ../../Xconfigurator.pm_.c:309 ../../Xconfigurator.pm_.c:316
-#: ../../Xconfigurator.pm_.c:366
+#: ../../Xconfigurator.pm_.c:307 ../../Xconfigurator.pm_.c:313
+#: ../../Xconfigurator.pm_.c:363 ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s"
 msgstr "XFree %s"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:310
 msgid "Which configuration of XFree do you want to have?"
-msgstr "Nec� bir XFree qur�usunu ist�yirsiniz?"
+msgstr "Necə bir XFree qurğusunu istəyirsiniz?"
 
-#: ../../Xconfigurator.pm_.c:324
+#: ../../Xconfigurator.pm_.c:321
 #, 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 ""
-"Sizin kart�n�z�n 3D s�r'�tl�ndirm� d�st�yi ola bil�r, amma sadec� olaraq "
+"Sizin kartınızın 3D sür'ətləndirmə dəstəyi ola bilər, amma sadecə olaraq "
 "XFree %s\n"
-"il� d�zg�n i�l�y�r.\n"
-"Sizin kart�n�za XFree %s t�r�find�n d�st�k verilir ve bu 2D ���n daha yax�� "
+"ilə düzgün işləyər.\n"
+"Sizin kartınıza XFree %s tərəfindən dəstək verilir ve bu 2D üçün daha yaxşı "
 "bir fikir olar."
 
-#: ../../Xconfigurator.pm_.c:326 ../../Xconfigurator.pm_.c:359
+#: ../../Xconfigurator.pm_.c:323 ../../Xconfigurator.pm_.c:356
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with XFree %s."
-msgstr "Sizin kart�n�z�n XFree %s il� 3D d�st�yi ola bil�r."
+msgstr "Sizin kartınızın XFree %s ilə 3D dəstəyi ola bilər."
 
-#: ../../Xconfigurator.pm_.c:328 ../../Xconfigurator.pm_.c:361
+#: ../../Xconfigurator.pm_.c:325 ../../Xconfigurator.pm_.c:358
+#: ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s with 3D hardware acceleration"
-msgstr "3D avadanl�q s�r'�tl�ndirm�si il� XFree %s"
+msgstr "3D avadanlıq sür'ətləndirməsi ilə XFree %s"
 
-#: ../../Xconfigurator.pm_.c:336 ../../Xconfigurator.pm_.c:350
+#: ../../Xconfigurator.pm_.c:333 ../../Xconfigurator.pm_.c:347
 #, 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 ""
-"Sizin kart�n�z�n XFree %s il� 3D d�st�yi ola bil�r.\n"
-"D�QQ�T! BU SINAQ M�RH�L�SIND�DIR V� KOMP�TER�N�Z DONDURA BIL�R."
+"Sizin kartınızın XFree %s ilə 3D dəstəyi ola bilər.\n"
+"DİQQƏT! BU SINAQ MƏRHƏLƏSINDƏDIR VƏ KOMPÜTERİNİZ DONDURA BILƏR."
 
-#: ../../Xconfigurator.pm_.c:338 ../../Xconfigurator.pm_.c:352
+#: ../../Xconfigurator.pm_.c:335 ../../Xconfigurator.pm_.c:349
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
-msgstr "SINAQ M�RH�L�S�ND�K� 3D s�r'�tl�ndirm� d�st�kli XFree %s"
+msgstr "SINAQ MƏRHƏLƏSİNDƏKİ 3D sür'ətləndirmə dəstəkli XFree %s"
 
-#: ../../Xconfigurator.pm_.c:347
+#: ../../Xconfigurator.pm_.c:344
 #, 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 ""
-"Sizin kart�n�z�n 3D s�r'�tl�ndirm� d�st�yi ola bil�r, amma sadec� olaraq "
+"Sizin kartınızın 3D sür'ətləndirmə dəstəyi ola bilər, amma sadecə olaraq "
 "XFree %s\n"
-"il� d�zg�n i�l�y�r.\n"
-"D�QQ�T! BU SINAQ M�RH�L�SIND�DIR V� KOMP�TER�N�Z DONDURA BIL�R.\n"
-"Sizin kart�n�za XFree %s t�r�find�n d�st�k verilir ve bu 2D ���n daha yax�� "
-"bir se�ki olar."
+"ilə düzgün işləyər.\n"
+"DİQQƏT! BU SINAQ MƏRHƏLƏSINDƏDIR VƏ KOMPÜTERİNİZ DONDURA BILƏR.\n"
+"Sizin kartınıza XFree %s tərəfindən dəstək verilir ve bu 2D üçün daha yaxşı "
+"bir seçki olar."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
-msgstr "XFree qura�d�r�lmas�"
+msgstr "XFree quraşdırılması"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
-msgstr "Ekran kart�n�z�n yadda� b�y�kl�y�n� se�in"
+msgstr "Ekran kartınızın yaddaş böyüklüyünü seçin"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
-msgstr "X verici ���n se��n�kl�ri g�st�rin"
+msgstr "X verici üçün seçənəkləri göstərin"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
-msgstr "Monitorunuzu se�in"
+msgstr "Monitorunuzu seçin"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:483
+#: ../../Xconfigurator.pm_.c:519
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -147,197 +152,201 @@ msgid ""
 "monitor.\n"
 " If in doubt, choose a conservative setting."
 msgstr ""
-"Buradaki iki vacib parametr �f�qi ve �aquli yenil�m� s�r'�tl�ridir.\n"
-"Se��rk�n monitorunuzun qabiliyy�tinin �st�nd� bir parametr\n"
-"se�m�m�yiniz �ox vacibdir, �ks halda monitor z�r�r g�r�r.\n"
-"Se��rk�n bir q�rars�zl��a d���rs�niz, al�aq rezolyusiya se�in."
+"Buradaki iki vacib parametr üfüqi ve şaquli yeniləmə sür'ətləridir.\n"
+"Seçərkən monitorunuzun qabiliyyətinin üstündə bir parametr\n"
+"seçməməyiniz çox vacibdir, əks halda monitor zərər görər.\n"
+"Seçərkən bir qərarsızlığa düşərsəniz, alçaq rezolyusiya seçin."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
-msgstr "�f�qi yenil�m� s�r'�ti"
+msgstr "Üfüqi yeniləmə sür'əti"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
-msgstr "�aquli yenil�m� s�r'�ti"
+msgstr "Şaquli yeniləmə sür'əti"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
-msgstr "Monitor qurulmay�b"
+msgstr "Monitor qurulmayıb"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
-msgstr "Ekran kart� h�l� qurulmay�b"
+msgstr "Ekran kartı hələ qurulmayıb"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
-msgstr "Rezolyusiya h�l� se�ilm�yib"
+msgstr "Rezolyusiya hələ seçilməyib"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
-msgstr "Qur�ular� s�namaq ist�yirsiniz?"
+msgstr "Qurğuları sınamaq istəyirsiniz?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
-msgstr "Diqq�t: Bu qrafika kart� il� edil�c�k s�naq t�hl�k�lidir"
+msgstr "Diqqət: Bu qrafika kartı ilə ediləcək sınaq təhlükəlidir"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
-msgstr "Qur�ular�n s�na��"
+msgstr "Qurğuların sınağı"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
 msgstr ""
 "\n"
-"b�'zi parametrl�ri d�yi�dirin"
+"bə'zi parametrləri dəyişdirin"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
-msgstr "Bir x�ta oldu:"
+msgstr "Bir xəta oldu:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
-msgstr "%d saniy� sonra ��x�lacaq"
+msgstr "%d saniyə sonra çıxılacaq"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
-msgstr "Bu qur�ular do�rudur?"
+msgstr "Bu qurğular doğrudur?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
-msgstr "Bir x�ta oldu, parametrl�ri d�yi�dirin"
+msgstr "Bir xəta oldu, parametrləri dəyişdirin"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Rezolyusiya"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
-msgstr "Rezolyusiya v� r�ng d�rinliyini se�in"
+msgstr "Rezolyusiya və rəng dərinliyini seçin"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
-msgstr "Ekran kart�: %s"
+msgstr "Ekran kartı: %s"
 
-#: ../../Xconfigurator.pm_.c:734
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 verici: %s"
 
-#: ../../Xconfigurator.pm_.c:750 ../../standalone/draknet_.c:280
-#: ../../standalone/draknet_.c:283
+#: ../../Xconfigurator.pm_.c:829 ../../printerdrake.pm_.c:1885
+#: ../../standalone/draknet_.c:298 ../../standalone/draknet_.c:301
 msgid "Expert Mode"
 msgstr "Usta Modu"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
-msgstr "Ham�s�n� G�st�r"
+msgstr "Hamısını Göstər"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Rezolyusiyalar"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
-msgstr "Klavatura d�z�l���: %s\n"
+msgstr "Klavatura düzülüşü: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
-msgstr "Si�an n�v�: %s\n"
+msgstr "Siçan növü: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
-msgstr "Si�an avadanl���: %s\n"
+msgstr "Siçan avadanlığı: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1333
+#: ../../Xconfigurator.pm_.c:1440
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1334
+#: ../../Xconfigurator.pm_.c:1441
 #, c-format
 msgid "Monitor HorizSync: %s\n"
-msgstr "Monitorun �aquli Daramas�: %s\n"
+msgstr "Monitorun Şaquli Daraması: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
-msgstr "Monitorun �f�qi Yenil�m�si: %s\n"
+msgstr "Monitorun Üfüqi Yeniləməsi: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
-msgstr "Ekran kart�: %s\n"
+msgstr "Ekran kartı: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Ekran kartı: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
-msgstr "Ekran kart� yadda��: %s KB\n"
+msgstr "Ekran kartı yaddaşı: %s KB\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
-msgstr "R�ng d�rinliyi: %s\n"
+msgstr "Rəng dərinliyi: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Rezolyusiya: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1342
+#: ../../Xconfigurator.pm_.c:1450
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 verici: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1343
+#: ../../Xconfigurator.pm_.c:1451
 #, c-format
 msgid "XFree86 driver: %s\n"
-msgstr "XFree86 s�r�c�: %s\n"
+msgstr "XFree86 sürücü: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
-msgstr "X-Window qur�ular� haz�rlan�r"
+msgstr "X-Window qurğuları hazırlanır"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
-msgstr "N� etm�k ist�yirsiniz?"
+msgstr "Nə etmək istəyirsiniz?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
-msgstr "Monitoru D�yi�dir"
+msgstr "Monitoru Dəyişdir"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
-msgstr "Ekran kart�n� d�yi�dir"
+msgstr "Ekran kartını dəyişdir"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
-msgstr "Verici se��n�kl�rini d�yi�dir"
+msgstr "Verici seçənəklərini dəyişdir"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
-msgstr "Rezolyusiyan� D�yi�dir"
+msgstr "Rezolyusiyanı Dəyişdir"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
-msgstr "M�'lumat� g�st�r"
+msgstr "Mə'lumatı göstər"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
-msgstr "Yenid�n s�na"
+msgstr "Yenidən sına"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
-msgstr "��x"
+msgstr "Çıx"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -345,51 +354,51 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"M�vcud qur�ular� saxlay�m?\n"
-"Hal-haz�rk� qur�ular:\n"
+"Mövcud qurğuları saxlayım?\n"
+"Hal-hazırkı qurğular:\n"
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
-msgstr "\"%s\"a(�) t�krar girin v� d�yi�iklikl�ri f�alla�d�r�n"
+msgstr "\"%s\"a(ə) təkrar girin və dəyişiklikləri fəallaşdırın"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
-msgstr "L�tfen ��x�n v� Ctrl-Alt-BackSpace d�ym�l�rin� bas�n"
+msgstr "Lütfen çıxın və Ctrl-Alt-BackSpace düymələrinə basın"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
-msgstr "X il� A��l��"
+msgstr "X ilə Açılış"
 
-#: ../../Xconfigurator.pm_.c:1447
+#: ../../Xconfigurator.pm_.c:1556
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
 msgstr ""
-"Komp�terinizi avtomatik olaraq X il� a��lmas� ���n qura bil�r�m.\n"
-"A��l��da X Window il� ba�lamaq ist�yirsiniz?"
+"Kompüterinizi avtomatik olaraq X ilə açılması üçün qura bilərəm.\n"
+"Açılışda X Window ilə başlamaq istəyirsiniz?"
 
 #: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
-msgstr "256 r�ng (8 bits)"
+msgstr "256 rəng (8 bits)"
 
 #: ../../Xconfigurator_consts.pm_.c:7
 msgid "32 thousand colors (15 bits)"
-msgstr "32 min r�ng (15 bits)"
+msgstr "32 min rəng (15 bits)"
 
 #: ../../Xconfigurator_consts.pm_.c:8
 msgid "65 thousand colors (16 bits)"
-msgstr "65 min r�ng (16 bits)"
+msgstr "65 min rəng (16 bits)"
 
 #: ../../Xconfigurator_consts.pm_.c:9
 msgid "16 million colors (24 bits)"
-msgstr "16 milyon r�ng (24 bits)"
+msgstr "16 milyon rəng (24 bits)"
 
 #: ../../Xconfigurator_consts.pm_.c:10
 msgid "4 billion colors (32 bits)"
-msgstr "4 milyard r�ng (32 bits)"
+msgstr "4 milyard rəng (32 bits)"
 
 #: ../../Xconfigurator_consts.pm_.c:106
 msgid "256 kB"
@@ -416,361 +425,369 @@ msgid "8 MB"
 msgstr "8 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
-msgstr "16 MB v� ya daha �ox"
+msgid "16 MB"
+msgstr "16 MB"
+
+#: ../../Xconfigurator_consts.pm_.c:113
+msgid "32 MB"
+msgstr "32 MB"
+
+#: ../../Xconfigurator_consts.pm_.c:114
+#, fuzzy
+msgid "64 MB or more"
+msgstr "16 MB və ya daha çox"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
-msgstr "Standart VGA, 60 Hz-d� 640x480 "
+msgstr "Standart VGA, 60 Hz-də 640x480 "
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
-msgstr "Super VGA, 56 Hz-d� 800x600"
+msgstr "Super VGA, 56 Hz-də 800x600"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
-msgstr "8514 Uy�un, 87 Hz-d� titr��imli 1024x768 (800x600 yox)"
+msgstr "8514 Uyğun, 87 Hz-də titrəşimli 1024x768 (800x600 yox)"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
-msgstr "Super VGA, 87 Hz-d� titr��imli 1024x768, 56 Hz-d� 800x600"
+msgstr "Super VGA, 87 Hz-də titrəşimli 1024x768, 56 Hz-də 800x600"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
-msgstr "T�kmill��dirilmi� Super VGA, 60 Hz-d� 800x600, 72 Hz-d� 640x480"
+msgstr "Təkmilləşdirilmiş Super VGA, 60 Hz-də 800x600, 72 Hz-də 640x480"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
-msgstr "Titr��imsiz SVGA, 60 Hz-d� 1024x768, 72 Hz-d� 800x600"
+msgstr "Titrəşimsiz SVGA, 60 Hz-də 1024x768, 72 Hz-də 800x600"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
-msgstr "Y�ks�k Frekansl� SVGA, 70 Hz-d� 1024x768"
+msgstr "Yüksək Frekanslı SVGA, 70 Hz-də 1024x768"
 
-#: ../../Xconfigurator_consts.pm_.c:127
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
-msgstr "�oxlu Frekansa qadir 60 Hz-d� 1280x1024"
+msgstr "Çoxlu Frekansa qadir 60 Hz-də 1280x1024"
 
-#: ../../Xconfigurator_consts.pm_.c:128
+#: ../../Xconfigurator_consts.pm_.c:130
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
-msgstr "�oxlu Frekansa qadir 74 Hz-d� 1280x1024"
+msgstr "Çoxlu Frekansa qadir 74 Hz-də 1280x1024"
 
-#: ../../Xconfigurator_consts.pm_.c:129
+#: ../../Xconfigurator_consts.pm_.c:131
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
-msgstr "�oxlu Frekansa qadir 76 Hz-d� 1280x1024"
+msgstr "Çoxlu Frekansa qadir 76 Hz-də 1280x1024"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
-msgstr "70 Hz d� 1600x1200 qadir Monitor"
+msgstr "70 Hz də 1600x1200 qadir Monitor"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
-msgstr "76 Hz d� 1600x1200 qadir Monitor"
+msgstr "76 Hz də 1600x1200 qadir Monitor"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124
+#: ../../any.pm_.c:96 ../../any.pm_.c:121
 msgid "First sector of boot partition"
-msgstr "A��l�� qisminin ilk sektoru"
+msgstr "Açılış qisminin ilk sektoru"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124 ../../any.pm_.c:197
+#: ../../any.pm_.c:96 ../../any.pm_.c:121 ../../any.pm_.c:194
 msgid "First sector of drive (MBR)"
 msgstr "Diskin ilk sektoru (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "SILO Qurulumu"
 
-#: ../../any.pm_.c:104 ../../any.pm_.c:117
+#: ../../any.pm_.c:101 ../../any.pm_.c:114
 msgid "Where do you want to install the bootloader?"
-msgstr "Sistem y�kl�yicisini haraya qurmaq ist�yirsiniz?"
+msgstr "Sistem yükləyicisini haraya qurmaq istəyirsiniz?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "LILO/grup Qurulumu"
 
-#: ../../any.pm_.c:128 ../../any.pm_.c:142
+#: ../../any.pm_.c:125 ../../any.pm_.c:139
 msgid "SILO"
 msgstr "SILO"
 
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:127
 msgid "LILO with text menu"
-msgstr "M�tn menyulu LILO"
+msgstr "Mətn menyulu LILO"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "Qrafiki menyulu LILO"
 
-#: ../../any.pm_.c:134
+#: ../../any.pm_.c:131
 msgid "Grub"
 msgstr "Grub"
 
-#: ../../any.pm_.c:138
+#: ../../any.pm_.c:135
 msgid "Boot from DOS/Windows (loadlin)"
-msgstr "DOS/W�ndowsdan a��l (loadlin)"
+msgstr "DOS/Wİndowsdan açıl (loadlin)"
 
-#: ../../any.pm_.c:140 ../../any.pm_.c:142
+#: ../../any.pm_.c:137 ../../any.pm_.c:139
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: ../../any.pm_.c:148 ../../any.pm_.c:180
+#: ../../any.pm_.c:145 ../../any.pm_.c:177
 msgid "Bootloader main options"
-msgstr "Sistem y�kl�yicisi ana se��n�kl�ri"
+msgstr "Sistem yükləyicisi ana seçənəkləri"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
-msgstr "�stifad� edil�c�k A��l�� idar�cisi"
+msgstr "İstifadə ediləcək Açılış idarəcisi"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
-msgstr "A��l�� y�kl�yici qurulu�u"
+msgstr "Açılış yükləyici quruluşu"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
-msgstr "A��l�� avadanl���"
+msgstr "Açılış avadanlığı"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
-msgstr "LBA (k�hn� BIOSlarda i�l�m�z)"
+msgstr "LBA (köhnə BIOSlarda işləməz)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
-msgstr "B�sit"
+msgstr "Bəsit"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
-msgstr "b�sit"
+msgstr "bəsit"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Ekran modu"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
-msgstr "A��l��da gecikm� m�dd�ti"
+msgstr "Açılışda gecikmə müddəti"
 
-#: ../../any.pm_.c:160 ../../any.pm_.c:741
-#: ../../install_steps_interactive.pm_.c:904 ../../netconnect.pm_.c:629
-#: ../../printerdrake.pm_.c:98 ../../printerdrake.pm_.c:132
-#: ../../standalone/draknet_.c:569
+#: ../../any.pm_.c:157 ../../any.pm_.c:730
+#: ../../install_steps_interactive.pm_.c:938 ../../network/modem.pm_.c:46
+#: ../../printerdrake.pm_.c:402 ../../printerdrake.pm_.c:481
+#: ../../standalone/draknet_.c:603
 msgid "Password"
 msgstr "Parol"
 
-#: ../../any.pm_.c:161 ../../any.pm_.c:742
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../any.pm_.c:158 ../../any.pm_.c:731
+#: ../../install_steps_interactive.pm_.c:939
 msgid "Password (again)"
-msgstr "Parol (t�krar)"
+msgstr "Parol (təkrar)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
-msgstr "�mr s�tiri se��n�kl�rini m�hdudla�d�r"
+msgstr "Əmr sətiri seçənəklərini məhdudlaşdır"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
-msgstr "m�hdudla�d�r"
+msgstr "məhdudlaşdır"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
-msgstr "/tmp-i h�r a��l��da t�mizl�"
+msgstr "/tmp-i hər açılışda təmizlə"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
-msgstr "�mumi yadda� miqdar� (%d MB tap�ld�)"
+msgstr "Ümumi yaddaş miqdarı (%d MB tapıldı)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
-msgstr "Bird�n art�q profil� icaz� ver"
+msgstr "Birdən artıq profilə icazə ver"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
-msgstr "Yadda� miqdar�n� Mb cinsind�n verin"
+msgstr "Yaddaş miqdarını Mb cinsindən verin"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
-"``�mr s�tiri se��n�kl�rini m�hdudla�d�r`` se��n�yi parolsuz bir i�� yaramaz"
+"``Əmr sətiri seçənəklərini məhdudlaşdır`` seçənəyi parolsuz bir işə yaramaz"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "Please try again"
-msgstr "Xahi� edirik t�krar s�nay�n"
+msgstr "Xahiş edirik təkrar sınayın"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "The passwords do not match"
-msgstr "Parollar uy�un g�lmir"
+msgstr "Parollar uyğun gəlmir"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
-msgstr "�nit �smar�c�"
+msgstr "İnit İsmarıcı"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
-msgstr "Firmware Gecikm�sini A�"
+msgstr "Firmware Gecikməsini Aç"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
-msgstr "��kird�k A��l��� Vaxt Dolmas�"
+msgstr "Çəkirdək Açılışı Vaxt Dolması"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
-msgstr "CDd�n A��l��� F�alla�d�r�m?"
+msgstr "CDdən Açılışı Fəallaşdırım?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
-msgstr "OF A��l��� F�alla�d�r�m?"
+msgstr "OF Açılışı Fəallaşdırım?"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 msgid "Default OS?"
-msgstr "�sas OS"
+msgstr "Əsas OS"
 
-#: ../../any.pm_.c:210
+#: ../../any.pm_.c:207
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
 msgstr ""
-"Buradak� bir birind�n f�rqli se��n�kl�r� yenil�rini �lav� ed� bil�r,\n"
-"ya da m�vcud olanlar� d�yi�dir� bil�rsiniz."
+"Buradakı bir birindən fərqli seçənəklərə yenilərini əlavə edə bilər,\n"
+"ya da mövcud olanları dəyişdirə bilərsiniz."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
-msgstr "�lav� et"
+msgstr "Əlavə et"
 
-#: ../../any.pm_.c:220 ../../any.pm_.c:729 ../../diskdrake.pm_.c:46
-#: ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217 ../../any.pm_.c:718 ../../diskdrake.pm_.c:161
+#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:1846
+#: ../../printerdrake.pm_.c:1847 ../../printerdrake.pm_.c:1904
+#: ../../printerdrake.pm_.c:1948
 msgid "Done"
-msgstr "Qurtard�"
+msgstr "Qurtardı"
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:217
 msgid "Modify"
-msgstr "T�kmill��dir"
+msgstr "Təkmilləşdir"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
-msgstr "Ne c�r bir giri� ist�yirsiniz?"
+msgstr "Ne cür bir giriş istəyirsiniz?"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Linux"
 msgstr "Linuks"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Other OS (SunOS...)"
-msgstr "Dig�r sisteml�r (SunOS...)"
+msgstr "Digər sistemlər (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
-msgstr "Dig�r sisteml�r (MacOS...)"
+msgstr "Digər sistemlər (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
-msgstr "Dig�r sisteml�r (windows...)"
+msgstr "Digər sistemlər (windows...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
-msgstr "�ks"
+msgstr "Əks"
 
-#: ../../any.pm_.c:253 ../../any.pm_.c:264
+#: ../../any.pm_.c:247 ../../any.pm_.c:258
 msgid "Root"
-msgstr "K�k"
+msgstr "Kök"
 
-#: ../../any.pm_.c:254 ../../any.pm_.c:283
+#: ../../any.pm_.c:248 ../../any.pm_.c:277
 msgid "Append"
-msgstr "Sonuna �lav� et"
+msgstr "Sonuna əlavə et"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "Oxu-yaz"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
-msgstr "C�dv�l"
+msgstr "Cədvəl"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
-msgstr "E'tibars�z"
+msgstr "E'tibarsız"
 
-#: ../../any.pm_.c:274 ../../any.pm_.c:279 ../../any.pm_.c:282
+#: ../../any.pm_.c:268 ../../any.pm_.c:273 ../../any.pm_.c:276
 msgid "Label"
 msgstr "Etiket"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
-msgstr "�sas"
+msgstr "Əsas"
 
-#: ../../any.pm_.c:284
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
-msgstr "Initrd b�y�kl�y�"
+msgstr "Initrd böyüklüyü"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
-msgstr "NoV�deo"
+msgstr "NoVİdeo"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
-msgstr "Giri�i sil"
+msgstr "Girişi sil"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
-msgstr "Bo� etiket q�bul edil� bilm�z"
+msgstr "Boş etiket qəbul edilə bilməz"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
-msgstr "Bu etiket istifad� edilm�z"
+msgstr "Bu etiket istifadə edilməz"
 
-#: ../../any.pm_.c:317
-msgid "What type of partitioning?"
-msgstr "N�c� b�lm�landirm� ist�yirs�n?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
-msgstr "%s %s ara �z� tap�ld�"
+msgstr "%s %s ara üzü tapıldı"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
-msgstr "Ba�qa var?"
+msgstr "Başqa var?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
-msgstr "He� %s ara �z� var?"
+msgstr "Heç %s ara üzü var?"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
-#: ../../printerdrake.pm_.c:237
+#: ../../any.pm_.c:601 ../../any.pm_.c:760 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "No"
 msgstr "Xeyr"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
+#: ../../any.pm_.c:601 ../../any.pm_.c:759 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "Yes"
-msgstr "B�li"
+msgstr "Bəli"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
-msgstr "Avadanl�q m�'lumat�na bax"
+msgstr "Avadanlıq mə'lumatına bax"
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:648
+#: ../../any.pm_.c:637
 #, c-format
 msgid "Installing driver for %s card %s"
-msgstr "%s kart� (%s) ���n s�r�c� y�kl�nir"
+msgstr "%s kartı (%s) üçün sürücü yüklənir"
 
-#: ../../any.pm_.c:649
+#: ../../any.pm_.c:638
 #, c-format
 msgid "(module %s)"
 msgstr "(modul %s)"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:660
+#: ../../any.pm_.c:649
 #, c-format
 msgid "Which %s driver should I try?"
-msgstr "Hans� %s s�r�c�s� s�nans�n?"
+msgstr "Hansı %s sürücüsü sınansın?"
 
-#: ../../any.pm_.c:668
+#: ../../any.pm_.c:657
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -781,126 +798,139 @@ msgid ""
 "should\n"
 "not cause any damage."
 msgstr ""
-"B�zi hallarda, %s s�r�c� d�zg�n i�l�m�si ���n �lav� m�'lumat ist�y� bil�r.\n"
-"S�r�c�ler ���n �lav� bir x�susiyy�t g�st�rm�k mi ist�y�rsiniz, yoxsa\n"
-"s�r�c�l�rin laz�mi m�'lumatlar ���n avadal��� tan�mas�n� m� ist�y�rsiniz? \n"
-"B�'z�n tan�mlama komp�terinizi dondura bil�r amma dondu�u ���n\n"
-"komp�teriniz� he� bir �ey olmaz."
+"Bəzi hallarda, %s sürücü düzgün işləməsi üçün əlavə mə'lumat istəyə bilər.\n"
+"Sürücüler üçün əlavə bir xüsusiyyət göstərmək mi istəyərsiniz, yoxsa\n"
+"sürücülərin lazımi mə'lumatlar üçün avadalığı tanımasını mı istəyərsiniz? \n"
+"Bə'zən tanımlama kompüterinizi dondura bilər amma donduğu üçün\n"
+"kompüterinizə heç bir şey olmaz."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "Avtomatik yoxla"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
-msgstr "Se��n�kl�ri g�st�r"
+msgstr "Seçənəkləri göstər"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
-msgstr "�ndi %s moduluna parametrl�r gir� bil�rsiniz."
+msgstr "İndi %s moduluna parametrlər girə bilərsiniz."
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
 "Options are in format ``name=value name2=value2 ...''.\n"
 "For instance, ``io=0x300 irq=7''"
 msgstr ""
-"�st�s�niz indi %s modulunun parametrl�rini g�st�r� bil�rsiniz.\n"
-"Parametrl�r``ad=qiym�t ad2=qiym�t2...'' ��klind� olmal�d�r.\n"
-"M�s�l�n ``io=0x300 irq=7''"
+"İstəsəniz indi %s modulunun parametrlərini göstərə bilərsiniz.\n"
+"Parametrlər``ad=qiymət ad2=qiymət2...'' şəklində olmalıdır.\n"
+"Məsələn ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
-msgstr "Modul se��n�kl�ri:"
+msgstr "Modul seçənəkləri:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
 "Do you want to try again with other parameters?"
 msgstr ""
-"%s modulunun y�kl�nm�si iflas etdi.\n"
-"Yenid�n ba�qa bir parametr il� s�namaq ist�yirsiniz?"
+"%s modulunun yüklənməsi iflas etdi.\n"
+"Yenidən başqa bir parametr ilə sınamaq istəyirsiniz?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
-msgstr "(%s art�q �lav� edilmi�dir)"
+msgstr "(%s artıq əlavə edilmişdir)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
-msgstr "Z�if parol se�diniz!"
+msgstr "Zəif parol seçdiniz!"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
-msgstr "Xahi� edirik bir istifad��i ad� al�n"
+msgstr "Xahiş edirik bir istifadəçi adı alın"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
-"�stifad��i ad�nda sadac� ki�ik h�rfl�r, r�q�ml�r, `-' v� `_' xarakterl�ri "
-"ola bil�r"
+"İstifadəçi adında sadacə kiçik hərflər, rəqəmlər, `-' və `_' xarakterləri "
+"ola bilər"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
-msgstr "Bu istifad��i ad� art�q vard�r"
+msgstr "Bu istifadəçi adı artıq vardır"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
-msgstr "�stifad��ini �lav� et"
+msgstr "İstifadəçini əlavə et"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
 "%s"
 msgstr ""
-"Bir istifad��i girin\n"
+"Bir istifadəçi girin\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
-msgstr "�stifad��ini q�bul et"
+msgstr "İstifadəçini qəbul et"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
-msgstr "H�qiqi ad�"
+msgstr "Həqiqi adı"
 
-#: ../../any.pm_.c:740 ../../printerdrake.pm_.c:97
-#: ../../printerdrake.pm_.c:131
+#: ../../any.pm_.c:729 ../../printerdrake.pm_.c:401
+#: ../../printerdrake.pm_.c:480
 msgid "User name"
-msgstr "�stifad��i ad�"
+msgstr "İstifadəçi adı"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
-msgstr "Qab�q"
+msgstr "Qabıq"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "Timsal"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:756
 msgid "Autologin"
-msgstr "Avtomatik Giri�"
+msgstr "Avtomatik Giriş"
 
-#: ../../any.pm_.c:767
+#: ../../any.pm_.c:757
+#, fuzzy
 msgid ""
 "I can set up your computer to automatically log on one user.\n"
-"If you don't want to use this feature, click on the cancel button."
+"Do you want to use this feature?"
 msgstr ""
-"Komp�terinizi avtomatik olaraq bir istifad��i il� ba�lada bil�r�m.\n"
-"�st�mirsiniz is� r�dd edin."
+"Kompüterinizi avtomatik olaraq bir istifadəçi ilə başlada bilərəm.\n"
+"İstəmirsiniz isə rədd edin."
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
-msgstr "�sas istifad��ini se�in:"
+msgstr "Əsas istifadəçini seçin:"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
-msgstr "�stifad� etm�k ist�diyiniz p�nc�r� idar��isini se�in:"
+msgstr "İstifadə etmək istədiyiniz pəncərə idarəçisini seçin:"
+
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "Xahiş edirik istifadə üçün bir dil seçin."
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr "Qurulumdan sonra istifadə edə biləcəyiniz başqa dillər seçə bilərsiniz"
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "Hamısı"
 
 # NOTE: this message will be displayed at boot time; that is
 # only the ascii charset will be available on most machines
@@ -908,7 +938,7 @@ msgstr "�stifad� etm�k ist�diyiniz p�nc�r� idar��isini se�in:"
 # leave it in English, as it is the best for your language)
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:262 ../../bootloader.pm_.c:608
+#: ../../bootloader.pm_.c:259
 #, c-format
 msgid ""
 "Welcome to %s the operating system chooser!\n"
@@ -917,9 +947,9 @@ msgid ""
 "wait %d seconds for default boot.\n"
 "\n"
 msgstr ""
-"%s emeliyyat sistemi secki proqramina xos g�lmissiniz!\n"
+"%s emeliyyat sistemi secki proqramina xos gəlmissiniz!\n"
 "\n"
-"I�lerinden birini acmaq ucun adini yazin ve <ENTER>\n"
+"Içlerinden birini acmaq ucun adini yazin ve <ENTER>\n"
 "duymesine basin ve ya esas acilis ucun %d saniye gozleyin.\n"
 "\n"
 
@@ -933,9 +963,9 @@ msgstr ""
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:809
+#: ../../bootloader.pm_.c:835
 msgid "Welcome to GRUB the operating system chooser!"
-msgstr "Emeliyyat sistemi secici GRUB'a xos g�lmissiniz!"
+msgstr "Emeliyyat sistemi secici GRUB'a xos gəlmissiniz!"
 
 # NOTE: this message will be displayed by grub at boot time; that is
 # using the BIOS font; that means cp437 charset on 99.99% of PC computers
@@ -947,10 +977,10 @@ msgstr "Emeliyyat sistemi secici GRUB'a xos g�lmissiniz!"
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:812
+#: ../../bootloader.pm_.c:838
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "%c ve %c duymeleri ile is�qland�r�lm�s girisleri sece bilersiniz"
+msgstr "%c ve %c duymeleri ile isıqlandırılmıs girisleri sece bilersiniz"
 
 # NOTE: this message will be displayed by grub at boot time; that is
 # using the BIOS font; that means cp437 charset on 99.99% of PC computers
@@ -962,7 +992,7 @@ msgstr "%c ve %c duymeleri ile is�qland�r�lm�s girisleri sece bilersiniz"
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:815
+#: ../../bootloader.pm_.c:841
 msgid "Press enter to boot the selected OS, 'e' to edit the"
 msgstr "Sistemi secili emeliyyat sistemiyle acmaq ucun entere,"
 
@@ -976,10 +1006,10 @@ msgstr "Sistemi secili emeliyyat sistemiyle acmaq ucun entere,"
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:818
+#: ../../bootloader.pm_.c:844
 msgid "commands before booting, or 'c' for a command-line."
 msgstr ""
-"acilisdan evvel emrleri duzeltm�k ucun 'e', emr setiri ucun ise 'c' basin"
+"acilisdan evvel emrleri duzeltmək ucun 'e', emr setiri ucun ise 'c' basin"
 
 # NOTE: this message will be displayed by grub at boot time; that is
 # using the BIOS font; that means cp437 charset on 99.99% of PC computers
@@ -991,2872 +1021,2414 @@ msgstr ""
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:821
+#: ../../bootloader.pm_.c:847
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr "Isaretli secenek %d saniye icinde sistemi acacaq."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
-msgstr "/boot i�ind� laz�mi yer yoxdur"
+msgstr "/boot içində lazımi yer yoxdur"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
 #. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:918
+#: ../../bootloader.pm_.c:951
 msgid "Desktop"
-msgstr "Masa �st�"
+msgstr "Masa Üstü"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:920
+#: ../../bootloader.pm_.c:953
 msgid "Start Menu"
-msgstr "Ba�lama Menyusu"
+msgstr "Başlama Menyusu"
+
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "Sistem yükləyicisini haraya qurmaq istəyirsiniz?"
 
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
-msgstr "h�l�lik yard�m sistemi m�vcud deyildir.\n"
+msgstr "hələlik yardım sistemi mövcud deyildir.\n"
 
 #: ../../bootlook.pm_.c:62
 msgid "Boot Style Configuration"
-msgstr "Qurulum T�rzi Qura�d�r�lmas�"
+msgstr "Qurulum Tərzi Quraşdırılması"
 
 #: ../../bootlook.pm_.c:79
 msgid "/_File"
 msgstr "/_Fayl"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/Fayl/_Yeni"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>Y"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/Fayl/_A�"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>A"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/Fayl/_Qeyd Et"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>Q"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/Fayl/_F�rqli Qeyd Et"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/Fayl/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
-msgstr "/Fayl/��_x"
+msgstr "/Fayl/Çı_x"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>x"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_Se��n�kl�r"
+#: ../../bootlook.pm_.c:91
+msgid "NewStyle Categorizing Monitor"
+msgstr "NewStyle Kateqoriyasından Monitor"
+
+#: ../../bootlook.pm_.c:92
+msgid "NewStyle Monitor"
+msgstr "NewStyle Monitor"
 
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Se��n�kl�r/S�naq"
+#: ../../bootlook.pm_.c:93
+msgid "Traditional Monitor"
+msgstr "Ənənəvi Monitor"
 
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/_Yard�m"
+#: ../../bootlook.pm_.c:94
+msgid "Traditional Gtk+ Monitor"
+msgstr "Ənənəvi Gtk+ Monitor"
 
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/Yard�m/_Haqq�nda..."
+#: ../../bootlook.pm_.c:95
+msgid "Launch Aurora at boot time"
+msgstr "Açılışda Auroranı başlat"
 
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "Qur"
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "Lilo/grub modu"
 
-#: ../../bootlook.pm_.c:114
+#: ../../bootlook.pm_.c:102
 #, c-format
 msgid ""
 "You are currently using %s as Boot Manager.\n"
 "Click on Configure to launch the setup wizard."
 msgstr ""
-"A��l�� �dar��isi olaraq haz�rda %s i�l�dirsiniz.\n"
-"Qura�d�rma sehirbaz�n� ba�latmaq ���n t�qlay�n."
-
-#: ../../bootlook.pm_.c:121
-msgid "Lilo/grub mode"
-msgstr "Lilo/grub modu"
-
-#: ../../bootlook.pm_.c:131
-msgid "NewStyle Categorizing Monitor"
-msgstr "NewStyle Kateqoriyas�ndan Monitor"
-
-#: ../../bootlook.pm_.c:134
-msgid "NewStyle Monitor"
-msgstr "NewStyle Monitor"
-
-#: ../../bootlook.pm_.c:137
-msgid "Traditional Monitor"
-msgstr "�n�n�vi Monitor"
-
-#: ../../bootlook.pm_.c:140
-msgid "Traditional Gtk+ Monitor"
-msgstr "�n�n�vi Gtk+ Monitor"
+"Açılış İdarəçisi olaraq hazırda %s işlədirsiniz.\n"
+"Quraşdırma sehirbazını başlatmaq üçün tıqlayın."
 
-#: ../../bootlook.pm_.c:144
-msgid "Launch Aurora at boot time"
-msgstr "A��l��da Auroran� ba�lat"
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "Qur"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
-msgstr "A��l�� modu"
+msgstr "Açılış modu"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "Sistem modu"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
-msgstr "A��l��da X-Window sistemini ba�lat"
+msgstr "Açılışda X-Window sistemini başlat"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
-msgstr "Xeyr, Avtomatik giri� ist�mir�m"
+msgstr "Xeyr, Avtomatik giriş istəmirəm"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr ""
-"B�li, bu istifad��i ���n avtomatik giri� ist�yir�m (istifad��i, masa �st�)"
-
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "Sistem modu"
-
-#: ../../bootlook.pm_.c:228
-msgid "Default Runlevel"
-msgstr "�sas Runlevel"
+"Bəli, bu istifadəçi üçün avtomatik giriş istəyirəm (istifadəçi, masa üstü)"
 
-#: ../../bootlook.pm_.c:236 ../../standalone/draknet_.c:88
-#: ../../standalone/draknet_.c:120 ../../standalone/draknet_.c:184
-#: ../../standalone/draknet_.c:302 ../../standalone/draknet_.c:396
-#: ../../standalone/draknet_.c:473 ../../standalone/draknet_.c:509
-#: ../../standalone/draknet_.c:617
+#: ../../bootlook.pm_.c:155 ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:140 ../../standalone/draknet_.c:208
+#: ../../standalone/draknet_.c:320 ../../standalone/draknet_.c:433
+#: ../../standalone/draknet_.c:507 ../../standalone/draknet_.c:543
+#: ../../standalone/draknet_.c:644
 msgid "OK"
 msgstr "Oldu"
 
-#: ../../bootlook.pm_.c:238 ../../install_steps_gtk.pm_.c:576
-#: ../../interactive.pm_.c:114 ../../interactive.pm_.c:269
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:357
-#: ../../my_gtk.pm_.c:360 ../../my_gtk.pm_.c:617
-#: ../../standalone/drakgw_.c:639 ../../standalone/draknet_.c:95
-#: ../../standalone/draknet_.c:127 ../../standalone/draknet_.c:295
-#: ../../standalone/draknet_.c:485 ../../standalone/draknet_.c:631
-#: ../../standalone/tinyfirewall_.c:63
+#: ../../bootlook.pm_.c:156 ../../install_steps_gtk.pm_.c:516
+#: ../../interactive.pm_.c:122 ../../interactive.pm_.c:286
+#: ../../interactive.pm_.c:308 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:416 ../../my_gtk.pm_.c:419 ../../my_gtk.pm_.c:716
+#: ../../printerdrake.pm_.c:1158 ../../standalone/drakgw_.c:648
+#: ../../standalone/draknet_.c:115 ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:313 ../../standalone/draknet_.c:519
+#: ../../standalone/draknet_.c:658 ../../standalone/tinyfirewall_.c:63
 msgid "Cancel"
-msgstr "L��v et"
+msgstr "Ləğv et"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "/etc/inittab oxunmaq ���n a��la bilmir: $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "/etc/sysconfig/autologin  oxunmaq ���n a��la bilmir: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "/etc/inittab oxunmaq üçün açıla bilmir: %s"
 
-#: ../../bootlook.pm_.c:435 ../../standalone/drakboot_.c:47
+#: ../../bootlook.pm_.c:336 ../../standalone/drakboot_.c:47
 msgid "Installation of LILO failed. The following error occured:"
-msgstr "LILO qurulumu iflas etdi. Olan x�ta:"
+msgstr "LILO qurulumu iflas etdi. Olan xəta:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Yarat"
-
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Ay�r"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Sil"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "��kill�ndir"
+#: ../../common.pm_.c:93 ../../install_steps_graphical.pm_.c:287
+#: ../../install_steps_graphical.pm_.c:334
+msgid "MB"
+msgstr "MB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:653
-msgid "Resize"
-msgstr "B�y�kl�y�n� D�yi�dir"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "N�v"
+#: ../../common.pm_.c:109
+#, c-format
+msgid "%d minutes"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "Ba�lama n�qt�si"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "/etc/fstab-a Yaz"
+#: ../../common.pm_.c:113
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "%d saniyə sonra çıxılacaq"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "Usta moduna ke�"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "Əvvəlcə datanızın yedəyini alın"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "Normal moda ke�"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "Diqqətlə Oxuyun!"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "Fayldan geri �a��r"
+#: ../../diskdrake.pm_.c:103
+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 istifadə etməyi istəyirsinizsə, boş disk sahəsi (2048 sektor bəsdir.)\n"
+"buraxmayı unutmayın."
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Fayla qeyd et"
+#: ../../diskdrake.pm_.c:122 ../../diskdrake_interactive.pm_.c:313
+#: ../../diskdrake_interactive.pm_.c:328 ../../install_steps.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:37
+#: ../../install_steps_interactive.pm_.c:310 ../../interactive_http.pm_.c:119
+#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:62
+msgid "Error"
+msgstr "Xəta"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "Sehirbaz"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Disketd�n geri �a��r"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Yeni"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Disket� qeyd et"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+#, fuzzy
+msgid "Remote"
+msgstr "Uzaqdakı növbə adı"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "Ham�s�n� t�mizl�"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "Bağlama nöqtəsi"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Ham�s�n� ��kill�ndir"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Seçənəklər"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Avtomatik ay�r"
+#: ../../diskdrake.pm_.c:211 ../../diskdrake.pm_.c:417
+#: ../../diskdrake.pm_.c:534 ../../diskdrake_interactive.pm_.c:353
+#: ../../diskdrake_interactive.pm_.c:488
+msgid "Type"
+msgstr "Növ"
 
-#: ../../diskdrake.pm_.c:59
-msgid "All primary partitions are used"
-msgstr "B�t�n birinci b�lm�l�r istifad�d�dir"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Ayır"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "Art�q b�lm� �lav� edil� bilm�z"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Bağla"
 
-#: ../../diskdrake.pm_.c:59
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Monitorunuzu seçin"
+
+#: ../../diskdrake.pm_.c:235
 msgid ""
-"To have more partitions, please delete one to be able to create an extended "
-"partition"
-msgstr "Art�q b�lm� yaratmaq ���n, bir b�lm�ni silib m�ntiqi b�lm� yarad�n"
+"You have one big FAT partition\n"
+"(generally used by MicroSoft Dos/Windows).\n"
+"I suggest you first resize that partition\n"
+"(click on it, then click on \"Resize\")"
+msgstr ""
+"Tək bir böyük disk bölməniz var\n"
+"(əsasən MS DOS/Windows istifadə edər).\n"
+"Əvvəlcə bu disk bölməsinin böyüklüyünü dəyişdirməyinizi\n"
+"tövsiyə edirik. Əvvəlcə bölmənin üstünə, sonra \"Böyüklüyü\n"
+"Dəyişdir\" düyməsinə tıqlayın"
 
-#: ../../diskdrake.pm_.c:61
-msgid "Not enough space for auto-allocating"
-msgstr "Avtomatik yerl��dirm� ���n bo� sah� yoxdur"
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Xahiş edirik bir bölmə üstünə tıqlayın"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Geri al"
+#: ../../diskdrake.pm_.c:240
+#, fuzzy
+msgid "Please click on a media"
+msgstr "Xahiş edirik bir bölmə üstünə tıqlayın"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "B�lm� c�dv�lini yaz"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "Xahiş edirik bir bölmə üstünə tıqlayın"
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "Daha �ox"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
+
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "Ətraflı"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
+#, fuzzy
+msgid "Journalised FS"
+msgstr "bağlama iflas etdi"
+
+#: ../../diskdrake.pm_.c:395
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Swap"
 msgstr "Swap"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:396 ../../diskdrake_interactive.pm_.c:952
 msgid "Empty"
-msgstr "Bo�"
+msgstr "Boş"
 
-#: ../../diskdrake.pm_.c:117 ../../install_steps_gtk.pm_.c:407
-#: ../../mouse.pm_.c:145
+#: ../../diskdrake.pm_.c:396 ../../install_steps_gtk.pm_.c:373
+#: ../../install_steps_gtk.pm_.c:433 ../../mouse.pm_.c:161
+#: ../../services.pm_.c:161
 msgid "Other"
-msgstr "Dig�r"
+msgstr "Digər"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
-msgstr "Fayl sistemi n�v�:"
+msgstr "Fayl sistemi növü:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "�trafl�"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Yarat"
+
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Yerinə ``%s'' işlət"
+
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Sil"
+
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Əvvəlcə ``Ayır'-ı işlət"
 
-#: ../../diskdrake.pm_.c:147
+#: ../../diskdrake.pm_.c:424 ../../diskdrake_interactive.pm_.c:480
+#, c-format
 msgid ""
-"You have one big FAT partition\n"
-"(generally used by MicroSoft Dos/Windows).\n"
-"I suggest you first resize that partition\n"
-"(click on it, then click on \"Resize\")"
+"After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
-"T�k bir b�y�k disk b�lm�niz var\n"
-"(�sas�n MS DOS/Windows istifad� ed�r).\n"
-"�vv�lc� bu disk b�lm�sinin b�y�kl�y�n� d�yi�dirm�yinizi\n"
-"t�vsiy� edirik. �vv�lc� b�lm�nin �st�n�, sonra \"B�y�kl�y�\n"
-"D�yi�dir\" d�ym�sin� t�qlay�n"
+"%s bölməsinin növünü dəyişdirdikdən sonra, bu bölmədəki bütün mə'lumatlar "
+"silinəcəkdir"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "�vv�lc� datan�z�n yed�yini al�n"
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "%s avadanlığını haraya bağlamaq istəyirsiniz?"
 
-#: ../../diskdrake.pm_.c:152 ../../diskdrake.pm_.c:170
-#: ../../diskdrake.pm_.c:179 ../../diskdrake.pm_.c:570
-#: ../../diskdrake.pm_.c:592
-msgid "Read carefully!"
-msgstr "Diqq�tl� Oxuyun!"
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Mount options"
+msgstr "Modul seçənəkləri:"
 
-#: ../../diskdrake.pm_.c:155
-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"
+#: ../../diskdrake.pm_.c:507
+msgid "Various"
 msgstr ""
-"Aboot istifad� etm�yi ist�yirsinizs�, bo� disk sah�si (2048 sektor b�sdir.)\n"
-"buraxmay� unutmay�n."
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "Diqq�tl� olun: bu �m�liyyat t�hl�k�lidir."
+#: ../../diskdrake.pm_.c:525
+#, fuzzy
+msgid "Removable media"
+msgstr "Taxılıb sökülə bilən avadanlıqların avtomatik bağlanması"
 
-#: ../../diskdrake.pm_.c:214 ../../install_steps.pm_.c:72
-#: ../../install_steps_interactive.pm_.c:37
-#: ../../install_steps_interactive.pm_.c:322 ../../standalone/diskdrake_.c:66
-msgid "Error"
-msgstr "X�ta"
+#: ../../diskdrake.pm_.c:532
+#, fuzzy
+msgid "Change type"
+msgstr "Bölmə növünü Dəyişdir"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Ba�lama n�qt�si: "
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Hansı dili istəyirsiniz?"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Avadanl�q: "
+#: ../../diskdrake.pm_.c:564
+msgid "Scanning available nfs shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:569
 #, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "DOS s�r�c� h�rfi: %s (sad�c� t�xmini)\n"
+msgid "Scanning available nfs shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:244 ../../diskdrake.pm_.c:251
-#: ../../diskdrake.pm_.c:301
-msgid "Type: "
-msgstr "N�v: "
+#: ../../diskdrake.pm_.c:578 ../../diskdrake.pm_.c:648
+msgid "If the list above doesn't contain the wanted entry, enter it here:"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:248
-msgid "Name: "
-msgstr "Ad: "
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "Verici"
 
-#: ../../diskdrake.pm_.c:253
-#, c-format
-msgid "Start: sector %s\n"
-msgstr "Ba�lan��c: sektor %s\n"
+#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
+msgid "Shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Size: %s"
-msgstr "B�y�kl�y�: %s"
+#: ../../diskdrake.pm_.c:615
+msgid "Scanning available samba shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:256
+#: ../../diskdrake.pm_.c:626 ../../diskdrake.pm_.c:639
 #, c-format
-msgid ", %s sectors"
-msgstr ", %s sektor"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:258
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Silindr %d -d�n silindr %d-y�\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose a partition"
+msgstr "Monitorunuzu seçin"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "��kill�ndirilmi�\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose another partition"
+msgstr "Yeni bölmə yarat"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "��kill�ndirilm�mi�\n"
+#: ../../diskdrake_interactive.pm_.c:188
+#, fuzzy
+msgid "Exit"
+msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "Ba�l�\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "Usta moduna keç"
 
-#: ../../diskdrake.pm_.c:262
-#, c-format
-msgid "RAID md%s\n"
-msgstr "RAID md%s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to normal mode"
+msgstr "Normal moda keç"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Loopback fayl�: %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Geri al"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Ana a��lma b�lm�si\n"
-"    (MS-DOS a��l��� ���n)\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "Davam edilsin?"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "S�viyy� %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "Qeyd etmədən Çıx"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Par�a b�y�kl�y� %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "Bölmə cədvəlini qeyd etmədən çıxırsınız?"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "RAID-diskl�ri %s\n"
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Qurğuları sınamaq istəyirsiniz?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Loopback fayl� ad�: %s"
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Avtomatik ayır"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "Hamısını təmizlə"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "Daha Çox"
+
+#: ../../diskdrake_interactive.pm_.c:250
+#, fuzzy
+msgid "Hard drive information"
+msgstr "Sabit disk seçkisi"
+
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "Not enough space for auto-allocating"
+msgstr "Avtomatik yerləşdirmə üçün boş sahə yoxdur"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "Bütün birinci bölmələr istifadədədir"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "Artıq bölmə əlavə edilə bilməz"
+
+#: ../../diskdrake_interactive.pm_.c:275
 msgid ""
-"\n"
-"Chances are, this partition is\n"
-"a Driver partition, you should\n"
-"probably leave it alone.\n"
-msgstr ""
-"\n"
-"B�lk� d� bu bir S�r�c� b�lm�sidir.\n"
-"Onda bunu ele bel�c� burax�n.\n"
+"To have more partitions, please delete one to be able to create an extended "
+"partition"
+msgstr "Artıq bölmə yaratmaq üçün, bir bölməni silib məntiqi bölmə yaradın"
+
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "Bölmə cədvəlini yaz"
+
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "Bölmə cədvəlini qurtar"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "Bölmə cədvəlini qurtar"
+
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "Bölmə cədvəlini qurtar"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "Taxılıb sökülə bilən avadanlıqların avtomatik bağlanması"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Fayl seç"
+
+#: ../../diskdrake_interactive.pm_.c:308
 msgid ""
-"\n"
-"This special Bootstrap\n"
-"partition is for\n"
-"dual-booting your system.\n"
+"The backup partition table has not the same size\n"
+"Still continue?"
 msgstr ""
-"\n"
-"Bu, ikili a��l�� ���n x�susi\n"
-"Bootstrap-d�r.\n"
+"Yedək bölmə cədvəli eyni böyüklüyə sahib deyil\n"
+"Davam etmək istəyirsiniz?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Xahi� edirik bir b�lm� �st�n� t�qlay�n"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Xəbərdarlıq"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "B�y�kl�k: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Disket sürücüyə bir disket yerləşdirin\n"
+"Bu disketdəki bütün mə'lumatlar yox olacaqdır"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geometriyas�: %s silindr, %s ba�, %s sektor\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "Bölmə cədvəli qurtarılmağa cəhd edilir"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "LVM-diskl�ri %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+#, fuzzy
+msgid "Detailed information"
+msgstr "Mə'lumatı göstər"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "B�lm� c�dv�li n�v�: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Böyüklüyünü Dəyişdir"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "%d data yolunda, %d n�'li\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Daşı"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Ba�la"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Şəkilləndir"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
-msgstr "F�al"
+msgstr "Fəal"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
-msgstr "RAID� �lav� et"
-
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "RAIDd�n ay�r"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "RAIDi d�yi�dir"
+msgstr "RAIDə əlavə et"
 
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
-msgstr "LVM� �lav� et"
+msgstr "LVMə əlavə et"
 
-#: ../../diskdrake.pm_.c:332
-msgid "Remove from LVM"
-msgstr "LVMd�n ay�r"
-
-#: ../../diskdrake.pm_.c:334
-msgid "Use for loopback"
-msgstr "Loopback ���n istifad� et"
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "RAIDdən ayır"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Monitorunuzu se�in"
+#: ../../diskdrake_interactive.pm_.c:364
+msgid "Remove from LVM"
+msgstr "LVMdən ayır"
 
-#: ../../diskdrake.pm_.c:435
-msgid ""
-"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
-"1024).\n"
-"Either you use LILO and it won't work, or you don't use LILO and you don't "
-"need /boot"
-msgstr ""
-"Ba���lay�n, /boot b�lm�sini bu s�r�c�d� yarada bilm�y�c�m.\n"
-"Onda ya LILO istifad� ed� bilm�y�c�ksiniz ve /boot b�l�m�n� \n"
-"ehtiyac�n�z yoxdur v� ya LILO istifad�sini s�nayars�n�z, ancaq LILO i�l�m�y� "
-"bil�r."
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "RAIDi dəyişdir"
 
-#: ../../diskdrake.pm_.c:439
-msgid ""
-"The partition you've selected to add as root (/) is physically located "
-"beyond\n"
-"the 1024th cylinder of the hard drive, and you have no /boot partition.\n"
-"If you plan to use the LILO boot manager, be careful to add a /boot partition"
-msgstr ""
-"Se�diyiniz b�l�m fiziki sah�nin �st�nd� (1024. silindrin xaricind�)\n"
-"/boot b�l�m�n�z yoxdur. Lilo a��l�� idar�cisind�n istifad� etm�k "
-"ist�yirsinizs�, \n"
-"/boot b�lm�sini �lav� ed�rk�n �ox diqq�tli olmal�s�n�z."
+#: ../../diskdrake_interactive.pm_.c:366
+msgid "Use for loopback"
+msgstr "Loopback üçün istifadə et"
 
-#: ../../diskdrake.pm_.c:445
-msgid ""
-"You've selected a software RAID partition as root (/).\n"
-"No bootloader is able to handle this without a /boot partition.\n"
-"So be careful to add a /boot partition"
-msgstr ""
-"Bir proqram t�'minatl� RAID b�lm�sini k�k qovlu�u (/) olaraq t�'yin "
-"etdiniz.\n"
-"�g�r lilo ya da grub istifad� etm�k ist�yirsinizs�, bir /boot b�lm�si\n"
-"�lav� etm�yi unutmay�n"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Yeni bölmə yarat"
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "Yerin� ``%s'' i�l�t"
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "Başlanğıç sektoru: "
 
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "�vv�lc� ``Ay�r'-� i�l�t"
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "MB cinsindən böyüklük: "
 
-#: ../../diskdrake.pm_.c:469 ../../diskdrake.pm_.c:513
-#, c-format
-msgid ""
-"After changing type of partition %s, all data on this partition will be lost"
-msgstr ""
-"%s b�lm�sinin n�v�n� d�yi�dirdikd�n sonra, bu b�lm�d�ki b�t�n m�'lumatlar "
-"silin�c�kdir"
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Fayl sistemi növü: "
 
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "Davam edilsin?"
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Bağlama nöqtəsi: "
 
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "Qeyd etm�d�n ��x"
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Xüsusiyyətlər: "
 
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "B�lm� c�dv�lini qeyd etm�d�n ��x�rs�n�z?"
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "Loopback faylı şəkilləndirilir: %s"
 
-#: ../../diskdrake.pm_.c:516
+#: ../../diskdrake_interactive.pm_.c:486
 msgid "Change partition type"
-msgstr "B�lm� n�v�n� D�yi�dir"
+msgstr "Bölmə növünü Dəyişdir"
 
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "Hans� dili ist�yirsiniz?"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "32MB d�n ki�ik disk b�lm�l�rind� ReiserFS istifad� etm�lisiniz"
+#: ../../diskdrake_interactive.pm_.c:491
+msgid "Switching from ext2 to ext3"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake_interactive.pm_.c:521
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
-msgstr "%s loopback avadanl���n� haraya ba�lamaq ist�yirsiniz?"
+msgstr "%s loopback avadanlığını haraya bağlamaq istəyirsiniz?"
 
-#: ../../diskdrake.pm_.c:538
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "%s avadanl���n� haraya ba�lamaq ist�yirsiniz?"
-
-#: ../../diskdrake.pm_.c:542
+#: ../../diskdrake_interactive.pm_.c:528
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
-"Bu disk b�lm�si loopback ���n istifad� edildiyind�n �tr� ba�lanma "
-"n�qt�sind�n ayr�la bilinmir.\n"
-"�vv�lc� loopback-� l��v edin."
+"Bu disk bölməsi loopback üçün istifadə edildiyindən ötrü bağlanma "
+"nöqtəsindən ayrıla bilinmir.\n"
+"Əvvəlcə loopback-ı ləğv edin."
 
-#: ../../diskdrake.pm_.c:561
-#, c-format
-msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr ""
-"%s b�lm�si ��kill�ndirildikd�n sonra bu b�lm�d�ki b�t�n m�'lumatlar "
-"silin�c�kdir"
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "Fat fayl sistemi ucları hesaplanır"
 
-#: ../../diskdrake.pm_.c:563
-msgid "Formatting"
-msgstr "��kill�ndirilir"
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "Böyüklüyü dəyişdirilir"
 
-#: ../../diskdrake.pm_.c:564
-#, c-format
-msgid "Formatting loopback file %s"
-msgstr "Loopback fayl� ��kill�ndirilir: %s"
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "Hansı bölmə növünü istəyirsiniz?"
 
-#: ../../diskdrake.pm_.c:565 ../../install_steps_interactive.pm_.c:430
-#, c-format
-msgid "Formatting partition %s"
-msgstr "��kill�ndiril�n b�lm�: %s"
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "Bu bölmədəki bütün mə'lumatlar yedəklənməlidir"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "B�t�n b�lm�l�ri ��kill�ndirdikd�n sonra, "
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr ""
+"%s bölməsi böyüklüyü dəyişdirildirkdən sonra bu bölmədəki bütün mə'lumatlar "
+"silinəcəkdir"
 
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "bu b�lm�l�rd�ki b�t�n veril�r it�c�kdir"
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Yeni böyüklük seçin"
 
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Da��"
+#: ../../diskdrake_interactive.pm_.c:591
+#, fuzzy
+msgid "New size in MB: "
+msgstr "MB cinsindən böyüklük: "
 
-#: ../../diskdrake.pm_.c:577
+#: ../../diskdrake_interactive.pm_.c:631
 msgid "Which disk do you want to move it to?"
-msgstr "Hans� disk� da��maq ist�yirsiniz?"
+msgstr "Hansı diskə daşımaq istəyirsiniz?"
 
-#: ../../diskdrake.pm_.c:578
+#: ../../diskdrake_interactive.pm_.c:632
 msgid "Sector"
 msgstr "Sektor"
 
-#: ../../diskdrake.pm_.c:579
+#: ../../diskdrake_interactive.pm_.c:633
 msgid "Which sector do you want to move it to?"
-msgstr "Hans� sektora da��maq ist�yirsiniz?"
+msgstr "Hansı sektora daşımaq istəyirsiniz?"
 
-#: ../../diskdrake.pm_.c:582
+#: ../../diskdrake_interactive.pm_.c:636
 msgid "Moving"
-msgstr "Da��n�r"
+msgstr "Daşınır"
 
-#: ../../diskdrake.pm_.c:582
+#: ../../diskdrake_interactive.pm_.c:636
 msgid "Moving partition..."
-msgstr "B�lm� da��n�r..."
+msgstr "Bölmə daşınır..."
+
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "Əlavə etmək üçün mövcud bir RAID seçin"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "yeni"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "Əlavə etmək üçün mövcud bir LVM seçin"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "LVM adı?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "Bu disk bölməsi loopback üçün işlədilməz"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Loopback"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Loopback fayl adı: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "Həqiqi adı"
 
-#: ../../diskdrake.pm_.c:592
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr ""
+"Fayl başqa bir loopback tərəfindən istifadədədir, başqa\n"
+"birini seçin"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "Fayl onsuz da vardır. İşlədilsin?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "avadanlıq"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "səviyyə"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "parça böyüklüyü"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "Diqqətlı olun: bu əməliyyat təhlükəlidir."
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "Nəcə bölməlandirmə istəyirsən?"
+
+#: ../../diskdrake_interactive.pm_.c:834
+msgid ""
+"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
+"1024).\n"
+"Either you use LILO and it won't work, or you don't use LILO and you don't "
+"need /boot"
+msgstr ""
+"Bağışlayın, /boot bölməsini bu sürücüdə yarada bilməyəcəm.\n"
+"Onda ya LILO istifadə edə bilməyəcəksiniz ve /boot bölümünə \n"
+"ehtiyacınız yoxdur və ya LILO istifadəsini sınayarsınız, ancaq LILO işləməyə "
+"bilər."
+
+#: ../../diskdrake_interactive.pm_.c:838
+msgid ""
+"The partition you've selected to add as root (/) is physically located "
+"beyond\n"
+"the 1024th cylinder of the hard drive, and you have no /boot partition.\n"
+"If you plan to use the LILO boot manager, be careful to add a /boot partition"
+msgstr ""
+"Seçdiyiniz bölüm fiziki sahənin üstündə (1024. silindrin xaricində)\n"
+"/boot bölümünüz yoxdur. Lilo açılış idarəcisindən istifadə etmək "
+"istəyirsinizsə, \n"
+"/boot bölməsini əlavə edərkən çox diqqətli olmalısınız."
+
+#: ../../diskdrake_interactive.pm_.c:844
+msgid ""
+"You've selected a software RAID partition as root (/).\n"
+"No bootloader is able to handle this without a /boot partition.\n"
+"So be careful to add a /boot partition"
+msgstr ""
+"Bir proqram tə'minatlı RAID bölməsini kök qovluğu (/) olaraq tə'yin "
+"etdiniz.\n"
+"Əgər lilo ya da grub istifadə etmək istəyirsinizsə, bir /boot bölməsi\n"
+"əlavə etməyi unutmayın"
+
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "%s s�r�c�s�n�n b�lm� c�dv�li disk� yaz�lacaq!"
+msgstr "%s sürücüsünün bölmə cədvəli diskə yazılacaq!"
 
-#: ../../diskdrake.pm_.c:594
+#: ../../diskdrake_interactive.pm_.c:868
 msgid "You'll need to reboot before the modification can take place"
-msgstr "Yeni qur�ular�n f�alla�ma�� ���n sistemi yenid�n ba�latmal�s�n�z"
+msgstr "Yeni qurğuların fəallaşmağı üçün sistemi yenidən başlatmalısınız"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "Fat fayl sistemi uclar� hesaplan�r"
+#: ../../diskdrake_interactive.pm_.c:879
+#, c-format
+msgid "After formatting partition %s, all data on this partition will be lost"
+msgstr ""
+"%s bölməsi şəkilləndirildikdən sonra bu bölmədəki bütün mə'lumatlar "
+"silinəcəkdir"
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "B�y�kl�y� d�yi�dirilir"
+#: ../../diskdrake_interactive.pm_.c:881
+msgid "Formatting"
+msgstr "Şəkilləndirilir"
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "Hans� b�lm� n�v�n� ist�yirsiniz?"
+#: ../../diskdrake_interactive.pm_.c:882
+#, c-format
+msgid "Formatting loopback file %s"
+msgstr "Loopback faylı şəkilləndirilir: %s"
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "Bu b�lm�d�ki b�t�n m�'lumatlar yed�kl�nm�lidir"
+#: ../../diskdrake_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:419
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Şəkilləndirilən bölmə: %s"
+
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid iflas etdi"
 
-#: ../../diskdrake.pm_.c:650
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "Yeni bölmələr üçün boş sahə yoxdur"
+
+#: ../../diskdrake_interactive.pm_.c:895
 #, c-format
-msgid "After resizing partition %s, all data on this partition will be lost"
+msgid ""
+"Directory %s already contain some data\n"
+"(%s)"
 msgstr ""
-"%s b�lm�si b�y�kl�y� d�yi�dirildirkd�n sonra bu b�lm�d�ki b�t�n m�'lumatlar "
-"silin�c�kdir"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Yeni b�y�kl�k se�in"
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "Yeni bölmələr üçün boş sahə yoxdur"
 
-#: ../../diskdrake.pm_.c:660 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
-msgid "MB"
-msgstr "MB"
+#: ../../diskdrake_interactive.pm_.c:910
+#, c-format
+msgid "Copying %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "Yeni b�lm� yarat"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Rezolyusiya: %s\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "Ba�lan��� sektoru: "
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Avadanlıq: "
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "MB cinsind�n b�y�kl�k: "
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "DOS sürücü hərfi: %s (sadəcə təxmini)\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Fayl sistemi n�v�: "
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Növ: "
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "X�susiyy�tl�r: "
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Ad: "
 
-#: ../../diskdrake.pm_.c:798
-msgid "This partition can't be used for loopback"
-msgstr "Bu disk b�lm�si loopback ���n i�l�dilm�z"
+#: ../../diskdrake_interactive.pm_.c:954
+#, c-format
+msgid "Start: sector %s\n"
+msgstr "Başlanğıc: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:808
-msgid "Loopback"
-msgstr "Loopback"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Böyüklüyü: %s"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Loopback fayl ad�: "
+#: ../../diskdrake_interactive.pm_.c:957
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s sektor"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr ""
-"Fayl ba�qa bir loopback t�r�find�n istifad�d�dir, ba�qa\n"
-"birini se�in"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Silindr %d -dən silindr %d-yə\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "Fayl onsuz da vard�r. ��l�dilsin?"
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Şəkilləndirilmiş\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Fayl se�"
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "Şəkilləndirilməmiş\n"
+
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "Bağlı\n"
 
-#: ../../diskdrake.pm_.c:876
+#: ../../diskdrake_interactive.pm_.c:963
+#, c-format
+msgid "RAID md%s\n"
+msgstr "RAID md%s\n"
+
+#: ../../diskdrake_interactive.pm_.c:965
+#, c-format
 msgid ""
-"The backup partition table has not the same size\n"
-"Still continue?"
+"Loopback file(s):\n"
+"   %s\n"
 msgstr ""
-"Yed�k b�lm� c�dv�li eyni b�y�kl�y� sahib deyil\n"
-"Davam etm�k ist�yirsiniz?"
-
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "X�b�rdarl�q"
+"Loopback faylı:\n"
+"   %s\n"
 
-#: ../../diskdrake.pm_.c:885
+#: ../../diskdrake_interactive.pm_.c:966
 msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
-"Disket s�r�c�y� bir disket yerl��dirin\n"
-"Bu disketd�ki b�t�n m�'lumatlar yox olacaqd�r"
+"Ana açılma bölməsi\n"
+"    (MS-DOS açılışı üçün)\n"
 
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "B�lm� c�dv�li qurtar�lma�a c�hd edilir"
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "Səviyyə %s\n"
 
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "avadanl�q"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Parça böyüklüyü %s\n"
 
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "s�viyy�"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "RAID-diskləri %s\n"
 
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "par�a b�y�kl�y�"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Loopback faylı adı: %s"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "�lav� etm�k ���n m�vcud bir RAID se�in"
+#: ../../diskdrake_interactive.pm_.c:975
+msgid ""
+"\n"
+"Chances are, this partition is\n"
+"a Driver partition, you should\n"
+"probably leave it alone.\n"
+msgstr ""
+"\n"
+"Bəlkə də bu bir Sürücü bölməsidir.\n"
+"Onda bunu ele beləcə buraxın.\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "yeni"
+#: ../../diskdrake_interactive.pm_.c:978
+msgid ""
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
+msgstr ""
+"\n"
+"Bu, ikili açılış üçün xüsusi\n"
+"Bootstrap-dır.\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "�lav� etm�k ���n m�vcud bir LVM se�in"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Böyüklük: %s\n"
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr "LVM ad�?"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geometriyası: %s silindr, %s baş, %s sektor\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "Tax�l�b s�k�l� bil�n avadanl�qlar�n avtomatik ba�lanmas�"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Mə'lumat: "
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "B�lm� c�dv�lini qurtar"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM-diskləri %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Bölmə cədvəli növü: %s\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "Yenid�n y�kl�"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "%d data yolunda, %d nö'li\n"
+
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Seçənəklər: %s"
 
-#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
-#: ../../fs.pm_.c:113
+#: ../../fs.pm_.c:447 ../../fs.pm_.c:457 ../../fs.pm_.c:461 ../../fs.pm_.c:465
+#: ../../fs.pm_.c:469 ../../fs.pm_.c:473
 #, c-format
 msgid "%s formatting of %s failed"
-msgstr "%s ��kill�ndirilm�sind� %s b�lm� x�tas�"
+msgstr "%s şəkilləndirilməsində %s bölmə xətası"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
-msgstr "%s'i nec� ��kill�ndir�c�yimi bilmir�m (N�v: %s)"
+msgstr "%s'i necə şəkilləndirəcəyimi bilmirəm (Növ: %s)"
 
-#: ../../fs.pm_.c:231
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "bağlama iflas etdi"
+
+#: ../../fs.pm_.c:588
+#, c-format
+msgid "fsck failed with exit code %d or signal %d"
+msgstr ""
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
 msgid "mount failed: "
-msgstr "ba�lama iflas etdi: "
+msgstr "bağlama iflas etdi: "
 
-#: ../../fs.pm_.c:243
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
-msgstr "%s ayr�l�rk�n x�ta oldu: %s"
+msgstr "%s ayrılırkən xəta oldu: %s"
 
 #: ../../fsedit.pm_.c:21
 msgid "simple"
-msgstr "b�sit"
+msgstr "bəsit"
 
 #: ../../fsedit.pm_.c:30
 msgid "server"
 msgstr "verici"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "16MB dən kiçik disk bölmələrində JFS istifadə etməlisiniz"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "32MB dən kiçik disk bölmələrində ReiserFS istifadə etməlisiniz"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
-msgstr "Ba�lama n�qt�l�ri / il� ba�lamal�d�r"
+msgstr "Bağlama nöqtələri / ilə başlamalıdır"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
-msgstr "Onsuz da ba�lama n�qt�si %s olan bir b�lm� var\n"
+msgstr "Onsuz da bağlama nöqtəsi %s olan bir bölmə var\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Dair�vi ba�lama %s\n"
-
-#: ../../fsedit.pm_.c:285
+#: ../../fsedit.pm_.c:476
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
-msgstr "%s ���n LVM M�ntiqi Cildini istifad� ed� bilm�zsiniz"
+msgstr "%s üçün LVM Məntiqi Cildini istifadə edə bilməzsiniz"
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
-msgstr "Bu qovluq k�k fayl sistemi i��risind� olmal�d�r"
+msgstr "Bu qovluq kök fayl sistemi içərisində olmalıdır"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
-"Bu ba�lama n�qt�si ���n h�qiqi bir fayl sistemin� (ext2, reisrfs)\n"
-"ehtiyac vard�r.\n"
+"Bu bağlama nöqtəsi üçün həqiqi bir fayl sisteminə (ext2, reisrfs)\n"
+"ehtiyac vardır.\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
-msgstr "Yazmaq ���n a��lan %s'd� x�ta: %s"
+msgstr "Yazmaq üçün açılan %s'də xəta: %s"
 
-#: ../../fsedit.pm_.c:453
+#: ../../fsedit.pm_.c:681
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
 msgstr ""
-"Bir x�ta oldu. Yeni fayl sisteminin yarad�laca�� h�kml� bir s�r�c� "
-"tap�lmad�. Bu problemin qayna�� ���n avadanl���n�z� yoxlay�n"
+"Bir xəta oldu. Yeni fayl sisteminin yaradılacağı hökmlü bir sürücü "
+"tapılmadı. Bu problemin qaynağı üçün avadanlığınızı yoxlayın"
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
-msgstr "He� disk b�lm�niz yoxdur!"
-
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr "Qurulma v� sistem istifad�si ���n bir dil se�in."
-
-#: ../../help.pm_.c:12
-msgid ""
-"You need to accept the terms of the above license to continue installation.\n"
-"\n"
+msgstr "Heç disk bölməniz yoxdur!"
+
+#: ../../help.pm_.c:13
+msgid ""
+"GNU/Linux is a multiuser system, and this means that each user can have his\n"
+"own preferences, his own files and so on. You can read the ``User Guide''\n"
+"to learn more. But unlike \"root\", which is the administrator, the users\n"
+"you will add here will not be entitled to change anything except their own\n"
+"files and their own configuration. You will have to create at least one\n"
+"regular user for yourself. That account is where you should log in for\n"
+"routine use. Although it is very practical to log in as \"root\" everyday,\n"
+"it may also be very dangerous! The slightest mistake could mean that your\n"
+"system would not work any more. If you make a serious mistake as a regular\n"
+"user, you may only lose some information, but not the entire system.\n"
+"\n"
+"First, you have to enter your real name. This is not mandatory, of course -\n"
+"as you can actually enter whatever you want. DrakX will then take the first\n"
+"word you have entered in the box and will bring it over to the \"User\n"
+"name\". This is the name this particular user will use to log into the\n"
+"system. You can change it. You then have to enter a password here. A\n"
+"non-privileged (regular) user's password is not as crucial as that of\n"
+"\"root\" from a security point of view, but that is no reason to neglect it\n"
+"- after all, your files are at risk.\n"
+"\n"
+"If you click on \"Accept user\", you can then add as many as you want. Add\n"
+"a user for each one of your friends: your father or your sister, for\n"
+"example. When you finish adding all the users you want, select \"Done\".\n"
+"\n"
+"Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
+"for that user (bash by default)."
+msgstr ""
+
+#: ../../help.pm_.c:41
+msgid ""
+"Listed above are the existing Linux partitions detected on your hard drive.\n"
+"You can keep the choices made by the wizard, they are good for most common\n"
+"installs. If you make any changes, you must at least define a root\n"
+"partition (\"/\"). Do not choose too small a partition or you will not be\n"
+"able to install enough software. If you want to store your data on a\n"
+"separate partition, you will also need to create a partition for \"/home\"\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"
-"Please click on \"Accept\" if you agree with its terms.\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"
-"Please click on \"Refuse\" if you disagree with its terms. Installation will "
-"end without modifying your current\n"
-"configuration."
-msgstr ""
-"Davam ed� bilm�k ���n yuxar�dak� lisenziyan�n madd�l�rini q�bul "
-"etm�lisiniz.\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"
-"Xahi� edirik, madd�l�rl� raz� is�niz \"Q�bul\" d�ym�sin� bas�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"
-"Xahi� edirik, madd�l�rl� raz� deyils�niz ,\"R�dd\" d�ym�sin� bas�n\n"
-"Y�kl�m� indiki qur�ular�n�z d�yi�dirilm�d�n bitiril�c�k."
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Yuxar�dak� siyah�dan klaviaturan�za uy�un g�l�n d�z�l��� se�iniz"
-
-#: ../../help.pm_.c:25
-msgid ""
-"If you wish other languages (than the one you choose at\n"
-"beginning of installation) will be available after installation, please "
-"chose\n"
-"them in list above. If you want select all, you just need to select \"All\"."
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc."
 msgstr ""
-"�g�r y�kl�m�d�n sonra i�l�tm�k ���n f�rqli dill�r (y�kl�m�nin �vv�lind� "
-"se�diyinizd�n) se�m�k ist�yirsinizs�,\n"
-"xahi� edirik, onlar� yuxar�dak� siyah�dan se�in.\n"
-"�g�r ham�s�n� se�m�k ist�yirsiniz is� \"Ham�s�n�\" se�in."
-
-#: ../../help.pm_.c:30
-msgid ""
-"Please choose \"Install\" if there are no previous version of Linux-"
-"Mandrake\n"
-"installed or if you wish to use several operating systems.\n"
-"\n"
-"\n"
-"Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\n"
-"\n"
+"Yuxarıda sürücünüzdə tapılan Linuks bölmələri sıralanıb\n"
+"Sehirbazın tövsiyələrinə uyun, onlar çox vaxt işə yarayır.\n"
+"Əgər bunu istəməsəniz en azından kök bölməsi (\"/\") seçməlisiniz\n"
+"Çox kiçik bölmə seçməyin. yoxsa çox proqram tə'minatı yükləyə bilməzsəniz.\n"
+"Əgər verilərinizi başqa bölmədə tutmaq istəyirsinizsə, ondabir de \"/home\" "
+"bölməsi də yaratmalısınız (birdən çox Linuks\n"
+"bölməniz var isə).\n"
 "\n"
-"Depend of your knowledge in GNU/Linux, you can choose one of the following "
-"levels to install or update your\n"
-"Linux-Mandrake operating system:\n"
 "\n"
-"\t* Recommended: if you have never installed a GNU/Linux operating system "
-"choose this. Installation will be\n"
-"\t  be very easy and you will be asked only on few questions.\n"
+"Xəbəriniz olsun, hər bölmə aşağıdakı kimi sıralanıb: \"Ad\", \"Həcm\".\n"
 "\n"
 "\n"
-"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
-"the primary usage (workstation, server,\n"
-"\t  development) of your system. You will need to answer to more questions "
-"than in \"Recommended\" installation\n"
-"\t  class, so you need to know how GNU/Linux works to choose this "
-"installation class.\n"
+"\"Ad\" belə kodlanıb: \"sürücü növü\", \"sürücü mömrəsi\",\n"
+"\"bölmə nömrəsi\" (məsələn \"hda1\").\n"
 "\n"
 "\n"
-"\t* Expert: if you have a good knowledge in GNU/Linux, you can choose this "
-"installation class. As in \"Customized\"\n"
-"\t  installation class, you will be able to choose the primary usage "
-"(workstation, server, development). Be very\n"
-"\t  careful before choose this installation class. You will be able to "
-"perform a higly customized installation.\n"
-"\t  Answer to some questions can be very difficult if you haven't a good "
-"knowledge in GNU/Linux. So, don't choose\n"
-"\t  this installation class unless you know what you are doing."
-msgstr ""
-"Xahi� edirik Linuks Mandrakenin daha �vv�lki burax�l��lar� qurulu deyils� v� "
-"ya m�xt�lif �m�liyyat sisteml�rind�n istifad� etm�k ist�yirsinizs� \"Y�kl�\" "
-"se�in.\n"
-"\n"
+"\"Sürücü növü\" əgər sürücünüz IDE sürücüdürsə \"hd\"dirvə SCSI sürücü isə "
+"\"sd\"dir.\n"
 "\n"
-"Xahi� edirik qurulu olan Linuks Mandrakenin �vv�lki burax�l���n� g�nc�ll�m�k "
-"ist�yirsinizs� \"G�nc�ll�\" se�in.\n"
 "\n"
+"\"Sürücü nömrəsi\" həmişə \"hd\" və ya \"sd\"dən sonrakı rəqəmdir.IDE "
+"sürücülər üçün:\n"
 "\n"
-"Sizin GNU/Linuks biliyinizd�n as�l� olaraq y�kl�m�k v� ya g�nc�ll�m�k ���n "
-"Linuks Mandrakenin a�a��dak� s�viyy�l�rini se�� bil�rsiniz:\n"
+"*\"a\" yəni \"birinci IDE idarəcisində ali sürücü\",\n"
 "\n"
-"\t* T�vsiy� edil�n: �g�r �vv�lc� he� GNU/Linuks il� tan�� olmad�n�z is� "
-"se�in. Y�kl�m� �ox asand olacaq v� �ox az sual soru�ulacaq.\n"
+"*\"b\" yəni \"birinci IDE idarəcisində kölə sürücü\",\n"
 "\n"
+"*\"c\" yəni \"ikinci IDE idarəcisində ali sürücü\",\n"
 "\n"
-"\t* X�susi: �g� �vv�lc� GNU/Linuksa bir az a�ina is�niz, se�in. Onda siz "
-"ist�diyiniz sistem n�v�n� (Masa �st�, Verici, T�cr�bi) se�� bil�c�ksiniz.\n"
-"\t �lb�td� siz� \"T�vsiy� edil�n\" se�kid�n daha �ox sual soru�ulacaq.\n"
-"\t Ona g�r� d� GNU/Linuksa bir az a�ina olmal�s�n�z.\n"
+"*\"d\" yəni \"ikinci IDE idarəcisində kölə sürücü\".\n"
 "\n"
 "\n"
-"\t* Usta: �g�r yax�� bir GNU/Linuks biliyin� sahibs�niz, bu sinifi se�in.\n"
-"\t \"X�susi\" sinifind�ki kimi i�l�d�c�yiniz sistemi (Masa �st�, Verici, "
-"T�cr�bi)\n"
-"\t se�� bil�c�ksiniz. Amma sizi �ox ��tin suallar g�zl�yir. B�z�n bu "
-"suallar�n i�ind�n\n"
-"\t ��xa bilm�k �ox z�hm�tli olur. Ona g�r� d� n� etdiyinizi bilirs�niz, bu "
-"sinifi se�in."
+"SCSI sürücülərində \"a\" nın mənası \"birinci sürücü\",\n"
+"\"b\"nin mənası \"ikinci sürücü\"dür vs..."
 
-#: ../../help.pm_.c:56
+#: ../../help.pm_.c:72
 msgid ""
-"Select:\n"
-"\n"
-"  - Customized: If you are familiar enough with GNU/Linux, you may then "
-"choose\n"
-"    the primary usage for your machine. See below for details.\n"
-"\n"
-"\n"
-"  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
-"    perform a highly customized installation. As for a \"Customized\"\n"
-"    installation class, you will be able to select the usage for your "
-"system.\n"
-"    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
-"DOING!"
+"The Mandrake Linux installation is spread out over several CDROMs. DrakX\n"
+"knows if a selected package is located on another CDROM and will eject the\n"
+"current CD and ask you to insert a different one as required."
 msgstr ""
-"Se�:\n"
-"\n"
-"  - X�susi: �g�r Linuksa a�ina is�niz  bu se��n�y� t�qlay�n.\n"
-"    Sonra sistemin sinifini se�� bil�c�ksiniz.\n"
-"     Ayr�nr�lar ���n a�a��ya bax�n.\n"
-"\n"
-"\n"
-"  - Usta: �g�r GNU/Linuks haqq�nda yax�� bilik sahibi is�niz bunu se�in.\n"
-"    Daha sonra \"X�susi\" se�kisind� oldu�u kimi sistemin sinifini se�� "
-"bil�c�ksiniz.\n"
-"    Ancaq art�q d�r�c�d� xahi� edirik, N� ETD�Y�N�Z� B�LM�RS�N�Z BU  S�N�F� "
-"SE�M�Y�N!."
 
-#: ../../help.pm_.c:68
+#: ../../help.pm_.c:77
 msgid ""
-"You must now define your machine usage. Choices are:\n"
-"\n"
-"\t* Workstation: this the ideal choice if you intend to use your machine "
-"primarily for everyday use, at office or\n"
-"\t  at home.\n"
+"It is now time to specify which programs you wish to install on your\n"
+"system. There are thousands of packages available for Mandrake Linux, and\n"
+"you are not supposed to know them all by heart.\n"
 "\n"
+"If you are performing a standard installation from CDROM, you will first be\n"
+"asked to specify the CDs you currently have (in Expert mode only). Check\n"
+"the CD labels and highlight the boxes corresponding to the CDs you have\n"
+"available for installation. Click \"OK\" when you are ready to continue.\n"
 "\n"
-"\t* Development: if you intend to use your machine primarily for software "
-"development, it is the good choice. You\n"
-"\t  will then have a complete collection of software installed in order to "
-"compile, debug and format source code,\n"
-"\t  or create software packages.\n"
+"Packages are sorted in groups corresponding to a particular use of your\n"
+"machine. The groups themselves are sorted into four sections:\n"
 "\n"
+" * \"Workstation\": if you plan to use your machine as a workstation, "
+"select\n"
+"one or more of the corresponding groups.\n"
 "\n"
-"\t* Server: if you intend to use this machine as a server, it is the good "
-"choice. Either a file server (NFS or\n"
-"\t  SMB), a print server (Unix style or Microsoft Windows style), an "
-"authentication server (NIS), a database\n"
-"\t  server and so on. As such, do not expect any gimmicks (KDE, GNOME, etc.) "
-"to be installed."
-msgstr ""
-"�ndi is� komp�terinizi nec� i�l�d�c�yiniz� qerar verin.Se�:\n"
+" * \"Development\": if the machine is to be used for programming, choose "
+"the\n"
+"desired group(s).\n"
 "\n"
-"\t* Masa �st�: komp�terinizi g�nd�lik i�l�r (idar� i�l�ri, qrafika vs.)\n"
-"\t ���n istifad� ed�c�k is�niz, bunu se�in.\n"
+" * \"Server\": finally, if the machine is intended to be a server, you will\n"
+"be able to select which of the most common services you wish to see\n"
+"installed on the machine.\n"
 "\n"
+" * \"Graphical Environment\": this is where you will choose your preferred\n"
+"graphical environment. At least one must be selected if you want to have a\n"
+"graphical workstation!\n"
 "\n"
-"\t* T�cr�bi: Komp�terinizi proqram t�'minat� inki�af� ���n i�l�d�c�ks�niz, "
-"sizin ���n ideal se�kidir.\n"
-"\t O zaman qaynaq kodlar� yazmaq, ��kill�ndirm�k v� x�tadan ay�qlamaq v� ya "
-"proqram paketl�ri haz�rlamaq ���n laz�mi h�r c�r proqram�n daxil oldu�u bir "
-"kolleksiya komp�teriniz� qurulacaqd�r.\n"
+"Moving the mouse cursor over a group name will display a short explanatory\n"
+"text about that group.\n"
 "\n"
+"You can check the \"Individual package selection\" box, which is useful if\n"
+"you are familiar with the packages being offered or if you want to have\n"
+"total control over what will be installed.\n"
 "\n"
-"\t* Verici: Komp�teriniz� Linuks-Mandrakeni verici olaraq i�l�tm�k ���n "
-"quracaqsan�z, bu yax�� bir se�kidir.\n"
-"\t Bir fayl vericisi (NFS ya da SMB),�ap edici vericisi(Unixin lp protokolu "
-"ya da Windows t�rzi SMB �ap),\n"
-"\t tan�d�c� verici (NIS), m�'lumat taban� vericisi v� ox�ar�...Onda KDE, "
-"GNOME kimi m�z�li �eyl�rin qurulma��n� g�zl�m�yin."
+"If you started the installation in \"Update\" mode, you can unselect all\n"
+"groups to avoid installing any new package. This is useful for repairing or\n"
+"updating an existing system."
+msgstr ""
 
-#: ../../help.pm_.c:84
+#: ../../help.pm_.c:115
 msgid ""
-"DrakX will attempt to look for PCI SCSI adapter(s). If DrakX\n"
-"finds an SCSI adapter and knows which driver to use, it will be "
-"automatically\n"
-"installed.\n"
+"Finally, depending on your choice of whether or not to select individual\n"
+"packages, you will be presented a tree containing all packages classified\n"
+"by groups and subgroups. While browsing the tree, you can select entire\n"
+"groups, subgroups, or individual packages.\n"
 "\n"
+"Whenever you select a package on the tree, a description appears on the\n"
+"right. When your selection is finished, click the \"Install\" button which\n"
+"will then launch the installation process. Depending on the speed of your\n"
+"hardware and the number of packages that need to be installed, it may take\n"
+"a while to complete the process. A time to complete estimate is displayed\n"
+"on the screen to help you gauge if there is sufficient time to enjoy a cup\n"
+"of coffee.\n"
 "\n"
-"If you have no SCSI adapter, an ISA SCSI adapter or a PCI SCSI adapter that\n"
-"DrakX doesn't recognize, you will be asked if a SCSI adapter is present in "
-"your\n"
-"system. If there is no adapter present, you can click on \"No\". If you "
-"click on\n"
-"\"Yes\", a list of drivers will be presented from which you can select your\n"
-"specific adapter.\n"
-"\n"
+"!! If a server package has been selected either intentionally or because it\n"
+"was part of a whole group, you will be asked to confirm that you really\n"
+"want those servers to be installed. Under Mandrake Linux, any installed\n"
+"servers are started by default at boot time. Even if they are safe and have\n"
+"no known issues at the time the distribution was shipped, it may happen\n"
+"that security holes are discovered after this version of Mandrake Linux was\n"
+"finalized. If you do not know what a particular service is supposed to do\n"
+"or why it is being installed, then click \"No\". Clicking \"Yes\" will\n"
+"install the listed services and they will be started automatically by\n"
+"default. !!\n"
 "\n"
-"If you have to manually specify your adapter, DrakX will ask if you want to\n"
-"specify options for it. You should allow DrakX to probe the hardware for "
-"the\n"
-"options. This usually works well.\n"
+"The \"Automatic dependencies\" option simply disables the warning dialog\n"
+"which appears whenever the installer automatically selects a package. This\n"
+"occurs because it has determined that it needs to satisfy a dependency with\n"
+"another package in order to successfully complete the installation.\n"
 "\n"
-"\n"
-"If not, you will need to provide options to the driver. Please review the "
-"User\n"
-"Guide (chapter 3, section \"Collective informations on your hardware) for "
-"hints\n"
-"on retrieving this information from hardware documentation, from the\n"
-"manufacturer's Web site (if you have Internet access) or from Microsoft "
-"Windows\n"
-"(if you have it on your system)."
+"The tiny floppy disc icon at the bottom of the list allows to load the\n"
+"packages list chosen during a previous installation. Clicking on this icon\n"
+"will ask you to insert a floppy disk previously created at the end of\n"
+"another installation. See the second tip of last step on how to create such\n"
+"a floppy."
 msgstr ""
-"DrakX PCI SCSI adapterleri axtarma�a c�hd ed�c�k. �g� DrakX SCSI\n"
-"taparsa v� hans� s�r�c� i�l�dil�c�yini bil�rs�, her �ey �z �z�n�\n"
-"qurulacaq.\n"
-"\n"
-"\n"
-"�g�r sisteminizd� SCSI adapteri yoxsa, DrakXin tan�mayaca�� bir\n"
-"ISA SCSI v� ya PCI SCSI adapteri var is�, siz� sisteminizd� SCSI\n"
-"adapteri olub olmad��� soru�ulacaq.\n"
-"�g�r SCSI adapteriniz yox is�, \"Yox\" t�qlay�n. �g�r \"Var\"� "
-"t�qlayarsan�z.\n"
-"qar��n�za s�r�c�l�in siyah�s� ��xacaq, oradan siz� uyan�n� se��rsiniz.\n"
-"\n"
-"\n"
-"�g�r �ll� qurma�� s���rs�niz, o zaman DrakX siz� adapterin x�susiyy�tl�rini\n"
-"soru�acaq. �mkan verin ki, DrakX s�rb�stc� �z� x�susiyy�tl�ri taps�n.\n"
-"�oxunda bu i�� yaray�r.\n"
-"\n"
-"\n"
-"�g�r ist�mirs�niz is�, o zaman adapter ���n x�susiyy�tl�ri �z�n�z\n"
-"g�st�rm�lisiniz. Bunun ���n �stifad��inin �l Kitab�as�na\n"
-"(ba�l�q 3, \"Avadanl���n�z ���n kollektiv m�'lumat) b�lm�sin�\n"
-"bax�n. Ya da avadanl���n�z�n �l kitab�as�ndan v� ya\n"
-"veb s�hif�sind�n (�g�r internet� ��x���n�z var is�)\n"
-"ya da Microsoft Windowsdan (�g�r sisteminizd� qurulu is�)\n"
-"m�'lumat al�n."
 
-#: ../../help.pm_.c:108
+#: ../../help.pm_.c:151
 msgid ""
-"At this point, you need to choose where to install your\n"
-"Linux-Mandrake operating system on your hard drive. If it is empty or if an\n"
-"existing operating system uses all the space available on it, you need to\n"
-"partition it. Basically, partitioning a hard drive consists of logically\n"
-"dividing it to create space to install your new Linux-Mandrake system.\n"
+"If you wish to connect your computer to the Internet or to a local network,\n"
+"please choose the correct option. Please turn on your device before\n"
+"choosing the correct option to let DrakX detect it automatically.\n"
 "\n"
+"Mandrake Linux proposes the configuration of an Internet connection at\n"
+"installation time. Available connections are: traditional modem, ISDN\n"
+"modem, ADSL connection, cable modem, and finally a simple LAN connection\n"
+"(Ethernet).\n"
 "\n"
-"Because the effects of the partitioning process are usually irreversible,\n"
-"partitioning can be intimidating and stressful if you are an inexperienced "
-"user.\n"
-"This wizard simplifies this process. Before beginning, please consult the "
-"manual\n"
-"and take your time.\n"
-"\n"
-"\n"
-"You need at least two partitions. One is for the operating system itself and "
-"the\n"
-"other is for the virtual memory (also called Swap).\n"
-"\n"
-"\n"
-"If partitions have been already defined (from a previous installation or "
-"from\n"
-"another partitioning tool), you just need choose those to use to install "
-"your\n"
-"Linux system.\n"
-"\n"
-"\n"
-"If partitions haven't been already defined, you need to create them. \n"
-"To do that, use the wizard available above. Depending of your hard drive\n"
-"configuration, several solutions can be available:\n"
+"Here, we will not detail each configuration. Simply make sure that you have\n"
+"all the parameters from your Internet Service Provider or system\n"
+"administrator.\n"
 "\n"
-"\t* Use existing partition: the wizard has detected one or more existing "
-"Linux partitions on your hard drive. If\n"
-"\t  you want to keep them, choose this option. \n"
+"You can consult the manual chapter about Internet connections for details\n"
+"about the configuration, or simply wait until your system is installed and\n"
+"use the program described there to configure your connection.\n"
 "\n"
-"\n"
-"\t* Erase entire disk: if you want delete all data and all partitions "
-"present on your hard drive and replace them by\n"
-"\t  your new Linux-Mandrake system, you can choose this option. Be careful "
-"with this solution, you will not be\n"
-"\t  able to revert your choice after confirmation.\n"
-"\n"
-"\n"
-"\t* Use the free space on the Windows partition: if Microsoft Windows is "
-"installed on your hard drive and takes\n"
-"\t  all space available on it, you have to create free space for Linux data. "
-"To do that you can delete your\n"
-"\t  Microsoft Windows partition and data (see \"Erase entire disk\" or "
-"\"Expert mode\" solutions) or resize your\n"
-"\t  Microsoft Windows partition. Resizing can be performed without loss of "
-"any data. This solution is\n"
-"\t  recommended if you want use both Linux-Mandrake and Microsoft Windows on "
-"same computer.\n"
-"\n"
-"\n"
-"\t  Before choosing this solution, please understand that the size of your "
-"Microsoft\n"
-"\t  Windows partition will be smaller than at present time. It means that "
-"you will have less free space under\n"
-"\t  Microsoft Windows to store your data or install new software.\n"
-"\n"
-"\n"
-"\t* Expert mode: if you want to partition manually your hard drive, you can "
-"choose this option. Be careful before\n"
-"\t  choosing this solution. It is powerful but it is very dangerous. You can "
-"lose all your data very easily. So,\n"
-"\t  don't choose this solution unless you know what you are doing."
+"If you wish to configure the network later after installation or if you\n"
+"have finished configuring your network connection, click \"Cancel\"."
 msgstr ""
-"Bu n�qt�d� Linuks Mandrakeni sabit diskinizd� haraya quraca��n�za\n"
-"q�rar ver�c�ksiniz. �g�r diskiniz bo� is� v� ya bir ba�qa sistem\n"
-"b�t�n yeri doldurmu� is�, o zaman diskinizd� Linuks Mandrake ���n\n"
-"yer a�mal�s�n�z. Ona g�r� d� diski b�lm�l�ndirm�lisiniz.\n"
-"B�lm�l�ndirm� �sas�n diskinizd� m�ntiqi s�r�c�l�r yaratmaqdan ibar�tdir.\n"
-"\n"
-"�mumiyy�tl� b�lm�l�ndirm�nin t�siri geri d�n�lm�zdir.Ona g�r� d�\n"
-"bu i� �ox g�rgin v� yorucudur. �g�r �z�n�z� inanm�rs�n�z is� bu\n"
-"sehirbaz siz� yard�m ed�r. Ba�lamadan �vv�l xahi� edirik �l kitab�an�za\n"
-"bax�n. V� bu i� ���n bir az vaxt ay�r�n.\n"
-"\n"
-"\n"
-"Siz� �n az 2 b�lm� laz�md�r. Biri sistemin �z�n� k���rm�si ���n\n"
-"Dig�ri is� uydurma yadda� (ya da dig�r ad� il� Swap) ���n.\n"
-"\n"
-"\n"
-"�g�r diskiniz onsuz da b�l�nm�� is� (�vv�lki sistemden ya da\n"
-"ba�qa b�lm�l�ndirm� vasit�l�ri il� haz�rlanm��) qurulu�da\n"
-"sad�c� olaraq o yerl�ri y�kl�m�k ���n se�in.\n"
-"\n"
-"\n"
-"�g�r disk b�l�nm�mi� ise, yuxar�dak� sehirbazdan istifad� ed� bil�rsiniz.\n"
-"Sisteminizin qurulu�undan as�l� olaraq m�xt�lif imkanlar�n�z var:\n"
-"\n"
-"\t* B�t�n diski sil: Linuks Mandrake qurmaq ���n b�t�n diskinizin\n"
-"\t �z�rind�ki b�lm�l�ri sil�r. Burada diqq�tli olun.\n"
-"\t Sildikl�riniz �sla geri g�lm�z.\n"
-"\n"
-"\n"
-"\t* Windows b�lm�sind�ki sah�ni istifad� et: Sisteminizd�\n"
-"\t Microsoft Windows qurulu is� ve b�t�n diski �hat� edir is�\n"
-"\t Linuks Mandrake ���n bir yer ay�rmal�s�n�z. Bunun ���n\n"
-"\t ya b�t�n diski silm�lisiniz (\"B�t�n diski sil\" bax ya da\n"
-"\t \" Usta modu\" t�vsiy�l�ri) ya da yenid�n b�lm�l�ndirm�lisiniz.Bu i� he� "
-"bir m�'lumat itkisi olmadan da edil� bil�r.Bunun ba�qa ad�\n"
-"\t eyni komp�terd� h�m Linuks Mandrake h�m d� Windows qurulu olmas�d�r.\n"
-"\n"
-"\n"
-"t Bu se�kiy� getm�d�n �vv�l bir �eyi ba�a d��m�lisiniz ki, yenid�n "
-"b�lm�l�ndirm� il� sizin Windows b�lm�si ki�il�c�kdir.\n"
-"\t Y�'ni Windows alt�nda daha az disk sah�sin� malik olacaqs�n�z.\n"
-"\n"
-"\n"
-"\t* Usta modu: �g�r �ll� diski b�lm�k ist�s�niz, bu modu se�in. Diqq�tli "
-"olun.\n"
-"\t Bu mod g��l�d�r amma bir o q�d�r d� t�hl�k�lidir. Diskinizd�ki b�t�n "
-"bilgiyi asandl�qla itir� bil�rsiniz.\n"
-"\t T�cr�b�siz is�niz bunu se�m�yin."
 
-#: ../../help.pm_.c:160
+#: ../../help.pm_.c:172
+#, fuzzy
 msgid ""
-"At this point, you need to choose what\n"
-"partition(s) to use to install your new Linux-Mandrake system. If "
-"partitions\n"
-"have been already defined (from a previous installation of GNU/Linux or "
-"from\n"
-"another partitioning tool), you can use existing partitions. In other "
-"cases,\n"
-"hard drive partitions must be defined.\n"
-"\n"
-"\n"
-"To create partitions, you must first select a hard drive. You can select "
-"the\n"
-"disk for partitioning by clicking on \"hda\" for the first IDE drive, \"hdb"
-"\" for\n"
-"the second or \"sda\" for the first SCSI drive and so on.\n"
+"You may now choose which services you wish to start at boot time.\n"
 "\n"
+"Here are presented all the services available with the current\n"
+"installation. Review them carefully and uncheck those which are not always\n"
+"needed at boot time.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
-"\n"
-"   * Clear all: this option deletes all partitions available on the selected "
-"hard drive.\n"
-"\n"
-"\n"
-"   * Auto allocate: this option allows you to automatically create Ext2 and "
-"swap partitions in free space of your\n"
-"     hard drive.\n"
-"\n"
-"\n"
-"   * Rescue partition table: if your partition table is damaged, you can try "
-"to recover it using this option. Please\n"
-"     be careful and remember that it can fail.\n"
-"\n"
-"\n"
-"   * Undo: you can use this option to cancel your changes.\n"
-"\n"
-"\n"
-"   * Reload: you can use this option if you wish to undo all changes and "
-"load your initial partitions table\n"
-"\n"
-"\n"
-"   * Wizard: If you wish to use a wizard to partition your hard drive, you "
-"can use this option. It is recommended if\n"
-"     you do not have a good knowledge in partitioning.\n"
-"\n"
-"\n"
-"   * Restore from floppy: if you have saved your partition table on a floppy "
-"during a previous installation, you can\n"
-"     recover it using this option.\n"
-"\n"
-"\n"
-"   * Save on floppy: if you wish to save your partition table on a floppy to "
-"be able to recover it, you can use this\n"
-"     option. It is strongly recommended to use this option\n"
-"\n"
+"You can get a short explanatory text about a service by selecting a\n"
+"specific service. However, if you are not sure whether a service is useful\n"
+"or not, it is safer to leave the default behavior.\n"
 "\n"
-"   * Done: when you have finished partitioning your hard drive, use this "
-"option to save your changes.\n"
-"\n"
-"\n"
-"For information, you can reach any option using the keyboard: navigate "
-"trough the partitions using Tab and Up/Down arrows.\n"
-"\n"
-"\n"
-"When a partition is selected, you can use:\n"
-"\n"
-"           * Ctrl-c to create a new partition (when a empty partition is "
-"selected)\n"
-"\n"
-"           * Ctrl-d to delete a partition\n"
-"\n"
-"           * Ctrl-m to set the mount point\n"
-"           \n"
-"\n"
-"           \n"
-"If you are installing on a PPC Machine, you will want to create a small HFS "
-"'bootstrap' partition of at least 1MB for use\n"
-"by the yaboot bootloader. If you opt to make the partition a bit larger, say "
-"50MB, you may find it a useful place to store \n"
-"a spare kernel and ramdisk image for emergency boot situations."
+"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."
 msgstr ""
-"Bu n�qt�d� siz Linuks Mandrake y�kl�m�k ���n b�lm�l�ri se�m�lisiniz. �g�r "
-"�vv�ld�n b�lm�l�r var is� (sistemd� �vv�ll�r qurulu olan GNU/Linuks "
-"b�lm�l�ri v� ya ba�qa b�lm�l�ndirm� vasit�l�ri il� haz�rlad���n�z b�lm�l�r), "
-"onlar� se�in v� istifad� edin.\n"
-"Yoxsa onlar� bildirm�lisiniz.\n"
-"\n"
-"\n"
-"B�lm�l�ri yaratmaq ���n �vv�lci diski se�m�lisiniz.\n"
-"Diski se�m�k ���n birinci IDE s�r�c�s� ���n \"hda\" n�, ikinciyi se�m�k ���n "
-"\"hdb\"ni, birinci SCS� s�r�c�s� ���n ise \"sda\" vs t�qlamal�s�n�z.\n"
-"\n"
-"\n"
-"Se�diyiniz s�r�c�y� a�a��dak�lar� etm�y� qadirsiniz:\n"
-"\n"
-"  *Ham�s�n� t�mizl�: se�ili s�r�c�d� b�t�n b�lm�l�ri sil�r.\n"
-"\n"
-"\n"
-"  *Avtomatik: S�r�c�n�zd�ki bo� sah�d� Ext2 v� Swap\tb�lm�l�rini avtomatik\n"
-"yaradar.\n"
+"İndi, açılışda avtomatik olaraq başlamasını istədiyiniz xidmətləri \n"
+"seçə bilərsiniz. Siçan bir maddənin üzərina gəldiyində o xidmətin rolunu "
+"açıqlayan\n"
+"kiçik bir baloncuq ortaya çıxacaqdır.\n"
 "\n"
-"\n"
-"  *B�lm� c�dv�lini qurtar: Z�d�l�nmi� b�lm� c�dv�lini\tb�rpa ed�r.  Xahi� "
-"edirik\n"
-" diqq�tli olun, ��nk� bu da iflas ed� bil�r.\n"
-"\n"
-"\n"
-"  *G�ri d�n: �st�m�diyiniz se�kil�rinizd�n geri d�nd�r�r.\n"
-"\n"
-"\n"
-"  *Yenid�n y�kl�: B�t�n d�yi�iklikl�rinizd�n geri d�n�r\tba�dak� b�lm� "
-"c�dv�lin� g�l�r.\n"
-"\n"
-"\n"
-"  *Sehirbaz: B�lm�l�ndirm�yi bir sehirbaz ed�r. T�cr�b�siz\tis�niz bunu "
-"se�in.\n"
-"\n"
-"\n"
-" *Floppy-d�n b�rpa et: B�lm� c�dv�lini �vv�ll�r flopy-y� qeyd\tetdiniz is�, "
-"b�lm� c�dv�lini b�rpa edin.\n"
-"\n"
-"\n"
-"  *Floppy-y� qeyd et: Daha sonradan b�rpa etmek ���n\tbilgil�ri floppy-y� "
-"qeyd edin.\n"
-"  Bu se�ki �idd�tl� t�vsiy� edilir.\n"
-"\n"
-"\n"
-"  *Oldu: B�lm�l�ndirm� bitdiyind�, bunu se��r�k\td�yi�iklikl�rinizi qeyd "
-"edin.\n"
-"\n"
-"\n"
-"X�b�riniz olsun, ist�nil�n se�kiy� Tab ve A�a��/Yuxar� oxlar�n� da i�l�d�r�k "
-"klaviaturadan idar� ed� bil�rsiniz.\n"
-"\n"
-"\n"
-"B�lm� se�ildiyi zaman bunlar� i�l�d� bil�rsiniz:\n"
-"\n"
-"      *Ctrl-c yeni b�lm� yaratmaq ���n (bo� b�lm� se�ili oldu�u zaman)\n"
-"\n"
-"      *Ctrl-d b�lm�ni l��v etm�k ���n\n"
-"\n"
-"      *Ctrl-m ba�lama n�qt�sini g�st�rm�k ���n\n"
-"\t\n"
-"\n"
-"\t\n"
-"�g�r PPC komp�terd� qurulum apar�rs�n�zsa, �n az 1 MBl�q balaca bir HFC "
-"'bootstrap' b�lm�sini yaboot a��l�� y�kl�yicisi ���n se�m�k ist�y�c�ksiniz.\n"
-"�g�r daha �ox yeriniz varsa ; m�s�l�n 50 MB, onda b�t�n kernel v� ramdisk "
-"�ksini t�cili a��l�� hallar� ���n saxlaya bil�rsiniz."
+"Əgər kompüterinizi bir verici olaraq istifadə edəcəksəniz bu addımda tam bir "
+"diqqət ayırmalısınız:\n"
+"mühtəməldir ki lazımi heç bir xidməti başlatmaq istəməzsiniz."
 
-#: ../../help.pm_.c:224
+#: ../../help.pm_.c:188
 msgid ""
-"Above are listed the existing Linux partitions detected on\n"
-"your hard drive. You can keep choices make by the wizard, they are good for "
-"a\n"
-"common usage. If you change these choices, you must at least define a root\n"
-"partition (\"/\"). Don't choose a too little partition or you will not be "
-"able\n"
-"to install enough software. If you want store your data on a separate "
-"partition,\n"
-"you need also to choose a \"/home\" (only possible if you have more than "
-"one\n"
-"Linux partition available).\n"
-"\n"
-"\n"
-"For information, each partition is listed as follows: \"Name\", \"Capacity"
-"\".\n"
-"\n"
-"\n"
-"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
-"\n"
-"\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and "
-"\"sd\"\n"
-"if it is an SCSI hard drive.\n"
-"\n"
-"\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE "
-"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"
-"\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc..."
+"GNU/Linux manages time in GMT (Greenwich Manage Time) and translates it in\n"
+"local time according to the time zone you selected."
 msgstr ""
-"Yuxar�da s�r�c�n�zd� tap�lan Linuks b�lm�l�ri s�ralan�b\n"
-"Sehirbaz�n t�vsiy�l�rin� uyun, onlar �ox vaxt i�� yaray�r.\n"
-"�g�r bunu ist�m�s�niz en az�ndan k�k b�lm�si (\"/\") se�m�lisiniz\n"
-"�ox ki�ik b�lm� se�m�yin. yoxsa �ox proqram t�'minat� y�kl�y� bilm�zs�niz.\n"
-"�g�r veril�rinizi ba�qa b�lm�d� tutmaq ist�yirsinizs�, ondabir de \"/home\" "
-"b�lm�si d� yaratmal�s�n�z (bird�n �ox Linuks\n"
-"b�lm�niz var is�).\n"
-"\n"
-"\n"
-"X�b�riniz olsun, h�r b�lm� a�a��dak� kimi s�ralan�b: \"Ad\", \"H�cm\".\n"
-"\n"
-"\n"
-"\"Ad\" bel� kodlan�b: \"s�r�c� n�v�\", \"s�r�c� m�mr�si\",\n"
-"\"b�lm� n�mr�si\" (m�s�l�n \"hda1\").\n"
-"\n"
-"\n"
-"\"S�r�c� n�v�\" �g�r s�r�c�n�z IDE s�r�c�d�rs� \"hd\"dirv� SCSI s�r�c� is� "
-"\"sd\"dir.\n"
-"\n"
-"\n"
-"\"S�r�c� n�mr�si\" h�mi�� \"hd\" v� ya \"sd\"d�n sonrak� r�q�mdir.IDE "
-"s�r�c�l�r ���n:\n"
-"\n"
-"\t*\"a\" y�ni \"birinci IDE idar�cisind� ali s�r�c�\",\n"
-"\n"
-"\t*\"b\" y�ni \"birinci IDE idar�cisind� k�l� s�r�c�\",\n"
+"Linuks zamanı GMT-yə (Greenwich Mean Time) görə qurğular və olduğunuz \n"
+"yerdəki zamana görə lazımi dəyişiklikləri edər."
+
+#: ../../help.pm_.c:192
+msgid ""
+"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
+"on which all the graphics environments (KDE, Gnome, AfterStep,\n"
+"WindowMaker...) bundled with Mandrake Linux rely. In this section, DrakX\n"
+"will try to configure X automatically.\n"
 "\n"
-"\t*\"c\" y�ni \"ikinci IDE idar�cisind� ali s�r�c�\",\n"
+"It is extremely rare for it to fail, unless the hardware is very old (or\n"
+"very new). If it succeeds, it will start X automatically with the best\n"
+"resolution possible depending on the size of the monitor. A window will\n"
+"then appear and ask you if you can see it.\n"
 "\n"
-"\t*\"d\" y�ni \"ikinci IDE idar�cisind� k�l� s�r�c�\".\n"
+"If you are doing an \"Expert\" install, you will enter the X configuration\n"
+"wizard. See the corresponding section of the manual for more information\n"
+"about this wizard.\n"
 "\n"
+"If you can see the message and answer \"Yes\", then DrakX will proceed to\n"
+"the next step. If you cannot see the message, it simply means that the\n"
+"configuration was wrong and the test will automatically end after 10\n"
+"seconds, restoring the screen."
+msgstr ""
+
+#: ../../help.pm_.c:212
+msgid ""
+"The first time you try the X configuration, you may not be very satisfied\n"
+"with its display (screen is too small, shifted left or right...). Hence,\n"
+"even if X starts up correctly, DrakX then asks you if the configuration\n"
+"suits you. It will also propose to change it by displaying a list of valid\n"
+"modes it could find, asking you to select one.\n"
 "\n"
-"SCSI s�r�c�l�rind� \"a\" n�n m�nas� \"birinci s�r�c�\",\n"
-"\"b\"nin m�nas� \"ikinci s�r�c�\"d�r vs..."
+"As a last resort, if you still cannot get X to work, choose \"Change\n"
+"graphics card\", select \"Unlisted card\", and when prompted on which\n"
+"server you want, choose \"FBDev\". This is a failsafe option which works\n"
+"with any modern graphics card. Then choose \"Test again\" to be sure."
+msgstr ""
 
-#: ../../help.pm_.c:258
+#: ../../help.pm_.c:224
 msgid ""
-"Choose the hard drive you want to erase to install your\n"
-"new Linux-Mandrake partition. Be careful, all data present on it will be "
-"lost\n"
-"and will not be recoverable."
+"Finally, you will be asked whether you want to see the graphical interface\n"
+"at boot. Note this question will be asked even if you chose not to test the\n"
+"configuration. Obviously, you want to answer \"No\" if your machine is to\n"
+"act as a server, or if you were not successful in getting the display\n"
+"configured."
 msgstr ""
-"Linuks Mandrakeni y�kl�mak ���n s�r�c�y� se�in.\n"
-"Diqq�tli olun, s�r�c�d�ki b�t�n m�'lumatlar silin�c�k\n"
-"v� geri g�lm�y�c�k."
 
-#: ../../help.pm_.c:263
+#: ../../help.pm_.c:231
 msgid ""
-"Click on \"OK\" if you want to delete all data and\n"
-"partitions present on this hard drive. Be careful, after clicking on \"OK\", "
-"you\n"
-"will not be able to recover any data and partitions present on this hard "
-"drive,\n"
-"including any Windows data.\n"
+"The Mandrake Linux CDROM has a built-in rescue mode. You can access it by\n"
+"booting from the CDROM, press the >>F1<< key at boot and type >>rescue<< at\n"
+"the prompt. But in case your computer cannot boot from the CDROM, you\n"
+"should come back to this step for help in at least two situations:\n"
 "\n"
+" * when installing the boot loader, DrakX will rewrite the boot sector "
+"(MBR)\n"
+"of your main disk (unless you are using another boot manager) so that you\n"
+"can start up with either Windows or GNU/Linux (assuming you have Windows in\n"
+"your system). If you need to reinstall Windows, the Microsoft install\n"
+"process will rewrite the boot sector, and then you will not be able to\n"
+"start GNU/Linux!\n"
 "\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
-"partitions present on this hard drive."
-msgstr ""
-"S�r�c�d�ki b�t�n bilgil�ri v� b�lm�l�ri silm�k ���n\n"
-"\"Oldu\" d�ym�sin� bas�n. Diqq�tli olun,\"Oldu\" d�ym�sin� basd�qdan sonra\n"
-"Windows bilgil�ri d� daxil olmaq �z�r�b�t�n b�lm� m�'lumat� geri d�nm�y�c�k "
-"��kild� silin�c�k.\n"
+" * if a problem arises and you cannot start up GNU/Linux from the hard "
+"disk,\n"
+"this floppy disk will be the only means of starting up GNU/Linux. It\n"
+"contains a fair number of system tools for restoring a system, which has\n"
+"crashed due to a power failure, an unfortunate typing error, a typo in a\n"
+"password, or any other reason.\n"
 "\n"
-"\n"
-"B�lm�d�ki m�'lumatlar� qoruyaraq \"L��v et\" d�ym�sin�\n"
-"�m�liyyat� l��v ed� bil�rsiniz."
+"When you click on this step, you will be asked to enter a disk inside the\n"
+"drive. The floppy disk you will insert must be empty or contain data which\n"
+"you do not need. You will not have to format it since DrakX will rewrite\n"
+"the whole disk."
+msgstr ""
 
-#: ../../help.pm_.c:273
+#: ../../help.pm_.c:255
+#, fuzzy
 msgid ""
-"More than one Microsoft Windows partition have been\n"
-"detected on your hard drive. Please choose the one you want resize to "
-"install\n"
-"your new Linux-Mandrake operating system.\n"
+"At this point you need to choose where on your hard drive to install your\n"
+"Mandrake Linux operating system. If your hard drive is empty or if an\n"
+"existing operating system is using all the space available, you will need\n"
+"to partition it. Basically, partitioning a hard drive consists of logically\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
+"Because the effects of the partitioning process are usually irreversible,\n"
+"partitioning can be intimidating and stressful if you are an inexperienced\n"
+"user. Fortunately, there is a wizard which simplifies this process. Before\n"
+"beginning, please consult the manual and take your time.\n"
 "\n"
-"For information, each partition is listed as follow; \"Linux name\", "
-"\"Windows\n"
-"name\" \"Capacity\".\n"
+"If you are running the install in Expert mode, you will enter DiskDrake,\n"
+"the Mandrake Linux partitioning tool, which allows you to fine-tune your\n"
+"partitions. See the DiskDrake chapter of the manual. From the installation\n"
+"interface, you can use the wizards as described here by clicking the\n"
+"\"Wizard\" button of the dialog.\n"
 "\n"
-"\"Linux name\" is coded as follow: \"hard drive type\", \"hard drive number"
-"\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
+"If partitions have already been defined, either from a previous\n"
+"installation or from another partitioning tool, simply select those to\n"
+"install your Linux system.\n"
 "\n"
+"If partitions are not defined, you will need to create them using the\n"
+"wizard. Depending on your hard drive configuration, several options are\n"
+"available:\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and \"sd"
-"\"\n"
-"if it is an SCSI hard drive.\n"
+" * \"Use free space\": this option will simply lead to an automatic\n"
+"partitioning of your blank drive(s). You will not be prompted further.\n"
 "\n"
+" * \"Use existing partition\": the wizard has detected one or more existing\n"
+"Linux partitions on your hard drive. If you want to use them, choose this\n"
+"option.\n"
 "\n"
-"\"Hard drive number\" is always a letter putted after \"hd\" or \"sd\". With "
-"IDE hard drives:\n"
-"\n"
-"   * \"a\" means \"master hard drive on the primary IDE controller\",\n"
+" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+"installed on your hard drive and takes all the space available on it, you\n"
+"have to create free space for Linux data. To do that, you can delete your\n"
+"Microsoft Windows partition and data (see \"Erase entire disk\" or \"Expert\n"
+"mode\" solutions) or resize your Microsoft Windows partition. Resizing can\n"
+"be performed without the loss of any data. This solution is recommended if\n"
+"you want to use both Mandrake Linux and Microsoft Windows on same computer.\n"
 "\n"
-"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
+"   Before choosing this option, please understand that after this "
+"procedure,\n"
+"the size of your Microsoft Windows partition will be smaller than at the\n"
+"present time. You will have less free space under Microsoft Windows to\n"
+"store your data or to install new software.\n"
 "\n"
-"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
+" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
+"present on your hard drive and replace them with your new Mandrake Linux\n"
+"system, choose this option. Be careful with this solution because you will\n"
+"not be able to revert your choice after confirmation.\n"
 "\n"
-"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc.\n"
+" * \"Remove Windows\": this will simply erase everything on the drive and\n"
+"begin fresh, partitioning everything from scratch. All data on your disk\n"
+"will be lost.\n"
 "\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first "
-"disk\n"
-"or partition is called \"C:\")."
+" * \"Expert mode\": choose this option if you want to manually partition\n"
+"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"can very easily lose all your data. Hence, do not choose this unless you\n"
+"know what you are doing."
 msgstr ""
-"S�r�c�n�zd� bir v� ya daha �ox Windows b�lm�si tap�ld�.\n"
-"Xahi� edirik Linuks Mandrakeni qurmaq ���n onlardan birini "
-"yenid�n�l��l�ndirm�k �z�r� se�in.\n"
+"Bu nöqtədə Linuks Mandrakeni sabit diskinizdə haraya quracağınıza\n"
+"qərar verəcəksiniz. Əgər diskiniz boş isə və ya bir başqa sistem\n"
+"bütün yeri doldurmuş isə, o zaman diskinizdə Linuks Mandrake üçün\n"
+"yer açmalısınız. Ona görə də diski bölmələndirməlisiniz.\n"
+"Bölmələndirmə əsasən diskinizdə məntiqi sürücülər yaratmaqdan ibarətdir.\n"
 "\n"
+"Ümumiyyətlə bölmələndirmənin təsiri geri dönülməzdir.Ona görə də\n"
+"bu iş çox gərgin və yorucudur. Əgər özünüzə inanmırsınız isə bu\n"
+"sehirbaz sizə yardım edər. Başlamadan əvvəl xahiş edirik əl kitabçanıza\n"
+"baxın. Və bu iş üçün bir az vaxt ayırın.\n"
 "\n"
-"X�b�riniz olsun, her b�lm� bu c�r s�ralan�b; \"Linuks ad�\",\"Windows\n"
-"ad�\"\"H�cm\".\n"
 "\n"
-"\"Linuks ad�\" bu c�r kodlan�b: \"s�r�c� n�v�\", \"s�r�c� n�mr�si\",\"b�lm� "
-"n�mr�si\" (m�s�l�n, \"hda\").\n"
+"Sizə ən az 2 bölmə lazımdır. Biri sistemin özünü köçürməsi üçün\n"
+"Digəri isə uydurma yaddaş (ya da digər adı ilə Swap) üçün.\n"
 "\n"
 "\n"
-"\"S�r�c� n�v�\" s�r�c�n�z IDE s�r�c� is� \"hd\"dirSCSI s�r�c� is�\n"
-"\"sd\"dir.\n"
+"Əgər diskiniz onsuz da bölünmüş isə (əvvəlki sistemden ya da\n"
+"başqa bölmələndirmə vasitələri ilə hazırlanmış) quruluşda\n"
+"sadəcə olaraq o yerləri yükləmək üçün seçin.\n"
 "\n"
 "\n"
-"\"S�r�c� n�mr�si\" h�mi�� \"hd\" v� ya \"sd\"d�n sonrak� r�q�mdir.IDE "
-"s�r�c�l�r ���n:\n"
+"Əgər disk bölünməmiş ise, yuxarıdakı sehirbazdan istifadə edə bilərsiniz.\n"
+"Sisteminizin quruluşundan asılı olaraq müxtəlif imkanlarınız var:\n"
 "\n"
-"\t*\"a\" y�ni \"birinci IDE idar�cisind� ali s�r�c�\",\n"
+"* Bütün diski sil: Linuks Mandrake qurmaq üçün bütün diskinizin\n"
+" üzərindəki bölmələri silər. Burada diqqətli olun.\n"
+" Sildikləriniz əsla geri gəlməz.\n"
 "\n"
-"\t*\"b\" y�ni \"birinci IDE idar�cisind� k�l� s�r�c�\",\n"
 "\n"
-"\t*\"c\" y�ni \"ikinci IDE idar�cisind� ali s�r�c�\",\n"
+"* Windows bölməsindəki sahəni istifadə et: Sisteminizdə\n"
+" Microsoft Windows qurulu isə ve bütün diski əhatə edir isə\n"
+" Linuks Mandrake üçün bir yer ayırmalısınız. Bunun üçün\n"
+" ya bütün diski silməlisiniz (\"Bütün diski sil\" bax ya da\n"
+" \" Usta modu\" tövsiyələri) ya da yenidən bölmələndirməlisiniz.Bu iş heç "
+"bir mə'lumat itkisi olmadan da edilə bilər.Bunun başqa adı\n"
+" eyni kompüterdə həm Linuks Mandrake həm də Windows qurulu olmasıdır.\n"
 "\n"
-"\t*\"d\" y�ni \"ikinci IDE idar�cisind� k�l� s�r�c�\".\n"
 "\n"
+"t Bu seçkiyə getmədən əvvəl bir şeyi başa düşməlisiniz ki, yenidən "
+"bölmələndirmə ilə sizin Windows bölməsi kiçiləcəkdir.\n"
+" Yə'ni Windows altında daha az disk sahəsinə malik olacaqsınız.\n"
 "\n"
-"SCSI s�r�c�l�rind� \"a\" n�n m�nas� \"birinci s�r�c�\",\n"
-"\"b\"nin m�nas� \"ikinci s�r�c�\"d�r vs..."
-
-#: ../../help.pm_.c:306
-msgid "Please be patient. This operation can take several minutes."
-msgstr "S�brli olun. Bu �m�liyyat bir ne�� deqiq� s�r� bil�r."
+"\n"
+"* Usta modu: Əgər əllə diski bölmək istəsəniz, bu modu seçin. Diqqətli "
+"olun.\n"
+" Bu mod güçlüdür amma bir o qədər də təhlükəlidir. Diskinizdəki bütün "
+"bilgiyi asandlıqla itirə bilərsiniz.\n"
+" Təcrübəsiz isəniz bunu seçməyin."
 
-#: ../../help.pm_.c:309
+#: ../../help.pm_.c:319
 msgid ""
-"Any partitions that have been newly defined must be\n"
-"formatted for use (formatting meaning creating a filesystem).\n"
-"\n"
-"\n"
-"At this time, you may wish to reformat some already existing partitions to "
-"erase\n"
-"the data they contain. If you wish do that, please also select the "
-"partitions\n"
-"you want to format.\n"
-"\n"
-"\n"
-"Please note that it is not necessary to reformat all pre-existing "
-"partitions.\n"
-"You must reformat the partitions containing the operating system (such as \"/"
-"\",\n"
-"\"/usr\" or \"/var\") but do you no have to reformat partitions containing "
-"data\n"
-"that you wish to keep (typically /home).\n"
-"\n"
-"\n"
-"Please be careful selecting partitions, after formatting, all data will be\n"
-"deleted and you will not be able to recover any of them.\n"
-"\n"
-"\n"
-"Click on \"OK\" when you are ready to format partitions.\n"
-"\n"
+"There you are. Installation is now complete and your GNU/Linux system is\n"
+"ready to use. Just click \"OK\" to reboot the system. You can start\n"
+"GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
+"soon as the computer has booted up again.\n"
 "\n"
-"Click on \"Cancel\" if you want to choose other partitions to install your "
-"new\n"
-"Linux-Mandrake operating system."
-msgstr ""
-"Yeni yarad�lan b�t�n b�lm�l�r ��kill�ndirilm�lidir\n"
-"(��kill�ndirm�k y�ni fayl sistemi yaratmaq - format).\n"
-"\n"
-"\n"
-"Bu arada var olan haz�r b�lm�l�ri d� �st�nd�kil�ri silm�k ���nyenid�n "
-"��kill�ndirm�k ist�ya\n"
-"bil�rsiniz.\n"
-"Bunu ist�yirsinizs� bu b�lm�l�ri d� se�m�lisiniz.\n"
+"The \"Advanced\" button (in Expert mode only) shows two more buttons to:\n"
 "\n"
+" * \"generate auto-install floppy\": to create an installation floppy disk\n"
+"which will automatically perform a whole installation without the help of\n"
+"an operator, similar to the installation you just configured.\n"
 "\n"
-"Bunu a�l�n�zda tutun ki var olan b�t�n b�lm�l�ri ��kill�ndirm�k\n"
-"m�cburi deyil.\n"
-"��l�tim sist�mini �m�l� g�tir�n b�lm�l�ri (y�ni\n"
-"\"/\", \"usr\" v� ya \"var\"� yenid�n ��kill�ndirm�k ���n\n"
-"se�� bil�rsiniz. Veril�r olan \"home\"u m�s�l� toxunulmadan\n"
-"buraxa bil�rsiniz.\n"
+"   Note that two different options are available after clicking the button:\n"
 "\n"
+"    * \"Replay\". This is a partially automated install as the partitioning\n"
+"step (and only this one) remains interactive.\n"
 "\n"
-"Diqq�tli olun. ��kill�ndirdiyiniz b�lm�l�rd�ki veril�r\n"
-"geri g�lm�z.\n"
+"    * \"Automated\". Fully automated install: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
 "\n"
+"   This feature is very handy when installing a great number of similar\n"
+"machines. See the Auto install section at our web site.\n"
 "\n"
-"��kill�ndirm�y� haz�r is�niz \"Oldu\" d�ym�sini t�qlay�n.\n"
+" * \"Save packages selection\"(*): saves the packages selection as made\n"
+"previously. Then, when doing another installation, insert the floppy inside\n"
+"the driver and run the installation going to the help screen by pressing on\n"
+"the [F1] key, and by issuing >>linux defcfg=\"floppy\"<<.\n"
 "\n"
-"\n"
-"Yeni Linuks Mandrake sisteminizi qurmaq ���n ba�qa b�lm� se�m�k\n"
-"ist�yirsiniz is� \"L��v et\" d�ym�sin� bas�n."
-
-#: ../../help.pm_.c:335
-msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
-"\n"
-"\n"
-"DrakX will then check whether you have enough room to install them all. If "
-"not,\n"
-"it will warn you about it. If you want to go on anyway, it will proceed onto "
-"the\n"
-"installation of all selected groups but will drop some packages of lesser\n"
-"interest. At the bottom of the list you can select the option \n"
-"\"Individual package selection\"; in this case you will have to browse "
-"through\n"
-"more than 1000 packages..."
+"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
+"\"mformat a:\")"
 msgstr ""
-"�ndi qurmaq ya da g�nc�ll�m�k ist�diyiniz paket qruplar�n�\n"
-"se�� bil�rsiniz.\n"
-"\n"
-"Sonra DrakX se�dikl�rinizi qurmaq ya da g�nc�ll�m�k ���n laz�mi \n"
-"bo� yerinizin olub olmad���n� s�nayacaq. �g�r yoxsa, siz� bunu \n"
-"s�yl�y�c�k. N� olursa olsun davam etm�k ist�s�niz,y�kl�m� davam ed�c�k.\n"
-"Amma daha az ehtiyac olan paketl�r qurulmayacaq.\n"
-"Siyah�n�n �st�nd� \"��xsi paket se�ilm�si\"\n"
-"se��n�yini i�ar�tl�siniz 1000d�n art�qpaket aras�ndan se�� bil�rsiniz."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:350
+#, fuzzy
 msgid ""
-"You can now choose individually all the packages you\n"
-"wish to install.\n"
-"\n"
-"\n"
-"You can expand or collapse the tree by clicking on options in the left "
-"corner of\n"
-"the packages window.\n"
-"\n"
-"\n"
-"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
-"\"Toggle flat and group sorted\".\n"
-"\n"
-"\n"
-"If you want not to be warned on dependencies, click on \"Automatic\n"
-"dependencies\". If you do this, note that unselecting one package may "
-"silently\n"
-"unselect several other packages which depend on it."
-msgstr ""
-"�ndi is� siz ist�diyiniz paketi qurmaq ���n\n"
-"se�� bil�rsiniz.\n"
+"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"
-"Paket p�nc�r�si solundak� bucaqdaki se��n�y� t�qlayaraqa�ac� h�m a�a\n"
-"h�m d� s�x��d�ra bil�rsiniz.\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"
+"any of them.\n"
 "\n"
-"Paketl�rin �lifba s�ras�na g�r� d�z�lm�sini ist�yirsinizs�\n"
-"\"Otaq v� grupu  d�z\"\n"
-"d�ym�sin� bas�n.\n"
+"Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
+"Click on \"Cancel\" if you want to choose another partition for your new\n"
+"Mandrake Linux operating system installation.\n"
 "\n"
-"Paket ehtiyaclar� x�b�rdarl�qlar�n� ist�mirs�niz \"Avtomatik\n"
-"ehtiyaclar\"� se�� bil�rsiniz.\n"
-"Amma bunu i�ar�tl�diyiniz vaxt unutmay�n bir paketin i�ar�tini "
-"qald�rd���n�zda\n"
-"ehtiyac� olan dig�r paketlerin de i�ar�ti s�ssizc� qalxar."
-
-#: ../../help.pm_.c:364
-msgid ""
-"If you have all the CDs in the list above, click Ok. If you have\n"
-"none of those CDs, click Cancel. If only some CDs are missing, unselect "
-"them,\n"
-"then click Ok."
+"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
+"for bad blocks on the disc."
 msgstr ""
-"Yuxar�dak� siyah�dak� b�t�n CDl�r� sahibs�niz, OLDUya t�qlay�n.\n"
-"Bu CD'l�rin he� birin� sahib deyils�niz, L��v et'i t�qlay�n.\n"
-"CD'l�rd�n b�'zil�ri �ksiks�, bunlar� se�ili v�ziyy�td�n ��xar�b OLDUya "
-"t�qlay�n."
-
-#: ../../help.pm_.c:369
-msgid ""
-"Your new Linux-Mandrake operating system is currently being\n"
-"installed. This operation should take a few minutes (it depends on size you\n"
-"choose to install and the speed of your computer).\n"
+"Yeni yaradılan bütün bölmələr şəkilləndirilməlidir\n"
+"(şəkilləndirmək yəni fayl sistemi yaratmaq - format).\n"
 "\n"
 "\n"
-"Please be patient."
-msgstr ""
-"T�pt�z� Linuks Mandrake sisteminiz� qurulacaq. Bu da se�diyiniz\n"
-"y�kl�m� b�y�kl�y�n� v� sist�minizin qabiliyy�tin� g�r�\n"
-"bir ne�� deqiq� alar.\n"
+"Bu arada var olan hazır bölmələri də üstündəkiləri silmək üçünyenidən "
+"şəkilləndirmək istəya\n"
+"bilərsiniz.\n"
+"Bunu istəyirsinizsə bu bölmələri də seçməlisiniz.\n"
 "\n"
 "\n"
-"Xahi� edirik, s�brli olun."
-
-#: ../../help.pm_.c:377
-msgid ""
-"You can now test your mouse. Use buttons and wheel to verify\n"
-"if settings are good. If not, you can click on \"Cancel\" to choose another\n"
-"driver."
-msgstr ""
-"�ndi si�an� s�naya bil�rsiniz. H�r �eyin yolunda oldu�unu \n"
-"s�namaq ���n d�ym� v� �arx� i�l�din. Qur�ular yax�� is�\n"
-"problem yoxdur. �g�r deyils� onda \"L��v et\"i t�qlayaraq\n"
-"ba�qa si�an s�r�c�s� se�� bil�rsiniz."
-
-#: ../../help.pm_.c:382
-msgid ""
-"Please select the correct port. For example, the COM1\n"
-"port under MS Windows is named ttyS0 under GNU/Linux."
-msgstr ""
-"Xahi� edirik do�ru qap�n� se�in. M�s�l�n, MS Windowsdak� COM1'in qar��l���\n"
-"Linuksda ttyS0'd�r."
-
-#: ../../help.pm_.c:386
-msgid ""
-"If you wish to connect your computer to the Internet or\n"
-"to a local network please choose the correct option. Please turn on your "
-"device\n"
-"before choosing the correct option to let DrakX detect it automatically.\n"
+"Bunu ağlınızda tutun ki var olan bütün bölmələri şəkilləndirmək\n"
+"məcburi deyil.\n"
+"İşlətim sistəmini əmələ gətirən bölmələri (yəni\n"
+"\"/\", \"usr\" və ya \"var\"ı yenidən şəkilləndirmək üçün\n"
+"seçə bilərsiniz. Verilər olan \"home\"u məsələ toxunulmadan\n"
+"buraxa bilərsiniz.\n"
 "\n"
 "\n"
-"If you do not have any connection to the Internet or a local network, "
-"choose\n"
-"\"Disable networking\".\n"
+"Diqqətli olun. şəkilləndirdiyiniz bölmələrdəki verilər\n"
+"geri gəlməz.\n"
 "\n"
 "\n"
-"If you wish to configure the network later after installation or if you "
-"have\n"
-"finished to configure your network connection, choose \"Done\"."
-msgstr ""
-"Komp�terinizi internete v� ya yerli networka ba�lamaq\n"
-"ist�yirsinizs� xahi� edirik do�ru x�susiy�ti se�in. Ayr�ca DrakXin bunu "
-"tapmas� ���n avadanl���n�z� a��n.\n"
+"Şəkilləndirməyə hazır isəniz \"Oldu\" düyməsini tıqlayın.\n"
 "\n"
 "\n"
-"�nternet v� ya yerli networka he� giri�iniz yox is�\"��b�k� qur�ular�n� ke�"
-"\"\n"
-"se��n�yini i�ar�tl�yin.\n"
-"\n"
-"\n"
-"��b�k� qur�ular�n� sonraya buraxmaq ist�yirsinizs�v� ya qur�ular bitdiys� "
-"\"Oldu\" se��n�yini i�ar�tl�yin."
+"Yeni Linuks Mandrake sisteminizi qurmaq üçün başqa bölmə seçmək\n"
+"istəyirsiniz isə \"Ləğv et\" düyməsinə basın."
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:376
+#, fuzzy
 msgid ""
-"No modem has been detected. Please select the serial port on which it is "
-"plugged.\n"
-"\n"
+"Your new Mandrake Linux operating system is currently being installed.\n"
+"Depending on the number of packages you will be installing and the speed of\n"
+"your computer, this operation could take from a few minutes to a\n"
+"significant amount of time.\n"
 "\n"
-"For information, the first serial port (called \"COM1\" under Microsoft\n"
-"Windows) is called \"ttyS0\" under Linux."
+"Please be patient."
 msgstr ""
-"Modem tap�lmad�. Xahi� edirik modemin ba�l� oldu�u serial qap�n� se�in.\n"
+"Təptəzə Linuks Mandrake sisteminizə qurulacaq. Bu da seçdiyiniz\n"
+"yükləmə böyüklüyünə və sistəminizin qabiliyyətinə görə\n"
+"bir neçə deqiqə alar.\n"
 "\n"
 "\n"
-"X�b�riniz olsun, birinci serial qap� (Windows alt�nda\n"
-"\"COM1\") linux alt�nda\"ttyS0\" dey� adland�r�l�r."
-
-#: ../../help.pm_.c:406
-msgid ""
-"You may now enter dialup options. If you don't know\n"
-"or are not sure what to enter, the correct informations can be obtained "
-"from\n"
-"your Internet Service Provider. If you do not enter the DNS (name server)\n"
-"information here, this information will be obtained from your Internet "
-"Service\n"
-"Provider at connection time."
-msgstr ""
-"�ndi is� �evirm�li ba�lant� x�susiyy�tl�ri se�� bil�rsiniz.\n"
-"�g�r bilmirsinizs� v� ya ne gir�c�yiniz� qerar verm�dinizs�\n"
-"(M�s�l�n, �XV (ISP) v� DNS n�mr�l�ri kimi) bunlar�\n"
-"daha sonra da internete gir�r�k �yr�n� bil�rsiniz."
+"Xahiş edirik, səbrli olun."
 
-#: ../../help.pm_.c:413
+#: ../../help.pm_.c:384
 msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
+"Before continuing you should read carefully the terms of the license. It\n"
+"covers the whole Mandrake Linux distribution, and if you do not agree with\n"
+"all the terms in it, click on the \"Refuse\" button which will immediately\n"
+"terminate the installation. To continue with the installation, click the\n"
+"\"Accept\" button."
 msgstr ""
-"Modeminiz xarici is� modeminizi a��n ki DrakX onu avtomatik olaraq taps�n."
 
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "Xahi� edirik modeminizi a��n ve do�ru se��n�yi i�ar�tl�yin."
-
-#: ../../help.pm_.c:419
-msgid ""
-"If you are not sure if informations above are\n"
-"correct or if you don't know or are not sure what to enter, the correct\n"
-"informations can be obtained from your Internet Service Provider. If you do "
-"not\n"
-"enter the DNS (name server) information here, this information will be "
-"obtained\n"
-"from your Internet Service Provider at connection time."
-msgstr ""
-"�g�r yuxar�dak�lar haqq�nda m�'lumat�n�z yox is� v� ya ne gir�c�yiniz� q�rar "
-"verm�dinizs�\n"
-"(M�s�l�n, �XV (ISP) v� DNS n�mr�l�ri kimi)bunlar�\n"
-"daha sonra da internete gir�r�k �yr�n� bil�rsiniz."
-
-#: ../../help.pm_.c:426
+#: ../../help.pm_.c:391
 msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, the correct informations can be\n"
-"obtained from your Internet Service Provider."
-msgstr ""
-"�ndi is� ev sahibi bilgil�rini girin. Ne gir�c�yiniz�\n"
-"qerar verm�dinizs�\n"
-"(M�s�l�n, �XV (ISP) v� DNS n�mr�l�ri kimi)bunlar�\n"
-"daha sonra da internete gir�r�k �yr�n� bil�rsiniz."
-
-#: ../../help.pm_.c:431
-msgid ""
-"You may now configure your network device.\n"
-"\n"
-"   * IP address: if you don't know or are not sure what to enter, ask your "
-"network administrator.\n"
-"     You should not enter an IP address if you select the option \"Automatic "
-"IP\" below.\n"
-"\n"
-"   * Netmask: \"255.255.255.0\" is generally a good choice. If you don't "
-"know or are not sure what to enter,\n"
-"     ask your network administrator.\n"
-"\n"
-"   * Automatic IP: if your network uses BOOTP or DHCP protocol, select this "
-"option. If selected, no value is needed in\n"
-"    \"IP address\". If you don't know or are not sure if you need to select "
-"this option, ask your network administrator."
-msgstr ""
-"Se�:\n"
-"\n"
-" - IP �nvan�: �g�r IP �nvan�n� bilmirsinizs�, sistem idar�cisin�ya da \n"
-"�nternet xidm�t vericisin� dan���n.\n"
+"At this point, it is time to choose the security level desired for the\n"
+"machine. As a rule of thumb, the more exposed the machine is, and the more\n"
+"the data stored in it is crucial, the higher the security level should be.\n"
+"However, a higher security level is generally obtained at the expenses of\n"
+"easiness of use. Refer to the MSEC chapter of the ``Reference Manual'' to\n"
+"get more information about the meaning of these levels.\n"
 "\n"
-" - ��b�k� maskas�: �mumiyy�tl� \"255.255.255.0\" yax�� bir se�kidir. �g�r "
-"�min \n"
-"deyils�niz, yen� sistem idar�ciniz� ya da xidm�t vericiniz�soru�un.\n"
-"\n"
-"\n"
-" - Avtomatik IP : �g�r networkunuz bootp ya da dhcp protokollar�ndan bir "
-"d�n�sini \n"
-"istifad� edirs� bu se��n�yi i�ar�tl�yin."
-
-#: ../../help.pm_.c:443
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, ask your network administrator."
+"If you do not know what to choose, keep the default option."
 msgstr ""
-"�g�r ��b�k�d� NIS i�l�dilirs�, \"NIS kullan\" se��n�yini i�ar�tl�yin. �g�r \n"
-"bilmirsinizs� sistem idar�ciniz� soru�un."
 
-#: ../../help.pm_.c:447
+#: ../../help.pm_.c:401
+#, fuzzy
 msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, leave blank."
-msgstr "�ndi ev sahibi ad�n� girin. Bilmirsinizs� bo� burax�n."
-
-#: ../../help.pm_.c:451
-msgid ""
-"You may now enter dialup options. If you're not sure what to enter, the\n"
-"correct information can be obtained from your ISP."
-msgstr ""
-"�ndi �evirm�li ba�lant� se��n�kl�rini gir� bil�rsiniz. �g�r n� yaz�lmas� "
-"laz�m oldu�unu\n"
-"bilmirsinizs� �nternet xidm�t vericinizd�n laz�mi bilgil�ri al�n."
-
-#: ../../help.pm_.c:455
-msgid ""
-"If you will use proxies, please configure them now. If you don't know if\n"
-"you should use proxies, ask your network administrator or your ISP."
-msgstr "�g� v�kil (proxy) verici istifad� edac�ms�niz bunlar� girin."
-
-#: ../../help.pm_.c:459
-msgid ""
-"You can install cryptographic package if your internet connection has been\n"
-"set up correctly. First choose a mirror where you wish to download packages "
-"and\n"
-"after that select the packages to install.\n"
+"At this point, you need to choose what partition(s) will be used for the\n"
+"installation of your Mandrake Linux system. If partitions have been already\n"
+"defined, either from a previous installation of GNU/Linux or from 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"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
-msgstr ""
-"�g�r �nternet ba�lant�n�z do�ru ��kild� qurulmu� is� kriptoqrafik paketi \n"
-"d� qura bil�rsiniz. �vv�l bir �ks �nvan� se�in v� daha sonra qurulacaq \n"
-"paketl�ri qura�d�r�n."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "�ndi is� ya�ad���n�z yer� g�r� zaman zola��n� se�in."
-
-#: ../../help.pm_.c:471
-msgid ""
-"GNU/Linux manages time in GMT (Greenwich Manage\n"
-"Time) and translates it in local time according to the time zone you have\n"
-"selected.\n"
+"To partition the selected hard drive, you can use these options:\n"
 "\n"
+" * \"Clear all\": this option deletes all partitions on the selected hard\n"
+"drive.\n"
 "\n"
-"If you use Microsoft Windows on this computer, choose \"No\"."
-msgstr ""
-"Linuks zaman� GMT-y� (Greenwich Mean Time) g�r� qur�ular v� oldu�unuz \n"
-"yerd�ki zamana g�r� laz�mi d�yi�iklikl�ri ed�r.\n"
+" * \"Auto allocate\": this option allows you to automatically create Ext2\n"
+"and swap partitions in free space of your hard drive.\n"
 "\n"
-"Sisteminizd� Microsoft Windows i�l�dirs�niz \"Xeyr\" se�in."
-
-#: ../../help.pm_.c:479
-msgid ""
-"You may now choose which services you want to start at boot time.\n"
+" * \"Rescue partition table\": if your partition table is damaged, you can\n"
+"try to recover it using this option. Please be careful and remember that it\n"
+"can fail.\n"
 "\n"
+" * \"Undo\": use this option to cancel your changes.\n"
 "\n"
-"When your mouse comes over an item, a small balloon help will popup which\n"
-"describes the role of the service.\n"
+" * \"Reload\": you can use this option if you wish to undo all changes and\n"
+"load your initial partitions table.\n"
 "\n"
+" * \"Wizard\": 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 knowledge of\n"
+"partitioning.\n"
 "\n"
-"Be very careful in this step if you intend to use your machine as a server: "
-"you\n"
-"will probably want not to start any services that you don't need. Please\n"
-"remember that several services can be dangerous if they are enable on a "
-"server.\n"
-"In general, select only the services that you really need."
-msgstr ""
-"�ndi, a��l��da avtomatik olaraq ba�lamas�n� ist�diyiniz xidm�tl�ri \n"
-"se�� bil�rsiniz. Si�an bir madd�nin �z�rina g�ldiyind� o xidm�tin rolunu "
-"a��qlayan\n"
-"ki�ik bir baloncuq ortaya ��xacaqd�r.\n"
+" * \"Restore from floppy\": this option will allow you to restore a\n"
+"previously saved partition table from floppy disk.\n"
 "\n"
-"�g�r komp�terinizi bir verici olaraq istifad� ed�c�ks�niz bu add�mda tam bir "
-"diqq�t ay�rmal�s�n�z:\n"
-"m�ht�m�ldir ki laz�mi he� bir xidm�ti ba�latmaq ist�m�zsiniz."
-
-#: ../../help.pm_.c:492
-msgid ""
-"You can configure a local printer (connected to your computer) or remote\n"
-"printer (accessible via a Unix, Netware or Microsoft Windows network)."
-msgstr ""
-"Siz indi yerli v� ya �evirm�li yaz���n� qura bil�rsiniz\n"
-"(Unix, Netware v� ya Microsoft Windows networkundak�)."
-
-#: ../../help.pm_.c:496
-msgid ""
-"If you wish to be able to print, please choose one printing system between\n"
-"CUPS and LPR.\n"
+" * \"Save to floppy\": saves the partition table to a floppy. Useful for\n"
+"later partition-table recovery if necessary. It is strongly recommended to\n"
+"perform this step.\n"
 "\n"
+" * \"Done\": when you have finished partitioning your hard drive, this will\n"
+"save your changes back to disc.\n"
 "\n"
-"CUPS is a new, powerful and flexible printing system for Unix systems (CUPS\n"
-"means \"Common Unix Printing System\"). It is the default printing system "
-"in\n"
-"Linux-Mandrake.\n"
+"Note: you can reach any option using the keyboard. Navigate through the\n"
+"partitions using [Tab] and [Up/Down] arrows.\n"
 "\n"
+"When a partition is selected, you can use:\n"
 "\n"
-"LPR is the old printing system used in previous Linux-Mandrake "
-"distributions.\n"
+" * Ctrl-c to create a new partition (when an empty partition is selected);\n"
 "\n"
+" * Ctrl-d to delete a partition;\n"
 "\n"
-"If you don't have printer, click on \"None\"."
-msgstr ""
-"Yazd�rma funksiyas� ist�yirsinizs� CUPS v� LPR aras�nda se�ici\n"
-"davranmal�s�n�z.\n"
+" * Ctrl-m to set the mount point.\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"
+"boot loader. 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 ""
+"Bu nöqtədə siz Linuks Mandrake yükləmək üçün bölmələri seçməlisiniz. Əgər "
+"əvvəldən bölmələr var isə (sistemdə əvvəllər qurulu olan GNU/Linuks "
+"bölmələri və ya başqa bölmələndirmə vasitələri ilə hazırladığınız bölmələr), "
+"onları seçin və istifadə edin.\n"
+"Yoxsa onları bildirməlisiniz.\n"
 "\n"
-"CUPS yeni, g�cl� ve elastik bir Unix yazd�rma sistemidir\n"
-"CUPS y�ni \"Common Unix Printing System\". Bu da Linuks Mandrake\n"
-"d� �sas yazd�rma sistemidir.\n"
 "\n"
+"Bölmələri yaratmaq üçün əvvəlci diski seçməlisiniz.\n"
+"Diski seçmək üçün birinci IDE sürücüsü üçün \"hda\" nı, ikinciyi seçmək üçün "
+"\"hdb\"ni, birinci SCSİ sürücüsü üçün ise \"sda\" vs tıqlamalısınız.\n"
 "\n"
-"LPR Linuks Mandrakenin k�hne sistemidir.\n"
 "\n"
+"Seçdiyiniz sürücüyə aşağıdakıları etməyə qadirsiniz:\n"
 "\n"
-"Printeriniz yox is�  \"Yox\" d�ym�sin� t�qlay�n."
-
-#: ../../help.pm_.c:511
-msgid ""
-"GNU/Linux can deal with many types of printer. Each of these types requires\n"
-"a different setup.\n"
+"  *Hamısını təmizlə: seçili sürücüdə bütün bölmələri silər.\n"
 "\n"
 "\n"
-"If your printer is physically connected to your computer, select \"Local\n"
-"printer\".\n"
+"  *Avtomatik: Sürücünüzdəki boş sahədə Ext2 və Swapbölmələrini avtomatik\n"
+"yaradar.\n"
 "\n"
 "\n"
-"If you want to access a printer located on a remote Unix machine, select\n"
-"\"Remote printer\".\n"
+"  *Bölmə cədvəlini qurtar: Zədələnmiş bölmə cədvəlinibərpa edər.  Xahiş "
+"edirik\n"
+" diqqətli olun, çünkü bu da iflas edə bilər.\n"
 "\n"
 "\n"
-"If you want to access a printer located on a remote Microsoft Windows "
-"machine\n"
-"(or on Unix machine using SMB protocol), select \"SMB/Windows 95/98/NT\"."
-msgstr ""
-"GNU/Linuks bir �ox �ap edici n�v� i�l�d� bil�r. H�r bir n�v\n"
-"m�xt�lif qurulu� ist�y�r.\n"
+"  *Gəri dön: İstəmədiyiniz seçkilərinizdən geri döndərər.\n"
 "\n"
 "\n"
-"�ap ediciniz fiziki olaraq komp�teriniz� ba�l� is�\n"
-"\"Yerli �ap edici\"n� se�in.\n"
+"  *Yenidən yüklə: Bütün dəyişikliklərinizdən geri dönərbaşdakı bölmə "
+"cədvəlinə gələr.\n"
 "\n"
 "\n"
-"Unix sistemin� ba�l� �ap ediciy� uzaqdan ba�lanmaq ist�yirsinizs�\n"
-"\"Uzaqdan ba�lan�lan �ap edici\".\n"
+"  *Sehirbaz: Bölmələndirməyi bir sehirbaz edər. Təcrübəsizisəniz bunu "
+"seçin.\n"
 "\n"
 "\n"
-" MS Windows komp�terin� (v� ya SMB protokolunu\n"
-"i�l�d�n Unix komp�terin�) ba�l� bir �ap ediciy� �atmaq ���n\n"
-"\"SMB/Windows95/98/NT\" se��n�yini i�ar�tl�yin."
-
-#: ../../help.pm_.c:527
-msgid ""
-"Please turn on your printer before continuing to let DrakX detect it.\n"
+" *Floppy-dən bərpa et: Bölmə cədvəlini əvvəllər flopy-yə qeydetdiniz isə, "
+"bölmə cədvəlini bərpa edin.\n"
 "\n"
-"You have to enter some informations here.\n"
 "\n"
+"  *Floppy-yə qeyd et: Daha sonradan bərpa etmek üçünbilgiləri floppy-yə qeyd "
+"edin.\n"
+"  Bu seçki şiddətlə tövsiyə edilir.\n"
 "\n"
-"   * Name of printer: the print spooler uses \"lp\" as default printer name. "
-"So, you must have a printer named \"lp\".\n"
-"     If you have only one printer, you can use several names for it. You "
-"just need to separate them by a pipe\n"
-"     character (a \"|\"). So, if you prefer a more meaningful name, you have "
-"to put it first, eg: \"My printer|lp\".\n"
-"     The printer having \"lp\" in its name(s) will be the default printer.\n"
 "\n"
+"  *Oldu: Bölmələndirmə bitdiyində, bunu seçərəkdəyişikliklərinizi qeyd "
+"edin.\n"
 "\n"
-"   * Description: this is optional but can be useful if several printers are "
-"connected to your computer or if you allow\n"
-"     other computers to access to this printer.\n"
 "\n"
+"Xəbəriniz olsun, istənilən seçkiyə Tab ve Aşağı/Yuxarı oxlarını da işlədərək "
+"klaviaturadan idarə edə bilərsiniz.\n"
 "\n"
-"   * Location: if you want to put some information on your\n"
-"     printer location, put it here (you are free to write what\n"
-"     you want, for example \"2nd floor\").\n"
-msgstr ""
-"Xahi� edirik DrakXin tapa bilm�si ���n yaz���n�z� a��n.\n"
 "\n"
-"Burada bir ne�� m�'lumat verm�lisiniz.\n"
+"Bölmə seçildiyi zaman bunları işlədə bilərsiniz:\n"
 "\n"
+"      *Ctrl-c yeni bölmə yaratmaq üçün (boş bölmə seçili olduğu zaman)\n"
 "\n"
-"\t*�ap Edici ad�: yaz���lar ���n \"lp\" i�l�dilir.\n"
-"Ona g�r� d� yaz���n�z�n ad� \"lp\" olmal�d�r.\n"
-"Bir ne�� �ap ediciniz var is� ist�diyiniz ad� ver� bil�rsiniz. Sad�c� olaraq "
-"� aralar�na boru i�ar�ti \"|\" qoymal�s�n�z.\n"
-"M�s�l�n \"M�nim yaz���m|lp\".\n"
-"Ad�nda \"lp\" olan �ap edici ba� �ap edici olacaqd�r.\n"
+"      *Ctrl-d bölməni ləğv etmək üçün\n"
 "\n"
+"      *Ctrl-m bağlama nöqtəsini göstərmək üçün\n"
 "\n"
-"\t*T�svir: �st�y� ba�l�d�r. Amma bir ne�� �ap ediciniz var is�\n"
-"\tbir xeyli faydal� ola bil�r.\n"
 "\n"
 "\n"
-"\t*Yerl��m�: �ap Edicinin yeri haqq�nda ist�diyinizi yaza bil�rsiniz."
-"\tM�s�l�n, \"2ci m�rt�b�\".\n"
+"Əgər PPC kompüterdə qurulum aparırsınızsa, ən az 1 MBlıq balaca bir HFC "
+"'bootstrap' bölməsini yaboot açılış yükləyicisi üçün seçmək istəyəcəksiniz.\n"
+"Əgər daha çox yeriniz varsa ; məsələn 50 MB, onda bütün kernel və ramdisk "
+"əksini təcili açılış halları üçün saxlaya bilərsiniz."
 
-#: ../../help.pm_.c:548
+#: ../../help.pm_.c:460
+#, fuzzy
 msgid ""
-"You need to enter some informations here.\n"
+"More than one Microsoft Windows partition has been detected on your hard\n"
+"drive. Please choose the one you want 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"
-"   * Name of queue: the print spooler uses \"lp\" as default printer name. "
-"So, you need have a printer named \"lp\".\n"
-"    If you have only one printer, you can use several names for it. You just "
-"need to separate them by a pipe\n"
-"    character (a \"|\"). So, if you prefer to have a more meaningful name, "
-"you have to put it first, eg: \"My printer|lp\".\n"
-"    The printer having \"lp\" in its name(s) will be the default printer.\n"
+"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"  \n"
-"   * Spool directory: it is in this directory that printing jobs are stored. "
-"Keep the default choice\n"
-"     if you don't know what to use\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"
-"   * Printer Connection: If your printer is physically connected to your "
-"computer, select \"Local printer\".\n"
-"     If you want to access a printer located on a remote Unix machine, "
-"select \"Remote lpd printer\".\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"
-"     If you want to access a printer located on a remote Microsoft Windows "
-"machine (or on Unix machine using SMB\n"
-"     protocol), select \"SMB/Windows 95/98/NT\".\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"
-"     If you want to acces a printer located on NetWare network, select "
-"\"NetWare\".\n"
-msgstr ""
-"Burada bir ne�� m�'lumat verm�lisiniz.\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 ""
+"Sürücünüzdə bir və ya daha çox Windows bölməsi tapıldı.\n"
+"Xahiş edirik Linuks Mandrakeni qurmaq üçün onlardan birini "
+"yenidənölçüləndirmək üzərə seçin.\n"
 "\n"
-"\t*�st�k ad�:  yaz���lar ���n \"lp\" i�l�dilir.\n"
-"Ona g�r� d� yaz���n�z�n ad� \"lp\" olmal�d�r.\n"
-"Bir ne�� �ap ediciniz var is� ist�diyiniz ad� ver� bil�rsiniz. Sad�c� "
-"�olaraq aralar�na boru i�ar�ti \"|\" qoymal�s�n�z.\n"
-"M�s�l�n \"M�nim yaz���m|lp\".\n"
-"Ad�nda \"lp\" olan �ap edici ba� �ap edici olacaqd�r.\n"
 "\n"
+"Xəbəriniz olsun, her bölmə bu cür sıralanıb; \"Linuks adı\",\"Windows\n"
+"adı\"\"Həcm\".\n"
 "\n"
-"\t*Saxlama qovlu�u: �ap Edici sifari�l�rinizi saxlan�ld��� yer.\n"
-"\tM�vzudan bix�b�r is�niz �sas qur�unu se�in.\n"
+"\"Linuks adı\" bu cür kodlanıb: \"sürücü növü\", \"sürücü nömrəsi\",\"bölmə "
+"nömrəsi\" (məsələn, \"hda\").\n"
 "\n"
 "\n"
-"\t*�ap Edici ba�lant�s�: �ap Edici fiziki olaraq komp�ter� ba�l� ise\n"
-"\t\"Yerli �ap Edici\" se�in.\n"
-"\tUzaq bir Unix sistem� ba�l� �ap edici is�\"Uzaqdan idar�li lpd �ap Edici\" "
-"se�in.\n"
+"\"Sürücü növü\" sürücünüz IDE sürücü isə \"hd\"dirSCSI sürücü isə\n"
+"\"sd\"dir.\n"
 "\n"
 "\n"
-"\tUzaq SMB vericisi i�l�d�n Unix v� ya Windows sistemin� ba�l�yaz��� ���n "
-"is� \"SMB/Windows 95/98/NT\" se�in.\n"
+"\"Sürücü nömrəsi\" həmişə \"hd\" və ya \"sd\"dən sonrakı rəqəmdir.IDE "
+"sürücülər üçün:\n"
 "\n"
+"*\"a\" yəni \"birinci IDE idarəcisində ali sürücü\",\n"
 "\n"
-"\tNetWare ��b�k�d� yerl���n �ap edici ���n is�\"NetWare\" se�in.\n"
-
-#: ../../help.pm_.c:573
-msgid ""
-"Your printer has not been detected. Please enter the name of the device on\n"
-"which it is connected.\n"
+"*\"b\" yəni \"birinci IDE idarəcisində kölə sürücü\",\n"
 "\n"
+"*\"c\" yəni \"ikinci IDE idarəcisində ali sürücü\",\n"
 "\n"
-"For information, most printers are connected on the first parallel port. "
-"This\n"
-"one is called \"/dev/lp0\" under GNU/Linux and \"LPT1\" under Microsoft "
-"Windows."
-msgstr ""
-"Sizin �ap edici tap�lmad�. Xahi� edirik ba�l� oldu�u avadanl���n\n"
-"ad�n� girin.\n"
+"*\"d\" yəni \"ikinci IDE idarəcisində kölə sürücü\".\n"
 "\n"
 "\n"
-"X�b�riniz olsun, bir �ox �ap edici birinci paralel qap�ya ba�l�d�r.\n"
-"Bu da GNU/Linuksda \"/dev/lp0\", Windowsda is� \"LPT1\"dir."
+"SCSI sürücülərində \"a\" nın mənası \"birinci sürücü\",\n"
+"\"b\"nin mənası \"ikinci sürücü\"dür vs..."
 
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "�ndi yuxar�dak� siyah�dan �ap edici se�malisiniz."
+#: ../../help.pm_.c:491
+msgid "Please be patient. This operation can take several minutes."
+msgstr "Səbrli olun. Bu əməliyyat bir neçə deqiqə sürə bilər."
 
-#: ../../help.pm_.c:584
+#: ../../help.pm_.c:494
+#, fuzzy
 msgid ""
-"Please select the right options according to your printer.\n"
-"Please see its documentation if you don't know what choose here.\n"
+"DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
+"installation or if you want to have greater control (\"Expert\"). You also\n"
+"have the choice of performing a new install or an upgrade of an existing\n"
+"Mandrake Linux system. Clicking \"Install\" will completely wipe out the\n"
+"old system. Select \"Upgrade\" if you are upgrading or repairing an\n"
+"existing system.\n"
 "\n"
+"Please choose \"Install\" if there are no previous version of Mandrake\n"
+"Linux installed or if you wish to boot between various operating systems.\n"
 "\n"
-"You will be able to test your configuration in next step and you will be "
-"able to modify it if it doesn't work as you want."
-msgstr ""
-"Xahi� edirik yaz�c�n�z ���n do�ru qur�ular� girin.\n"
-"N� se��c�yinizi bilmirsiniz is� s�n�dl�r� bax�n\n"
+"Please choose \"Update\" if you wish to update or repair an already\n"
+"installed version of Mandrake Linux.\n"
 "\n"
+"Depending on your knowledge of GNU/Linux, please choose one of the\n"
+"following to install or update your Mandrake Linux operating system:\n"
 "\n"
-"Bir sonrak� add�mda yaz�c�n�z� s�naya bil�rsiniz v�\n"
-"daha sonra da ist�diyiniz zaman d�yi�dir� bil�r."
-
-#: ../../help.pm_.c:591
-msgid ""
-"You can now enter the root password for your Linux-Mandrake system.\n"
-"The password must be entered twice to verify that both password entries are "
-"identical.\n"
+" * Recommended: choose this if you have never installed a GNU/Linux\n"
+"operating system. The installation will be very easy and you will only be\n"
+"asked a few questions.\n"
 "\n"
+" * Expert: if you have a good knowledge of GNU/Linux, you can choose this\n"
+"installation class. The expert installation will allow you to perform a\n"
+"highly customized installation. Answering some of the questions can be\n"
+"difficult if you do not have a good knowledge of GNU/Linux so do not choose\n"
+"this unless you know what you are doing."
+msgstr ""
+"Xahiş edirik Linuks Mandrakenin daha əvvəlki buraxılışları qurulu deyilsə və "
+"ya müxtəlif əməliyyat sistemlərindən istifadə etmək istəyirsinizsə \"Yüklə\" "
+"seçin.\n"
 "\n"
-"Root is the system's administrator and is the only user allowed to modify "
-"the\n"
-"system configuration. Therefore, choose this password carefully. \n"
-"Unauthorized use of the root account can be extemely dangerous to the "
-"integrity\n"
-"of the system, its data and other system connected to it.\n"
 "\n"
+"Xahiş edirik qurulu olan Linuks Mandrakenin əvvəlki buraxılışını güncəlləmək "
+"istəyirsinizsə \"Güncəllə\" seçin.\n"
 "\n"
-"The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. It should never be written down.\n"
 "\n"
+"Sizin GNU/Linuks biliyinizdən asılı olaraq yükləmək və ya güncəlləmək üçün "
+"Linuks Mandrakenin aşağıdakı səviyyələrini seçə bilərsiniz:\n"
 "\n"
-"Do not make the password too long or complicated, though: you must be able "
-"to\n"
-"remember it without too much effort."
-msgstr ""
-"Linuks sisteminiz ���n bir idar�ci parolu verilm�lidir. Bu parol\n"
-"yaz�l�� x�talar�na meydan verm�m�si v� e'tibarl� olmas� s�b�bi il� iki d�f�\n"
-"girilm�lidir.\n"
+"* Tövsiyə edilən: Əgər əvvəlcə heç GNU/Linuks ilə tanış olmadınız isə seçin. "
+"Yükləmə çox asand olacaq və çox az sual soruşulacaq.\n"
 "\n"
 "\n"
-"Bu parolu diqq�tli se�m�lisiniz. Sad�c� idar�i parolunu bil�n \n"
-"adamlar sistemi idar� v� d�yi�iklik ed� bilirl�r. Ayr�ca idar�ci \n"
-"parolu il� sistem� gir�n bir adam b�t�n veril�ri silib, sistema z�r�r \n"
-"ver� bil�r. Se�diyiniz parol alfanumerik xarakterl�r daxil edib en az 8 "
-"xarakter uzunlu�unda olmal�d�r. H�r hans� bir ka��za, d�ftara qeyd\n"
-"al�nmamal�d�r. �ox uzun bir parol v� ya �ox qar���q bir parol i�l�dilir "
-"is� \n"
-"parolun xat�rlanmas� ��tinl��ir.\n"
+"* Xüsusi: Əgə əvvəlcə GNU/Linuksa bir az aşina isəniz, seçin. Onda siz "
+"istədiyiniz sistem növünü (Masa üstü, Verici, Təcrübi) seçə biləcəksiniz.\n"
+" Əlbətdə sizə \"Tövsiyə edilən\" seçkidən daha çox sual soruşulacaq.\n"
+" Ona görə də GNU/Linuksa bir az aşina olmalısınız.\n"
 "\n"
 "\n"
-"�dar�ci olaraq sistem� gir�cayiniz zaman, giri� s�ras�nda \"login\"\n"
-"yazan qism� \"root\" v� \"password\" yazan qism� idar�ci parolunu\n"
-"yazmal�s�n�z."
+"* Usta: Əgər yaxşı bir GNU/Linuks biliyinə sahibsəniz, bu sinifi seçin.\n"
+" \"Xüsusi\" sinifindəki kimi işlədəcəyiniz sistemi (Masa üstü, Verici, "
+"Təcrübi)\n"
+" seçə biləcəksiniz. Amma sizi çox çətin suallar gözləyir. Bəzən bu sualların "
+"içindən\n"
+" çıxa bilmək çox zəhmətli olur. Ona görə də nə etdiyinizi bilirsəniz, bu "
+"sinifi seçin."
 
-#: ../../help.pm_.c:609
+#: ../../help.pm_.c:521
 msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
+"Normally, DrakX selects the right keyboard for you (depending on the\n"
+"language you have chosen) and you will not even see this step. However, you\n"
+"might not have a keyboard that corresponds exactly to your language: for\n"
+"example, if you are an English speaking Swiss person, you may still want\n"
+"your keyboard to be a Swiss keyboard. Or if you speak English but are\n"
+"located in Quebec, you may find yourself in the same situation. In both\n"
+"cases, you will have to go back to this installation step and select an\n"
+"appropriate keyboard from the list.\n"
+"\n"
+"Click on the \"More\" button to be presented with the complete list of\n"
+"supported keyboards."
 msgstr ""
-"Daha e'tibarl� bir sistem ���n \"K�lg� parol i�l�t\" v� \"MD5 kodlama \n"
-"i�l�t\" se��n�kl�rini i�ar�tlayin."
 
-#: ../../help.pm_.c:613
+#: ../../help.pm_.c:534
 msgid ""
-"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
-"network administrator."
+"Please choose your preferred language for installation and system usage.\n"
+"\n"
+"Clicking on the \"Advanced\" button will allow you to select other\n"
+"languages to be installed on your workstation. Selecting other languages\n"
+"will install the language-specific files for system documentation and\n"
+"applications. For example, if you will host users from Spain on your\n"
+"machine, select English as the main language in the tree view and in the\n"
+"Advanced section click on the grey star corresponding to \"Spanish|Spain\".\n"
+"\n"
+"Note that multiple languages may be installed. Once you have selected any\n"
+"additional locales click the \"OK\" button to continue."
 msgstr ""
-"�g�r ��b�k�d� NIS istifad� edilirs�, \"NIS i�l�t\" se��neyini i�ar�tl�yin.  "
-"�g�r \n"
-"bilmirsinizs� sistem idar�ciniz� soru�un."
 
-#: ../../help.pm_.c:617
+#: ../../help.pm_.c:547
 msgid ""
-"You may now create one or more \"regular\" user account(s), as\n"
-"opposed to the \"privileged\" user account, root. You can create\n"
-"one or more account(s) for each person you want to allow to use\n"
-"the computer. Note that each user account will have its own\n"
-"preferences (graphical environment, program settings, etc.)\n"
-"and its own \"home directory\", in which these preferences are\n"
-"stored.\n"
-"\n"
-"\n"
-"First of all, create an account for yourself! Even if you will be the only "
-"user\n"
-"of the machine, you may NOT connect as root for daily use of the system: "
-"it's a\n"
-"very high security risk. Making the system unusable is very often a typo "
-"away.\n"
+"By default, DrakX assumes you have a two-button mouse and will set it up\n"
+"for third-button emulation. DrakX will automatically know whether it is a\n"
+"PS/2, serial or USB mouse.\n"
 "\n"
+"If you wish to specify a different type of mouse select the appropriate\n"
+"type from the list provided.\n"
 "\n"
-"Therefore, you should connect to the system using the user account\n"
-"you will have created here, and login as root only for administration\n"
-"and maintenance purposes."
+"If you choose a mouse other than the default you will be presented with a\n"
+"mouse test screen. Use the buttons and wheel to verify that the settings\n"
+"are good. If the mouse is not working correctly press the space bar or\n"
+"RETURN to \"Cancel\" and choose again."
 msgstr ""
-"�ndi bir ya da daha �ox adam�n Linuks sisteminizi istifad� etm�sin� icaz�\n"
-"ver� bil�rsiniz. H�r istifad��i hesab� ���n edil�n d�yi�iklikl�r sad�c�\n"
-"o istifad��i ve istifad��inin \"istifad��i s�ras�\" ���n h�kml� olar.\n"
-"\n"
-"\n"
-"Sistemi sad�c� siz istifad� edeceks�niz bel� ayr� bir istifad��i hesab� "
-"a�araq\n"
-"normal i�ler ���n bu hesab� istifad� etm�lisiniz. �dar��i \"root\" hesab�\n"
-"g�nd�lik i�l�rd� istifad� edilm�m�lidir. Bu bir t�hl�k�sizlik riski t��kil "
-"ed�r.\n"
-"Sad� bir istifad��i hesab� il� i�l�m�k sizi v� sistemi size qar��\n"
-"qoruyar. �dar�ci hesab� olan \"root\" sad�c�, sad� bir istifad��i hesab�\n"
-"il� etm�y�c�yiniz idar� v� t�mir i�l�ri ���n istifad� edilm�lidir."
 
-#: ../../help.pm_.c:636
+#: ../../help.pm_.c:560
 msgid ""
-"Creating a boot disk is strongly recommended. If you can't\n"
-"boot your computer, it's the only way to rescue your system without\n"
-"reinstalling it."
+"Please select the correct port. For example, the COM1 port under MS Windows\n"
+"is named ttyS0 under GNU/Linux."
 msgstr ""
-"Ba�lan��c disketi yarad�lmas� a��r� d�r�c�d� t�vsiyy� edilir.\n"
-"Sistemi a�a bilm�diyiniz zaman bu, sizin ���n t�k qurtulu� yolu olar.\n"
-"Yoxsa sistemi yenid�n y�kl�m�k m�cburiyy�tind�siniz."
+"Xahiş edirik doğru qapını seçin. Məsələn, MS Windowsdakı COM1'in qarşılığı\n"
+"Linuksda ttyS0'dır."
 
-#: ../../help.pm_.c:641
+#: ../../help.pm_.c:564
 msgid ""
-"You need to indicate where you wish\n"
-"to place the information required to boot to GNU/Linux.\n"
+"This is the most crucial decision point for the security of your GNU/Linux\n"
+"system: you have to enter the \"root\" password. \"root\" is the system\n"
+"administrator and is the only one authorized to make updates, add users,\n"
+"change the overall system configuration, and so on. In short, \"root\" can\n"
+"do everything! That is why you must choose a password that is difficult to\n"
+"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
+"choose not to enter a password, but we strongly advise you against this if\n"
+"only for one reason: do not think that because you booted GNU/Linux that\n"
+"your other operating systems are safe from mistakes. Since \"root\" can\n"
+"overcome all limitations and unintentionally erase all data on partitions\n"
+"by carelessly accessing the partitions themselves, it is important for it\n"
+"to be difficult to become \"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 too\n"
+"easy to compromise a system.\n"
 "\n"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"Linuksu a�maq ���n laz�mi bilgil�rin harada saxlan�laca��na q�rar verin.\n"
+"However, please do not make the password too long or complicated because\n"
+"you must be able to remember it without too much effort.\n"
 "\n"
+"The password will not be displayed on screen as you type it in. Hence, you\n"
+"will have to type the password twice to reduce the chance of a typing\n"
+"error. If you do happen to make the same typing error twice, this\n"
+"\"incorrect\" password will have to be used the first time you connect.\n"
 "\n"
-"N� etdiyinizi bilmirsinizs�, \"Diskin ilk sektoru (MBR)\" se�in."
-
-#: ../../help.pm_.c:649
-msgid ""
-"Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
-" (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
-msgstr ""
-"Ba�qa bir ��kild� se�ilm�mi� is�, �mumiyy�tl� bu se�ki \"/dev/hda\" \n"
-"(Birinci ali IDE disk) ya da \"/dev/sda\" (birinci SCSI disk)\n"
-"olacaqd�r."
-
-#: ../../help.pm_.c:653
-msgid ""
-"LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either GNU/Linux or any other operating system present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
+"In expert mode, you will be asked if you will be connecting to an\n"
+"authentication server, like NIS or LDAP.\n"
 "\n"
+"If your network uses LDAP (or NIS) protocol for authentication, select\n"
+"\"LDAP\" (or \"NIS\") as authentication. If you do not know, ask your\n"
+"network administrator.\n"
 "\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"LILO (Linuks Y�kl�yici) v� Grub a��l�� sistem y�kl�yicil�ridir: sistemi "
-"Linuks\n"
-"ya da komp�terinizd� olan ba�qa bir �m�liyyatiyle a�a bil�rl�r.\n"
-"�sas�n bu dig�r �m�liyyat sisteml�ri do�ru bir ��kilde t�sbit edilib "
-"a��l��a\n"
-"qurula bil�rl�r. �g�r bir problem olarsa, buradan �ll� �lav� edil� "
-"bil�rl�r.\n"
-"Parametrl�r m�vzusunda diqq�tli olun."
 
-#: ../../help.pm_.c:665
+#: ../../help.pm_.c:600
 msgid ""
-"LILO and grub main options are:\n"
-"  - Boot device: Sets the name of the device (e.g. a hard disk\n"
-"partition) that contains the boot sector. Unless you know specifically\n"
-"otherwise, choose \"/dev/hda\".\n"
-"\n"
-"\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero.\n"
+"LILO and GRUB are boot loaders for GNU/Linux. This stage, normally, is\n"
+"totally automated. In fact, DrakX analyzes the disk boot sector and acts\n"
+"accordingly, depending on what it finds here:\n"
 "\n"
+" * if Windows boot sector is found, it will replace it with a GRUB/LILO "
+"boot\n"
+"sector. Hence, you will be able to load either GNU/Linux or another OS;\n"
 "\n"
-"  - Video mode: This specifies the VGA text mode that should be selected\n"
-"when booting. The following values are available: \n"
+" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
+"one;\n"
 "\n"
-"    * normal: select normal 80x25 text mode.\n"
+"If in doubt, DrakX will display a dialog with various options.\n"
 "\n"
-"    * <number>:  use the corresponding text mode.\n"
+" * \"Boot loader to use\": you have three choices:\n"
 "\n"
+"    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
+"interface.\n"
 "\n"
-"  - Clean \"/tmp\" at each boot: if you want delete all files and "
-"directories\n"
-"stored in \"/tmp\" when you boot your system, select this option.\n"
+"    * \"GRUB\": if you prefer GRUB (text menu).\n"
 "\n"
+"    * \"LILO with text menu\": if you prefer LILO with its text menu "
+"interface.\n"
 "\n"
-"  - Precise RAM if needed: unfortunately, there is no standard method to ask "
-"the\n"
-"BIOS about the amount of RAM present in your computer. As consequence, Linux "
-"may\n"
-"fail to detect your amount of RAM correctly. If this is the case, you can\n"
-"specify the correct amount or RAM here. Please note that a difference of 2 "
-"or 4\n"
-"MB between detected memory and memory present in your system is normal."
-msgstr ""
-"LILO v� grub ana se��n�kl�ri bunlard�r: \n"
-"\t- A��l�� avadanl���: A��l�� sektorunu oldu�u sabit disk b�lm�sini daxil "
-"ed�n avadanl���n\n"
-"ad�n� t�yin ed�r.\n"
-"�g�r he� bir �ey bilmirsinizs� \"/dev/hda\"y� se�in.\n"
-"\n"
-"\n"
-"\t- �sas �ks il� a�madan �vv�l gecikm�: A��l�� sistem y�kl�yicisinin ilk \n"
-"�ksi a�madan �vv�l g�zl�y�c�yi zaman�n, saniy�nin onda biri cinsind�n "
-"miqdar�d�r.\n"
-"Bu, klaviaturan�n f�alla�mas�ndan h�m�n sonra sabit diskd�n a��lan sisteml�r "
-"���n faydal�d�r.\n"
-"Sistem y�kl�yicisi, �g�r \"delay\" s�f�r olaraq verilmi� is�\n"
-"he� g�zl�m�z.\n"
-"\n"
+" * \"Boot device\": in most cases, you will not change the default\n"
+"(\"/dev/hda\"), but if you prefer, the boot loader can be installed on the\n"
+"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\").\n"
 "\n"
-"\t- Ekran modu: A��l��da bir ne�� m�tn ekran modu se�il� bil�r:\n"
-"   * sad�: 80x25 m�tn ekran a��l�r.\n"
-"    * <r�q�m>: G�st�ril�nn r�q�ml�r� g�r� m�tn ekran rezolyusiyas� "
-"qura�d�r�l�r.\n"
+" * \"Delay before booting the default image\": when rebooting the computer,\n"
+"this is the delay granted to the user to choose - in the boot loader menu,\n"
+"another boot entry than the default one.\n"
 "\n"
+"!! Beware that if you choose not to install a boot loader (by selecting\n"
+"\"Cancel\" here), you must ensure that you have a way to boot your Mandrake\n"
+"Linux system! Also be sure you know what you do before changing any of the\n"
+"options. !!\n"
 "\n"
-"\t- \"/tmp\"I h�r a��l��da t�mizl�: �g�r h�r a��l��da \"/tmp\" c�rg�sind� "
-"olan b�t�n\n"
-"olan b�t�n c�rg� v� qovluqlar�n silinm�sini ist�yirsinizs�, bu se��n�yi "
-"se�in.\n"
+"Clicking the \"Advanced\" button in this dialog will offer many advanced\n"
+"options, which are reserved to the expert user.\n"
 "\n"
+"Mandrake Linux installs its own boot loader, which will let you boot either\n"
+"GNU/Linux or any other operating systems which you have on your system.\n"
 "\n"
-"\t- Var olan RAM miqdar�: T��s�f ki, Linuks h�mi�� RAM miqdar�n� BIOSdan "
-"d�zg�n\n"
-"bir ��kild� �yr�n�m�y� bil�r. Onda siz �z�n�z sisteminizd� olan h�qiq RAM "
-"miqdar�n� buradan\n"
-"gir� bil�rsiniz. Yadda saxlay�n ki, h�qiqi RAM il� sistemin tapd��� miqdar "
-"aras�nda 2\n"
-"v� ya 4 MBl�q f�rq ola bil�r."
+"If there is another operating system installed on your machine, it will be\n"
+"automatically added to the boot menu. Here, you can choose to fine-tune the\n"
+"existing options. Double-clicking on an existing entry allows you to change\n"
+"its parameters or remove it; \"Add\" creates a new entry; and \"Done\" goes\n"
+"on to the next installation step."
+msgstr ""
 
-#: ../../help.pm_.c:697
+#: ../../help.pm_.c:647
+#, fuzzy
 msgid ""
-"Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able\n"
-"to boot either GNU/Linux, MacOS, or MacOSX, if present on your computer.\n"
+"LILO (the LInux LOader) and GRUB are boot loaders: they are able to boot\n"
+"either GNU/Linux or any other operating system present on your computer.\n"
 "Normally, these other operating systems are correctly detected and\n"
 "installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
-"\n"
-"\n"
-"Yaboot main options are:\n"
-"\n"
-"\n"
-"  - Init Message: A simple text message that is displayed before the boot\n"
-"prompt.\n"
-"\n"
-"\n"
-"  - Boot Device: Indicate where you want to place the information required "
-"to \n"
-"boot to GNU/Linux. Generally, you will have setup a bootstrap partition "
-"earlier \n"
-"to hold this information.\n"
-"\n"
-"\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"
+"screen. Be careful to choose the correct parameters.\n"
 "\n"
+"You may also not want to give access to these other operating systems to\n"
+"anyone. In which case, you can delete the corresponding entries. But then,\n"
+"you will need a boot disk in order to boot those other operating systems!"
+msgstr ""
+"LILO (Linuks Yükləyici) və Grub açılış sistem yükləyiciləridir: sistemi "
+"Linuks\n"
+"ya da kompüterinizdə olan başqa bir əməliyyatiyle aça bilərlər.\n"
+"Əsasən bu digər əməliyyat sistemləri doğru bir şəkilde təsbit edilib "
+"açılışa\n"
+"qurula bilərlər. Əgər bir problem olarsa, buradan əllə əlavə edilə "
+"bilərlər.\n"
+"Parametrlər mövzusunda diqqətli olun."
+
+#: ../../help.pm_.c:658
+msgid ""
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\n"
 "\n"
-"  - Kernel Boot Timeout: This timeout is similar to the LILO boot delay.  "
-"After \n"
-"selecting Linux, you will have this delay in 0.1 seconds before your "
-"default\n"
-"kernel description is selected.\n"
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
+msgstr ""
+"Linuksu açmaq üçün lazımi bilgilərin harada saxlanılacağına qərar verin.\n"
 "\n"
+"Nə etdiyinizi bilmirsinizsə, \"Diskin ilk sektoru (MBR)\" seçin."
+
+#: ../../help.pm_.c:665
+msgid ""
+"Here we select a printing system for your computer to use. Other OSes may\n"
+"offer you one, but Mandrake offers three.\n"
 "\n"
-"  - Enable CD Boot?: Checking this option will allow you to choose 'C' for "
-"CD at\n"
-"the first boot prompt.\n"
+" * \"pdq\" - which means ``print, don't queue'', is the choice if you have "
+"a\n"
+"direct connection to your printer and you want to be able to panic out of\n"
+"printer jams, and you do not have any networked printers. It will handle\n"
+"only very simple network cases and is somewhat slow for networks. Pick\n"
+"\"pdq\" if this is your maiden voyage to GNU/Linux. You can change your\n"
+"choices after install by running PrinterDrake from the Mandrake Control\n"
+"Center and clicking the expert button.\n"
+"\n"
+" * \"CUPS\" - ``Common Unix Printing System'' is excellent at printing to\n"
+"your local printer and also halfway round the planet. It is simple and can\n"
+"act like a server or a client for the ancient \"lpd\" printing system, so\n"
+"it is compatible with the systems that went before. It can do many tricks,\n"
+"but the basic setup is almost as easy as \"pdq\". If you need this to\n"
+"emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
+"graphical front-ends for printing or choosing printer options.\n"
+"\n"
+" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
+"approximately the same things the others can do, but it will print to\n"
+"printers mounted on a Novell Network, because it supports IPX protocol, and\n"
+"it can print directly to shell commands. If you have need of Novell or\n"
+"printing to commands without using a separate pipe construct, use lprNG.\n"
+"Otherwise, CUPS is preferable as it is simpler and better at working over\n"
+"networks."
+msgstr ""
+
+#: ../../help.pm_.c:693
+#, fuzzy
+msgid ""
+"DrakX is now detecting any IDE devices present in your computer. It will\n"
+"also scan for one or more PCI SCSI card(s) on your system. If a SCSI card\n"
+"is found DrakX will automatically install the appropriate driver.\n"
+"\n"
+"Because hardware detection will sometimes not detect a piece of hardware\n"
+"DrakX will ask you to confirm if a PCI SCSI card is present. Click \"Yes\"\n"
+"if you know that there is a SCSI card installed in your machine. You will\n"
+"be presented a list of SCSI cards to choose from. Click \"No\" if you have\n"
+"no SCSI hardware. If you are unsure you can check the list of hardware\n"
+"detected in your machine by selecting \"See hardware info\" and clicking\n"
+"\"OK\". Examine the list of hardware and then click on the \"OK\" button to\n"
+"return to the SCSI interface question.\n"
 "\n"
+"If you have to manually specify your adapter, DrakX will ask if you want to\n"
+"specify options for it. You should allow DrakX to probe the hardware for\n"
+"the card-specific options that the hardware needs to initialize. This\n"
+"usually works well.\n"
+"\n"
+"If DrakX is not able to probe for the options that need to be passed, you\n"
+"will need to manually provide options to the driver. Please review the\n"
+"``User Guide'' (chapter 3, section \"Collecting information on your\n"
+"hardware\") for hints on retrieving the parameters required from hardware\n"
+"documentation, from the manufacturer's web site (if you have Internet\n"
+"access) or from Microsoft Windows (if you used this hardware with Windows\n"
+"on your system)."
+msgstr ""
+"DrakX PCI SCSI adapterleri axtarmağa cəhd edəcək. Əgə DrakX SCSI\n"
+"taparsa və hansı sürücü işlədiləcəyini bilərsə, her şey öz özünə\n"
+"qurulacaq.\n"
 "\n"
-"  - Enable OF Boot?: Checking this option will allow you to choose 'N' for "
-"Open\n"
-"Firmware at the first boot prompt.\n"
 "\n"
+"Əgər sisteminizdə SCSI adapteri yoxsa, DrakXin tanımayacağı bir\n"
+"ISA SCSI və ya PCI SCSI adapteri var isə, sizə sisteminizdə SCSI\n"
+"adapteri olub olmadığı soruşulacaq.\n"
+"Əgər SCSI adapteriniz yox isə, \"Yox\" tıqlayın. Əgər \"Var\"ı "
+"tıqlayarsanız.\n"
+"qarşınıza sürücüləin siyahısı çıxacaq, oradan sizə uyanını seçərsiniz.\n"
 "\n"
-"  - Default OS: You can select which OS will boot by default when the Open "
-"Firmware \n"
-"Delay expires."
-msgstr ""
-"Yaboot NewWorld MacIntosh avadal��� ���n a��l�� idar�cisidir. Ayr�ca\n"
-"GNU/Linuks, MacOS, v� ya MacOSX sisteml�rini komp�terinizd� varsa, "
-"a�acaqd�r.\n"
-"Normalda, bu �m�liyyat sisteml�ri d�zg�n tap�l�b qurula bilirl�r\n"
-"�g�r bel� olmazsa, bu ekrandan �ll� laz�mi qur�ular� gir� bil�rsiniz.\n"
-"D�zg�n parametrl�ri girib girm�diyinizi yax��ca bir yoxlay�n.\n"
 "\n"
+"Əgər əllə qurmağı səçərsəniz, o zaman DrakX sizə adapterin xüsusiyyətlərini\n"
+"soruşacaq. İmkan verin ki, DrakX sərbəstcə özü xüsusiyyətləri tapsın.\n"
+"Çoxunda bu işə yarayır.\n"
 "\n"
-"Yaboot ana se��n�kl�ri:\n"
 "\n"
+"Əgər istəmirsəniz isə, o zaman adapter üçün xüsusiyyətləri özünüz\n"
+"göstərməlisiniz. Bunun üçün İstifadəçinin Əl Kitabçasına\n"
+"(başlıq 3, \"Avadanlığınız üçün kollektiv mə'lumat) bölməsinə\n"
+"baxın. Ya da avadanlığınızın əl kitabçasından və ya\n"
+"veb səhifəsindən (Əgər internetə çıxışınız var isə)\n"
+"ya da Microsoft Windowsdan (Əgər sisteminizdə qurulu isə)\n"
+"mə'lumat alın."
+
+#: ../../help.pm_.c:720
+#, fuzzy
+msgid ""
+"You can add additional entries for yaboot, either for other operating\n"
+"systems, alternate kernels, or for an emergency boot image.\n"
 "\n"
-"  - Ba�lan��c �smar�c�: A��l��dan �vv�l ��xan sad� bir ismar�c.\n"
+"For other OS's, the entry consists only of a label and the root partition.\n"
 "\n"
+"For Linux, there are a few possible options:\n"
 "\n"
-"  - A��l�� Avadanl���: GNU/Linuksu hardan ba�latmaq ist�diyinizi bildirir."
-"�mumiyy�tl� bu m�'lumat� daha �vv�l \"bootstrap\" qura�d�r�lmas� "
-"s�ras�ndabildirmi� olacaqs�n�z.\n"
+" * Label: this is simply the name you will have to type at the yaboot "
+"prompt\n"
+"to select this boot option.\n"
 "\n"
+" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
+"or a variation of vmlinux with an extension.\n"
 "\n"
-"  - A��q Firmware Gecikm�si: LILOdan f�rqli olaraq, yabootda iki d�n� "
-"gecikm� vard�r\n"
-"Birinci gecikm� saniy�l�rl� �l��l�r v� bu arada siz\n"
-"CD, OF a��l���, MacOS v� ya Linuks aras�nda se�ki aparmal�s�n�z.\n"
+" * Root: the \"root\" device or \"/\" for your Linux installation.\n"
 "\n"
+" * Append: on Apple hardware, the kernel append option is used quite often\n"
+"to assist in initializing video hardware, or to enable keyboard mouse\n"
+"button emulation for the often lacking 2nd and 3rd mouse buttons on a stock\n"
+"Apple mouse. The following are some examples:\n"
 "\n"
-"  - Kernel A��l�� Vaxt Dolmas�: Bu vaxt dolmas� LILO a��l�� gecikm�sin� "
-"uy�un g�lir.  Linuksu\n"
-"se�dikd�n sonra ana kernel parametri olaraq bu gecikm� 0.1 saniy� olaraq "
-"qurulu olacaqd�r.\n"
+"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"hda=autotune\n"
 "\n"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-"  - CD A��l��� F�alla�s�nm�?: Bu se��n�kl� CDd�n a��l��� timsal ed�n 'C' "
-"xarakteri ilk a��l��da ��xacaqd�r.\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 4,096 bytes. If you\n"
+"need to allocate a large ramdisk, this option can be used.\n"
 "\n"
-"  - OF A��l��� F�alla�s�n?: Bu se��n�kl� OFd�n (Open Firmware) a��l���n� "
-"timsal ed�n 'N' xarakteri\n"
-"ilk a��l��da ��xacaqd�r.\n"
+" * Read-write: normally the \"root\" partition is initially brought up in\n"
+"read-only, to allow a file system check before the system becomes \"live\".\n"
+"Here, you can override 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"
-"  - Ana OS: OF gecikm�si m�dd�ti doldu�u vaxt hans� OSnin a��laca��n� "
-"g�st�rir."
-
-#: ../../help.pm_.c:738
-msgid ""
-"You can add additional entries for yaboot, either for other operating "
-"systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
+" * Default: selects this entry as being the default Linux selection,\n"
+"selectable by just pressing ENTER at the yaboot prompt. This entry will\n"
+"also be highlighted with a \"*\", if you press [Tab] to see the boot\n"
+"selections."
+msgstr ""
+"Burada yaboot üçün həm başqa əməliyyat sistemləri, həm alternativ "
+"kernellər,\n"
+" ya da təcili yardım açılış əksləri əlavə edə bilərsiniz.\n"
 "\n"
 "\n"
-"For other OS's - the entry consists only of a label and the root partition.\n"
+"Başqa OSlər  üçün girişin mənası ad və kök çığırından ibarətdir.\n"
 "\n"
 "\n"
-"For Linux, there are a few possible options: \n"
+"Linuks üçün mühtəməl girişlər bunlar ola bilər: \n"
 "\n"
 "\n"
-"  - Label: This is simply the name will type at the yaboot prompt to select "
-"this \n"
-"boot option.\n"
+"  - Ad: Bu sadəcə olaraq yaboot üçün açılacaq sistemi timsal edən bir "
+"addır.\n"
 "\n"
 "\n"
-"  - Image: This would be the name of the kernel to boot.  Typically vmlinux "
-"or\n"
-"a variation of vmlinux with an extension.\n"
+"  - Əks: Bu isə açılacaq çəkirdəyin, yə'ni kernelin adıdır.  Çox vaxt bu "
+"vmlinux və ya\n"
+"bunun variasiyalarıdır.\n"
 "\n"
 "\n"
-"  - Root: The root device or '/' for your Linux installation.\n"
+"  - Kök: Linuks qurulumunun kök avadanlığı və ya '/'.\n"
 "\n"
 "\n"
 "  \n"
-"  - Append: On Apple hardware, the kernel append option is used quite often "
-"to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button "
-"emulation\n"
-"for the often lacking 2nd and 3rd mouse buttons on a stock Apple mouse.  The "
-"following \n"
-"are some examples:\n"
+"  - Əlavə: Apple avadanlıqlarında kernel əlavə seçənəkləri ilə sıxlıqla "
+"başlanğıc\n"
+"video avadanlığı və ya sıx sıx xəta verən 2ci və 3cü siçan düymələri üçün "
+"emulyasiya\n"
+"imkanları tanına bilir.  Məsələn bunlar \n"
+"bir neçə nümunədir:\n"
 "\n"
 "\n"
-"\t\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
 "hda=autotune\n"
 "\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
+"\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
 "\n"
 "\n"
 " \n"
-"  - Initrd: This option can be used either to load initial modules, before "
-"the boot \n"
-"device is available, or to load a ramdisk image for an emergency boot "
-"situation.\n"
+"  - Initrd: Açılış avadanlığından əvvəl bə'zi açılış modullarını seçmək\n"
+"üçün işlədilir, ya da təcili yardım açılışlarında ramdisk əksini yükləmək "
+"imkanı verir.\n"
 "\n"
 "\n"
-"  - Initrd-size: The default ramdisk size is generally 4096 bytes.  If you "
-"should need\n"
-"to allocate a large ramdisk, this option can be used.\n"
+"  - Initrd-size: Ana ramdisk böyüklüyü ümumiyyətlə 4096 baytdır.  Əgər daha "
+"geniş ramdisk bildirə\n"
+"bilərsiniz isə bu seçənəyi işlədin.\n"
 "\n"
 "\n"
-"  - Read-write: Normally the 'root' partition is initially brought up read-"
-"only, to allow\n"
-"a filesystem check before the system becomes 'live'.  You can override this "
-"option here.\n"
+"  - Oxuma-yazma: Normalda sistemin 'dirilməsindən' əvvəl bə'zi sınaqların "
+"aparıla bilməsi üçün\n"
+"'root' fayl sistemi bu moda soxulur.  Bu seçənəyi nəzərə almayabilərsiniz.\n"
 "\n"
 "\n"
-"  - NoVideo: Should the Apple video hardware prove to be exceptionally "
-"problematic, you can\n"
-"select this option to boot in 'novideo' mode, with native framebuffer "
-"support.\n"
+"  - NoVideo: Bəlkə Apple video avadanlığı problem çıxarda bilər.Onda bu "
+"seçənəklə\n"
+"sistemi 'novideo' modda təbii framebuffer dəstəyi ilə aça bilərsiniz.\n"
 "\n"
 "\n"
-"  - Default: Selects this entry as being the default Linux selection, "
-"selectable by just\n"
-"pressing ENTER at the yaboot prompt.  This entry will also be highlighted "
-"with a '*', if you\n"
-"press TAB to see the boot selections."
-msgstr ""
-"Burada yaboot ���n h�m ba�qa �m�liyyat sisteml�ri, h�m alternativ "
-"kernell�r,\n"
-" ya da t�cili yard�m a��l�� �ksl�ri �lav� ed� bil�rsiniz.\n"
-"\n"
+"  - Əsas: Bu seçənəklə Linuks sistemi əsas əməliyyat sistemi halına gətirə "
+"bilərsiniz.\n"
+"Onda ENTER düyməsinə basmaqla Linuks sistemi açılacaqdır.  Bu giriş ayrıca "
+"TAB ilə açılış seçkilərinə baxdığınız vaxt \n"
+"'*' işarətilə işıqlandırılacaqdır."
+
+#: ../../help.pm_.c:765
+#, fuzzy
+msgid ""
+"Yaboot is a boot loader for NewWorld MacIntosh hardware. It is able to boot\n"
+"either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
+"these other operating systems are correctly detected and installed. If this\n"
+"is not the case, you can add an entry by hand in this screen. Be careful as\n"
+"to choose the correct parameters.\n"
 "\n"
-"Ba�qa OSl�r  ���n giri�in m�nas� ad v� k�k ����r�ndan ibar�tdir.\n"
+"Yaboot's main options are:\n"
 "\n"
+" * Init Message: a simple text message that is displayed before the boot\n"
+"prompt.\n"
 "\n"
-"Linuks ���n m�ht�m�l giri�l�r bunlar ola bil�r: \n"
+" * Boot Device: indicate where you want to place the information required "
+"to\n"
+"boot to GNU/Linux. Generally, you setup a bootstrap partition earlier to\n"
+"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"
-"  - Ad: Bu sad�c� olaraq yaboot ���n a��lacaq sistemi timsal ed�n bir "
-"add�r.\n"
+" * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
+"After selecting Linux, you will have this delay in 0.1 second before your\n"
+"default kernel description is selected.\n"
 "\n"
+" * Enable CD Boot?: checking this option allows you to choose \"C\" for CD\n"
+"at the first boot prompt.\n"
 "\n"
-"  - �ks: Bu is� a��lacaq ��kird�yin, y�'ni kernelin ad�d�r.  �ox vaxt bu "
-"vmlinux v� ya\n"
-"bunun variasiyalar�d�r.\n"
+" * Enable OF Boot?: checking this option allows you to choose \"N\" for "
+"Open\n"
+"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 NewWorld MacIntosh avadalığı üçün açılış idarəcisidir. Ayrıca\n"
+"GNU/Linuks, MacOS, və ya MacOSX sistemlərini kompüterinizdə varsa, "
+"açacaqdır.\n"
+"Normalda, bu əməliyyat sistemləri düzgün tapılıb qurula bilirlər\n"
+"Əgər belə olmazsa, bu ekrandan əllə lazımi qurğuları girə bilərsiniz.\n"
+"Düzgün parametrləri girib girmədiyinizi yaxşıca bir yoxlayın.\n"
 "\n"
-"  - K�k: Linuks qurulumunun k�k avadanl��� v� ya '/'.\n"
 "\n"
+"Yaboot ana seçənəkləri:\n"
 "\n"
-"  \n"
-"  - �lav�: Apple avadanl�qlar�nda kernel �lav� se��n�kl�ri il� s�xl�qla "
-"ba�lan��c\n"
-"video avadanl��� v� ya s�x s�x x�ta ver�n 2ci v� 3c� si�an d�ym�l�ri ���n "
-"emulyasiya\n"
-"imkanlar� tan�na bilir.  M�s�l�n bunlar \n"
-"bir ne�� n�mun�dir:\n"
 "\n"
+"  - Başlanğıc İsmarıcı: Açılışdan əvvəl çıxan sadə bir ismarıc.\n"
 "\n"
-"\t\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
-"hda=autotune\n"
 "\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
+"  - Açılış Avadanlığı: GNU/Linuksu hardan başlatmaq istədiyinizi bildirir."
+"Ümumiyyətlə bu mə'lumatı daha əvvəl \"bootstrap\" quraşdırılması "
+"sırasındabildirmiş olacaqsınız.\n"
 "\n"
 "\n"
-" \n"
-"  - Initrd: A��l�� avadanl���ndan �vv�l b�'zi a��l�� modullar�n� se�m�k\n"
-"���n i�l�dilir, ya da t�cili yard�m a��l��lar�nda ramdisk �ksini y�kl�m�k "
-"imkan� verir.\n"
+"  - Açıq Firmware Gecikməsi: LILOdan fərqli olaraq, yabootda iki dənə "
+"gecikmə vardır\n"
+"Birinci gecikmə saniyələrlə ölçülür və bu arada siz\n"
+"CD, OF açılışı, MacOS və ya Linuks arasında seçki aparmalısınız.\n"
 "\n"
 "\n"
-"  - Initrd-size: Ana ramdisk b�y�kl�y� �mumiyy�tl� 4096 baytd�r.  �g�r daha "
-"geni� ramdisk bildir�\n"
-"bil�rsiniz is� bu se��n�yi i�l�din.\n"
+"  - Kernel Açılış Vaxt Dolması: Bu vaxt dolması LILO açılış gecikməsinə "
+"uyğun gəlir.  Linuksu\n"
+"seçdikdən sonra ana kernel parametri olaraq bu gecikmə 0.1 saniyə olaraq "
+"qurulu olacaqdır.\n"
 "\n"
 "\n"
-"  - Oxuma-yazma: Normalda sistemin 'dirilm�sind�n' �vv�l b�'zi s�naqlar�n "
-"apar�la bilm�si ���n\n"
-"'root' fayl sistemi bu moda soxulur.  Bu se��n�yi n�z�r� almayabil�rsiniz.\n"
+"  - CD Açılışı Fəallaşsınmı?: Bu seçənəklə CDdən açılışı timsal edən 'C' "
+"xarakteri ilk açılışda çıxacaqdır.\n"
 "\n"
 "\n"
-"  - NoVideo: B�lk� Apple video avadanl��� problem ��xarda bil�r.Onda bu "
-"se��n�kl�\n"
-"sistemi 'novideo' modda t�bii framebuffer d�st�yi il� a�a bil�rsiniz.\n"
+"  - OF Açılışı Fəallaşsın?: Bu seçənəklə OFdən (Open Firmware) açılışını "
+"timsal edən 'N' xarakteri\n"
+"ilk açılışda çıxacaqdır.\n"
 "\n"
 "\n"
-"  - �sas: Bu se��n�kl� Linuks sistemi �sas �m�liyyat sistemi hal�na g�tir� "
-"bil�rsiniz.\n"
-"Onda ENTER d�ym�sin� basmaqla Linuks sistemi a��lacaqd�r.  Bu giri� ayr�ca "
-"TAB il� a��l�� se�kil�rin� baxd���n�z vaxt \n"
-"'*' i�ar�til� i��qland�r�lacaqd�r."
+"  - Ana OS: OF gecikməsi müddəti dolduğu vaxt hansı OSnin açılacağını "
+"göstərir."
 
-#: ../../help.pm_.c:793
+#: ../../help.pm_.c:798
 msgid ""
-"SILO is a bootloader for SPARC: it is able to boot\n"
-"either GNU/Linux or any other operating system present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
+"Here are presented various parameters concerning your machine. Depending on\n"
+"your installed hardware, you may - or not, see the following entries:\n"
 "\n"
+" * \"Mouse\": mouse check the current mouse configuration and click on the\n"
+"button to change it if necessary.\n"
 "\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
-msgstr ""
-"SILO (Linuks Y�kl�yici) SPARC ���n bir sistem y�kl�yicidir: sistemi Linuks\n"
-"ya da komp�terinizd�ki ba�qa bir �m�liyyat sistemiyl� a�a bilirl�r.\n"
-"�sas�n bu dig�r �m�liyyat sisteml�ri do�ru bir ��kild� t�sbit edilib "
-"a��l��a\n"
-"qurula bil�rl�r. �g�r bir problem olarsa, buradan �ll� �lav� edil� "
-"bil�rl�r.\n"
-"Parametrl�r m�vzusunda diqq�tli olun."
-
-#: ../../help.pm_.c:805
-msgid ""
-"SILO main options are:\n"
-"  - Bootloader installation: Indicate where you want to place the\n"
-"information required to boot to GNU/Linux. Unless you know exactly\n"
-"what you are doing, choose \"First sector of drive (MBR)\".\n"
-"\n"
-"\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero."
-msgstr ""
-"\t  - A��l�� avadanl���: A��l�� sektorunu oldu�u sabit disk b�lm�sini daxil "
-"ed�n avadanl���n\n"
-"ad�n� t�yin ed�r.\n"
-"�g�r he� bir �ey bilmirsinizs� \"/dev/hda\"y� se�in.\n"
+" * \"Keyboard\": keyboard check the current keyboard map configuration and\n"
+"click on the button to change that if necessary.\n"
 "\n"
+" * \"Timezone\": time zoneDrakX, by default, guesses your time zone from "
+"the\n"
+"language you have chosen. But here again, as for the choice of a keyboard,\n"
+"you may not be in the country for which the chosen language should\n"
+"correspond. Hence, you may need to click on the \"Timezone\" button in\n"
+"order to configure the clock according to the time zone you are in.\n"
 "\n"
-" \t - Ana �ks il� a�madan �vv�l gecikm�: A��l�� sistem y�kl�yicisinin ilk \n"
-"g�r�n��� a�madan �vv�l g�zl�y�c�yi zaman�n, saniy�nin onda biri cinsind�n "
-"miqdar�d�r.\n"
-"Bu, klaviaturan�n aktivl��m�sind�n h�m�n sonra sabit diskd�n a��lan "
-"sisteml�r ���n faydal�d�r.\n"
-"Sistem y�kl�yicisi, �g�r delay s�f�r olaraq verilmi� is�\n"
-"he� g�zl�m�z."
-
-#: ../../help.pm_.c:818
-msgid ""
-"Now it's time to configure the X Window System, which is the\n"
-"core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
-"you must configure your video card and monitor. Most of these\n"
-"steps are automated, though, therefore your work may only consist\n"
-"of verifying what has been done and accept the settings :)\n"
-"\n"
+" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
+"configuration wizard.\n"
 "\n"
-"When the configuration is over, X will be started (unless you\n"
-"ask DrakX not to) so that you can check and see if the\n"
-"settings suit you. If they don't, you can come back and\n"
-"change them, as many times as necessary."
-msgstr ""
-"Buradan etibar�n, Linuks GUI (Qrafik �stifad��i Ara �z�) ��kird�yini\n"
-"�m�l� g�tir�n X Window sistemini quraca��q. Buna g�r� d� ekran kart�n�z�\n"
-"v� monitorunuzu qurmal�s�n�z. Bu add�mlar�n �oxu onsuz da avtomatik olaraq\n"
-"ke�il�c�k v� siz� sad�c� olaraq t�vsiy� edil�n qur�ular� inc�l�m�k v� q�bul "
-"etm�k\n"
-"d���c�k. :-)\n"
+" * \"Sound card\": if a sound card is detected on your system, it is\n"
+"displayed here. No modification possible at installation time.\n"
 "\n"
+" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
+"here. No modification possible at installation time.\n"
 "\n"
-"Qurulu� qurtard���nda �g�r DrakXd�n �ksini ist�m�diniz is� X Window \n"
-"ba�layacaqd�r. Qur�u�ar�n�za bax�n v� yoxlay�n. Qur�ular�n�z� yoxlayaraq\n"
-"uyu�mazl�q olub olmad���na bax�n, laz�m g�lirs� geriy� d�n�n."
-
-#: ../../help.pm_.c:831
-msgid ""
-"If something is wrong in X configuration, use these options to correctly\n"
-"configure the X Window System."
-msgstr "X qur�ular�nda problem olarsa a�a��dak� se��n�kl�ri istifad� edin."
-
-#: ../../help.pm_.c:835
-msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
+" * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
+"displayed here. You can click on the button to change the parameters\n"
+"associated to it."
 msgstr ""
-"�g�r sistem� gir�rk�n qrafik arar �z�n�n g�lm�sini ist�yirs�n�z is� \"B�li\","
-"�ks halda \"Xeyr\" d�ym�sin� bas�n."
 
-#: ../../help.pm_.c:839
+#: ../../help.pm_.c:827
+#, fuzzy
 msgid ""
-"You can choose a security level for your system. Please refer to the manual "
-"for complete\n"
-"  information. Basically, if you don't know what to choose, keep the default "
-"option.\n"
+"Choose the hard drive you want to erase to install your new Mandrake Linux\n"
+"partition. Be careful, all data present on it will be lost and will not be\n"
+"recoverable!"
 msgstr ""
-"Sisteminiz ���n t�hl�k�sizlik s�viyy�sini se�� bil�rsiniz. �trafl� m�'lumat "
-"���n xahi� edirik b�l�d�iy�\n"
-" ba� vurun. �sas�n , n� se��c�yinizi bilmirsiniz is� buraya he� toxunmay�n.\n"
+"Linuks Mandrakeni yükləmak üçün sürücüyü seçin.\n"
+"Diqqətli olun, sürücüdəki bütün mə'lumatlar silinəcək\n"
+"və geri gəlməyəcək."
 
-#: ../../help.pm_.c:844
+#: ../../help.pm_.c:832
+#, fuzzy
 msgid ""
-"Your system is going to reboot.\n"
+"Click on \"OK\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
 "\n"
-"After rebooting, your new Linux Mandrake system will load automatically.\n"
-"If you want to boot into another existing operating system, please read\n"
-"the additional instructions."
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
-"�ndi sistem yenid�n qapan�b a��lacaqd�r.\n"
+"Sürücüdəki bütün bilgiləri və bölmələri silmək üçün\n"
+"\"Oldu\" düyməsinə basın. Diqqətli olun,\"Oldu\" düyməsinə basdıqdan sonra\n"
+"Windows bilgiləri də daxil olmaq üzərəbütün bölmə mə'lumatı geri dönməyəcək "
+"şəkildə silinəcək.\n"
 "\n"
-"A��ld�qdan sonra Linuks Mandrake avtomatik olaraq y�kl�n�c�kdir. �g�r "
-"ba�qa \n"
-"bir �m�liyyat sistemi d� i�l�d�c�ks�niz �lav� x�b�rdarl�qlar� oxuyun."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "��l�tdiyiniz dili se�in"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Qurulu� sinifini se�in"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Sabit disk se�kisi"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Si�an qur�ular�"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Klaviaturan�z� se�in"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
-msgstr "T�hl�k�sizlik"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Fayl sistemi qur�ular�"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "B�lm� ��kill�ndirilm�si"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Qurulacaq paketl�ri se�in"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Sistemi qur"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "Root parolunu qur"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "�stifad��i �lav� et"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "��b�k�ni qur"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-msgstr "M�nd�ricat"
-
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Xidm�tl�ri qur"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "A��l�� disketi yarat"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Sistem y�kl�yicini qur"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "X qur"
+"\n"
+"Bölmədəki mə'lumatları qoruyaraq \"Ləğv et\" düyməsinə\n"
+"əməliyyatı ləğv edə bilərsiniz."
 
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Qurulumdan ��x"
+#: ../../install2.pm_.c:114
+#, c-format
+msgid ""
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
+msgstr ""
 
-#: ../../install_any.pm_.c:403
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3870,159 +3442,154 @@ msgid ""
 "\n"
 "Do you really want to install these servers?\n"
 msgstr ""
-"bu vericil�ri se�diniz: %s\n"
+"bu vericiləri seçdiniz: %s\n"
 "\n"
 "\n"
-"bu vericil�r �sas�n f�alla�d�r�l�r. Onlar�n he� bir t�hl�k�sizlik\n"
-"probleml�ri yoxdur, amma b�'zi x�talar tap�la bil�r. Bel� olsa, m�m�k�n olan "
-"�n yax�n zamanda g�nc�ll�m�lisiniz.\n"
+"bu vericilər əsasən fəallaşdırılır. Onların heç bir təhlükəsizlik\n"
+"problemləri yoxdur, amma bə'zi xətalar tapıla bilər. Belə olsa, mümükün olan "
+"ən yaxın zamanda güncəlləməlisiniz.\n"
 "\n"
 "\n"
-"Bu vericil�ri qurmaq ist�yirsiniz?\n"
+"Bu vericiləri qurmaq istəyirsiniz?\n"
 
-#: ../../install_any.pm_.c:434
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
-msgstr "N�S domeyni olmadan translasiya i�l�dil� bilm�z"
+msgstr "NİS domeyni olmadan translasiya işlədilə bilməz"
 
-#: ../../install_any.pm_.c:675
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
-msgstr "%s s�r�c�s�n� FAT ��kill�ndirilmi� bir disket tax�n"
+msgstr "%s sürücüsünə FAT şəkilləndirilmiş bir disket taxın"
 
-#: ../../install_any.pm_.c:679
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
-msgstr "Bu floppi FAT ��klind� deyildir"
+msgstr "Bu floppi FAT şəklində deyildir"
 
-#: ../../install_any.pm_.c:689
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 msgstr ""
-"Bu saxlanm�� paketl�r se�kisini i�l�tm�k ���n qurulumu ``linux "
-"defcfg=floppy''il� ba�lad�n."
-
-#: ../../install_any.pm_.c:711
-msgid "Error reading file $f"
-msgstr "$f fayl� oxunurk�n x�ta oldu"
+"Bu saxlanmış paketlər seçkisini işlətmək üçün qurulumu ``linux "
+"defcfg=floppy''ilə başladın."
 
-#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:310
-#: ../../interactive.pm_.c:99 ../../interactive.pm_.c:114
-#: ../../interactive.pm_.c:269 ../../interactive_newt.pm_.c:166
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:356
-#: ../../my_gtk.pm_.c:617 ../../my_gtk.pm_.c:640
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "%s faylı oxunurkan xəta oldu"
+
+#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:325
+#: ../../interactive.pm_.c:107 ../../interactive.pm_.c:122
+#: ../../interactive.pm_.c:286 ../../interactive.pm_.c:308
+#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:170
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:415
+#: ../../my_gtk.pm_.c:716 ../../my_gtk.pm_.c:738
 msgid "Ok"
 msgstr "Oldu"
 
-#: ../../install_gtk.pm_.c:423
-msgid "Please test the mouse"
-msgstr "Xahi� edirik si�an�n�z� se�in"
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "Si�an�n�z� i�� salmaq ���n,"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "T�K�R� OYNADIN!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
 "Some hardware on your computer needs ``proprietary'' drivers to work.\n"
 "You can find some information about them at: %s"
 msgstr ""
-"Sisteminizdaki b�'zi avadanl�qlar i�l�m�si ���n d�zg�n s�r�c�l�r� ehtiyac "
+"Sisteminizdaki bə'zi avadanlıqlar işləməsi üçün düzgün sürücülərə ehtiyac "
 "duyar.\n"
-"Bunun haqq�nda %s d�/a laz�mi malumatlar� tapa bil�rsiniz"
+"Bunun haqqında %s də/a lazımi malumatları tapa bilərsiniz"
 
-#: ../../install_interactive.pm_.c:41
+#: ../../install_interactive.pm_.c:44
 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 ""
-"Bir root disk b�l�m�na ehtiyac�n�z var.\n"
-"Bunun ���n ist�r m�vcud bir disk b�l�m� �z�rina t�qlay�n, \n"
-"ya da yeni birini ba�dan yarad�n. Sonra \"Ba�lama \n"
-"N�qt�si\"n� g�lin va buray� '/' olaraq d�yi�dirin."
+"Bir root disk bölümüna ehtiyacınız var.\n"
+"Bunun üçün istər mövcud bir disk bölümü üzərina tıqlayın, \n"
+"ya da yeni birini başdan yaradın. Sonra \"Bağlama \n"
+"Nöqtəsi\"nə gəlin va burayı '/' olaraq dəyişdirin."
 
-#: ../../install_interactive.pm_.c:46 ../../install_steps_graphical.pm_.c:259
+#: ../../install_interactive.pm_.c:49 ../../install_steps_graphical.pm_.c:259
 msgid "You must have a swap partition"
-msgstr "Bir swap sah�sin� ehtiyac�n�z var"
+msgstr "Bir swap sahəsinə ehtiyacınız var"
 
-#: ../../install_interactive.pm_.c:47 ../../install_steps_graphical.pm_.c:261
+#: ../../install_interactive.pm_.c:50 ../../install_steps_graphical.pm_.c:261
 msgid ""
 "You don't have a swap partition\n"
 "\n"
 "Continue anyway?"
 msgstr ""
-"Bir swap sah�niz yoxdur\n"
+"Bir swap sahəniz yoxdur\n"
 "Davam edim?"
 
-#: ../../install_interactive.pm_.c:68
+#: ../../install_interactive.pm_.c:53 ../../install_steps.pm_.c:165
+#, fuzzy
+msgid "You must have a FAT partition mounted in /boot/efi"
+msgstr "Bir swap sahəsinə ehtiyacınız var"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
-msgstr "Bo� sah�ni istifad� et"
+msgstr "Boş sahəni istifadə et"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
-msgstr "Yeni b�lm�l�r ���n bo� sah� yoxdur"
+msgstr "Yeni bölmələr üçün boş sahə yoxdur"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
-msgstr "Var olan b�lm�l�ri i�l�dimmi"
+msgstr "Var olan bölmələri işlədimmi"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
-msgstr "B�lm� c�dv�li qurtar�lma�a �al���l�r"
+msgstr "Bölmə cədvəli qurtarılmağa çalışılır"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
-msgstr "Loopback ���n Windows b�lm�sini i�l�t"
+msgstr "Loopback üçün Windows bölməsini işlət"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
-msgstr "Linuks4Win'i qurmaq ���n hans� disk b�lm�sini istifad� ed�c�ksiniz?"
+msgstr "Linuks4Win'i qurmaq üçün hansı disk bölməsini istifadə edəcəksiniz?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
-msgstr "B�y�kl�kl�rini se�in"
+msgstr "Böyüklüklərini seçin"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
-msgstr "K�k (root) b�lm�si b�y�kl�y� (Mb): "
+msgstr "Kök (root) bölməsi böyüklüyü (Mb): "
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
-msgstr "Swap sah�si b�y�kl�y� (Mb): "
+msgstr "Swap sahəsi böyüklüyü (Mb): "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
-msgstr "Windows b�lm�sind�ki bo� sah�ni i�l�t"
+msgstr "Windows bölməsindəki boş sahəni işlət"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
-msgstr "Hans� b�lm�nin b�y�kl�y�n� d�yi�dir�c�ksiniz?"
+msgstr "Hansı bölmənin böyüklüyünü dəyişdirəcəksiniz?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
-msgstr "Fat fayl sistemi uclar� hesaplan�r"
+msgstr "Fat fayl sistemi ucları hesaplanır"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
 "the following error occured: %s"
 msgstr ""
-"FAT t�dqiqat��m�z sizin b�l�ml�ri i�l�d� bilmir,\n"
-"bu x�ta oldu: %s"
+"FAT tədqiqatçımız sizin bölümləri işlədə bilmir,\n"
+"bu xəta oldu: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
-"Sizin Windows b�l�m� �ox da��n�qd�r. Daxi� edirik, �vv�lc� birl��dirin "
+"Sizin Windows bölümü çox dağınıqdır. Daxiş edirik, əvvəlcə birləşdirin "
 "(defraq)"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -4032,233 +3599,237 @@ msgid ""
 "restart the installation. You should also backup your data.\n"
 "When sure, press Ok."
 msgstr ""
-"D�QQ�T!\n"
+"DİQQƏT!\n"
 "\n"
-"DrakX \"Windows\" disk b�lm�nizin b�y�kl�y�n� d�yi�dir�c�k. Bu i� \n"
-"tehl�k�li ola bil�r. A�ina deyil is�niz qurulumdan ��x�n v� \"Windows\" \n"
-"alt�nda \"Scandisk\" (laz�m g�l�rs� \"defrag\" da) proqram�n� �al��d�r�n. "
-"Ard�ndan quruluma \n"
-"davam edin. Veril�rinizin yed�yini alma�� da unutmay�n!"
+"DrakX \"Windows\" disk bölmənizin böyüklüyünü dəyişdirəcək. Bu iş \n"
+"tehlükəli ola bilər. Aşina deyil isəniz qurulumdan çıxın və \"Windows\" \n"
+"altında \"Scandisk\" (lazım gələrsə \"defrag\" da) proqramını çalışdırın. "
+"Ardından quruluma \n"
+"davam edin. Verilərinizin yedəyini almağı da unutmayın!"
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
-msgstr "Hans� sektora da��maq ist�yirsiniz?"
+msgstr "Hansı sektora daşımaq istəyirsiniz?"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
-msgstr "b�lm� %s"
+msgstr "bölmə %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
-msgstr "FAT b�y�kl�y� d�yi�dirilm�si bacar�lmad�: %s"
+msgstr "FAT böyüklüyü dəyişdirilməsi bacarılmadı: %s"
 
-#: ../../install_interactive.pm_.c:145
+#: ../../install_interactive.pm_.c:154
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
-msgstr "FAT b�lm�si yoxdur ya da loopback ���n laz�mi yer burax�lmay�b"
+msgstr "FAT bölməsi yoxdur ya da loopback üçün lazımi yer buraxılmayıb"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
-msgstr "B�t�n diski sil"
+msgstr "Bütün diski sil"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "\"Windows\"u sil"
 
-#: ../../install_interactive.pm_.c:154
+#: ../../install_interactive.pm_.c:163
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr ""
-"Sizin bird�n �ox diskiniz var, linux qurmaq ���n hans�n� istifad� "
-"ed�c�ksiniz?"
+"Sizin birdən çox diskiniz var, linux qurmaq üçün hansını istifadə "
+"edəcəksiniz?"
 
-#: ../../install_interactive.pm_.c:157
+#: ../../install_interactive.pm_.c:166
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr ""
-"%s b�l�m�sinin b�y�kl�y� d�yi�dirildikd�n sonra bu b�lm�d�ki b�t�n "
-"m�'lumatlar silin�c�kdir"
+"%s bölüməsinin böyüklüyü dəyişdirildikdən sonra bu bölmədəki bütün "
+"mə'lumatlar silinəcəkdir"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
-msgstr "Haz�rk� disk b�lm�l�ndirm�si"
+msgstr "Hazırkı disk bölmələndirməsi"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
-msgstr "Fdisk istifad� et"
+msgstr "Fdisk istifadə et"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
 "When you are done, don't forget to save using `w'"
 msgstr ""
-"�ndi %s sabit diskinizi b�lm�l�ndir� bil�rsiniz\n"
-"��inizi bitirdiyinizd� `w' il� qeyd etm�yi unutmay�n"
+"İndi %s sabit diskinizi bölmələndirə bilərsiniz\n"
+"İşinizi bitirdiyinizdə `w' ilə qeyd etməyi unutmayın"
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
-msgstr "He� Windows disk b�lm�niz yoxdur!"
+msgstr "Heç Windows disk bölməniz yoxdur!"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
-msgstr "Art�q b�lm� �lav� edil� bilm�z"
+msgstr "Artıq bölmə əlavə edilə bilməz"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
-msgstr "DrakX b�lm� sehirbaz� bu yolu tapd�:"
+msgstr "DrakX bölmə sehirbazı bu yolu tapdı:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
-msgstr "B�lm� c�dv�li n�v�: %s"
+msgstr "Bölmə cədvəli növü: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
-msgstr "��b�k� f�alla�d�r�l�r"
+msgstr "Şəbəkə fəallaşdırılır"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
-msgstr "��b�k� dayand�r�l�r"
+msgstr "Şəbəkə dayandırılır"
 
 #: ../../install_steps.pm_.c:73
 msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
-"Bir x�ta oldu, f�q�t nec� d�z�ldil�c�yini bilmir�m.\n"
-"Davam edin, riski siz� aitdir!"
+"Bir xəta oldu, fəqət necə düzəldiləcəyini bilmirəm.\n"
+"Davam edin, riski sizə aitdir!"
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
-msgstr "%s ba�lama n�qt�sini �oxalt"
+msgstr "%s bağlama nöqtəsini çoxalt"
 
-#: ../../install_steps.pm_.c:385
+#: ../../install_steps.pm_.c:384
 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 ""
-"B�zi paketl�r do�ru olaraq qurulumu bitirm�di.\n"
-"cdrom s�r�c�n�z ya da cdromunuz d�zg�n i�l�mir.\n"
-"�vv�ld�n Linuks qurulu bir sistemd� \"rpm -qpl Mandrake/RPMS/*.rpm\"'yi\n"
-"istifad� ed�r�k Cd-Rom'u yoxlay�n.\n"
+"Bəzi paketlər doğru olaraq qurulumu bitirmədi.\n"
+"cdrom sürücünüz ya da cdromunuz düzgün işləmir.\n"
+"Əvvəldən Linuks qurulu bir sistemdə \"rpm -qpl Mandrake/RPMS/*.rpm\"'yi\n"
+"istifadə edərək Cd-Rom'u yoxlayın.\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
-msgstr "%s Sistemin� Xo�g�lmi�siniz"
+msgstr "%s Sisteminə Xoşgəlmişsiniz"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
-msgstr "Disket s�r�c� yoxdur"
+msgstr "Disket sürücü yoxdur"
 
-#: ../../install_steps_auto_install.pm_.c:51
+#: ../../install_steps_auto_install.pm_.c:77
 #: ../../install_steps_stdio.pm_.c:23
 #, c-format
 msgid "Entering step `%s'\n"
-msgstr "Ba�lan��c add�m� `%s'\n"
+msgstr "Başlanğıc addımı `%s'\n"
 
 #: ../../install_steps_graphical.pm_.c:287
 msgid "Choose the size you want to install"
-msgstr "Qurmaq ist�diyiniz paketl�ri se�in"
+msgstr "Qurmaq istədiyiniz paketləri seçin"
 
 #: ../../install_steps_graphical.pm_.c:334
 msgid "Total size: "
-msgstr "Ham�s�: "
+msgstr "Hamısı: "
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:437
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:387
 #, c-format
 msgid "Version: %s\n"
-msgstr "Burax�l��: %s\n"
+msgstr "Buraxılış: %s\n"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:438
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:388
 #, c-format
 msgid "Size: %d KB\n"
-msgstr "B�y�kl�y�: %d KB\n"
+msgstr "Böyüklüyü: %d KB\n"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:337
-#: ../../install_steps_interactive.pm_.c:520
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:509
 msgid "Choose the packages you want to install"
-msgstr "Qurmaq ist�diyiniz paketl�ri se�in"
+msgstr "Qurmaq istədiyiniz paketləri seçin"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:340
+#: ../../install_steps_graphical.pm_.c:465 ../../interactive_gtk.pm_.c:571
 msgid "Info"
-msgstr "M�'lumat"
+msgstr "Mə'lumat"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:345
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:457
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Install"
 msgstr "Qurulum"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:558
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:497
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Installing"
 msgstr "Qurulur"
 
 #: ../../install_steps_graphical.pm_.c:499
 msgid "Please wait, "
-msgstr "Xahi� edirik g�zl�yin, "
+msgstr "Xahiş edirik gözləyin, "
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:570
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:510
 msgid "Time remaining "
-msgstr "Qalan m�dd�t"
+msgstr "Qalan müddət"
 
 #: ../../install_steps_graphical.pm_.c:502
 msgid "Total time "
-msgstr "�mumi m�dd�t"
+msgstr "Ümumi müddət"
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
-msgstr "Qurulum haz�rlan�r"
+msgstr "Qurulum hazırlanır"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:618
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:558
 #, c-format
 msgid "Installing package %s"
 msgstr "%s paketi qurulur"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
+#: ../../install_steps_gtk.pm_.c:646
 msgid "Go on anyway?"
-msgstr "Yen� d� davam ed�k?"
+msgstr "Yenə də davam edək?"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
 msgid "There was an error ordering packages:"
-msgstr "Paketl�ri ist�rk�n bir x�ta oldu:"
+msgstr "Paketləri istərkən bir xəta oldu:"
 
 #: ../../install_steps_graphical.pm_.c:577
 msgid "Use existing configuration for X11?"
-msgstr "X11 qur�ular� ���n m�vcud qur�ulardan istifad� ed�k?"
+msgstr "X11 qurğuları üçün mövcud qurğulardan istifadə edək?"
 
-#: ../../install_steps_gtk.pm_.c:142
+#: ../../install_steps_gtk.pm_.c:148
 msgid ""
 "Your system is low on resource. You may have some problem installing\n"
-"Linux-Mandrake. If that occurs, you can try a text install instead. For "
+"Mandrake Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Sizin sisteminizin qaynaqlar� �at��m�r. Qurulum �rzind� problem ya�aya "
-"bil�rsiniz\n"
-"Bu ba� ver�rs� m�tn arac�l��� il� qurulumu s�namal�s�n�z. Bunun ���n "
-"d�CDROMdan ba�latd���n�z zaman,\n"
-" 'F1'� bas�n v� 'text' yazaraq enter'� bas�n."
+"Sizin sisteminizin qaynaqları çatışmır. Qurulum ərzində problem yaşaya "
+"bilərsiniz\n"
+"Bu baş verərsə mətn aracılığı ilə qurulumu sınamalısınız. Bunun üçün "
+"dəCDROMdan başlatdığınız zaman,\n"
+" 'F1'ə basın və 'text' yazaraq enter'ə basın."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Qurulum Sinifi"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
-msgstr "Xahi� edirik a�a��dak� qurulum sinifl�rind�n birisini se�iniz:"
+msgstr "Xahiş edirik aşağıdakı qurulum siniflərindən birisini seçiniz:"
 
-#: ../../install_steps_gtk.pm_.c:222
+#: ../../install_steps_gtk.pm_.c:228
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
-msgstr "Se�diyiniz paket qruplar�n�n �mumi b�y�kl�y� t�xim�n %d MBd�r.\n"
+msgstr "Seçdiyiniz paket qruplarının ümumi böyüklüyü təximən %d MBdır.\n"
 
-#: ../../install_steps_gtk.pm_.c:224
+#: ../../install_steps_gtk.pm_.c:230
 #, c-format
 msgid ""
 "If you wish to install less than this size,\n"
@@ -4267,11 +3838,11 @@ msgid ""
 "A low percentage will install only the most important packages;\n"
 "a percentage of 100%% will install all selected packages."
 msgstr ""
-"Bu b�y�kl�kd�n daha az�n� y�kl�m�k ist�s�niz,\n"
-"qurmaq ist�diyiniz paket faizini se�in.\n"
-"100%%'i se��rs�niz b�t�n paketl�r qurulacaqd�r."
+"Bu böyüklükdən daha azını yükləmək istəsəniz,\n"
+"qurmaq istədiyiniz paket faizini seçin.\n"
+"100%%'i seçərsəniz bütün paketlər qurulacaqdır."
 
-#: ../../install_steps_gtk.pm_.c:229
+#: ../../install_steps_gtk.pm_.c:235
 #, c-format
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
@@ -4281,114 +3852,117 @@ msgid ""
 "A low percentage will install only the most important packages;\n"
 "a percentage of %d%% will install as many packages as possible."
 msgstr ""
-"Sabit diskinizd� bu paketl�rin sad�c� olaraq %d%%'sini quracaq q�d�r yer "
+"Sabit diskinizdə bu paketlərin sadəcə olaraq %d%%'sini quracaq qədər yer "
 "var.\n"
-"Bundan daha az�n� qurmaq ist�s�niz,\n"
-"daha az bir faiz sad�c� �n vacib paketl�ri ;\n"
-"%d%% is� qurula bil�c�k b�t�n paketl�ri quracaqd�r."
+"Bundan daha azını qurmaq istəsəniz,\n"
+"daha az bir faiz sadəcə ən vacib paketləri ;\n"
+"%d%% isə qurula biləcək bütün paketləri quracaqdır."
 
-#: ../../install_steps_gtk.pm_.c:235
+#: ../../install_steps_gtk.pm_.c:241
 msgid "You will be able to choose them more specifically in the next step."
-msgstr "Sonrak� add�mda daha geni� bir se�ki qaba��n�za g�l�c�kdir."
+msgstr "Sonrakı addımda daha geniş bir seçki qabağınıza gələcəkdir."
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
-msgstr "Qurulacaq paketl�rin faizi"
+msgstr "Qurulacaq paketlərin faizi"
 
-#: ../../install_steps_gtk.pm_.c:285 ../../install_steps_interactive.pm_.c:599
+#: ../../install_steps_gtk.pm_.c:291 ../../install_steps_interactive.pm_.c:619
 msgid "Package Group Selection"
-msgstr "Paket Qrup Se�kisi"
+msgstr "Paket Qrup Seçkisi"
 
-#: ../../install_steps_gtk.pm_.c:305 ../../install_steps_interactive.pm_.c:614
+#: ../../install_steps_gtk.pm_.c:320 ../../install_steps_interactive.pm_.c:634
 msgid "Individual package selection"
-msgstr "F�rdi paket se�kisi"
-
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr "Avtomatik se�ili paketl�ri g�st�r"
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "A�ac� A�"
+msgstr "Fərdi paket seçkisi"
 
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "A�ac� Qapat"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Otaq v� grup s�ralamas� aras�nda g�z"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Ümumi böyüklük: %d / %d Mb"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
-msgstr "X�tal� paket"
+msgstr "Xətalı paket"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Ad: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
-msgstr "�h�miyy�t: %s\n"
+msgstr "Əhəmiyyət: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "�mumi b�y�kl�k: %d / %d Mb"
-
-#: ../../install_steps_gtk.pm_.c:467
+#: ../../install_steps_gtk.pm_.c:411
 msgid ""
 "You can't select this package as there is not enough space left to install it"
-msgstr "Bu paketi se�� bilm�zsiniz, ��nki qurmaq ���n yer �atm�r."
+msgstr "Bu paketi seçə bilməzsiniz, çünki qurmaq üçün yer çatmır."
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
-msgstr "A�a��dak� paketl�r qurulacaqd�r"
+msgstr "Aşağıdakı paketlər qurulacaqdır"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
-msgstr "A�a��dak� paketl�r sistemd�n silin�c�kl�r"
+msgstr "Aşağıdakı paketlər sistemdən silinəcəklər"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
-msgstr "Bu paketi se�� bilm�zsiniz/sistemd�n ��xarda bilm�zs�n�z"
+msgstr "Bu paketi seçə bilməzsiniz/sistemdən çıxarda bilməzsınız"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
-msgstr "Bu laz�ml� bir paketdir, sistemd�n ��xard�la bilm�z"
+msgstr "Bu lazımlı bir paketdir, sistemdən çıxardıla bilməz"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
-msgstr "Bu paketi sistemd�n ��xarda bilm�zs�n�z. Art�q qurulmu�dur."
+msgstr "Bu paketi sistemdən çıxarda bilməzsınız. Artıq qurulmuşdur."
 
-#: ../../install_steps_gtk.pm_.c:507
+#: ../../install_steps_gtk.pm_.c:447
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
 msgstr ""
-"Bu paket yenil�nm�lidir\n"
-"Sistemd�n ��xarmaq m�vzusunda ciddisiniz?"
+"Bu paket yenilənməlidir\n"
+"Sistemdən çıxarmaq mövzusunda ciddisiniz?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
-msgstr "Bu paketi sistemd�n ��xarda bilm�zsiniz. Yenil�nm�lidir"
+msgstr "Bu paketi sistemdən çıxarda bilməzsiniz. Yenilənməlidir"
+
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr "Avtomatik seçili paketləri göstər"
+
+#: ../../install_steps_gtk.pm_.c:460
+#, fuzzy
+msgid "Load/Save on floppy"
+msgstr "Disketə qeyd et"
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:461
+#, fuzzy
+msgid "Updating package selection"
+msgstr "Paket seçkilərini saxla"
+
+#: ../../install_steps_gtk.pm_.c:466
+#, fuzzy
+msgid "Minimal install"
+msgstr "Qurulumdan çıx"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
-msgstr "T�xmini olaraq hesaplan�r"
+msgstr "Təxmini olaraq hesaplanır"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
-msgstr "Xahi� edirik g�zl�yin, qurulum haz�rlan�r"
+msgstr "Xahiş edirik gözləyin, qurulum hazırlanır"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d paket"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -4438,7 +4012,7 @@ msgstr ""
 "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 ��b�k�. In doubt, please contact \n"
+"system, or adapt it to be used on a şəbəkə. 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"
@@ -4448,15 +4022,15 @@ msgstr ""
 "respective authors and are protected by intellectual property and \n"
 "copyright laws applicable to software programs.\n"
 
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Accept"
-msgstr "Q�bul Et"
+msgstr "Qəbul Et"
 
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Refuse"
-msgstr "R�dd Et"
+msgstr "Rədd Et"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4465,47 +4039,34 @@ msgid ""
 "done.\n"
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
-"Cd-Romu d�yi�dirin!\n"
+"Cd-Romu dəyişdirin!\n"
 "\n"
-"\"%s\" adl� Cd-Romu s�r�c�n�z� tax�n v� OLDU'ya bas�n.\n"
-"�g�r Cd-Rom �linizd� deyils� bu Cd-Rom'dan qurmamaq ���n �MT�NA ET'� bas�n."
+"\"%s\" adlı Cd-Romu sürücünüzə taxın və OLDU'ya basın.\n"
+"Əgər Cd-Rom əlinizdə deyilsə bu Cd-Rom'dan qurmamaq üçün İMTİNA ET'ə basın."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
-msgstr "Paketl�r qurulurk�n bir x�ta oldu:"
+msgstr "Paketlər qurulurkən bir xəta oldu:"
 
 #: ../../install_steps_interactive.pm_.c:37
 msgid "An error occurred"
-msgstr "Bir x�ta oldu"
+msgstr "Bir xəta oldu"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "Xahi� edirik istifad� ���n bir dil se�in."
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr "Qurulumdan sonra istifad� ed� bil�c�yiniz ba�qa dill�r se�� bil�rsiniz"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "Ham�s�"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
-msgstr "Lisenziya s�zl��m�si"
+msgstr "Lisenziya sözləşməsi"
 
-#: ../../install_steps_interactive.pm_.c:87
+#: ../../install_steps_interactive.pm_.c:72
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Linux-"
-"Mandrake distribution \n"
+"The operating system and the different components available in the Mandrake "
+"Linux 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 Linux-Mandrake distribution.\n"
+"system and the different components of the Mandrake Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4559,7 +4120,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 Linux-Mandrake sites  which are prohibited or restricted in some "
+"from one of Mandrake Linux 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"
@@ -4596,7 +4157,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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
 "MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -4733,103 +4294,99 @@ msgstr ""
 "Paris - France.\n"
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 
-#: ../../install_steps_interactive.pm_.c:182
-#: ../../install_steps_interactive.pm_.c:822
+#: ../../install_steps_interactive.pm_.c:168
+#: ../../install_steps_interactive.pm_.c:871
 #: ../../standalone/keyboarddrake_.c:28
 msgid "Keyboard"
 msgstr "Klaviatura"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
-msgstr "Klaviatura qurulu�unu se�iniz."
+msgstr "Klaviatura quruluşunu seçiniz."
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
-msgstr "B�t�n m�vcud klaviaturalar�n siyah�s�"
-
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Qurulum Sinifi"
+msgstr "Bütün mövcud klaviaturaların siyahısı"
 
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
-msgstr "Hans� qurulum sinifini ist�yirsiniz?"
+msgstr "Hansı qurulum sinifini istəyirsiniz?"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
-msgstr "Qurulum/G�nc�ll�m�"
+msgstr "Qurulum/Güncəlləmə"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
-msgstr "Bu bir qurulum mu, yoxsa g�nc�ll�m�midir?"
+msgstr "Bu bir qurulum mu, yoxsa güncəlləməmidir?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
-msgstr "T�vsiy� edil�n"
+msgstr "Tövsiyə edilən"
 
-#: ../../install_steps_interactive.pm_.c:215
-#: ../../install_steps_interactive.pm_.c:218
+#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:204
 msgid "Expert"
 msgstr "Usta"
 
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Update"
-msgstr "G�nc�ll�m�"
+msgstr "Güncəlləmə"
 
-#: ../../install_steps_interactive.pm_.c:238 ../../standalone/mousedrake_.c:41
+#: ../../install_steps_interactive.pm_.c:224 ../../standalone/mousedrake_.c:48
 msgid "Please, choose the type of your mouse."
-msgstr "Xahi� edirik si�an�n�z�n n�v�n� se�in."
+msgstr "Xahiş edirik siçanınızın növünü seçin."
 
-#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:57
+#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
 msgid "Mouse Port"
-msgstr "Si�an Qap�s�"
+msgstr "Siçan Qapısı"
 
-#: ../../install_steps_interactive.pm_.c:245 ../../standalone/mousedrake_.c:58
+#: ../../install_steps_interactive.pm_.c:231 ../../standalone/mousedrake_.c:65
 msgid "Please choose on which serial port your mouse is connected to."
-msgstr "Si�an�n�z�n ba�l� oldu�u serial Qap�y� se�in."
+msgstr "Siçanınızın bağlı olduğu serial Qapıyı seçin."
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
-msgstr "D�ym� emulyasiyas�"
+msgstr "Düymə emulyasiyası"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
-msgstr "D�ym� 2 emulyasiyas�"
+msgstr "Düymə 2 emulyasiyası"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
-msgstr "D�ym� 3 emulyasiyas�"
+msgstr "Düymə 3 emulyasiyası"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "PCMCIA kartlar qurulur..."
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "Configuring IDE"
-msgstr "IDE qap�lar� qurulur"
+msgstr "IDE qapıları qurulur"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:295
+#: ../../install_steps_interactive.pm_.c:281
 msgid "no available partitions"
-msgstr "uy�un b�lm� tap�lmad�"
+msgstr "uyğun bölmə tapılmadı"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
-msgstr "Ba�lama n�qt�l�ri ���n b�lm�l�r daran�r"
+msgstr "Bağlama nöqtələri üçün bölmələr daranır"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
-msgstr "Ba�lama n�qt�l�rini se�in"
+msgstr "Bağlama nöqtələrini seçin"
 
-#: ../../install_steps_interactive.pm_.c:323
+#: ../../install_steps_interactive.pm_.c:311
 #, c-format
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
@@ -4839,113 +4396,154 @@ msgid ""
 "\n"
 "Do you agree to loose all the partitions?\n"
 msgstr ""
-"B�lm� c�dv�linizi oxuya bilmir�m, d�y�s�n biraz xarab olub:-(\n"
-"Xarab olmu� bolm�l�ri d�z�ltm�y� �al��acam.\n"
-"Amma b�t�n m�'lumatlar it�c�kdir.\n"
-"Ba�qa bir yol is� DrakXin b�lm� c�dv�ll�rini yoxlamas�n� "
-"passivl��dirm�kdir.\n"
-"(x�ta %s)\n"
+"Bölmə cədvəlinizi oxuya bilmirəm, dəyəsən biraz xarab olub:-(\n"
+"Xarab olmuş bolmələri düzəltməyə çalışacam.\n"
+"Amma bütün mə'lumatlar itəcəkdir.\n"
+"Başqa bir yol isə DrakXin bölmə cədvəllərini yoxlamasını "
+"passivləşdirməkdir.\n"
+"(xəta %s)\n"
 "\n"
-"B�t�n b�lm�l�ri itirm�k ist�yirsiniz?\n"
+"Bütün bölmələri itirmək istəyirsiniz?\n"
 
-#: ../../install_steps_interactive.pm_.c:336
+#: ../../install_steps_interactive.pm_.c:324
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
 msgstr ""
-"DiskDrake b�lm� c�dv�lini oxuma�� bacara bilm�di.\n"
-"�z�n�z davam ed� bil�rsiniz."
+"DiskDrake bölmə cədvəlini oxumağı bacara bilmədi.\n"
+"Özünüz davam edə bilərsiniz."
+
+#: ../../install_steps_interactive.pm_.c:340
+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_.c:349
+#, fuzzy
+msgid "No root partition found to perform an upgrade"
+msgstr "Şəkilləndiriləcək disk bölmələrini seçin"
 
-#: ../../install_steps_interactive.pm_.c:361
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
-msgstr "K�k (root) B�lm�si"
+msgstr "Kök (root) Bölməsi"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
-msgstr "Sisteminizin k�k (/) b�lm�si hans�d�r?"
+msgstr "Sisteminizin kök (/) bölməsi hansıdır?"
 
-#: ../../install_steps_interactive.pm_.c:376
+#: ../../install_steps_interactive.pm_.c:365
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
-"B�lm� c�v�lind�ki d�yi�iklikl�rin daxil olmas� ���n komp�terinizi yenid�n "
-"ba�latmal�s�n�z."
+"Bölmə cəvəlindəki dəyişikliklərin daxil olması üçün kompüterinizi yenidən "
+"başlatmalısınız."
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
-msgstr "��kill�ndiril�c�k disk b�lm�l�rini se�in"
+msgstr "Şəkilləndiriləcək disk bölmələrini seçin"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
-msgstr "X�tal� bloklar s�nans�nm�?"
+msgstr "Xətalı bloklar sınansınmı?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
-msgstr "B�lm�l�r ��kill�ndirilir"
+msgstr "Bölmələr şəkilləndirilir"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
-msgstr "%s fayl� yarad�l�r v� ��kill�ndirilir"
+msgstr "%s faylı yaradılır və şəkilləndirilir"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
-msgstr "Qurulumu bitirm�k ���n laz�mi sah� yoxdur, xahi� edirik �lav� edin"
+msgstr "Qurulumu bitirmək üçün lazımi sahə yoxdur, xahiş edirik əlavə edin"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
-msgstr "M�vcud olan paketl�r axtar�l�r."
+msgstr "Mövcud olan paketlər axtarılır."
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
-msgstr "G�nc�ll�n�c�k paketlar tap�l�r"
+msgstr "Güncəllənəcək paketlar tapılır"
 
-#: ../../install_steps_interactive.pm_.c:461
+#: ../../install_steps_interactive.pm_.c:450
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
-"Sisteminizd� qurulum ya da g�nc�ll�m� ���n laz�mi bo� yer yoxdur(%d > %d)"
+"Sisteminizdə qurulum ya da güncəlləmə üçün lazımi boş yer yoxdur(%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
-msgstr "Ham�s� (%dMB)"
+msgstr "Hamısı (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Minimum (%dMB)"
-msgstr "�n az (%dMB)"
+msgstr "Ən az (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
-msgstr "T�vsiy� edil�n (%dMB)"
+msgstr "Tövsiyə edilən (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
-msgstr "X�susi"
+msgstr "Xüsusi"
+
+#: ../../install_steps_interactive.pm_.c:522
+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_.c:525
+#, fuzzy
+msgid "Load from floppy"
+msgstr "Disketdən geri çağır"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Loading from floppy"
+msgstr "Disketdən geri çağır"
 
-#: ../../install_steps_interactive.pm_.c:585
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Package selection"
+msgstr "Paket Qrup Seçkisi"
+
+#: ../../install_steps_interactive.pm_.c:532
+#, fuzzy
+msgid "Insert a floppy containing package selection"
+msgstr "%s sürücüsünə bir disket taxın"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Disketə qeyd et"
+
+#: ../../install_steps_interactive.pm_.c:605
 msgid "Selected size is larger than available space"
-msgstr "Se�ili b�y�kl�k var olandan daha b�y�kd�r"
+msgstr "Seçili böyüklük var olandan daha böyükdür"
 
-#: ../../install_steps_interactive.pm_.c:650
+#: ../../install_steps_interactive.pm_.c:670
 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 ""
-"A�a��dak� siyah�dak� b�t�n CD'l�r� sahib is�niz, OLDU'ya bas�n.\n"
-"CD'l�rin he� birin� sahib deyils�niz, �MT�NA ET'� bas�n.\n"
-"CD'l�rd�n b�'zil�i �ksik is�, onlar� se�ili v�ziyy�td�n ��xard�b OLDU'ya "
-"bas�n."
+"Aşağıdakı siyahıdakı bütün CD'lərə sahib isəniz, OLDU'ya basın.\n"
+"CD'lərin heç birinə sahib deyilsəniz, İMTİNA ET'ə basın.\n"
+"CD'lərdən bə'ziləi əksik isə, onları seçili vəziyyətdən çıxardıb OLDU'ya "
+"basın."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
-msgstr "\"%s\" adl� Cd-Rom"
+msgstr "\"%s\" adlı Cd-Rom"
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -4954,11 +4552,21 @@ msgstr ""
 "%s paketi qurulur\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
-msgstr "Qurulum sonras� qur�ular"
+msgstr "Qurulum sonrası qurğular"
+
+#: ../../install_steps_interactive.pm_.c:719
+#, fuzzy, c-format
+msgid "Please insert the Boot floppy used in drive %s"
+msgstr "%s sürücüsünə bir disket taxın"
 
-#: ../../install_steps_interactive.pm_.c:718
+#: ../../install_steps_interactive.pm_.c:725
+#, fuzzy, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "%s sürücüsünə boş bir disket yerləşdirin"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -4996,125 +4604,172 @@ msgid ""
 "Altadena California 91001\n"
 "USA"
 msgstr ""
-"�ndi �ifrl�m� ���n istifad� edil�c�k t�'minat� endir� bil�rsiniz.\n"
-"D�QQ�T:\n"
+"İndi şifrləmə üçün istifadə ediləcək tə'minatı endirə bilərsiniz.\n"
+"DİQQƏT:\n"
 "\n"
-"Bu t�'minata b�'zi f�rqli �mumi ehtiyaclardan v� m�xt�lif\n"
-"m�hak�m� haqlar�ndan �tr�, bu t�'minat�n son istifad��isi, qanunlar�n ona "
+"Bu tə'minata bə'zi fərqli ümumi ehtiyaclardan və müxtəlif\n"
+"mühakəmə haqlarından ötrü, bu tə'minatın son istifadəçisi, qanunların ona "
 "bu\n"
-"t�'minat� internetd�n endirm� v� saxlama haqq�n� verdiyind�n �min "
-"olmal�d�r.\n"
+"tə'minatı internetdən endirmə və saxlama haqqını verdiyindən əmin "
+"olmalıdır.\n"
 "\n"
-"�lav� olaraq, m��d�ri va/v� ya son istifad��i x�susil�, yerl��diyi m�hak�m� "
+"Əlavə olaraq, müşdəri va/və ya son istifadəçi xüsusilə, yerləşdiyi mühakəmə "
 "yerinin\n"
-"qanunlar�n� �eyn�m�diyind�n �min olmal�d�r. M��d�ri v�/v� ya son istifad��i\n"
-"qanunlar�n �mr etdiyi ��rtl�ri pozdu�u zaman ciddi c�zalara\n"
-"m�'ruz qalacaqd�r.\n"
+"qanunlarını çeynəmədiyindən əmin olmalıdır. Müşdəri və/və ya son istifadəçi\n"
+"qanunların əmr etdiyi şərtləri pozduğu zaman ciddi cəzalara\n"
+"mə'ruz qalacaqdır.\n"
 "\n"
-"X�susi ya da dolayl� z�r�rl�r� (g�lir azalmas�, i�in pozulmas�, ticari "
-"m�'lumat\n"
-"itkisi v� dig�r maddi itkil�r) yol a�an he� bir hadis�d� n� Mandrakesoft, n� "
-"d� \n"
-"istehsalat��lar� v�/va ya qaynaq vericil�ri m�s'ul tutulmazlar. Bu "
-"t�'minat�\n"
-"internetden endirirk�n son istifad��i bu s�zl��m�yi q�bul etdiyini \n"
-"b�yan etmi� say�l�r.\n"
+"Xüsusi ya da dolaylı zərərlərə (gəlir azalması, işin pozulması, ticari "
+"mə'lumat\n"
+"itkisi və digər maddi itkilər) yol açan heç bir hadisədə nə Mandrakesoft, nə "
+"də \n"
+"istehsalatçıları və/va ya qaynaq vericiləri məs'ul tutulmazlar. Bu "
+"tə'minatı\n"
+"internetden endirirkən son istifadəçi bu sözləşməyi qəbul etdiyini \n"
+"bəyan etmiş sayılır.\n"
 "\n"
 "\n"
-"Bu s�zl��m�yl� �laq�d�r h�r c�r sual ���n xahi� edirik\n"
+"Bu sözləşməylə əlaqədər hər cür sual üçün xahiş edirik\n"
 "Mandrakesoft, Inc.\n"
 "2400 N. Lincoln Avenue Suite 243\n"
 "Altadena California 91001\n"
 "USA\n"
-"�nvan�na yaz�n�z."
+"ünvanına yazınız."
 
-#: ../../install_steps_interactive.pm_.c:750
+#: ../../install_steps_interactive.pm_.c:782
 msgid "Choose a mirror from which to get the packages"
-msgstr "Paketleri almaq ���n bir �ks �nvan� se�in"
+msgstr "Paketleri almaq üçün bir əks ünvanı seçin"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
-msgstr "�ks �nvan�na ba�lant� qurulur"
+msgstr "Əks ünvanına bağlantı qurulur"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
-msgstr "Xahi� edirik qurmaq ist�diyiniz paketl�ri se�in."
+msgstr "Xahiş edirik qurmaq istədiyiniz paketləri seçin."
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
-msgstr "Sisteminiz hans� m�qs�dl� istifad� edil�c�k?"
+msgstr "Sisteminiz hansı məqsədlə istifadə ediləcək?"
+
+#: ../../install_steps_interactive.pm_.c:813
+#, fuzzy
+msgid "Hardware clock set to GMT"
+msgstr "Avadanlıq saatınız GMT-yə göra quruludur mu?"
 
-#: ../../install_steps_interactive.pm_.c:778
-msgid "Is your hardware clock set to GMT?"
-msgstr "Avadanl�q saat�n�z GMT-y� g�ra quruludur mu?"
+#: ../../install_steps_interactive.pm_.c:814
+msgid "Automatic time synchronization (using NTP)"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:806 ../../printer.pm_.c:22
-#: ../../printerdrake.pm_.c:415
+#: ../../install_steps_interactive.pm_.c:821
+#, fuzzy
+msgid "NTP Server"
+msgstr "NIS Verici"
+
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
 msgstr "Uzaq CUPS vericisi"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
-msgstr "�ap Edicisiz"
+msgstr "Çap Edicisiz"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Mündəricat"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
-msgstr "Si�an"
+msgstr "Siçan"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr "Vaxt Dilimi"
 
-#: ../../install_steps_interactive.pm_.c:824 ../../printerdrake.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:873 ../../printerdrake.pm_.c:1773
+#: ../../printerdrake.pm_.c:1844
 msgid "Printer"
-msgstr "�ap Edici"
+msgstr "Çap Edici"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:875
 msgid "ISDN card"
-msgstr "ISDN kart�"
+msgstr "ISDN kartı"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
-msgstr "S�s kart�"
+msgstr "Səs kartı"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
-msgstr "TV kart�"
+msgstr "TV kartı"
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "Hans� �ap edici sistemini istifad� etm�k ist�yirsiniz?"
+#: ../../install_steps_interactive.pm_.c:917
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:945
+msgid "LDAP"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:918
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:954
+#, fuzzy
+msgid "NIS"
+msgstr "NIS istifadə et"
+
+#: ../../install_steps_interactive.pm_.c:919
+#: ../../install_steps_interactive.pm_.c:941
+#, fuzzy
+msgid "Local files"
+msgstr "Yerli Çap Edici"
+
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "Root parolunu qur"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Parolsuz"
 
-#: ../../install_steps_interactive.pm_.c:901
+#: ../../install_steps_interactive.pm_.c:935
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
-msgstr "Bu parol �ox sad�dir (en az %d xarakter boyunda olmal�d�r)"
+msgstr "Bu parol çox sadədir (en az %d xarakter boyunda olmalıdır)"
+
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Tanıtma"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "NIS istifad� et"
+#: ../../install_steps_interactive.pm_.c:949
+#, fuzzy
+msgid "Authentication LDAP"
+msgstr "Tanıtma"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "sar� s�hif�l�r"
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
+#: ../../install_steps_interactive.pm_.c:951
+#, fuzzy
+msgid "LDAP Server"
+msgstr "Verici"
+
+#: ../../install_steps_interactive.pm_.c:957
+#, fuzzy
+msgid "Authentication NIS"
 msgstr "NIS"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
-msgstr "NIS sah�si"
+msgstr "NIS sahəsi"
 
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:959
 msgid "NIS Server"
 msgstr "NIS Verici"
 
-#: ../../install_steps_interactive.pm_.c:951
+#: ../../install_steps_interactive.pm_.c:994
 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 "
@@ -5131,33 +4786,33 @@ msgid ""
 "first\n"
 "drive and press \"Ok\"."
 msgstr ""
-"X�susi bir a��l�� disketi, Linuks sisteminizin normal bir sistem y�kl�yiciy� "
-"l�z�m\n"
-"olmadan a��lmas�na imkan ver�r. �g� sisteminiz� lilo (ya da grub) "
-"qurmayacaqsan�z,\n"
-"ya da ba�qa bir �m�liyyat sistemi liloyu sil�rsa ya da lilo "
-"avadanl���n�zlai�l�m�zs�\n"
-"bu disket siz� yard�m�i olacaqd�r. Sonradan Mandrake qurtarma disketi "
-"r�smini\n"
-"istifad� ed�r�k d� bu disket yarad�la bil�r.\n"
-"A��l�� disketi yaratmaq ist�yirsiniz?\n"
-"A��l�� disketi yaratmaq ist�yirsinizs�, birinci disket s�r�c�y� disket "
-"yerl��dirin\n"
-"v� \"OLDU\" bas�n."
-
-#: ../../install_steps_interactive.pm_.c:967
+"Xüsusi bir açılış disketi, Linuks sisteminizin normal bir sistem yükləyiciyə "
+"lüzüm\n"
+"olmadan açılmasına imkan verər. Əgə sisteminizə lilo (ya da grub) "
+"qurmayacaqsanız,\n"
+"ya da başqa bir əməliyyat sistemi liloyu silərsa ya da lilo "
+"avadanlığınızlaişləməzsə\n"
+"bu disket sizə yardımçi olacaqdır. Sonradan Mandrake qurtarma disketi "
+"rəsmini\n"
+"istifadə edərək də bu disket yaradıla bilər.\n"
+"Açılış disketi yaratmaq istəyirsiniz?\n"
+"Açılış disketi yaratmaq istəyirsinizsə, birinci disket sürücüyə disket "
+"yerləşdirin\n"
+"və \"OLDU\" basın."
+
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
-msgstr "�lk disket s�r�c�"
+msgstr "İlk disket sürücü"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
-msgstr "�kinci disket s�r�c�"
+msgstr "İkinci disket sürücü"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
-msgstr "N�z�r� Alma"
+msgstr "Nəzərə Alma"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:1017
 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 "
@@ -5170,140 +4825,149 @@ msgid ""
 "system\n"
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
-"X�susi bir a��l�� disketi, Linuks sisteminizin normal bir sistem y�kl�yiciy� "
-"l�z�m\n"
-"olmadan a��lmas�na imkan ver�r. �g� sisteminiz� lilo (ya da grub) "
-"qurmayacaqsan�z,\n"
-"ya da ba�qa bir �m�liyyat sistemi liloyu sil�rsa ya da lilo "
-"avadanl���n�zlai�l�m�zs�\n"
-"bu disket siz� yard�m�i olacaqd�r. Sonradan Mandrake qurtarma disketi "
-"r�smini\n"
-"istifad� ed�r�k d� bu disket yarad�la bil�r.\n"
-"A��l�� disketi yaratmaq ist�yirsiniz?\n"
-"A��l�� disketi yaratmaq ist�yirsinizs�, birinci disket s�r�c�y�disklet "
-"yerl��dirin\n"
-"v� \"OLDU\" bas�n."
-
-#: ../../install_steps_interactive.pm_.c:983
+"Xüsusi bir açılış disketi, Linuks sisteminizin normal bir sistem yükləyiciyə "
+"lüzüm\n"
+"olmadan açılmasına imkan verər. Əgə sisteminizə lilo (ya da grub) "
+"qurmayacaqsanız,\n"
+"ya da başqa bir əməliyyat sistemi liloyu silərsa ya da lilo "
+"avadanlığınızlaişləməzsə\n"
+"bu disket sizə yardımçi olacaqdır. Sonradan Mandrake qurtarma disketi "
+"rəsmini\n"
+"istifadə edərək də bu disket yaradıla bilər.\n"
+"Açılış disketi yaratmaq istəyirsiniz?\n"
+"Açılış disketi yaratmaq istəyirsinizsə, birinci disket sürücüyədisklet "
+"yerləşdirin\n"
+"və \"OLDU\" basın."
+
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
-msgstr "Ba���lay�n, disket s�r�c� yoxdur"
+msgstr "Bağışlayın, disket sürücü yoxdur"
 
-#: ../../install_steps_interactive.pm_.c:987
+#: ../../install_steps_interactive.pm_.c:1030
 msgid "Choose the floppy drive you want to use to make the bootdisk"
-msgstr "A��l�� disketi yaratmaq ���n istifad� edil�c�k disket s�r�c�y� se�in"
+msgstr "Açılış disketi yaratmaq üçün istifadə ediləcək disket sürücüyü seçin"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
-msgstr "%s s�r�c�s�n� bir disket tax�n"
+msgstr "%s sürücüsünə bir disket taxın"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
-msgstr "A��l�� disketi yarad�l�r"
+msgstr "Açılış disketi yaradılır"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
-msgstr "A��l�� y�kl�yici haz�rlan�r"
+msgstr "Açılış yükləyici hazırlanır"
 
-#: ../../install_steps_interactive.pm_.c:1010
+#: ../../install_steps_interactive.pm_.c:1055
+msgid ""
+"You appear to have an OldWorld or Unknown\n"
+" machine, the yaboot bootloader will not work for you.\n"
+"The install will continue, but you'll\n"
+" need to use BootX to boot your machine"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:1060
 msgid "Do you want to use aboot?"
-msgstr "aboot istifad� etm�k ist�yirsiniz?"
+msgstr "aboot istifadə etmək istəyirsiniz?"
 
-#: ../../install_steps_interactive.pm_.c:1013
+#: ../../install_steps_interactive.pm_.c:1063
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 "aboot qurulumunda xata, \n"
-"ilk disk b�lm�sini yox ets� bel� yen� d� qurulmas�n� ist�yirsiniz?"
+"ilk disk bölməsini yox etsə belə yenə də qurulmasını istəyirsiniz?"
+
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "Sistem yükləyicini qur"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
-msgstr "A��l�� y�kl�yicisi qurulumu iflas etdi. X�ta:"
+msgstr "Açılış yükləyicisi qurulumu iflas etdi. Xəta:"
 
-#: ../../install_steps_interactive.pm_.c:1030
+#: ../../install_steps_interactive.pm_.c:1084
+#, fuzzy, 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 $of_boot,\\\\:tbxi\n"
+" setenv boot-device %s,\\\\:tbxi\n"
 " Then type: shut-down\n"
 "At your next boot you should see the bootloader prompt."
 msgstr ""
-"Siz Open F�rmware a��l�� avadanl���n�z� a��l�� y�kl�yicisini\n"
-"f�alla�d�rmaq ���n d�yi�dirm�li ola bil�rsiniz. �mr-Se��n�k-O-F d�ym�l�rini\n"
-" yenid�n ba�lark�n bas�n v� bunlar� girin:\n"
+"Siz Open Fİrmware açılış avadanlığınızı açılış yükləyicisini\n"
+"fəallaşdırmaq üçün dəyişdirməli ola bilərsiniz. Əmr-Seçənək-O-F düymələrini\n"
+" yenidən başlarkən basın və bunları girin:\n"
 " setenv boot-device $of_boot,\\\\:tbxi\n"
-" Sonra da bunlar� yaz�n: shut-down\n"
-"Bir sonrak� ba�lan��cda a��l�� y�kl�yicisi s�tirini g�rm�lisiniz."
+" Sonra da bunları yazın: shut-down\n"
+"Bir sonrakı başlanğıcda açılış yükləyicisi sətirini görməlisiniz."
 
-#: ../../install_steps_interactive.pm_.c:1038 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1092 ../../standalone/draksec_.c:23
 msgid "Low"
-msgstr "Al�aq"
+msgstr "Alçaq"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Orta"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
-msgstr "Y�ks�k"
+msgstr "Yüksək"
 
-#: ../../install_steps_interactive.pm_.c:1044 ../../standalone/draksec_.c:49
+#: ../../install_steps_interactive.pm_.c:1098 ../../standalone/draksec_.c:62
 msgid "Choose security level"
-msgstr "T�hl�k�sizlik s�viyy�sini se�in"
+msgstr "Təhlükəsizlik səviyyəsini seçin"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr ""
-"Linuks k���r�lm�si ���n bir d�n� avtomatik qurulum disketi yaratmaq "
-"ist�y�rmisiniz?"
-
-#: ../../install_steps_interactive.pm_.c:1082
+#: ../../install_steps_interactive.pm_.c:1134
+#: ../../standalone/drakautoinst_.c:80
 #, c-format
 msgid "Insert a blank floppy in drive %s"
-msgstr "%s s�r�c�s�n� bo� bir disket yerl��dirin"
+msgstr "%s sürücüsünə boş bir disket yerləşdirin"
 
-#: ../../install_steps_interactive.pm_.c:1096
-#: ../../install_steps_interactive.pm_.c:1128
+#: ../../install_steps_interactive.pm_.c:1138
+#: ../../standalone/drakautoinst_.c:82
 msgid "Creating auto install floppy"
-msgstr "Avtomatik qurulum disketi haz�rlan�r"
+msgstr "Avtomatik qurulum disketi hazırlanır"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
-"B�'zi b�lm�l�r bitdi.\n"
+"Bə'zi bölmələr bitdi.\n"
 "\n"
-"H�qiq�t�n d� ��xmaq ist�yirsiniz?"
+"Həqiqətən də çıxmaq istəyirsiniz?"
 
-#: ../../install_steps_interactive.pm_.c:1167
+#: ../../install_steps_interactive.pm_.c:1160
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
-"For information on fixes which are available for this release of Linux-"
-"Mandrake,\n"
-"consult the Errata available from http://www.linux-mandrake.com/.\n"
+"For information on fixes which are available for this release of Mandrake "
+"Linux,\n"
+"consult the Errata available from http://www.mandrakelinux.com/.\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Linux-Mandrake User's Guide."
+"install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
-"T�brikl�r, qurulu� bitdi.\n"
-"Cdrom v� disketi ��xartd�qtan sonra Enter'� basaraq komp�terinizi \n"
-"yenid�n ba�lad�n. Linuks Mandrake'nin bu burax�l���ndak� yamaqlar haqq�nda \n"
-"m�'lumat almaq ���n http://www.linux-mandrake.com �nvan�ndan Errata'ya "
-"bax�n.\n"
-"Sisteminizin qur�ular� haqq�nda daha geni� bilgiyi Linuks Mandrake \n"
-"�stifad��i Kitabc���nda tapa bil�rsiniz."
+"Təbriklər, quruluş bitdi.\n"
+"Cdrom və disketi çıxartdıqtan sonra Enter'ə basaraq kompüterinizi \n"
+"yenidən başladın. Linuks Mandrake'nin bu buraxılışındakı yamaqlar haqqında \n"
+"mə'lumat almaq üçün http://www.mandrakelinux.com ünvanından Errata'ya "
+"baxın.\n"
+"Sisteminizin qurğuları haqqında daha geniş bilgiyi Linuks Mandrake \n"
+"İstifadəçi Kitabcığında tapa bilərsiniz."
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
-msgstr "Avtomatik qurulum disketi haz�rlan�r"
+msgstr "Avtomatik qurulum disketi hazırlanır"
 
-#: ../../install_steps_interactive.pm_.c:1181
+#: ../../install_steps_interactive.pm_.c:1174
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -5311,339 +4975,380 @@ msgid ""
 "\n"
 "You may prefer to replay the installation.\n"
 msgstr ""
-"Avtomatik qurulum disketi haz�rlanmas� se�il�rs�,\n"
-"b�t�n sabit disk m�'lumat� daxil edil�c�kdir!!\n"
-"(y�'ni ba�qa sistemi d� qura bilm�k ���n).\n"
+"Avtomatik qurulum disketi hazırlanması seçilərsə,\n"
+"bütün sabit disk mə'lumatı daxil ediləcəkdir!!\n"
+"(yə'ni başqa sistemi də qura bilmək üçün).\n"
 "\n"
-"Bu qurulumu takrar etm�k ist�y� bil�rsiniz ax�.\n"
+"Bu qurulumu takrar etmək istəyə bilərsiniz axı.\n"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
-msgstr "Avtomatla�d�r�lm��"
+msgstr "Avtomatlaşdırılmış"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
-msgstr "T�krarla"
+msgstr "Təkrarla"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
-msgstr "Paket se�kil�rini saxla"
+msgstr "Paket seçkilərini saxla"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
+msgid "Mandrake Linux Installation %s"
 msgstr "Linuks-Mandrake Qurulumu %s"
 
-#: ../../install_steps_newt.pm_.c:33
+#: ../../install_steps_newt.pm_.c:34
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
-"  <Tab>/<Alt-Tab> ir�li/geri  |  <Bo�luq> i�ar�tl�  |  <F12> sonrak� ekran"
+"  <Tab>/<Alt-Tab> irəli/geri  |  <Boşluq> işarətlə  |  <F12> sonrakı ekran"
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
-msgstr "kdesu �ksikdir"
+msgstr "kdesu əksikdir"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "Monitorunuzu seçin"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
-msgstr "�trafl�"
+msgstr "Ətraflı"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
-msgstr "Xahi� edirik g�zl�yin"
+msgstr "Xahiş edirik gözləyin"
+
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Ağacı Aç"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Ağacı Qapat"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Otaq və grup sıralaması arasında gəz"
 
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
-msgstr "Qar���ql�q (%s), daha ayd�n yaz�n\n"
+msgstr "Qarışıqlıq (%s), daha aydın yazın\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
 #: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
-msgstr "X�tal� t�rcih, t�krar s�nay�n\n"
+msgstr "Xətalı tərcih, təkrar sınayın\n"
 
 #: ../../interactive_stdio.pm_.c:39
 #, c-format
 msgid " ? (default %s) "
-msgstr " ? (�sas %s) "
+msgstr " ? (əsas %s) "
 
 #: ../../interactive_stdio.pm_.c:52
 #, c-format
 msgid "Your choice? (default %s) "
-msgstr "Se�kiniz? (�sas %s) "
+msgstr "Seçkiniz? (əsas %s) "
 
 #: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
-msgstr "Se�kiniz (�sas %s, yoxsa `none' yaz�n) "
+msgstr "Seçkiniz (əsas %s, yoxsa `none' yazın) "
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
-msgstr "�ex dili (QWERTZ)"
+msgstr "Çex dili (QWERTZ)"
 
-#: ../../keyboard.pm_.c:125 ../../keyboard.pm_.c:138 ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:141 ../../keyboard.pm_.c:155 ../../keyboard.pm_.c:180
 msgid "German"
 msgstr "Almanca"
 
-#: ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:142
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:127 ../../keyboard.pm_.c:164
+#: ../../keyboard.pm_.c:143 ../../keyboard.pm_.c:186
 msgid "Spanish"
-msgstr "�spanca"
+msgstr "İspanca"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
-msgstr "Finc�"
+msgstr "Fincə"
 
-#: ../../keyboard.pm_.c:129 ../../keyboard.pm_.c:139 ../../keyboard.pm_.c:166
+#: ../../keyboard.pm_.c:145 ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:188
 msgid "French"
-msgstr "Frans�zca"
+msgstr "Fransızca"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
-msgstr "Norve�c�"
+msgstr "Norveçcə"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "Polyakca"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "Rusca"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "İsveçcə"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
-msgstr "�ngiliz (UK) klaviaturas�"
+msgstr "İngiliz (UK) klaviaturası"
 
-#: ../../keyboard.pm_.c:134 ../../keyboard.pm_.c:137 ../../keyboard.pm_.c:204
+#: ../../keyboard.pm_.c:152 ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:237
 msgid "US keyboard"
-msgstr "Amerikan (US) klaviaturas�"
+msgstr "Amerikan (US) klaviaturası"
+
+#: ../../keyboard.pm_.c:159
+#, fuzzy
+msgid "Albanian"
+msgstr "Farsca"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
-msgstr "Ermenic� (k�hn�) "
+msgstr "Ermenicə (köhnə) "
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
-msgstr "Ermenic� (yaz� ma��n�)"
+msgstr "Ermenicə (yazı maşını)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
-msgstr "Ermenic� (fonetik)"
+msgstr "Ermenicə (fonetik)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
-msgstr "Az�rbaycanca (lat�n)"
-
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Az�rbaycanca (kiril)"
+msgstr "Azərbaycanca (latın)"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
-msgstr "Bel�ika dili"
+msgstr "Belçika dili"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "Bulqarca"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "Brazilya dili (ABNT-2)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Belarusca"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
-msgstr "�sve�c� (Alman s�ras�)"
+msgstr "İsveçcə (Alman sırası)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
-msgstr "�sve�c� (Frans�z s�ras�)"
+msgstr "İsveçcə (Fransız sırası)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
-msgstr "�ex dili (QWERTY)"
-
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr "�ex dili (Proqramc�lar)"
+msgstr "Çex dili (QWERTY)"
 
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
-msgstr "Almanca (�l� d�ym�l�r olmas�n)"
+msgstr "Almanca (ölü düymələr olmasın)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "Danimarka dili"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:183
 msgid "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:184
 msgid "Dvorak (Norwegian)"
-msgstr "Dvorak (Norve�c�)"
+msgstr "Dvorak (Norveçcə)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Estoniya dili"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
-msgstr "G�rc� dili (\"Rus\" s�ras�)"
+msgstr "Gürcü dili (\"Rus\" sırası)"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
-msgstr "G�rc� dili (\"Lat�n\" s�ras�)"
+msgstr "Gürcü dili (\"Latın\" sırası)"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "Yunanca"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "Macarca"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
-msgstr "X�rvatca"
+msgstr "Xırvatca"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
-msgstr "�srail"
+msgstr "İsrail"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
-msgstr "�srail (Fonetik)"
+msgstr "İsrail (Fonetik)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Farsca"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
-msgstr "�zlandiya dili"
+msgstr "İzlandiya dili"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
-msgstr "�talyanca"
+msgstr "İtalyanca"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
-msgstr "Yaponca 106 d�ym�li"
+msgstr "Yaponca 106 düyməli"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
-msgstr "Koreya klaviaturas�"
+msgstr "Koreya klaviaturası"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
-msgstr "Lat�n Amerika dili"
-
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr "Makedoniya dili"
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "Hollandiya dili"
+msgstr "Latın Amerika dili"
 
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
-msgstr "Litvaniya dili AZERTY (k�hn�)"
+msgstr "Litvaniya dili AZERTY (köhnə)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Litvanya dili AZERTY (yeni)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Litvanya dili \"number row\" QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Litvanya dili \"Fonetik\" QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "Yeri"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Makedoniya dili"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "Hollandiya dili"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
-msgstr "Polyakca (QWERTY s�ras�)"
+msgstr "Polyakca (QWERTY sırası)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
-msgstr "Polyakca (QWERTZ s�ras�)"
+msgstr "Polyakca (QWERTZ sırası)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "Portuqalca"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
-msgstr "Frans�zca (Kanada/Quebec)"
+msgstr "Fransızca (Kanada/Quebec)"
 
-#: ../../keyboard.pm_.c:193
-msgid "Russian (Yawerty)"
+#: ../../keyboard.pm_.c:217
+#, fuzzy
+msgid "Romanian (qwertz)"
 msgstr "Rusca (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "�sve�c�"
+#: ../../keyboard.pm_.c:218
+#, fuzzy
+msgid "Romanian (qwerty)"
+msgstr "Rusca (Yawerty)"
 
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:220
+msgid "Russian (Yawerty)"
+msgstr "Rusca (Yawerty)"
+
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
-msgstr "Slovenc�"
+msgstr "Slovencə"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "Slovakca (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "Slovakca (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr "Slovakca (Proqramc�lar)"
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "Azərbaycanca (kiril)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Thai klaviatura"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "Thai klaviatura"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
-msgstr "T�rkc� (�n�n�vi \"F\" klaviatura)"
+msgstr "Türkcə (ənənəvi \"F\" klaviatura)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
-msgstr "T�rkc� (m�asir \"Q\" klaviatura)"
+msgstr "Türkcə (müasir \"Q\" klaviatura)"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ukrayna dili"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
-msgstr "Amerikan (US) klaviaturas� (beyn�lmil�l)"
+msgstr "Amerikan (US) klaviaturası (beynəlmiləl)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vyetnam dili \"numeric row\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
-msgstr "Yugoslavca (lat�n/kiril)"
+#: ../../keyboard.pm_.c:240
+#, fuzzy
+msgid "Yugoslavian (latin)"
+msgstr "Yugoslavca (latın/kiril)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Dairəvi bağlama %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
-msgstr "M�ntiqi ciltl�ri birinci olaraq sil\n"
+msgstr "Məntiqi ciltləri birinci olaraq sil\n"
 
 #: ../../mouse.pm_.c:25
 msgid "Sun - Mouse"
-msgstr "Sun - Si�an"
+msgstr "Sun - Siçan"
 
 #: ../../mouse.pm_.c:31
 msgid "Standard"
@@ -5655,7 +5360,7 @@ msgstr "Logitech MouseMan+"
 
 #: ../../mouse.pm_.c:33
 msgid "Generic PS2 Wheel Mouse"
-msgstr "S�ravi PS2 ��rxli Si�an"
+msgstr "Sıravi PS2 Çərxli Siçan"
 
 #: ../../mouse.pm_.c:34
 msgid "GlidePoint"
@@ -5675,15 +5380,15 @@ msgstr "Genius NetScroll"
 
 #: ../../mouse.pm_.c:43 ../../mouse.pm_.c:67
 msgid "1 button"
-msgstr "1 d�ym�"
+msgstr "1 düymə"
 
 #: ../../mouse.pm_.c:44
 msgid "Generic"
-msgstr "�mumi"
+msgstr "Ümumi"
 
 #: ../../mouse.pm_.c:45
 msgid "Wheel"
-msgstr "��rx"
+msgstr "Çərx"
 
 #: ../../mouse.pm_.c:48
 msgid "serial"
@@ -5691,11 +5396,11 @@ msgstr "serial"
 
 #: ../../mouse.pm_.c:50
 msgid "Generic 2 Button Mouse"
-msgstr "S�ravi 2 D�ym�li Si�an"
+msgstr "Sıravi 2 Düyməli Siçan"
 
 #: ../../mouse.pm_.c:51
 msgid "Generic 3 Button Mouse"
-msgstr "S�ravi 3 D�ym�li Si�an"
+msgstr "Sıravi 3 Düyməli Siçan"
 
 #: ../../mouse.pm_.c:52
 msgid "Microsoft IntelliMouse"
@@ -5727,7 +5432,7 @@ msgstr "MM HitTablet"
 
 #: ../../mouse.pm_.c:61
 msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech mouse (serial ya da k�hn� C7 n�v�)"
+msgstr "Logitech mouse (serial ya da köhnə C7 növü)"
 
 #: ../../mouse.pm_.c:65
 msgid "busmouse"
@@ -5735,184 +5440,232 @@ msgstr "busmouse"
 
 #: ../../mouse.pm_.c:68
 msgid "2 buttons"
-msgstr "2 d�ym�li"
+msgstr "2 düyməli"
 
 #: ../../mouse.pm_.c:69
 msgid "3 buttons"
-msgstr "3 d�ym�li"
+msgstr "3 düyməli"
 
 #: ../../mouse.pm_.c:72
 msgid "none"
-msgstr "he� biri"
+msgstr "heç biri"
 
 #: ../../mouse.pm_.c:74
 msgid "No mouse"
-msgstr "Si�ans�zs"
+msgstr "Siçansızs"
+
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Xahiş edirik siçanınızı seçin"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "Siçanınızı işə salmaq üçün,"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "TƏKƏRİ OYNADIN!"
+
+#: ../../my_gtk.pm_.c:380
+msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:415
 msgid "Finish"
 msgstr "Qurtar"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
-msgstr "Sonrak� ->"
+msgstr "Sonrakı ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
-msgstr "<- �vv�lki"
+msgstr "<- Əvvəlki"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
-msgstr "Do�rudur?"
+msgstr "Doğrudur?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "�nternet qur�ular�"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "İnternetə bağlan"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "�nternete giri�i indi s�namaq ist�yirsiniz?"
+#: ../../network/adsl.pm_.c:20
+msgid ""
+"The most common way to connect with adsl is pppoe.\n"
+"Some connections use pptp, a few ones use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"ADSL ilə internetə bağlanmanın ən yaxşı yolu pppoe'dur.\n"
+"Bəzi bağlantılar pptp istifadə edir, çox azı isə dhcp işlədir.\n"
+"Bilmirsiniz isə 'pppop istifadə et'i seçin"
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "Ba�lant�n�z s�nan�r..."
+#: ../../network/adsl.pm_.c:22
+msgid "Alcatel speedtouch usb"
+msgstr ""
 
-#: ../../netconnect.pm_.c:154 ../../standalone/draknet_.c:196
-msgid "The system is now connected to Internet."
-msgstr "�nternet� art�q ba�l�s�n�z"
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "dhcp istifadə et"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr "T�hl�k�sizlik s�b�bi il� indi ba�lant� qopacaqd�r."
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "pppoe istifadə et"
+
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "pptpe istifadə et"
 
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
+#: ../../network/ethernet.pm_.c:37
 msgid ""
-"The system doesn't seem to be connected to internet.\n"
-"Try to reconfigure your connection."
+"Which dhcp client do you want to use?\n"
+"Default is dhcpcd"
 msgstr ""
-"Sisteminiz �nternet� ba�l� deyil.\n"
-"Ba�lant�n� yenid�n qura�d�r�n"
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "��b�k� qura�d�r�lmas�"
-
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
-msgid "ISDN Configuration"
-msgstr "ISDN qura�d�r�lmas�"
+"Hansı dhcp alıcısını istifadə edəcəksiniz?\n"
+"Əsası dhcpcd dir"
 
-#: ../../netconnect.pm_.c:222
+#: ../../network/ethernet.pm_.c:88
 msgid ""
-"Select your provider.\n"
-" If it's not in the list, choose Unlisted"
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
-"�nternet xidm�t vericinizi se�in.\n"
-"Siyah�da deyils� Siyah�da deyil'i se�in."
+"Sisteminizdə heç bir eternet şəbəkə adapteri tapıla bilmədi.\n"
+"Bu bağlantı şəklini qura bilmərəm."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Ba�lant� qura�d�r�lmas�"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Şəbəkə ara üzünü seçin"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Xahi� edirik a�a��dak�lar� doldurun ya da se�in"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "İnternetə bağlanmaq üçün şəbəkə adapteri seçin."
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "Kart IRQ"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "şəbəkə kartı tapılmadı"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "Kart mem (DMA)"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "Şəbəkə Qurğuları"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "Kart IO"
+#: ../../network/ethernet.pm_.c:203
+msgid ""
+"Please enter your host name if you know it.\n"
+"Some DHCP servers require the hostname to work.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''."
+msgstr ""
+"Xahiş edirik kompüterinizın adını girin.\n"
+"Məsələn``kompüteradı.sahəadı.com''.\n"
+"Əgə şəbəkə keçidi istifadə edirsinizsə bunun da IP nömrəsini girməlisiniz."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "Kart IO_0"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "Ev sahibi adı"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "Kart IO_1"
+#: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
+#: ../../network/netconnect.pm_.c:91 ../../network/netconnect.pm_.c:105
+#: ../../network/netconnect.pm_.c:154 ../../network/netconnect.pm_.c:164
+#: ../../network/netconnect.pm_.c:190 ../../network/netconnect.pm_.c:213
+#: ../../network/netconnect.pm_.c:221
+msgid "Network Configuration Wizard"
+msgstr "Şəbəkə Quraşdırılması Sehirbazı"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "Sizin ��xsi telefon n�mr�niz"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "Xarici ISDN kart"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "�nternet xidm�t vericinizin ad� (m�s�l�n azeronline.com)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Daxili ISDN kart"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "�XM telefon n�mr�si"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "ISDN bağlantınızın növü nədir?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "�XM dns 1"
+#: ../../network/isdn.pm_.c:45
+msgid ""
+"Which ISDN configuration do you prefer?\n"
+"\n"
+"* The Old configuration uses isdn4net. It contains powerfull\n"
+"  tools, but is tricky to configure, and not standard.\n"
+"\n"
+"* The New configuration is easier to understand, more\n"
+"  standard, but with less tools.\n"
+"\n"
+"We recommand the light configuration.\n"
+msgstr ""
 
-#: ../../netconnect.pm_.c:248
-msgid "Provider dns 2"
-msgstr "�XM dns 2"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "New configuration (isdn-light)"
+msgstr "Oddan divar (Firewall) quruluşu tapıldı!"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "Y��ma modu"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "Old configuration (isdn4net)"
+msgstr "Oddan divar (Firewall) quruluşu tapıldı!"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Hesab Giri�i (istifad��i ad�)"
+#: ../../network/isdn.pm_.c:169 ../../network/isdn.pm_.c:187
+#: ../../network/isdn.pm_.c:197 ../../network/isdn.pm_.c:204
+#: ../../network/isdn.pm_.c:214
+msgid "ISDN Configuration"
+msgstr "ISDN quraşdırılması"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Hesap Parolu"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"İnternet xidmət vericinizi seçin.\n"
+"Siyahıda deyilsə Siyahıda deyil'i seçin."
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Avropa"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "Açılış Protokolu"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol (EDSS1)"
 msgstr "Avropa (EDSS1)"
 
-#: ../../netconnect.pm_.c:263
-msgid "Rest of the world"
-msgstr "B�t�n d�nya"
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
+msgid "Protocol for the rest of the world"
+msgstr "Bütün dünya"
 
-#: ../../netconnect.pm_.c:263
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
 msgid ""
-"Rest of the world \n"
+"Protocol for the rest of the world \n"
 " no D-Channel (leased lines)"
 msgstr ""
-"B�t�n d�nya \n"
-" D-Channel'l� xaric (kiral�q x�tl�r)"
+"Bütün dünya \n"
+" D-Channel'lə xaric (kiralıq xətlər)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
-msgstr "Hans� protokolu istifad� etm�k ist�yirsiniz?"
+msgstr "Hansı protokolu istifadə etmək istəyirsiniz?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
-msgstr "Hans� n�v kart�n�z var?"
+msgstr "Hansı növ kartınız var?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
-msgstr "Bilmir�m"
+msgstr "Bilmirəm"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../netconnect.pm_.c:284
+#: ../../network/isdn.pm_.c:205
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -5920,512 +5673,539 @@ msgid ""
 "If you have a PCMCIA card, you have to know the irq and io of your card.\n"
 msgstr ""
 "\n"
-"ISA kart�n�z var is� sonrak� ekrandak� qiym�tl�r do�ru olmal�d�r.\n"
+"ISA kartınız var isə sonrakı ekrandakı qiymətlər doğru olmalıdır.\n"
 "\n"
-"PCMCIA kart�n�z var is� kart�n�z�n irq v� ya io'sunu bilm�lisiniz.\n"
+"PCMCIA kartınız var isə kartınızın irq və ya io'sunu bilməlisiniz.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
-msgstr "Dayand�r"
+msgstr "Dayandır"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "Davam et"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
-msgstr "Hans�s� sizin ISDN kart�n�zd�r?"
+msgstr "Hansısı sizin ISDN kartınızdır?"
 
-#: ../../netconnect.pm_.c:314
+#: ../../network/isdn.pm_.c:234
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
 msgstr ""
-"ISDN PCI kart tapd�m, amma n�v�n� bilmir�m. Xahi� edirik sonrak� ekrandak� "
-"kartlardan birini se�in."
+"ISDN PCI kart tapdım, amma növünü bilmirəm. Xahiş edirik sonrakı ekrandakı "
+"kartlardan birini seçin."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
-msgstr "He� bir ISDN PCI kart tap�lma�. Sonrak� ekrandak�lardan se�in."
-
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Sisteminizd� he� bir eternet ��b�k� adapteri tap�la bilm�di.\n"
-"Bu ba�lant� ��klini qura bilm�r�m."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "��b�k� ara �z�n� se�in"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr "�nternet� ba�lanmaq ���n ��b�k� adapteri se�in."
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "��b�k� ara �z�"
+msgstr "Heç bir ISDN PCI kart tapılmaı. Sonrakı ekrandakılardan seçin."
 
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"Raz�s�n�z?"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "��b�k� avadanl���n� yenid�n ba�latmal�yam:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "ADSL qura�d�r�lmas�"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "Ba�lant�n�z� a��l��da ba�latmaq ist�yirsiniz?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
-msgstr "Modeminizin hans� serial qap�ya ba�l� oldu�unu se�iniz"
+msgstr "Modeminizin hansı serial qapıya bağlı olduğunu seçiniz"
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
-msgstr "�evirm�li ��b�k� se��n�kl�ri"
+msgstr "Çevirməli şəbəkə seçənəkləri"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
-msgstr "Ba�lant� ad�"
+msgstr "Bağlantı adı"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
-msgstr "Telefon n�mr�si"
+msgstr "Telefon nömrəsi"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
-msgstr "Giri� ad�"
+msgstr "Giriş adı"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "Tan�tma"
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
+msgid "CHAP"
+msgstr ""
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Script-based"
-msgstr "Skript �sasl�"
+msgstr "Skript əsaslı"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
-msgstr "Terminal �sasl�"
+msgstr "Terminal əsaslı"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
-msgstr "Sah�(domain) ad�"
+msgstr "Sahə(domain) adı"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
-msgstr "Birinci DNS Vericisi (arzuya g�r�)"
+msgstr "Birinci DNS Vericisi (arzuya görə)"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 msgid "Second DNS Server (optional)"
-msgstr "�kinci DNS Vericisi (arzuya g�r�)"
-
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr "$netc->{NET_DEVICE} avadanl���n� yenid�n ba�ladacam. Raz�s�n�z?"
+msgstr "İkinci DNS Vericisi (arzuya görə)"
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
 msgstr ""
 "\n"
-"Ba�lant�n�z� k�s� bil�rsiniz. Ya da ba�lant�n� yenid�n d� qura�d�ra "
-"bil�rsiniz."
+"Bağlantınızı kəsə bilərsiniz. Ya da bağlantını yenidən də quraşdıra "
+"bilərsiniz."
 
-#: ../../netconnect.pm_.c:745 ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:33 ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can reconfigure your connection."
 msgstr ""
 "\n"
-"Ba�lant�n�z� yenid�n qura�d�ra bil�rsiniz."
+"Bağlantınızı yenidən quraşdıra bilərsiniz."
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
-msgstr "Art�q �nternet� ba�l�s�n�z."
+msgstr "Artıq İnternetə bağlısınız."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
 msgstr ""
 "\n"
-"�st�s�niz �nternet� ba�lana bil�rsiniz ya da yeniden qura�d�ra bil�rsiniz."
+"İstəsəniz İnternetə bağlana bilərsiniz ya da yeniden quraşdıra bilərsiniz."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
-msgstr "H�l� �nternet� ba�l� deyilsiniz."
+msgstr "Hələ İnternetə bağlı deyilsiniz."
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
-msgstr "�nternet� ba�lant�"
+msgstr "İnternetə bağlantı"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
-msgstr "�nternet� ba�lant�n� k�s"
+msgstr "İnternetə bağlantını kəs"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
-msgstr "��b�k� (�nternet/LAN) ba�lant�n�z� qura�d�r�n"
+msgstr "Şəbəkə (İnternet/LAN) bağlantınızı quraşdırın"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
-msgstr "�nternet ba�lant�s� & qura�d�r�lmas�"
-
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "��b�k� Qura�d�r�lmas� Sehirbaz�"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "Xarici ISDN kart"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Daxili ISDN kart"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "ISDN ba�lant�n�z�n n�v� n�dir?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "�nternet� ba�lan"
-
-#: ../../netconnect.pm_.c:834
-msgid ""
-"The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few ones use dhcp.\n"
-"If you don't know, choose 'use pppoe'"
-msgstr ""
-"ADSL il� internet� ba�lanman�n �n yax�� yolu pppoe'dur.\n"
-"B�zi ba�lant�lar pptp istifad� edir, �ox az� is� dhcp i�l�dir.\n"
-"Bilmirsiniz is� 'pppop istifad� et'i se�in"
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "dhcp istifad� et"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "pppoe istifad� et"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "pptpe istifad� et"
-
-#: ../../netconnect.pm_.c:846
-#, c-format
-msgid "I'm about to restart the network device %s. Do you agree?"
-msgstr "%s avadanl���n� yenid�n ba�ladacam. Raz�s�n�z?"
+msgstr "İnternet bağlantısı & quraşdırılması"
 
-#: ../../netconnect.pm_.c:883
-msgid ""
-"Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
+#: ../../network/netconnect.pm_.c:96
+#, fuzzy, c-format
+msgid "We are now going to configure the %s connection."
 msgstr ""
-"Hans� dhcp al�c�s�n� istifad� ed�c�ksiniz?\n"
-"�sas� dhcpcd dir"
-
-#: ../../netconnect.pm_.c:900
-msgid "Network configuration"
-msgstr "��b�k� qura�d�r�lmas�"
-
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "��b�k�ni yenid�n ba�latmaq ist�yirsiniz?"
+"\n"
+"Bağlantınızı kəsə bilərsiniz. Ya da bağlantını yenidən də quraşdıra "
+"bilərsiniz."
 
-#: ../../netconnect.pm_.c:904
-#, c-format
+#: ../../network/netconnect.pm_.c:105
+#, fuzzy, c-format
 msgid ""
-"A problem occured while restarting the network: \n"
 "\n"
-"%s"
+"\n"
+"\n"
+"We are now going to configure the %s connection.\n"
+"\n"
+"\n"
+"Press OK to continue."
 msgstr ""
-"��b�k�nin yenid�n ba�lad�lmas� s�ras�nda x�ta oldu: \n"
 "\n"
-"%s"
+"Bağlantınızı kəsə bilərsiniz. Ya da bağlantını yenidən də quraşdıra "
+"bilərsiniz."
+
+#: ../../network/netconnect.pm_.c:129 ../../network/netconnect.pm_.c:243
+#: ../../network/netconnect.pm_.c:255 ../../network/tools.pm_.c:56
+msgid "Network Configuration"
+msgstr "Şəbəkə quraşdırılması"
 
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:130
 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 ""
-"��b�k�d�n qura�d�rmas� apard���n�z ���n ��b�k�niz art�q qurulmu� olmal�d�r.\n"
-"��b�k�/�nternet ba�lant�n�z� yenid�n qura�d�rmaq ���n Oldu'ya yoxsa L��v "
-"et'� bas�n.\n"
+"Şəbəkədən quraşdırması apardığınız üçün şəbəkəniz artıq qurulmuş olmalıdır.\n"
+"Şəbəkə/İnternet bağlantınızı yenidən quraşdırmaq üçün Oldu'ya yoxsa Ləğv "
+"et'ə basın.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 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 ""
-"��b�k� Qura�d�rma Sehirbaz�na Xo� G�ldiniz\n"
+"Şəbəkə Quraşdırma Sehirbazına Xoç Gəldiniz\n"
 "\n"
-"�nternet/��b�k� qur�ular�n�z� ed�c�yik.\n"
-"Avtomatik t�sbit ist�mirsiniz is� i�ar�ti qald�r�n.\n"
+"İnternet/Şəbəkə qurğularınızı edəcəyik.\n"
+"Avtomatik təsbit istəmirsiniz isə işarəti qaldırın.\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
-msgstr "Qurulacaq profili se�in"
+msgstr "Qurulacaq profili seçin"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
-msgstr "Avtomatik t�sbit i�l�t"
+msgstr "Avtomatik təsbit işlət"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
-msgstr "Avadanl�qlar tan�n�r..."
+msgstr "Avadanlıqlar tanınır..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
-msgstr "Normal modem t�sbiti"
+msgstr "Normal modem təsbiti"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
-msgstr "%s qap�s�nda tap�ld�"
+msgstr "%s qapısında tapıldı"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
-msgstr "ISDN Ba�lant�s�"
+msgstr "ISDN Bağlantısı"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
-msgstr "%s tap�ld�"
+msgstr "%s tapıldı"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "DSL (v� ya ADSL) ba�lant�s�"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+#, fuzzy
+msgid "ADSL connection"
+msgstr "Yerli Şəbəkə quraşdırılması"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
-msgstr "%s ara �z�nd� tap�ld�"
+msgstr "%s ara üzündə tapıldı"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
-msgstr "Kabel ba�lant�s�"
+msgstr "Kabel bağlantısı"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+#, fuzzy
+msgid "cable connection detected"
+msgstr "Kabel bağlantısı"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
-msgstr "Yerli ��b�k� qura�d�r�lmas�"
+msgstr "Yerli Şəbəkə quraşdırılması"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
-msgstr "eternet kart tap�ld�"
+msgstr "eternet kart tapıldı"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "�nternet� nec� ba�lanmaq ist�yirsiniz?"
+#: ../../network/netconnect.pm_.c:190
+#, fuzzy
+msgid "Choose the connection you want to configure"
+msgstr "İstifadə edəcəyiniz vasitəni seçin"
 
-#: ../../netconnect.pm_.c:1004
+#: ../../network/netconnect.pm_.c:214
 msgid ""
-"Congratulation, The network and internet configuration is finished.\n"
+"You have configured multiple ways to connect to the Internet.\n"
+"Choose the one you want to use.\n"
 "\n"
-"The configuration will now be applied to your system."
 msgstr ""
-"T�brik edirik, internet v� ��b�k� qura�d�r�lmas� qurtard�.\n"
-"\n"
-"Qur�ular indi sisteminiz� �lav� edil�c�k."
 
-#: ../../netconnect.pm_.c:1007
-msgid ""
-"After that is done, we recommend you to restart your X\n"
-"environnement to avoid hostname changing problem."
-msgstr ""
-"Bu edildikd�n sonra Xd�n ��xma��n�z� t�vsiyy� edirik, yoxsa\n"
-"verici ad� x�sar�tl�ri meydana g�l� bil�r."
+#: ../../network/netconnect.pm_.c:215
+#, fuzzy
+msgid "Internet connection"
+msgstr "İnternet Bağlantısı Bölüşdürülməsi"
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "��b�k� kart� tap�lmad�"
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "Bağlantınızı açılışda başlatmaq istəyirsiniz?"
 
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "��b�k� Qur�ular�"
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "Şəbəkə quraşdırılması"
+
+#: ../../network/netconnect.pm_.c:240
+msgid "The network needs to be restarted"
+msgstr ""
+
+#: ../../network/netconnect.pm_.c:243
+#, c-format
+msgid ""
+"A problem occured while restarting the network: \n"
+"\n"
+"%s"
+msgstr ""
+"Şəbəkənin yenidən başladılması sırasında xəta oldu: \n"
+"\n"
+"%s"
 
-#: ../../network.pm_.c:278
+#: ../../network/netconnect.pm_.c:247
 msgid ""
-"Please enter your host name if you know it.\n"
-"Some DHCP servers require the hostname to work.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''."
+"Congratulations, the network and internet configuration is finished.\n"
+"\n"
+"The configuration will now be applied to your system.\n"
 msgstr ""
-"Xahi� edirik komp�teriniz�n ad�n� girin.\n"
-"M�s�l�n``komp�terad�.sah�ad�.com''.\n"
-"�g� ��b�k� ke�idi istifad� edirsinizs� bunun da IP n�mr�sini girm�lisiniz."
+"Təbrik edirik, internet və şəbəkə quraşdırılması qurtardı.\n"
+"\n"
+"Qurğular indi sisteminizə əlavə ediləcək.\n"
 
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "Ev sahibi ad�"
+#: ../../network/netconnect.pm_.c:250
+msgid ""
+"After that is done, we recommend you to restart your X\n"
+"environnement to avoid hostname changing problem."
+msgstr ""
+"Bu edildikdən sonra Xdən çıxmağınızı tövsiyyə edirik, yoxsa\n"
+"verici adı xəsarətləri meydana gələ bilər."
 
-#: ../../network.pm_.c:319
+#: ../../network/network.pm_.c:283
 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 ""
-"D�QQ�T: Bu avadanl�q daha �vv�l �ntenet� ba�lanmaq ���n qurulmu�dur.\n"
-"Avadanl���n qur�ular�n� d�yi�dirma�k ist�mirsiniz is�,\n"
-"OLDU ya bas�n.\n"
-"A�a��dak� giri�l�ri d�z�ltm�niz �z�n� �vv�lki qur�ular�n �st�n� yazacaqd�r."
+"DİQQƏT: Bu avadanlıq daha əvvəl İntenetə bağlanmaq üçün qurulmuşdur.\n"
+"Avadanlığın qurğularını dəyişdirmaək istəmirsiniz isə,\n"
+"OLDU ya basın.\n"
+"Aşağıdakı girişləri düzəltməniz özünü əvvəlki qurğuların üstünə yazacaqdır."
 
-#: ../../network.pm_.c:324
+#: ../../network/network.pm_.c:288
 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 "Xahi� edirik bu komp�ter ���n IP qur�ular�n� girin"
+msgstr "Xahiş edirik bu kompüter üçün IP qurğularını girin"
 
-#: ../../network.pm_.c:333 ../../network.pm_.c:334
+#: ../../network/network.pm_.c:297 ../../network/network.pm_.c:298
 #, c-format
 msgid "Configuring network device %s"
-msgstr "%s ��b�k� avadanl��� qurulur"
+msgstr "%s şəbəkə avadanlığı qurulur"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr " (s�r�c� $module)"
+#: ../../network/network.pm_.c:298
+#, c-format
+msgid " (driver %s)"
+msgstr " (sürücü %s)"
 
-#: ../../network.pm_.c:336 ../../standalone/draknet_.c:231
-#: ../../standalone/draknet_.c:427
+#: ../../network/network.pm_.c:300 ../../standalone/draknet_.c:255
+#: ../../standalone/draknet_.c:461
 msgid "IP address"
-msgstr "IP �nvan�"
+msgstr "IP ünvanı"
 
-#: ../../network.pm_.c:337 ../../standalone/draknet_.c:428
+#: ../../network/network.pm_.c:301 ../../standalone/draknet_.c:462
 msgid "Netmask"
 msgstr "Netmask"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "(bootp/dhcp)"
 msgstr "(bootp/dhcp)"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "Automatic IP"
-msgstr "Avtomatla�d�r�lm�� IP"
+msgstr "Avtomatlaşdırılmış IP"
 
-#: ../../network.pm_.c:359 ../../printerdrake.pm_.c:102
-#: ../../printerdrake.pm_.c:425
+#: ../../network/network.pm_.c:323 ../../printerdrake.pm_.c:406
 msgid "IP address should be in format 1.2.3.4"
-msgstr "IP �nvan� 1.2.3.4 ��klind� olmal�d�r"
+msgstr "IP ünvanı 1.2.3.4 şəklində olmalıdır"
 
-#: ../../network.pm_.c:388
+#: ../../network/network.pm_.c:351
 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 ""
-"Xahi� edirik komp�terinizn ad�n� girin.\n"
-"M�s�l�n``komp�terad�.sah�ad�.com''.\n"
-"�g�r ��b�k� ke�idi istifad� edirsinizs� bunun da IP n�mr�sini girm�lisiniz."
+"Xahiş edirik kompüterinizn adını girin.\n"
+"Məsələn``kompüteradı.sahəadı.com''.\n"
+"Əgər şəbəkə keçidi istifadə edirsinizsə bunun da IP nömrəsini girməlisiniz."
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "DNS verici"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
-msgstr "Ke�it"
+msgstr "Keçit"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
-msgstr "Ke�it avadanl���"
+msgstr "Keçit avadanlığı"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
-msgstr "V�kil vericil�r qura�d�r�lmas�"
+msgstr "Vəkil vericilər quraşdırılması"
 
-#: ../../network.pm_.c:408
+#: ../../network/network.pm_.c:372
 msgid "HTTP proxy"
-msgstr "HTTP v�kil verici"
+msgstr "HTTP vəkil verici"
 
-#: ../../network.pm_.c:409
+#: ../../network/network.pm_.c:373
 msgid "FTP proxy"
-msgstr "FTP v�kil verici"
+msgstr "FTP vəkil verici"
+
+#: ../../network/network.pm_.c:374
+msgid "Track network card id (usefull for laptops)"
+msgstr ""
 
-#: ../../network.pm_.c:412
+#: ../../network/network.pm_.c:377
 msgid "Proxy should be http://..."
-msgstr "V�kil verici http://... ��klind� olmal�d�r."
+msgstr "Vəkil verici http://... şəklində olmalıdır."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
-msgstr "V�kil verici ftp://... olmal�d�r."
+msgstr "Vəkil verici ftp://... olmalıdır."
+
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "İnternet qurğuları"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "İnternete girişi indi sınamaq istəyirsiniz?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "Bağlantınız sınanır..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "İnternetə artıq bağlısınız"
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr "Təhlükəsizlik səbəbi ilə indi bağlantı qopacaqdır."
+
+#: ../../network/tools.pm_.c:51 ../../standalone/draknet_.c:220
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr ""
+"Sisteminiz İnternetə bağlı deyil.\n"
+"Bağlantını yenidən quraşdırın"
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Bağlantı quraşdırılması"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Xahiş edirik aşağıdakıları doldurun ya da seçin"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "Kart IRQ"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "Kart mem (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "Kart IO"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "Kart IO_0"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "Kart IO_1"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "Sizin şəxsi telefon nömrəniz"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "İnternet xidmət vericinizin adı (məsələn azeronline.com)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "İXM telefon nömrəsi"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "Dns xidmətcisi 1 (arzuya görə)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "Dns xidmətcisi 2 (arzuya görə)"
+
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "Klaviaturanızı seçin"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "Yığma modu"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+#, fuzzy
+msgid "Connection speed"
+msgstr "Bağlantı növü:"
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "Bağlantı növü:"
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Hesab Girişi (istifadəçi adı)"
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Hesap Parolu"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
-msgstr "Bu platformda geni�l�dilmi� b�lm�l�r d�st�kl�nmir"
+msgstr "Bu platformda genişlədilmiş bölmələr dəstəklənmir"
 
-#: ../../partition_table.pm_.c:581
+#: ../../partition_table.pm_.c:640
 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 ""
-"B�lm� c�dv�linizd� bir bo�luq var, amma o da i�l�dil� bilm�z.\n"
-"Bu bo�lu�u, birinci b�lm�nizi en yax�n�ndak� geni�l�dilmi� b�lm�y� "
-"da��yaraq\n"
-"m�s�l�ni h�ll ed� bil�rsiniz."
+"Bölmə cədvəlinizdə bir boşluq var, amma o da işlədilə bilməz.\n"
+"Bu boşluğu, birinci bölmənizi en yaxınındakı genişlədilmiş bölməyə "
+"daşıyaraq\n"
+"məsələni həll edə bilərsiniz."
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "%s fayl� oxunurkan x�ta oldu"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
-msgstr "%s fayl�ndan qurtar�l��da x�ta: %s"
+msgstr "%s faylından qurtarılışda xəta: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
-msgstr "X�tal� yed�kl�m� fayl�"
+msgstr "Xətalı yedəkləmə faylı"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
-msgstr "%s fayl�na yazark�n x�ta oldu"
+msgstr "%s faylına yazarkən xəta oldu"
 
-#: ../../partition_table_raw.pm_.c:161
+#: ../../partition_table_raw.pm_.c:154
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
 "It means writing anything on the disk will end up with random trash"
 msgstr ""
-"B�'z�n s�r�c�n�zd� pis �eyl�r ola bil�r.\n"
-"Datan�n b�t�vl�y� yoxlamas� bacar�lmad�. \n"
-"Bu o demekdir ki disk� yaz�lan h�r �ey t�sad�fi olacaqd�r"
+"Bə'zən sürücünüzdə pis şeylər ola bilər.\n"
+"Datanın bütövlüyü yoxlaması bacarılmadı. \n"
+"Bu o demekdir ki diskə yazılan hər şey təsadüfi olacaqdır"
 
 #: ../../pkgs.pm_.c:24
 msgid "must have"
-msgstr "al�nmal�"
+msgstr "alınmalı"
 
 #: ../../pkgs.pm_.c:25
 msgid "important"
@@ -6433,97 +6213,284 @@ msgstr "vacib"
 
 #: ../../pkgs.pm_.c:26
 msgid "very nice"
-msgstr "�la"
+msgstr "əla"
 
 #: ../../pkgs.pm_.c:27
 msgid "nice"
-msgstr "g�z�l"
+msgstr "gözəl"
 
 #: ../../pkgs.pm_.c:28
 msgid "maybe"
-msgstr "b�lk�"
+msgstr "bəlkə"
+
+#: ../../printer.pm_.c:23
+msgid "CUPS - Common Unix Printing System"
+msgstr ""
+
+#: ../../printer.pm_.c:24
+msgid "LPRng - LPR New Generation"
+msgstr ""
 
-#: ../../printer.pm_.c:20
+#: ../../printer.pm_.c:25
+msgid "LPD - Line Printer Daemon"
+msgstr ""
+
+#: ../../printer.pm_.c:26
+msgid "PDQ - Print, Don't Queue"
+msgstr ""
+
+#: ../../printer.pm_.c:32
+msgid "CUPS"
+msgstr ""
+
+#: ../../printer.pm_.c:33
+msgid "LPRng"
+msgstr ""
+
+#: ../../printer.pm_.c:34
+msgid "LPD"
+msgstr ""
+
+#: ../../printer.pm_.c:35
+msgid "PDQ"
+msgstr ""
+
+#: ../../printer.pm_.c:40
 msgid "Local printer"
-msgstr "Yerli �ap Edici"
+msgstr "Yerli Çap Edici"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
-msgstr "Uzaq �ap Edici"
+msgstr "Uzaq Çap Edici"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
-msgstr "Uzaq �ap edici vericisi(lpd)"
+#: ../../printer.pm_.c:42
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "Uzaq CUPS vericisi"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
+msgstr "Uzaq çap edici vericisi(lpd)"
+
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
-msgstr "��b�k� �ap Edicisi (soket) "
+msgstr "Şəbəkə Çap Edicisi (soket) "
 
-#: ../../printer.pm_.c:25
-msgid "SMB/Windows 95/98/NT"
+#: ../../printer.pm_.c:45
+#, fuzzy
+msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:26
-msgid "NetWare"
-msgstr "NetWare"
+#: ../../printer.pm_.c:46
+#, fuzzy
+msgid "Printer on NetWare server"
+msgstr "Çap Edici Vericisi"
 
-#: ../../printer.pm_.c:27 ../../printerdrake.pm_.c:158
-#: ../../printerdrake.pm_.c:160
-msgid "Printer Device URI"
-msgstr "�ap Edici avadanl��� URI"
+#: ../../printer.pm_.c:47
+#, fuzzy
+msgid "Enter a printer device URI"
+msgstr "Çap Edici avadanlığı URI"
+
+#: ../../printer.pm_.c:48
+msgid "Pipe job into a command"
+msgstr ""
+
+#: ../../printer.pm_.c:418 ../../printer.pm_.c:839
+#: ../../printerdrake.pm_.c:1227 ../../printerdrake.pm_.c:2023
+msgid "Unknown model"
+msgstr ""
+
+#: ../../printer.pm_.c:546 ../../printerdrake.pm_.c:790
+msgid "Raw printer (No driver)"
+msgstr ""
+
+#: ../../printer.pm_.c:693
+#, fuzzy, c-format
+msgid "(on %s)"
+msgstr "(modul %s)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "Çap Edici Bağlantısı Seçin"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "Çap ediciniz nə şəkildə bağlıdır?"
+
+#: ../../printerdrake.pm_.c:25
+#, fuzzy
+msgid ""
+"\n"
+"Printers on remote CUPS servers you do not have to configure\n"
+"here; these printers will be automatically detected. Please\n"
+"select \"Printer on remote CUPS server\" in this case."
+msgstr ""
+"Uzaq CUPS vericiləri üçün heç bir quraşdırmağa lüzüm yoxdur\n"
+"Buradakı hər çap edici avtomatik tapılacaqdır.\n"
+"Olmazsa \"Uzaq CUPS vericisi\" ni seçin."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+#, fuzzy
+msgid "None"
+msgstr "Qurtardı"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Əsas istifadəçini seçin:"
+
+#: ../../printerdrake.pm_.c:105
+msgid ""
+"With remote CUPS servers, you do not have to configure any \n"
+"printer here; CUPS servers inform your machine automatically\n"
+"about their printers. All printers known to your machine\n"
+"currently are listed in the \"Default printer\" field. Choose\n"
+"the default printer for your machine there and click the\n"
+"\"Apply/Re-read printers\" button. Click the same button to\n"
+"refresh the list (it can take up to 30 seconds after the start\n"
+"of CUPS until all remote printers are visible).\n"
+"When your CUPS server is in a different network, you have to \n"
+"give the CUPS server IP address and optionally the port number\n"
+"to get the printer information from the server, otherwise leave\n"
+"these fields blank."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:117
+msgid ""
+"\n"
+"Normally, CUPS is automatically configured according to your\n"
+"network environment, so that you can access the printers on the\n"
+"CUPS servers in your local network. If this does not work \n"
+"correctly, turn off \"Automatic CUPS configuration\" and edit\n"
+"your file /etc/cups/cupsd.conf manually. Do not forget to restart\n"
+"CUPS afterwards (command: \"service cups restart\")."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:124 ../../printerdrake.pm_.c:1290
+#: ../../printerdrake.pm_.c:1294 ../../printerdrake.pm_.c:1295
+#: ../../printerdrake.pm_.c:1296 ../../printerdrake.pm_.c:2011
+msgid "Close"
+msgstr "Qapat"
 
-#: ../../printerdrake.pm_.c:19
+#: ../../printerdrake.pm_.c:125
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "Uzaq Çap Edici"
+
+#: ../../printerdrake.pm_.c:129
+#, fuzzy
+msgid "The IP address should look like 192.168.1.20"
+msgstr "IP ünvanı 1.2.3.4 şəklində olmalıdır"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "Qapı nömrəsi rəqəmlə yazılmalıdır"
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+#, fuzzy
+msgid "Default printer"
+msgstr "Yerli Çap Edici"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "CUPS verici IP"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Qapı"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "Qurulum Tərzi Quraşdırılması"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "Avadanlıqlar tanınır..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
-msgstr "Qap�lar� s�na"
+msgstr "Qapıları sına"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
-msgstr "\"%s\" modelind� bir �ap edici tap�ld�:"
+msgstr "\"%s\" modelində bir çap edici tapıldı:"
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
-msgstr "Yerli �ap Edici Avadanl���"
+msgstr "Yerli Çap Edici Avadanlığı"
 
-#: ../../printerdrake.pm_.c:53
+#: ../../printerdrake.pm_.c:256
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
 msgstr ""
-"�ap ediciniz hans� avadanl��a ba�l�d�r? \n"
-"(/dev/lp0, LPT1'nin qar��l���d�r)\n"
+"Çap ediciniz hansı avadanlığa bağlıdır? \n"
+"(/dev/lp0, LPT1'nin qarşılığıdır)\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
-msgstr "�ap Edici Avadanl���"
+msgstr "Çap Edici Avadanlığı"
 
-#: ../../printerdrake.pm_.c:74
+#: ../../printerdrake.pm_.c:261
+msgid "Device/file name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:274 ../../printerdrake.pm_.c:698
+#: ../../printerdrake.pm_.c:786
+#, fuzzy
+msgid "Reading printer database ..."
+msgstr "CUPS sürücü datası oxunur..."
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
-msgstr "Uzaq �ap Edici (lpd) Se��n�kl�ri"
+msgstr "Uzaq Çap Edici (lpd) Seçənəkləri"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:313
+#, fuzzy
 msgid ""
-"To use a remote lpd print queue, you need to supply\n"
-"the hostname of the printer server and the queue name\n"
-"on that server which jobs should be placed in."
+"To use a remote lpd printer, you need to supply\n"
+"the hostname of the printer server and the printer name\n"
+"on that server."
 msgstr ""
-"Uzaqdak� bir lpd �ap edici n�vb�sini istifad� etm�k ���n, \n"
-"�ap edicinin ba�l� oldu�u �ap edici vericisinin ad�n� v� n�vb� \n"
-"ad�n�n� verm�lisiniz."
+"Uzaqdakı bir lpd çap edici növbəsini istifadə etmək üçün, \n"
+"çap edicinin bağlı olduğu çap edici vericisinin adını və növbə \n"
+"adınını verməlisiniz."
+
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
+msgstr "Uzaqdakı ev sahibi adı"
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
-msgstr "Uzaqdak� ev sahibi ad�"
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "Uzaq Çap Edici"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Uzaqdak� n�vb� ad�"
+#: ../../printerdrake.pm_.c:320
+#, fuzzy
+msgid "Remote host name missing!"
+msgstr "Uzaqdakı ev sahibi adı"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "Uzaqdakı ev sahibi adı"
+
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
-msgstr "SMB (Windows 9x/NT) �ap Edici Se��n�kl�ri"
+msgstr "SMB (Windows 9x/NT) Çap Edici Seçənəkləri"
 
-#: ../../printerdrake.pm_.c:89
+#: ../../printerdrake.pm_.c:393
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -6531,389 +6498,934 @@ msgid ""
 "well as the share name for the printer you wish to access and any\n"
 "applicable user name, password, and workgroup information."
 msgstr ""
-"Bir SMB �ap edicid�n yekun almaq ���n, SMB komp�ter ad�, �ap edici "
+"Bir SMB çap edicidən yekun almaq üçün, SMB kompüter adı, çap edici "
 "vericisinin\n"
-"IP �nvan�, �ap edicinin payla�d�rma ad�, i�l�m� grupu, istifad��i ad� v� \n"
-"parol verilm�lidir."
+"IP ünvanı, çap edicinin paylaşdırma adı, işləmə grupu, istifadəçi adı və \n"
+"parol verilməlidir."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
-msgstr "SMB verici ad�"
+msgstr "SMB verici adı"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "SMB verici IP"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
-msgstr "Payla�d�rma ad�"
+msgstr "Paylaşdırma adı"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
-msgstr "�� qrupu"
+msgstr "İş qrupu"
+
+#: ../../printerdrake.pm_.c:410
+msgid "Either the server name or the server's IP must be given!"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:124
+#: ../../printerdrake.pm_.c:414
+msgid "Samba share name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:473
 msgid "NetWare Printer Options"
-msgstr "NetWare �ap Edici Qur�ular�"
+msgstr "NetWare Çap Edici Qurğuları"
 
-#: ../../printerdrake.pm_.c:125
+#: ../../printerdrake.pm_.c:474
 msgid ""
-"To print to a NetWare printer, you need to provide the\n"
+"To print on a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
 "TCP/IP hostname!) as well as the print queue name for the printer you\n"
 "wish to access and any applicable user name and password."
 msgstr ""
-"NetWare �ap edicid�n yekun almaq ���n, NetWare vericisinin ad� v� �ap "
+"NetWare çap edicidən yekun almaq üçün, NetWare vericisinin adı və çap "
 "edici \n"
-"n�vb�si ad� il� istifad��i ad� va parolu verilm�lidir."
+"növbəsi adı ilə istifadəçi adı va parolu verilməlidir."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
-msgstr "�ap Edici Vericisi"
+msgstr "Çap Edici Vericisi"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
-msgstr "�ap Edici N�vb� Ad�"
+msgstr "Çap Edici Növbə Adı"
 
-#: ../../printerdrake.pm_.c:142
+#: ../../printerdrake.pm_.c:484
+msgid "NCP server name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:488
+msgid "NCP queue name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:527
 msgid "Socket Printer Options"
-msgstr "Soket �ap Edici Qur�ular�"
+msgstr "Soket Çap Edici Qurğuları"
 
-#: ../../printerdrake.pm_.c:143
+#: ../../printerdrake.pm_.c:528
+#, fuzzy
 msgid ""
 "To print to a socket printer, you need to provide the\n"
-"hostname of the printer and optionally the port number."
+"host name of the printer and optionally the port number.\n"
+"On HP JetDirect servers the port number is usually 9100,\n"
+"on other servers it can vary. See the manual of your\n"
+"hardware."
 msgstr ""
-"Soket �ap edicid�n yekun almaq ���n, �ap edicinin ev sahibi  ad�n� ve "
-"m�mk�ns�, qap�s�n�n n�mr�sini verm�lisiniz."
+"Soket çap edicidən yekun almaq üçün, çap edicinin ev sahibi  adını ve "
+"mümkünsə, qapısının nömrəsini verməlisiniz."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
-msgstr "�ap Edici Ev sahibi"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
+msgstr "Çap Edici Ev sahibi"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Qap�"
+#: ../../printerdrake.pm_.c:537
+#, fuzzy
+msgid "Printer host name missing!"
+msgstr "Çap Edici Ev sahibi"
+
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "Çap Edici avadanlığı URI"
+
+#: ../../printerdrake.pm_.c:567
+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 ""
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "CUPS il� �ap ediciy� yeti�m�k ���n URIni verm�lisiniz"
+#: ../../printerdrake.pm_.c:582
+msgid "A valid URI must be entered!"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
-msgstr "N� c�r bir �ap ediciniz var?"
+#: ../../printerdrake.pm_.c:682
+msgid ""
+"Every printer needs a name (for example lp).\n"
+"The Description and Location fields do not need \n"
+"to be filled in. They are comments for the users."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:204 ../../printerdrake.pm_.c:305
-msgid "Do you want to test printing?"
-msgstr "�ap edicini s�namaq ist�yirsiniz?"
+#: ../../printerdrake.pm_.c:685
+msgid "Name of printer"
+msgstr "Çap edici adı"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
-msgid "Printing test page(s)..."
-msgstr "S�naq s�hif�si �ap edilir..."
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "İzah"
 
-#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:324
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Yeri"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "CUPS sürücü datası oxunur..."
+
+#: ../../printerdrake.pm_.c:793
+#, fuzzy
+msgid "Printer model selection"
+msgstr "Çap Edici Bağlantısı"
+
+#: ../../printerdrake.pm_.c:794
+#, fuzzy
+msgid "Which printer model do you have?"
+msgstr "Nə cür bir çap ediciniz var?"
+
+#: ../../printerdrake.pm_.c:866
+#, fuzzy
+msgid "OKI winprinter configuration"
+msgstr "İnternet qurğuları"
+
+#: ../../printerdrake.pm_.c:867
+msgid ""
+"You are configuring an OKI laser winprinter. These printers\n"
+"use a very special communication protocol and therefore they\n"
+"work only when connected to the first parallel port. When\n"
+"your printer is connected to another port or to a print\n"
+"server box please connect the printer to the first parallel\n"
+"port before you print a test page. Otherwise the printer\n"
+"will not work. Your connection type setting will be ignored\n"
+"by the driver."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:916 ../../printerdrake.pm_.c:946
+#, fuzzy
+msgid "Lexmark inkjet configuration"
+msgstr "İnternet qurğuları"
+
+#: ../../printerdrake.pm_.c:917
+msgid ""
+"The inkjet printer drivers provided by Lexmark only support\n"
+"local printers, no printers on remote machines or print server\n"
+"boxes. Please connect your printer to a local port or\n"
+"configure it on the machine where it is connected to."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:947
+msgid ""
+"To be able to print with your Lexmark inkjet and this\n"
+"configuration, you need the inkjet printer drivers\n"
+"provided by Lexmark (http://www.lexmark.com/). Go to\n"
+"the US site and click on the \"Drivers\" button. Then\n"
+"choose your model and afterwards \"Linux\" as\n"
+"operating system. The drivers come as RPM packages\n"
+"or shell scripts with interactive graphical installation.\n"
+"You do not need to do this configuration by the\n"
+"graphical frontends. Cancel directly after the license\n"
+"agreement. Then print printhead alignment pages with\n"
+"\"lexmarkmaintain\" and adjust the head alignment\n"
+"settings with this program."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1079
+msgid ""
+"Printer default settings\n"
+"You should make sure that the page size and the\n"
+"ink type (if available) are set correctly. Note\n"
+"that with a very high printout quality printing\n"
+"can get substantially slower."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1090
+#, c-format
+msgid "Option %s must be an integer number!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1094
+#, c-format
+msgid "Option %s must be a number!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1099
 #, c-format
+msgid "Option %s out of range!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1136
+#, fuzzy, c-format
+msgid ""
+"Do you want to set this printer (\"%s\")\n"
+"as the default printer?"
+msgstr "Çap edicini sınamaq istəyirsiniz?"
+
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "Qapıları sına"
+
+#: ../../printerdrake.pm_.c:1153
+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\n"
+"and on laser printers with too low memory it can even not come out.\n"
+"In most cases it is enough to print the standard test page."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1158
+#, fuzzy
+msgid "No test pages"
+msgstr "Bəli, hər iki sınaq səhifəsini də çap et"
+
+#: ../../printerdrake.pm_.c:1159
+#, fuzzy
+msgid "Print"
+msgstr "Çap Edici"
+
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "Standart"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "Sınaq səhifəsi çap edilir..."
+
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "Sınaq səhifəsi çap edilir..."
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
+msgid "Printing test page(s)..."
+msgstr "Sınaq səhifəsi çap edilir..."
+
+#: ../../printerdrake.pm_.c:1200
+#, fuzzy, c-format
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
+"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"
-"Does it work properly?"
 msgstr ""
-"S�naq s�hif�si �ap edici vasit�sin� g�nd�rildi.\n"
-"�ap edicinin i�l�m�si ���n bir az vaxt ke��r.\n"
-"�ap v�ziyy�ti:\n"
+"Sınaq səhifəsi çap edici vasitəsinə göndərildi.\n"
+"Çap edicinin işləməsi üçün bir az vaxt keçər.\n"
+"Çap vəziyyəti:\n"
 "%s\n"
 "\n"
-"D�z m� i�l�yir?"
+"Düz mü işləyir?"
 
-#: ../../printerdrake.pm_.c:218 ../../printerdrake.pm_.c:328
+#: ../../printerdrake.pm_.c:1204
+#, fuzzy
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Does it work properly?"
+"Test page(s) have been sent to the printer.\n"
+"It may take some time before the printer starts.\n"
 msgstr ""
-"S�naq s�hif�si �ap edici vasit�sin� g�nd�rildi.\n"
-"�ap edicinin i�l�m�si ���n bir az vaxt ke��r.\n"
-"D�z m� i�l�yir?"
+"Sınaq səhifəsi çap edici vasitəsinə göndərildi.\n"
+"Çap edicinin işləməsi üçün bir az vaxt keçər.\n"
+"Düz mü işləyir?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "B�li, ASCII s�naq s�hif�si �ap et"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "B�li, PostScript s�naq s�hif�si �ap et"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Çap Edicisiz"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "B�li, h�r iki s�naq s�hif�sini d� �ap et"
+#: ../../printerdrake.pm_.c:1237
+#, 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 "
+"\"qtcups <file>\". The graphical tools allow you to choose the printer and "
+"to modify the option settings easily.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:243
-msgid "Configure Printer"
-msgstr "�ap Edicini Qur"
+#: ../../printerdrake.pm_.c:1239
+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 ""
 
-#: ../../printerdrake.pm_.c:273
-msgid "Printer options"
-msgstr "�ap edici se��n�kl�ri"
+#: ../../printerdrake.pm_.c:1242 ../../printerdrake.pm_.c:1254
+#: ../../printerdrake.pm_.c:1266
+#, 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 ""
+
+#: ../../printerdrake.pm_.c:1244 ../../printerdrake.pm_.c:1284
+msgid ""
+"To get a list of the options available for the current printer read either "
+"the list shown below or click on the \"Print option list\" button.\n"
+"\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Ka��z B�y�kl�y�"
+#: ../../printerdrake.pm_.c:1249 ../../printerdrake.pm_.c:1261
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\".\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "�� bittikd�n sonra s�hif� at�ls�n m�?"
+#: ../../printerdrake.pm_.c:1251 ../../printerdrake.pm_.c:1263
+#: ../../printerdrake.pm_.c:1275
+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 ""
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Uniprint s�r�c� se��n�kl�ri"
+#: ../../printerdrake.pm_.c:1256 ../../printerdrake.pm_.c:1268
+msgid ""
+"To get a list of the options available for the current printer click on the "
+"\"Print option list\" button.\n"
+"\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:281
-msgid "Color depth options"
-msgstr "R�ng d�rinlik se��n�kl�ri"
+#: ../../printerdrake.pm_.c:1273
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\" or \"%s <file>\".\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1277
+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 ""
+
+#: ../../printerdrake.pm_.c:1281
+#, 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 ""
 
-#: ../../printerdrake.pm_.c:283
-msgid "Print text as PostScript?"
-msgstr "M�tni PostScript olaraq yazd�rs�n m�?"
+#: ../../printerdrake.pm_.c:1292
+#, fuzzy, c-format
+msgid "Printing on the printer \"%s\""
+msgstr "Şəbəkə dayandırılır"
 
-#: ../../printerdrake.pm_.c:285
-msgid "Fix stair-stepping text?"
-msgstr "M�tn pill�li olaraq d�z�ldilsin mi?"
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
+msgstr "Çap edici seçənəkləri"
 
-#: ../../printerdrake.pm_.c:287
-msgid "Number of pages per output pages"
-msgstr "H�r yekun s�hif�sinin n�mr�si"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+#, fuzzy
+msgid "Reading printer data ..."
+msgstr "CUPS sürücü datası oxunur..."
 
-#: ../../printerdrake.pm_.c:288
-msgid "Right/Left margins in points (1/72 of inch)"
-msgstr "Sa�/Sol bo�luqlar n�qt�vi(inch'in 1/72'si"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "İnternet qurğuları"
 
-#: ../../printerdrake.pm_.c:289
-msgid "Top/Bottom margins in points (1/72 of inch)"
-msgstr "�st/Alt bo�luqlar n�qt�vi (inch'in 1/72'si)"
+#: ../../printerdrake.pm_.c:1339
+#, c-format
+msgid ""
+"You can copy the printer configuration which you have done \n"
+"for the spooler %s to %s, your current spooler. All the\n"
+"configuration data (printer name, description, location, \n"
+"connection type, and default option settings) is overtaken,\n"
+"but jobs will not be transferred.\n"
+"Not all queues can be transferred due to the following \n"
+"reasons:\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:291
-msgid "Extra GhostScript options"
-msgstr "�lav� GhostScript se��n�kl�ri"
+#: ../../printerdrake.pm_.c:1347
+msgid ""
+"CUPS does not support printers on Novell servers or printers\n"
+"sending the data into a free-formed command.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "�lav� m�tn se��n�kl�ri"
+#: ../../printerdrake.pm_.c:1350
+msgid ""
+"PDQ only supports local printers, remote LPD printers, and\n"
+"Socket/TCP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "T�rs s�hif� s�ralamas�"
+#: ../../printerdrake.pm_.c:1353
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:345
-msgid "Would you like to configure a printer?"
-msgstr "Bir �ap edici qurmaq ist�yirsiniz?"
+#: ../../printerdrake.pm_.c:1355
+msgid ""
+"In addition, queues not created with this program or\n"
+"\"foomatic-configure\" cannot be transferred."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:351
+#: ../../printerdrake.pm_.c:1357
 msgid ""
-"Here are the following print queues.\n"
-"You can add some more or change the existing ones."
+"\n"
+"Also printers configured with the PPD files provided by\n"
+"their manufacturers or with native CUPS drivers can not be\n"
+"transferred."
 msgstr ""
-"A�a��da yaz���dak� n�vb�l�r verilmi�dir.\n"
-"Yenil�rini �lav� ed� bil�r, v� ya m�vcud olanlar� d�yi�dir� bil�rsiniz."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "CUPS ba�lay�r"
+#: ../../printerdrake.pm_.c:1360
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:370
-msgid "Reading CUPS drivers database..."
-msgstr "CUPS s�r�c� datas� oxunur..."
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "�ap Edici Ba�lant�s� Se�in"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "�ap ediciniz n� ��kild� ba�l�d�r?"
+#: ../../printerdrake.pm_.c:1377
+#, 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 ""
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "�ap Edici Ba�lant�s� Se�in"
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr "Çap edici adı təkcə hərf, rəqəm və alt xətt daxil edə bilər"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1390
+#, c-format
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected.\n"
-"In case of doubt, select \"Remote CUPS server\"."
+"The printer \"%s\" already exists,\n"
+"do you really want to overwrite its configuration?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1398
+#, fuzzy
+msgid "New printer name"
+msgstr "Çap Edicisiz"
+
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
 msgstr ""
-"Uzaq CUPS vericil�ri ���n he� bir qura�d�rma�a l�z�m yoxdur\n"
-"Buradak� h�r �ap edici avtomatik tap�lacaqd�r.\n"
-"Olmazsa \"Uzaq CUPS vericisi\" ni se�in."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1412
+#, c-format
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected\n"
-"unless you have a server on a different network; in the\n"
-"latter case, you have to give the CUPS server IP address\n"
-"and optionally the port number."
+"You have transferred your former default printer (\"%s\"),\n"
+"Should it be also the default printer under the\n"
+"new printing system %s?"
 msgstr ""
-"Uzaq CUPS vericil�ri ���n he� bir qura�d�rmaya l�z�m yoxdur \n"
-"Buradak� h�r �ap edici avtomatik tap�lacaqd�r. \n"
-"�g�r uzaq �ap edici vericiniz var ise CUPS vercisinin \n"
-"IP �nvan�n� verm�lisiniz. Qap� n�mr�si vacib \n"
-"deyil."
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "CUPS verici IP"
+#: ../../printerdrake.pm_.c:1423
+#, fuzzy
+msgid "Refreshing printer data ..."
+msgstr "CUPS sürücü datası oxunur..."
 
-#: ../../printerdrake.pm_.c:429
-msgid "Port number should be numeric"
-msgstr "Qap� n�mr�si r�q�ml� yaz�lmal�d�r"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+msgid "Configuration of a remote printer"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "Bağlantınız başladılır..."
+
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "Şəbəkəni qur"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "N�vb�ni sil"
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "Monitor qurulmayıb"
 
-#: ../../printerdrake.pm_.c:454
+#: ../../printerdrake.pm_.c:1456
 msgid ""
-"Name of printer should contains only letters, numbers and the underscore"
-msgstr "�ap edici ad� t�kc� h�rf, r�q�m v� alt x�tt daxil ed� bil�r"
+"You are going to configure a remote printer. This needs working\n"
+"network access, but your network is not configured yet. If you\n"
+"go on without network configuration, you will not be able to use\n"
+"the printer which you are configuring now. How do you want \n"
+"to proceed?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "Şəbəkə Qurğuları"
 
-#: ../../printerdrake.pm_.c:461
+#: ../../printerdrake.pm_.c:1496
 msgid ""
-"Every printer need a name (for example lp).\n"
-"Other parameters such as the description of the printer or its location\n"
-"can be defined. What name should be used for this printer and\n"
-"how is the printer connected?"
+"The network configuration done during the installation \n"
+"cannot be started now. Please check whether the network\n"
+"gets accessable after booting your system and correct the\n"
+"configuration using the Mandrake Control Center, section\n"
+"\"Network & Internet\"/\"Connection\", and afterwards set\n"
+"up the printer, also using the Mandrake Control Center,\n"
+"section \"Hardware\"/\"Printer\""
 msgstr ""
-"H�r �ap edicinin bir ad� olmal�d�r (m�s�l�n lp).\n"
-"�ap edicinin t�sviri v� yeri d� g�st�rilm�lidir.\n"
-"Bu �ap edicinin ad� n�dir v� yeri haradad�r?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "�ap edici ad�"
+#: ../../printerdrake.pm_.c:1503
+msgid ""
+"The network access was not running and could not be \n"
+"started. Please check your configuration and your \n"
+"hardware. Then try to configure your remote printer\n"
+"again."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:466
-msgid "Description"
-msgstr "�zah"
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
+msgstr "Hansı çap edici sistemini istifadə etmək istəyirsiniz?"
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Yeri"
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "Yüksək"
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Şübhəci"
+
+#: ../../printerdrake.pm_.c:1549
+#, c-format
+msgid "Installing a printing system in the %s security level"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1550
+#, c-format
+msgid ""
+"You are about to install the printing system %s on\n"
+"a system running in the %s security level.\n"
+"\n"
+"This printing system runs a daemon (background process)\n"
+"which waits for print jobs and handles them. This daemon\n"
+"is also accessable by remote machines through the network\n"
+"and so it is a possible point for attacks. Therefore only\n"
+"a few selected daemons are started by default in this\n"
+"security level.\n"
+"\n"
+"Do you really want to configure printing on this\n"
+"machine?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1584
+#, fuzzy
+msgid "Starting the printing system at boot time"
+msgstr "Hansı çap edici sistemini istifadə etmək istəyirsiniz?"
+
+#: ../../printerdrake.pm_.c:1585
+#, c-format
+msgid ""
+"The printing system (%s) will not be started automatically\n"
+"when the machine is booted.\n"
+"\n"
+"It is possible that the automatic starting was turned off \n"
+"by changing to a higher security level, because the printing\n"
+"system is a potential point for attacks.\n"
+"\n"
+"Do you want to have the automatic starting of the printing\n"
+"system turned on again?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1612 ../../printerdrake.pm_.c:1644
+#: ../../printerdrake.pm_.c:1671 ../../printerdrake.pm_.c:1701
+#: ../../printerdrake.pm_.c:1778
+msgid "Checking installed software..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:482
+#: ../../printerdrake.pm_.c:1727
+#, fuzzy
+msgid "Select Printer Spooler"
+msgstr "Çap Edici Bağlantısı Seçin"
+
+#: ../../printerdrake.pm_.c:1728
+#, fuzzy
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Hansı çap edici sistemini istifadə etmək istəyirsiniz?"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Çap Edicini Qur"
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Çap edici seçənəkləri"
+
+#: ../../printerdrake.pm_.c:1815
+#, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "CUPS sürücü datası oxunur..."
+
+#: ../../printerdrake.pm_.c:1845
+#, fuzzy
+msgid "Would you like to configure printing?"
+msgstr "Bir çap edici qurmaq istəyirsiniz?"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1879
 msgid ""
-"Every print queue (which print jobs are directed to) needs a\n"
-"name (often lp) and a spool directory associated with it. What\n"
-"name and directory should be used for this queue and how is the printer "
-"connected?"
+"The following printers are configured.\n"
+"Click on one of them to modify it or\n"
+"to get information about it or on \n"
+"\"Add Printer\" to add a new printer."
 msgstr ""
-"H�r �ap edici n�vb�sinin (�ap edici i�l�rinin yolland��� yer) bir ad� olar \n"
-"(�oxunda lp) v� g�zl�m� qovlu�una ehtiyac duyar. Bu n�vb� ���n\n"
-"hans� ad v� qovluq istifad� edilsin?"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "N�vb�nin ad�"
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "Normal Mod"
+
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Əsas)"
+
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "Uzaq CUPS vericisi"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "Uzaq CUPS vericisi"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+#, fuzzy
+msgid "Add printer"
+msgstr "Çap Edicisiz"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "G�zl�m� qovlu�u"
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "Qurğuları sınamaq istəyirsiniz?"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
-msgstr "�ap Edici Ba�lant�s�"
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "İnternet qurğuları"
 
-#: ../../raid.pm_.c:33
+#: ../../printerdrake.pm_.c:2004
+#, c-format
+msgid ""
+"Printer %s: %s %s\n"
+"What do you want to modify on this printer?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2012
+msgid "Do it!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+#, fuzzy
+msgid "Printer connection type"
+msgstr "İnternet Bağlantısı Bölüşdürülməsi"
+
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
+msgstr "Çap Edici Bağlantısı"
+
+#: ../../printerdrake.pm_.c:2018 ../../printerdrake.pm_.c:2081
+msgid "Printer manufacturer, model, driver"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2019 ../../printerdrake.pm_.c:2082
+msgid "Printer manufacturer, model"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2028 ../../printerdrake.pm_.c:2092
+msgid "Set this printer as the default"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2029 ../../printerdrake.pm_.c:2097
+#, fuzzy
+msgid "Print test pages"
+msgstr "Sınaq səhifəsi çap edilir..."
+
+#: ../../printerdrake.pm_.c:2030 ../../printerdrake.pm_.c:2099
+msgid "Know how to print with this printer"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2031 ../../printerdrake.pm_.c:2101
+#, fuzzy
+msgid "Remove printer"
+msgstr "Uzaq Çap Edici"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "CUPS sürücü datası oxunur..."
+
+#: ../../printerdrake.pm_.c:2096
+#, c-format
+msgid "The printer \"%s\" is set as the default printer now."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2103
+#, fuzzy, c-format
+msgid "Do you really want to remove the printer \"%s\"?"
+msgstr "Şəbəkəni yenidən başlatmaq istəyirsiniz?"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "CUPS sürücü datası oxunur..."
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+#, fuzzy
+msgid "Proxy configuration"
+msgstr "Vəkil vericilər quraşdırılması"
+
+#: ../../proxy.pm_.c:30
+msgid ""
+"Welcome to the proxy configuration utility.\n"
+"\n"
+"Here, you'll be able to set up your http and ftp proxies\n"
+"with or without login and password\n"
+msgstr ""
+
+#: ../../proxy.pm_.c:38
+msgid ""
+"Please fill in the http proxy informations\n"
+"Leave it blank if you don't want an http proxy"
+msgstr ""
+
+#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
+msgid "URL"
+msgstr ""
+
+#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
+#, fuzzy
+msgid "port"
+msgstr "Qapı"
+
+#: ../../proxy.pm_.c:44
+#, fuzzy
+msgid "Url should begin with 'http:'"
+msgstr "Vəkil verici http://... şəklində olmalıdır."
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+#, fuzzy
+msgid "The port part should be numeric"
+msgstr "Qapı nömrəsi rəqəmlə yazılmalıdır"
+
+#: ../../proxy.pm_.c:59
+msgid ""
+"Please fill in the ftp proxy informations\n"
+"Leave it blank if you don't want an ftp proxy"
+msgstr ""
+
+#: ../../proxy.pm_.c:65
+#, fuzzy
+msgid "Url should begin with 'ftp:'"
+msgstr "Vəkil verici ftp://... olmalıdır."
+
+#: ../../proxy.pm_.c:79
+msgid ""
+"Please enter proxy login and password, if any.\n"
+"Leave it blank if you don't want login/passwd"
+msgstr ""
+
+#: ../../proxy.pm_.c:80
+#, fuzzy
+msgid "login"
+msgstr "Avtomatik Giriş"
+
+#: ../../proxy.pm_.c:82
+#, fuzzy
+msgid "password"
+msgstr "Parol"
+
+#: ../../proxy.pm_.c:84
+#, fuzzy
+msgid "re-type password"
+msgstr "Parolsuz"
+
+#: ../../proxy.pm_.c:88
+#, fuzzy
+msgid "The passwords don't match. Try again!"
+msgstr "Parollar uyğun gəlmir"
+
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
-msgstr "��kill�ndirilmi� RAID md%d-y� disk b�lm�si �lav� edil� bilinm�di"
+msgstr "Şəkilləndirilmiş RAID md%d-yə disk bölməsi əlavə edilə bilinmədi"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "$file fayl�na yaz�la bilinm�di"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "%s faylına yazıla bilinmədi"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid iflas etdi"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "mkraid iflas etdi (raidtools �ksik ola bil�r mi?)"
+msgstr "mkraid iflas etdi (raidtools əksik ola bilər mi?)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
-msgstr "%d s�viyy� RAID ���n �atmayan sayda disk b�lm�si\n"
+msgstr "%d səviyyə RAID üçün çatmayan sayda disk bölməsi\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
-msgstr "ALSA s�s sistemini (Advanced Linux Sound Architecture) ba�lat"
+msgstr "ALSA səs sistemini (Advanced Linux Sound Architecture) başlat"
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
-msgstr "Anakron, periodik �mr zamanlay�c�s�"
+msgstr "Anakron, periodik əmr zamanlayıcısı"
 
-#: ../../services.pm_.c:18
+#: ../../services.pm_.c:17
 msgid ""
 "apmd is used for monitoring batery status and logging it via syslog.\n"
 "It can also be used for shutting down the machine when the battery is low."
 msgstr ""
-"apmd batareya v�ziyy�tini izl�m�k ���n v� syslog arac�l���yla bunun qeydini "
-"tutmaq ���n istifad� edilir.\n"
-"Ayr�ca batareya azald���nda sistemi qapatmaq ���n d� istifad� edilir."
+"apmd batareya vəziyyətini izləmək üçün və syslog aracılığıyla bunun qeydini "
+"tutmaq üçün istifadə edilir.\n"
+"Ayrıca batareya azaldığında sistemi qapatmaq üçün də istifadə edilir."
 
-#: ../../services.pm_.c:20
+#: ../../services.pm_.c:19
 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 ""
-"at �mri, zamanlanan �mrl�ri i�l�m�l�ri laz�m g�l�n vaxtda i�l�dir.\n"
-"Sistem y�k� laz�mi q�d�r al�aq oldu�unda y��ma �mrl�ri i�l�dilir."
+"at əmri, zamanlanan əmrləri işləmələri lazım gələn vaxtda işlədir.\n"
+"Sistem yükü lazımi qədər alçaq olduğunda yığma əmrləri işlədilir."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:21
 msgid ""
 "cron is a standard UNIX program that runs user-specified programs\n"
 "at periodic scheduled times. vixie cron adds a number of features to the "
 "basic\n"
 "UNIX cron, including better security and more powerful configuration options."
 msgstr ""
-"cron, istifad��il�r� x�susi �mrl�ri periodik olaraq i�� sala bil�n\n"
-"standart bir UNIX proqram�d�r. vixie cron, standart cron'a �lav� edilmi� bir "
-"�ox\n"
-"yeni x�susiyy�t daxildir."
+"cron, istifadəçilərə xüsusi əmrləri periodik olaraq işə sala bilən\n"
+"standart bir UNIX proqramıdır. vixie cron, standart cron'a əlavə edilmiş bir "
+"çox\n"
+"yeni xüsusiyyət daxildir."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:24
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
 "operations,\n"
 "and includes support for pop-up menus on the console."
 msgstr ""
-"GPM, Midnight Commander kimi m�tn �sasl� t�'minatlara si�an d�st�yi �lav� "
-"ed�r.\n"
-"Ayr�ca konsolda si�anla k�sm� v� yap��d�rma �m�liyyatlar�na da imkan ver�r.\n"
-"Konsolda pop-up menyu d�st�yi ver�r."
+"GPM, Midnight Commander kimi mətn əsaslı tə'minatlara siçan dəstəyi əlavə "
+"edər.\n"
+"Ayrıca konsolda siçanla kəsmə və yapışdırma əməliyyatlarına da imkan verər.\n"
+"Konsolda pop-up menyu dəstəyi verər."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr ""
-"HardDrake texniki t�'minat s�na�� aparar v� onlar� bir �n qura�d�rmadan "
-"ke�ir�r."
+"HardDrake texniki tə'minat sınağı aparar və onları bir ön quraşdırmadan "
+"keçirər."
 
-#: ../../services.pm_.c:30
+#: ../../services.pm_.c:29
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
 msgstr ""
-"Apache bir World Wide Web vericisidir. HTML fayllar� v� CGI verilm�si ���n "
-"istifad� edilir."
+"Apache bir World Wide Web vericisidir. HTML faylları və CGI verilməsi üçün "
+"istifadə edilir."
 
-#: ../../services.pm_.c:32
+#: ../../services.pm_.c:31
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -6922,161 +7434,161 @@ msgid ""
 "disables\n"
 "all of the services it is responsible for."
 msgstr ""
-"Internet superserver daemon (q�saca inetd ) bir �ox \n"
-"ba�qa internet xidm�tcisini laz�m g�ldiyi zaman i�a sal�r. ��ind� telnet, "
-"ftp, rsh v� rlogin kimi proqram�n oldu�u xidm�tl�ri i�� salmaqla m�s'uldur.\n"
-"inetd-ni sistemden ��xarmaq, onun m�s'ul oldu�u b�t�n xidm�tl�ri\n"
-"r�dd etm�k m�nas�n� da��y�r."
+"Internet superserver daemon (qısaca inetd ) bir çox \n"
+"başqa internet xidmətcisini lazım gəldiyi zaman işa salır. İçində telnet, "
+"ftp, rsh və rlogin kimi proqramın olduğu xidmətləri işə salmaqla məs'uldur.\n"
+"inetd-ni sistemden çıxarmaq, onun məs'ul olduğu bütün xidmətləri\n"
+"rədd etmək mənasını daşıyır."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:35
 msgid ""
 "Launch packet filtering for Linux kernel 2.2 series, to set\n"
 "up a firewall to protect your machine from network attacks."
 msgstr ""
-"Linuks 2.2 seriyas� ��kird�kl�rind� firewall\n"
-"qurmaq ���n ���n paket s�z�lm�sini ba�lat."
+"Linuks 2.2 seriyası çəkirdəklərində firewall\n"
+"qurmaq üçün üçün paket süzülməsini başlat."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:37
 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 ""
-"Bu paket /etc/sysconfig/keyboard'dak� se�ili klaviatura d�z�l���n� y�kl�r.\n"
-"Hans� klaviatura d�z�l��� istifad� edil�c�yi kbdconfig il� se�ilir.\n"
-"Bu, mandrake qurulan bir �ox komp�terd� f�al burax�lmal�d�r."
+"Bu paket /etc/sysconfig/keyboard'dakı seçili klaviatura düzülüşünü yüklər.\n"
+"Hansı klaviatura düzülüşü istifadə ediləcəyi kbdconfig ilə seçilir.\n"
+"Bu, mandrake qurulan bir çox kompüterdə fəal buraxılmalıdır."
 
-#: ../../services.pm_.c:41
+#: ../../services.pm_.c:40
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
 msgstr ""
-"/usr/include/linux/{autoconf,version}.h ���n \n"
-"/boot-da avtomatik ��kird�k ba�l��� yarad�lmas�."
+"/usr/include/linux/{autoconf,version}.h üçün \n"
+"/boot-da avtomatik çəkirdək başlığı yaradılması."
 
-#: ../../services.pm_.c:43
+#: ../../services.pm_.c:42
 msgid "Automatic detection and configuration of hardware at boot."
-msgstr "Texniki avadanl���n a��l��da avtomatik t�sbiti v� qurulmas�."
+msgstr "Texniki avadanlığın açılışda avtomatik təsbiti və qurulması."
 
-#: ../../services.pm_.c:44
+#: ../../services.pm_.c:43
 msgid ""
 "Linuxconf will sometimes arrange to perform various tasks\n"
 "at boot-time to maintain the system configuration."
 msgstr ""
-"Linuxconf sistem qur�ular�n�z� idar� ed�n proqramlar�\n"
-"m�xt�lif v�zif�l�ri a��l��da icra ed�r."
+"Linuxconf sistem qurğularınızı idarə edən proqramları\n"
+"müxtəlif vəzifələri açılışda icra edər."
 
-#: ../../services.pm_.c:46
+#: ../../services.pm_.c:45
 msgid ""
 "lpd is the print daemon required for lpr to work properly. It is\n"
 "basically a server that arbitrates print jobs to printer(s)."
 msgstr ""
-"lpd, lpr'nin d�zg�n olaraq i�l�m�si ���n laz�mi �ap edici vasit�sidir.\n"
-"lpd �sas�n, �ap v�zif�l�rini idar� ed�n v� onlar� �ap ediciy� g�nd�r�n "
+"lpd, lpr'nin düzgün olaraq işləməsi üçün lazımi çap edici vasitəsidir.\n"
+"lpd əsasən, çap vəzifələrini idarə edən və onları çap ediciyə göndərən "
 "vericidir."
 
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:47
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
 msgstr ""
-"Linuks Virtual Verici, y�ks�k qabiliyy�tli vericil�r qurmaq ���n i�l�dilir."
+"Linuks Virtual Verici, yüksək qabiliyyətli vericilər qurmaq üçün işlədilir."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:49
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
 msgstr ""
-"named (BIND) verici adlar�n� IP �nvanlar�na �evir�n\n"
-"Sah� Ad� Vericisidir(DNS)."
+"named (BIND) verici adlarını IP ünvanlarına çevirən\n"
+"Sahə Adı Vericisidir(DNS)."
 
-#: ../../services.pm_.c:52
+#: ../../services.pm_.c:51
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
 msgstr ""
-"B�t�n ��b�k� Fayl Sisteml�rini (NFS), SMB (Lan Manager/Windows), v� \n"
-"NCP (NetWare) ba�lama n�qt�l�rini ba�lar v� ay�r�r."
+"Bütün Şəbəkə Fayl Sistemlərini (NFS), SMB (Lan Manager/Windows), və \n"
+"NCP (NetWare) bağlama nöqtələrini bağlar və ayırır."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
 msgstr ""
-"A��l�� s�ras�nda ba�lamaq ���n qurulmu� b�t�n ��b�k� axtar �zl�rini "
-"f�alla�d�r�r ya da qapat�r."
+"Açılış sırasında başlamaq üçün qurulmuş bütün şəbəkə axtar üzlərini "
+"fəallaşdırır ya da qapatır."
 
-#: ../../services.pm_.c:56
+#: ../../services.pm_.c:55
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP networks.\n"
 "This service provides NFS server functionality, which is configured via the\n"
 "/etc/exports file."
 msgstr ""
-"NFS TCP/IP ��b�k�l�rind� fayl b�l���lm�si ���n istifad� edil�n m��hur bir "
+"NFS TCP/IP şəbəkələrində fayl bölüşülməsi üçün istifadə edilən məşhur bir "
 "protokoldur.\n"
-"Bu xidm�t, /etc/exports fayl�nda qur�ular� olan NFS vericisinin\n"
-"istifad�sin� imkan ver�r."
+"Bu xidmət, /etc/exports faylında qurğuları olan NFS vericisinin\n"
+"istifadəsinə imkan verər."
 
-#: ../../services.pm_.c:59
+#: ../../services.pm_.c:58
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
 msgstr ""
-"NFS TCP/IP ��b�k�l�rind� fayl b�l���lm�si ���n istifad� edil�n m��hur bir \n"
-"protokoldur. Bu xidm�t NFS fayl q�f�l� istifad�sin� imkan ver�r."
+"NFS TCP/IP şəbəkələrində fayl bölüşülməsi üçün istifadə edilən məşhur bir \n"
+"protokoldur. Bu xidmət NFS fayl qıfılı istifadəsinə imkan verər."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
 msgstr ""
-"A��l��da XFree v� konsolda numlock d�ym�sini\n"
-"avtomatik olaraq a�."
+"Açılışda XFree və konsolda numlock düyməsini\n"
+"avtomatik olaraq aç."
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
-msgstr "OKI 4w v� uy�un Windows �ap edicil�rini d�st�kl�."
+msgstr "OKI 4w və uyğun Windows çap edicilərini dəstəklə."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:63
 msgid ""
 "PCMCIA support is usually to support things like ethernet and\n"
 "modems in laptops.  It won't get started unless configured so it is safe to "
 "have\n"
 "it installed on machines that don't need it."
 msgstr ""
-"PCMCIA d�st�yi, laptoplarda eternet v� modem kimi avadanl�qlar�n "
-"d�st�kl�nm�sin� imkan ver�r.\n"
-"Qurulmad��� vaxtda a��l��da i�l�m�z, i�l�m�sin� ehtiyac olmayan\n"
-"komp�terl�rd� qurulu olmas� problem yaratmaz."
+"PCMCIA dəstəyi, laptoplarda eternet və modem kimi avadanlıqların "
+"dəstəklənməsinə imkan verər.\n"
+"Qurulmadığı vaxtda açılışda işləməz, işləməsinə ehtiyac olmayan\n"
+"kompüterlərdə qurulu olması problem yaratmaz."
 
-#: ../../services.pm_.c:67
+#: ../../services.pm_.c:66
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
 "machines\n"
 "which act as servers for protocols which make use of the RPC mechanism."
 msgstr ""
-"portmapper, NFS ve NIS kimi protokollar t�r�find�n istifad� edil�n RPC \n"
-"ba�lant�lar�n� t��kilatland�r�r. Portmap vericisi RPC mexanizmini i�l�d�n\n"
-"protokollarla xidm�t ed�n komp�terl�rd� qurulmal�d�r v� i�l�dilm�lidir."
+"portmapper, NFS ve NIS kimi protokollar tərəfindən istifadə edilən RPC \n"
+"bağlantılarını təşkilatlandırır. Portmap vericisi RPC mexanizmini işlədən\n"
+"protokollarla xidmət edən kompüterlərdə qurulmalıdır və işlədilməlidir."
 
-#: ../../services.pm_.c:70
+#: ../../services.pm_.c:69
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
 msgstr ""
-"Posfix, elektronik m�ktublar�n bir komp�terd�n dig�rin� yollayan \n"
-"Elektronik M�ktub Yollama Vasit�sidir."
+"Posfix, elektronik məktubların bir kompüterdən digərinə yollayan \n"
+"Elektronik Məktub Yollama Vasitəsidir."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr ""
-"Y�ks�k keyfiyy�t t�sad�fi r�q�m istehsal ed�n sistem entropi hovuzunun \n"
-"saxlanmas� v� yenid�n k�hn� hal�na g�tirilm�sin� imkan ver�r."
+"Yüksək keyfiyyət təsadüfi rəqəm istehsal edən sistem entropi hovuzunun \n"
+"saxlanması və yenidən köhnə halına gətirilməsinə imkan verər."
 
-#: ../../services.pm_.c:74
+#: ../../services.pm_.c:73
 msgid ""
 "Assign raw devices to block devices (such as hard drive\n"
 "partitions), for the use of applications such as Oracle"
@@ -7084,176 +7596,262 @@ msgstr ""
 "Assign raw devices to block devices (such as hard drive\n"
 "partitions), for the use of applications such as Oracle"
 
-#: ../../services.pm_.c:76
+#: ../../services.pm_.c:75
 msgid ""
 "The routed daemon allows for automatic IP router table updated via\n"
 "the RIP protocol. While RIP is widely used on small networks, more complex\n"
 "routing protocols are needed for complex networks."
 msgstr ""
-"routed vasit�si avtomatik IP router c�dv�linin RIP protokolu t�r�find�n\n"
-"yenil�nm�sin� imkan ver�r. RIP �sas�n ki�ik ��b�k�l�rd� istifad� edilir, "
-"daha b�y�k\n"
-"��b�k�l�rd� daha qar���q routing protokollar�na ehtiyac� vard�r."
+"routed vasitəsi avtomatik IP router cədvəlinin RIP protokolu tərəfindən\n"
+"yenilənməsinə imkan verər. RIP əsasən kiçik şəbəkələrdə istifadə edilir, "
+"daha böyük\n"
+"şəbəkələrdə daha qarışıq routing protokollarına ehtiyacı vardır."
 
-#: ../../services.pm_.c:79
+#: ../../services.pm_.c:78
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr ""
-"rstat protokolu bir ��b�k�d�k� istifad��il�rin o ��b�k�d�k� h�r hans� bir\n"
-"komp�ter haqq�ndak� qabiliyy�t �l��l�ri ala bilm�l�rin� imkan ver�r."
+"rstat protokolu bir şəbəkədəkı istifadəçilərin o şəbəkədəkı hər hansı bir\n"
+"kompüter haqqındakı qabiliyyət ölçüləri ala bilmələrinə imkan verər."
 
-#: ../../services.pm_.c:81
+#: ../../services.pm_.c:80
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr ""
-"rusers protokolu bir ��b�k�d�k� istifad��il�rin o ��b�k�d�k� komp�terl�rd�\n"
-"i�l�y�n istifad��il�ri g�rm�sin� imkan ver�r."
+"rusers protokolu bir şəbəkədəkı istifadəçilərin o şəbəkədəkı kompüterlərdə\n"
+"işləyən istifadəçiləri görməsinə imkan verər."
 
-#: ../../services.pm_.c:83
+#: ../../services.pm_.c:82
 msgid ""
 "The rwho protocol lets remote users get a list of all of the users\n"
 "logged into a machine running the rwho daemon (similiar to finger)."
 msgstr ""
-"rwho protokolu, uzaq istifad��il�rin, rwho vasit�si i�l�d�n bir komp�terd�\n"
-"olan b�t�n istifad��il�ri g�rm�l�rina imkan ver�r."
+"rwho protokolu, uzaq istifadəçilərin, rwho vasitəsi işlədən bir kompüterdə\n"
+"olan bütün istifadəçiləri görmələrina imkan verər."
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:84
 msgid "Launch the sound system on your machine"
-msgstr "Komp�terinizd� s�s sistem� ba�lad�n"
+msgstr "Kompüterinizdə səs sistemı başladın"
 
-#: ../../services.pm_.c:86
+#: ../../services.pm_.c:85
 msgid ""
 "Syslog is the facility by which many daemons use to log messages\n"
 "to various system log files.  It is a good idea to always run syslog."
 msgstr ""
-"Syslog, bir �ox vasit�nin ismar�clar�n� m�xt�lif sistem qeydl�rind�\n"
-"tutmalar�na imkan ver�r. Syslog'un h�r zaman i�l�m�si\n"
-"yax�� fikirdir."
+"Syslog, bir çox vasitənin ismarıclarını müxtəlif sistem qeydlərində\n"
+"tutmalarına imkan verər. Syslog'un hər zaman işləməsi\n"
+"yaxşı fikirdir."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
-msgstr "USB avadanl���n�z ���n s�r�c�l�ri y�kl�yin."
+msgstr "USB avadanlığınız üçün sürücüləri yükləyin."
 
-#: ../../services.pm_.c:89
+#: ../../services.pm_.c:88
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
 msgstr ""
-"X Font Vericisini a��l��da i�� salar (Bu, XFree icras� ���n m�cburidir)."
+"X Font Vericisini açılışda işə salar (Bu, XFree icrası üçün məcburidir)."
 
-#: ../../services.pm_.c:118
+#: ../../services.pm_.c:114 ../../services.pm_.c:156
 msgid "Choose which services should be automatically started at boot time"
-msgstr "A��l��da avtomatik olaraq ba�layacaq xidm�tl�ri se�in"
+msgstr "Açılışda avtomatik olaraq başlayacaq xidmətləri seçin"
+
+#: ../../services.pm_.c:126
+#, fuzzy
+msgid "Printing"
+msgstr "Çap Edici"
+
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "İnternet"
+
+#: ../../services.pm_.c:130
+msgid "File sharing"
+msgstr ""
+
+#: ../../services.pm_.c:132
+#, fuzzy
+msgid "System"
+msgstr "Sistem modu"
 
 #: ../../services.pm_.c:137
+#, fuzzy
+msgid "Remote Administration"
+msgstr "Uzaq Çap Edici (lpd) Seçənəkləri"
+
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Databeyz"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+#, fuzzy
+msgid "Services"
+msgstr "avadanlıq"
+
+#: ../../services.pm_.c:198
 msgid "running"
-msgstr "i�l�mir"
+msgstr "işləmir"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 msgid "stopped"
-msgstr "dayand�r�l�b"
+msgstr "dayandırılıb"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
-msgstr "Xidm�tl�r v� vasit�l�r"
+msgstr "Xidmətlər və vasitələr"
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
 msgstr ""
-"Bu xidm�t haqq�nda t��s�f ki,\n"
-"�lav� m�'lumat yoxdur."
+"Bu xidmət haqqında təəsüf ki,\n"
+"əlavə mə'lumat yoxdur."
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 msgid "On boot"
-msgstr "A��l��da"
+msgstr "Açılışda"
+
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "%s paketi qurulur"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone/diskdrake_.c:63
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
 "I'll try to go on blanking bad partitions"
 msgstr ""
-"B�lm� c�dv�lini oxuya bilmir�m, d�y�s�n biraz xarab olub:-(\n"
-"X�s�rli hiss�l�ri d�z�ltm�y� c�hd ed�c�m"
+"Bölmə cədvəlini oxuya bilmirəm, dəyəsən biraz xarab olub:-(\n"
+"Xəsərli hissələri düzəltməyə cəhd edəcəm"
+
+#: ../../standalone/drakautoinst_.c:44
+#, fuzzy
+msgid "Error!"
+msgstr "Xəta"
+
+#: ../../standalone/drakautoinst_.c:45
+#, c-format
+msgid "I can't find needed image file `%s'."
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:47
+#, fuzzy
+msgid "Auto Install Configurator"
+msgstr "Qurulum sonrası qurğular"
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:48
+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"
+"Do you want to continue?"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:70
+#, fuzzy
+msgid "Automatic Steps Configuration"
+msgstr "Qurulum Tərzi Quraşdırılması"
+
+#: ../../standalone/drakautoinst_.c:71
+msgid ""
+"Please choose for each step whether it will replay like your install, or it "
+"will be manual"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:112 ../../standalone/drakgw_.c:599
+msgid "Congratulations!"
+msgstr "Təbriklər!"
+
+#: ../../standalone/drakautoinst_.c:113
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:36 ../../standalone/drakgw_.c:181
 msgid "Internet Connection Sharing"
-msgstr "�nternet Ba�lant�s� B�l��d�r�lm�si"
+msgstr "İnternet Bağlantısı Bölüşdürülməsi"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
-msgstr "�nternet Ba�lant�s� B�l��d�r�lm�si f�alla�d�r�ld�"
+msgstr "İnternet Bağlantısı Bölüşdürülməsi fəallaşdırıldı"
 
-#: ../../standalone/drakgw_.c:119
+#: ../../standalone/drakgw_.c:120
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
 "\n"
 "What would you like to do?"
 msgstr ""
-"�nternet Ba�lant�s� B�l��d�r�lm�si qurulmas� art�q bitdi.\n"
-"V� art�q f�alla�d�r�lm��d�r.\n"
+"İnternet Bağlantısı Bölüşdürülməsi qurulması artıq bitdi.\n"
+"Və artıq fəallaşdırılmışdır.\n"
 "\n"
-"N� etm�k ist�yirsiniz?"
+"Nə etmək istəyirsiniz?"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
-msgstr "passivl��dir"
+msgstr "passivləşdir"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
-msgstr "ke�"
+msgstr "keç"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
-msgstr "yenid�n qura�d�r"
+msgstr "yenidən quraşdır"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
-msgstr "Vericil�r ba�lan�r..."
+msgstr "Vericilər bağlanır..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
-msgstr "�nternet Ba�lant�s� B�l��d�r�lm�si indi ba�land�"
+msgstr "İnternet Bağlantısı Bölüşdürülməsi indi bağlandı"
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
-msgstr "�nternet Ba�lant�s� B�l��d�r�lm�si passivl��dirildi"
+msgstr "İnternet Bağlantısı Bölüşdürülməsi passivləşdirildi"
 
-#: ../../standalone/drakgw_.c:144
+#: ../../standalone/drakgw_.c:145
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
 "\n"
 "What would you like to do?"
 msgstr ""
-"�nternet Ba�lant�s� B�l��d�r�lm�si qurulmas� art�q bitdi.\n"
-"V� art�q passivl��dirilmi�dir.\n"
+"İnternet Bağlantısı Bölüşdürülməsi qurulması artıq bitdi.\n"
+"Və artıq passivləşdirilmişdir.\n"
 "\n"
-"N� etm�k ist�yirsiniz?"
+"Nə etmək istəyirsiniz?"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
-msgstr "f�alla�d�r"
+msgstr "fəallaşdır"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
-msgstr "Xidm�tl�r f�alla�d�r�l�r..."
+msgstr "Xidmətlər fəallaşdırılır..."
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
-msgstr "�nternet Ba�lant�s� B�l��d�r�lm�si indi a��ld�"
-
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "Qura�d�rma fayl�n�n i�ind�kil�rl� oynan�lmaz"
+msgstr "İnternet Bağlantısı Bölüşdürülməsi indi açıldı"
 
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr "Tan�nmaz qura�d�rma fayl�"
-
-#: ../../standalone/drakgw_.c:181
+#: ../../standalone/drakgw_.c:182
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
 "With that feature, other computers on your local network will be able to use "
@@ -7262,36 +7860,40 @@ msgid ""
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
 "(LAN)."
 msgstr ""
-"Komp�ter�n�zi �nternet ba�lant�s�n� b�l��d�rm�k ���n qura�d�r�rs�n�z.\n"
-"Bu se��n�kl� yerli ��b�k�nizd�ki ba�qa komp�terl�r sizin �nternet "
-"ba�lant�n�zdan faydalana bil�c�kl�r.\n"
+"Kompüterınızi İnternet bağlantısını bölüşdürmək üçün quraşdırırsınız.\n"
+"Bu seçənəklə yerli şəbəkənizdəki başqa kompüterlər sizin İnternet "
+"bağlantınızdan faydalana biləcəklər.\n"
 "\n"
-"X�b�darl�q: Yerli ��b�k� (LAN) qurmaq ���n uy�un ��b�k� Adapterin� "
-"ehtiyac�n�z var."
+"Xəbədarlıq: Yerli Şəbəkə (LAN) qurmaq üçün uyğun Şəbəkə Adapterinə "
+"ehtiyacınız var."
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
-msgstr "Ara �z %s (%s modulu i�l�dilir)"
+msgstr "Ara Üz %s (%s modulu işlədilir)"
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:209
 #, c-format
 msgid "Interface %s"
-msgstr "Ara �z %s"
+msgstr "Ara üz %s"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:217
 msgid "No network adapter on your system!"
-msgstr "Siseminizd� ��b�k� adapteri yoxdur!"
+msgstr "Siseminizdə şəbəkə adapteri yoxdur!"
 
-#: ../../standalone/drakgw_.c:217
+#: ../../standalone/drakgw_.c:218
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
 msgstr ""
-"Sisteminizd� ��b�k� kart� tap�la bilm�yib.Avadanl��� quran vasit�ni i�� "
-"sal�n."
+"Sisteminizdə şəbəkə kartı tapıla bilməyib.Avadanlığı quran vasitəni işə "
+"salın."
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "Şəbəkə ara üzü"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7300,83 +7902,81 @@ msgid ""
 "\n"
 "I am about to setup your Local Area Network with that adapter."
 msgstr ""
-"Sistemnizd� bir d�n� qurulmu� ��b�k� adapteri var:\n"
+"Sistemnizdə bir dənə qurulmuş şəbəkə adapteri var:\n"
 "\n"
 "%s\n"
 "\n"
-"Yerli ��b�k� adapterinizi qurmaq �z�r�y�m?"
+"Yerli Şəbəkə adapterinizi qurmaq üzərəyəm?"
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
-msgstr "Sizi Yerli ��b�k�y� ba�layacaq adapteri se�in"
+msgstr "Sizi Yerli Şəbəkəyə bağlayacaq adapteri seçin"
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
-msgstr "Diqq�t, ��b�k� adapteriniz onsuz da qurulub. Yenid�n quracam."
+msgstr "Diqqət, şəbəkə adapteriniz onsuz da qurulub. Yenidən quracam."
 
-#: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
-msgstr "$_ qu�usunda d�y�s�n bir LAN �nvan �ax��mas� tap�ld�!\n"
+#: ../../standalone/drakgw_.c:254
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr "%s quğusunda dəyəsən bir LAN ünvan çaxışması tapıldı!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
-msgstr "Oddan divar (Firewall) qurulu�u tap�ld�!"
+msgstr "Oddan divar (Firewall) quruluşu tapıldı!"
 
-#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:263 ../../standalone/drakgw_.c:269
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
 msgstr ""
-"Diqq�t! Var olan Firewall qur�usu tap�ld�. Y�kl�m�d�n sonra bir az �l "
-"g�zdir� bil�rsiniz."
+"Diqqət! Var olan Firewall qurğusu tapıldı. Yükləmədən sonra bir az əl "
+"gəzdirə bilərsiniz."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
-msgstr "Qura�d�r�l�r..."
+msgstr "Quraşdırılır..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
-msgstr "Skriptl� qurulur, proqram t�'minat� qurulur, xidm�tl�r ba�lad�l�r..."
+msgstr "Skriptlə qurulur, proqram tə'minatı qurulur, xidmətlər başladılır..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "$_ paketi qurulurk�n x�ta oldu"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "T�brikl�r!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "%s paketi qurulurkən xəta oldu"
 
-#: ../../standalone/drakgw_.c:591
+#: ../../standalone/drakgw_.c:600
 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 ""
-"H�r �ey quruldu.\n"
-"�ndi is� �nternet ba�lant�n�z� yerli ��b�k�d�k� ba�qa komp�terl�r il� "
-"b�l��d�r� bil�rsiniz, bunun ���n is� avtomatik ��b�k� qura�d�r�lmas� (DHCP) "
-"i�l�dilir."
+"Hər şey quruldu.\n"
+"İndi isə İnternet bağlantınızı yerli şəbəkədəkı başqa kompüterlər ilə "
+"bölüşdürə bilərsiniz, bunun üçün isə avtomatik şəbəkə quraşdırılması (DHCP) "
+"işlədilir."
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
-msgstr "Qura�d�rma art�q qurtar�bd�r, amma f�aliyy�ti dayand�r�l�b."
+msgstr "Quraşdırma artıq qurtarıbdır, amma fəaliyyəti dayandırılıb."
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
-msgstr "Qura�d�rma art�q qurtar�bd�r v� f�aliyy�td�dir."
+msgstr "Quraşdırma artıq qurtarıbdır və fəaliyyətdədir."
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
-msgstr "�nternet Ba�lant�s� B�l��d�rm� Qura�d�rmas� apar�lmay�b."
+msgstr "İnternet Bağlantısı Bölüşdürmə Quraşdırması aparılmayıb."
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
-msgstr "�nternet ba�lant�s� b�l��d�r�lm�si qura�d�r�lmas�"
+msgstr "İnternet bağlantısı bölüşdürülməsi quraşdırılması"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -7385,231 +7985,225 @@ msgid ""
 "\n"
 "Click on Configure to launch the setup wizard."
 msgstr ""
-"�nternet Ba�lant�s� B�l��d�rm� vasit�sin� Xo� G�ldiniz!\n"
+"İnternet Bağlantısı Bölüşdürmə vasitəsinə Xoş Gəldiniz!\n"
 "\n"
 "%s\n"
 "\n"
-"Qura�d�rma sehirbaz�n� a�maq ���n Qura�d�ra t�qlay�n."
+"Quraşdırma sehirbazını açmaq üçün Quraşdıra tıqlayın."
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
-msgstr "��b�k� qura�d�r�lmas� (%d adapter)"
+msgstr "Şəbəkə quraşdırılması (%d adapter)"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:539
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 msgid "Profile: "
 msgstr "Profil: "
 
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:94
 msgid "Del profile..."
 msgstr "Profili sil..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
-msgstr "Silin�c�k profil:"
+msgstr "Silinəcək profil:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "Yeni profil..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "Yarad�lacaq profil ad�:"
+#: ../../standalone/draknet_.c:134
+msgid ""
+"Name of the profile to create (the new profile is created as a copy of the "
+"current one) :"
+msgstr ""
 
-#: ../../standalone/draknet_.c:140
+#: ../../standalone/draknet_.c:160
 msgid "Hostname: "
-msgstr "Ev sahibi ad�:"
+msgstr "Ev sahibi adı:"
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
-msgstr "�nternet imkan�"
+msgstr "İnternet imkanı"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
-msgstr "N�v: "
+msgstr "Növ: "
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
-msgstr "Ke�it:"
+msgstr "Keçit:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Interface:"
-msgstr "Ara �z"
+msgstr "Ara üz"
 
-#: ../../standalone/draknet_.c:168
+#: ../../standalone/draknet_.c:192
 msgid "Status:"
 msgstr "Hal:"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:122 ../../standalone/net_monitor_.c:224
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 msgid "Connected"
-msgstr "Ba�land�"
+msgstr "Bağlandı"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:83 ../../standalone/net_monitor_.c:122
-#: ../../standalone/net_monitor_.c:224
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 msgid "Not connected"
-msgstr "Ba�l� deyil"
+msgstr "Bağlı deyil"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
-msgstr "Ba�lan..."
+msgstr "Bağlan..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Disconnect..."
-msgstr "Ba�lant�n� K�s..."
+msgstr "Bağlantını Kəs..."
 
-#: ../../standalone/draknet_.c:191
+#: ../../standalone/draknet_.c:215
 msgid "Starting your connection..."
-msgstr "Ba�lant�n�z ba�lad�l�r..."
+msgstr "Bağlantınız başladılır..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
-msgstr "Ba�lant�n�z k�silir..."
+msgstr "Bağlantınız kəsilir..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
 "/etc/sysconfig/network-scripts/net_cnx_down\n"
 "in root."
 msgstr ""
-"Ba�lant� k�sildi. Buna �ll� k�kd�\n"
-"/etc/sysconfig/��b�k�-scripts/net_cnx_down\n"
-"�mrini icra ed�r�k nail ola bil�rsiniz."
+"Bağlantı kəsildi. Buna əllə kökdə\n"
+"/etc/sysconfig/şəbəkə-scripts/net_cnx_down\n"
+"əmrini icra edərək nail ola bilərsiniz."
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
-msgstr "Sistem indi ba�lant�s�n� k�sib."
+msgstr "Sistem indi bağlantısını kəsib."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
-msgstr "�nternet ke�i�ini Qur..."
+msgstr "İnternet keçişini Qur..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
-msgstr "Yerli ��b�k� qura�d�r�lmas�"
-
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "Adapter"
+msgstr "Yerli Şəbəkə quraşdırılması"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
-msgstr "S�r�c�"
+msgstr "Sürücü"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
-msgstr "Ara �z"
+msgstr "Ara üz"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+#, fuzzy
+msgid "State"
+msgstr "Hal:"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
-msgstr "Yerli ��b�k�ni Qura�d�r..."
+msgstr "Yerli Şəbəkəni Quraşdır..."
 
-#: ../../standalone/draknet_.c:283
-msgid "Normal Mode"
-msgstr "Normal Mod"
+#: ../../standalone/draknet_.c:279
+msgid "Click here to launch the wizard ->"
+msgstr ""
 
-#: ../../standalone/draknet_.c:288
+#: ../../standalone/draknet_.c:306
 msgid "Apply"
-msgstr "�lav� Et"
+msgstr "Əlavə Et"
 
-#: ../../standalone/draknet_.c:307
+#: ../../standalone/draknet_.c:325
 msgid "Please Wait... Applying the configuration"
-msgstr "L�td�n G�zl�yin... Qur�ular �lav� edilir"
+msgstr "Lütdən Gözləyin... Qurğular əlavə edilir"
 
-#: ../../standalone/draknet_.c:391
+#: ../../standalone/draknet_.c:428
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
-"Qurulu ara �z�n�z yoxdure.\n"
-"�vv�lc� onlar�  'Qura�d�r'a basaraq qurun"
+"Qurulu ara üzünüz yoxdure.\n"
+"Əvvəlcə onları  'Quraşdır'a basaraq qurun"
 
-#: ../../standalone/draknet_.c:415
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
-msgstr "Yerli ��b�k� Qura�d�r�lmas�"
+msgstr "Yerli Şəbəkə Quraşdırılması"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "%s Adapteri: %s"
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
-msgstr "A��l�� Protokolu"
+msgstr "Açılış Protokolu"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
-msgstr "A��l��da ba�lad�l�r"
+msgstr "Açılışda başladılır"
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
-msgstr "DHCP al�c�s�"
+msgstr "DHCP alıcısı"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Disable"
-msgstr "Ba�la"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "activate now"
+msgstr "Fəal"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "A�"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "desactivate now"
+msgstr "Fəal"
 
-#: ../../standalone/draknet_.c:504
+#: ../../standalone/draknet_.c:538
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
 msgstr ""
-"He� �nternet ba�lant�n�z yoxdur.\n"
-"�vv�lc� onlar�  'Qura�d�r'a basaraq qurun"
+"Heç İnternet bağlantınız yoxdur.\n"
+"Əvvəlcə onları  'Quraşdır'a basaraq qurun"
 
-#: ../../standalone/draknet_.c:528
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
-msgstr "�nternet ba�lant�s� qura�d�r�lmas�"
+msgstr "İnternet bağlantısı quraşdırılması"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
-msgstr "�nternet Ba�lant�s� Qura�d�r�lmas�"
+msgstr "İnternet Bağlantısı Quraşdırılması"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
-msgstr "Ba�lant� n�v�:"
+msgstr "Bağlantı növü:"
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
-msgstr "Parametrl�r"
+msgstr "Parametrlər"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "Dns xidm�tcisi 1 (arzuya g�r�)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "Dns xidm�tcisi 2 (arzuya g�r�)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
-msgstr "Eternet Kart�"
+msgstr "Eternet Kartı"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
-msgstr "DHCP Al�c�s�"
+msgstr "DHCP Alıcısı"
 
 #: ../../standalone/draksec_.c:21
 msgid "Welcome To Crackers"
-msgstr "Krakerl�r� xo�g�lmi�siniz"
+msgstr "Krakerlərə xoşgəlmişsiniz"
 
 #: ../../standalone/draksec_.c:22
 msgid "Poor"
-msgstr "Z�if"
+msgstr "Zəif"
 
 #: ../../standalone/draksec_.c:26
 msgid "Paranoid"
-msgstr "��bh�ci"
+msgstr "Şübhəci"
 
 #: ../../standalone/draksec_.c:29
 msgid ""
@@ -7617,26 +8211,26 @@ msgid ""
 "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 ""
-"Bu s�viyy� RAID'i diqq�tli istifad�nizi t�vsiy� edirik. Sisteminiz daha "
+"Bu səviyyə RAID'i diqqətli istifadənizi tövsiyə edirik. Sisteminiz daha "
 "asand\n"
-"i�l�dil�c�k, ancaq x�talara qar�� da h�ssaiyy�ti d� artacaqd�r. �nternet� \n"
-"ba�l� is�niz bunu t�vsiy� etmirik. Parol il� girilir."
+"işlədiləcək, ancaq xətalara qarşı da həssaiyyəti də artacaqdır. İnternetə \n"
+"bağlı isəniz bunu tövsiyə etmirik. Parol ilə girilir."
 
 #: ../../standalone/draksec_.c:32
 msgid ""
 "Password are now enabled, but use as a networked computer is still not "
 "recommended."
 msgstr ""
-"Parollar f�alla�d�r�ld�, yen� d� bir ��b�k� �st�nd� istifad� edilm�m�si "
-"t�vsiy� edilir."
+"Parollar fəallaşdırıldı, yenə də bir şəbəkə üstündə istifadə edilməməsi "
+"tövsiyə edilir."
 
 #: ../../standalone/draksec_.c:33
 msgid ""
 "Few improvements for this security level, the main one is that there are\n"
 "more security warnings and checks."
 msgstr ""
-"Bu t�hl�k�sizlik s�viyy�si ���n �lav� olaraq art�r�lm�� t�hl�k�sizlik "
-"x�b�rdarl��� v� \n"
+"Bu təhlükəsizlik səviyyəsi üçün əlavə olaraq artırılmış təhlükəsizlik "
+"xəbərdarlığı və \n"
 "yoxlama var."
 
 #: ../../standalone/draksec_.c:35
@@ -7644,8 +8238,8 @@ msgid ""
 "This is the standard security recommended for a computer that will be used\n"
 "to connect to the Internet as a client. There are now security checks. "
 msgstr ""
-"�nternet� ba�l� bir komp�ter ���n standart v� t�vsiy� edil�n bir "
-"t�hl�k�sizlik s�viyy�sidir."
+"İnternetə bağlı bir kompüter üçün standart və tövsiyə edilən bir "
+"təhlükəsizlik səviyyəsidir."
 
 #: ../../standalone/draksec_.c:37
 msgid ""
@@ -7654,139 +8248,86 @@ msgid ""
 "The security is now high enough to use the system as a server which accept\n"
 "connections from many clients. "
 msgstr ""
-"Bu t�hl�k�sizlik s�viyy�siyl� sistemin bir verici olaraq istifad�si "
-"m�mk�nd�r.  \n"
-"T�hl�k�sizlik, bird�n �ox al�c�n�n ba�lanmas�na icaz� ver�c�k ��kild� "
-"art�r�lm��d�r. "
+"Bu təhlükəsizlik səviyyəsiylə sistemin bir verici olaraq istifadəsi "
+"mümkündür.  \n"
+"Təhlükəsizlik, birdən çox alıcının bağlanmasına icazə verəcək şəkildə "
+"artırılmışdır. "
 
 #: ../../standalone/draksec_.c:40
 msgid ""
 "We take level 4 features, but now the system is entirely closed.\n"
 "Security features are at their maximum."
 msgstr ""
-"Biz d�rd�nc� s�viyy� haqlar�n� verdik v� sistem xarici ba�lant�lara qar�� "
-"tamamil� qapal�d�r.\n"
-"T�hl�k�sizlik s�viyy�si indi �n �std�dir."
+"Biz dördüncü səviyyə haqlarını verdik və sistem xarici bağlantılara qarşı "
+"tamamilə qapalıdır.\n"
+"Təhlükəsizlik səviyyəsi indi ən üstdədir."
+
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "Təhlükəsizlik səviyyəsinin quraşdırılması"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "X verici üçün seçənəkləri göstərin"
+
+#: ../../standalone/draksec_.c:68
+msgid ""
+"A library which defends against buffer overflow and format string attacks."
+msgstr ""
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:72
 msgid "Setting security level"
-msgstr "T�hl�k�sizlik s�viyy�sinin qura�d�r�lmas�"
+msgstr "Təhlükəsizlik səviyyəsinin quraşdırılması"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
-msgstr "�dar� M�rk�zi"
+msgstr "İdarə Mərkəzi"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
-msgstr "�stifad� ed�c�yiniz vasit�ni se�in"
+msgstr "İstifadə edəcəyiniz vasitəni seçin"
 
 #: ../../standalone/keyboarddrake_.c:16
 msgid "usage: keyboarddrake [--expert] [keyboard]\n"
-msgstr "istifad� qaydas�: keyboarddrake [--expert] [klavatura]\n"
+msgstr "istifadə qaydası: keyboarddrake [--expert] [klavatura]\n"
 
 #: ../../standalone/keyboarddrake_.c:36
 msgid "Do you want the BackSpace to return Delete in console?"
-msgstr "Konsolda BackSpace'in Silm� funksyas�n� g�rm�yini ist�yirmisiniz?"
+msgstr "Konsolda BackSpace'in Silmə funksyasını görməyini istəyirmisiniz?"
 
 #: ../../standalone/livedrake_.c:23
 msgid "Change Cd-Rom"
-msgstr "Cd-Romu d�yi�dir"
+msgstr "Cd-Romu dəyişdir"
 
 #: ../../standalone/livedrake_.c:24
 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 ""
-"Qurma Cd-Romunu s�r�c�n�z� tax�n v� OLDUya bas�n.\n"
-"�g�r Cd-Rom �linizd� yox is�, bu Cd-Rom-dan qurmamaq ���n R�DD ET� bas�n."
+"Qurma Cd-Romunu sürücünüzə taxın və OLDUya basın.\n"
+"Əgər Cd-Rom əlinizdə yox isə, bu Cd-Rom-dan qurmamaq üçün RƏDD ETə basın."
 
 #: ../../standalone/livedrake_.c:34
 msgid "Unable to start live upgrade !!!\n"
-msgstr "T�kmill��dirm� i�i ba�laya bilmir !!!\n"
+msgstr "Təkmilləşdirmə işi başlaya bilmir !!!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
-msgstr "serial_USB avadanl��� tap�lmad�\n"
+msgstr "serial_USB avadanlığı tapılmadı\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
-msgstr "3 d�ym� emulasiyas�"
-
-#: ../../standalone/mousedrake_.c:131
-msgid "Test the mouse here."
-msgstr "Si�an�n�z� buradan s�nay�n."
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-msgid "Network Monitoring"
-msgstr "��b�k� Monitoru"
-
-#: ../../standalone/net_monitor_.c:56
-msgid "Statistics"
-msgstr "Statistikalar"
-
-#: ../../standalone/net_monitor_.c:59
-msgid "Sending Speed: "
-msgstr "Yollama S�r'�ti:"
-
-#: ../../standalone/net_monitor_.c:61
-msgid "Receiving Speed: "
-msgstr "Alam S�r'�ti:"
-
-#: ../../standalone/net_monitor_.c:66
-msgid "Close"
-msgstr "Qapat"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Connecting to Internet "
-msgstr "�nternet� ba�lan�l�r"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Disconnecting from Internet "
-msgstr "�nternet il� ba�lant�n� k�s"
-
-#: ../../standalone/net_monitor_.c:114
-msgid "Disconnection from Internet failed."
-msgstr "�nternet il� ba�lant� k�silm�si bacar�lmad�."
-
-#: ../../standalone/net_monitor_.c:115
-msgid "Disconnection from Internet complete."
-msgstr "�nternet il� ba�lant� k�silm�si qurtard�."
-
-#: ../../standalone/net_monitor_.c:117
-msgid "Connection complete."
-msgstr "Ba�lant� qurtard�."
-
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-"Ba�lant� iflas etdi.\n"
-"Qur�ular�n�z� Mandrake �dar� M�rk�zind�n yoxlay�n."
-
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr "yolland�:"
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr "al�nd�:"
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Connect"
-msgstr "Ba�lan"
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Disconnect"
-msgstr "Ba�lant�n� k�s"
+msgstr "3 düymə emulasiyası"
 
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
-msgstr "Firewall qura�d�r�lmas�"
+msgstr "Firewall quraşdırılması"
 
 #: ../../standalone/tinyfirewall_.c:42
 msgid "Firewalling configuration"
-msgstr "Firewall qura�d�r�lmas�"
+msgstr "Firewall quraşdırılması"
 
 #: ../../standalone/tinyfirewall_.c:77
 msgid ""
@@ -7797,8 +8338,8 @@ msgid ""
 msgstr ""
 "Firewall\n"
 "\n"
-"Firewall qur�ular�n� art�q qurtarm�s�n�z.\n"
-"Qur-a t�qlayaraq firewall qur�ular�n silin ya da t�kmill��dirin."
+"Firewall qurğularını artıq qurtarmısınız.\n"
+"Qur-a tıqlayaraq firewall qurğuların silin ya da təkmilləşdirin."
 
 #: ../../standalone/tinyfirewall_.c:81
 msgid ""
@@ -7808,24 +8349,92 @@ msgid ""
 msgstr ""
 "Firewall\n"
 "\n"
-"Qur-a t�qlayaraq standart firewall qur�ular�n� apar�n."
+"Qur-a tıqlayaraq standart firewall qurğularını aparın."
+
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "İşlətdiyiniz dili seçin"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Quruluş sinifini seçin"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Sabit disk seçkisi"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Siçan qurğuları"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Klaviaturanızı seçin"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "Təhlükəsizlik"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Fayl sistemi qurğuları"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Bölmə şəkilləndirilməsi"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Qurulacaq paketləri seçin"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Sistemi qur"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "İstifadəçi əlavə et"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Şəbəkəni qur"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Xidmətləri qur"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Açılış disketi yarat"
 
-#: ../../tinyfirewall.pm_.c:10
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Sistem yükləyicini qur"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "X qur"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Qurulumdan çıx"
+
+#: ../../tinyfirewall.pm_.c:9
 msgid ""
 "tinyfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Linux Mandrake machine.\n"
+"This configures a personal firewall for this Mandrake Linux machine.\n"
 "For a powerful dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "tinyfirewall configurator\n"
 "\n"
-"Bu, Linuks Mandrake sisteminiz ���n ��xsi bir firewall qura�d�racaqd�r.\n"
-"Daha g�cl� v� e'tibarl� sistem ���n xahi� edirik x�susi MandrakeSecurity "
+"Bu, Linuks Mandrake sisteminiz üçün şəxsi bir firewall quraşdıracaqdır.\n"
+"Daha güclü və e'tibarlı sistem üçün xahiş edirik xüsusi MandrakeSecurity "
 "Firewall\n"
-"burax�l���n� t�dqiq edin."
+"buraxılışını tədqiq edin."
 
-#: ../../tinyfirewall.pm_.c:15
+#: ../../tinyfirewall.pm_.c:14
 msgid ""
 "We'll now ask you questions about which services you'd like to allow\n"
 "the Internet to connect to.  Please think carefully about these\n"
@@ -7835,42 +8444,42 @@ msgid ""
 "it off.  You can change this configuration anytime you like by\n"
 "re-running this application!"
 msgstr ""
-"�ndi is� internet� ba�lan�rk�n istifad� etm�yi arzulad���n�z xidm�tl�ri\n"
-"soru�aca��q. Bu suallara xahi� edirik diqq�tl� cavab verin, ��nk� "
-"komp�terinizin \n"
-"t�hl�k�sizliyi �ox vacib m�s�l�dir.\n"
+"İndi isə internetə bağlanırkən istifadə etməyi arzuladığınız xidmətləri\n"
+"soruşacağıq. Bu suallara xahiş edirik diqqətlə cavab verin, çünkü "
+"kompüterinizin \n"
+"təhlükəsizliyi çox vacib məsələdir.\n"
 "\n"
-"Xahi� edirik, bu xidm�tl�rd�n istifad� etm�dikl�riniz� yax�� q�rar verin ki, "
+"Xahiş edirik, bu xidmətlərdən istifadə etmədiklərinizə yaxşı qərar verin ki, "
 "firewall\n"
-"onu ba�las�n. Sonradan bu qur�ular� �z�n�z proqram� yenid�n i�� salaraq "
-"d�yi�dir� bil�rsiniz.!"
+"onu bağlasın. Sonradan bu qurğuları özünüz proqramı yenidən işə salaraq "
+"dəyişdirə bilərsiniz.!"
 
-#: ../../tinyfirewall.pm_.c:22
+#: ../../tinyfirewall.pm_.c:21
 msgid ""
 "Are you running a web server on this machine that you need the whole\n"
 "Internet to see? If you are running a webserver that only needs to be\n"
 "accessed by this machine, you can safely answer NO here.\n"
 "\n"
 msgstr ""
-"Sisteminizd� b�t�n �nternet� g�st�rm�k ist�diyiniz veb vericisi "
-"i�l�dirsiniz? \n"
-"T�kc� bu komp�terin g�r�c�yi bir veb vericisi olacaqsa burada YOX cavasb� "
-"ver� bil�rsiniz.\n"
+"Sisteminizdə bütün İnternetə göstərmək istədiyiniz veb vericisi "
+"işlədirsiniz? \n"
+"Təkcə bu kompüterin görəcəyi bir veb vericisi olacaqsa burada YOX cavasbı "
+"verə bilərsiniz.\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:27
+#: ../../tinyfirewall.pm_.c:26
 msgid ""
 "Are you running a name server on this machine? If you didn't set one\n"
 "up to give away IP and zone information to the whole Internet, please\n"
 "answer no.\n"
 "\n"
 msgstr ""
-"Bu komp�terd� ad vericisi i�l�dirsiniz? �g�r internet� ba�lan�rk�n bir IP "
-"�nvan� v�\n"
-"nahiy� m�'lumat� alm�rs�n�zsa YOX cavab� verin.\n"
+"Bu kompüterdə ad vericisi işlədirsiniz? Əgər internetə bağlanırkən bir IP "
+"ünvanı və\n"
+"nahiyə mə'lumatı almırsınızsa YOX cavabı verin.\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:32
+#: ../../tinyfirewall.pm_.c:31
 msgid ""
 "Do you want to allow incoming Secure Shell (ssh) connections? This\n"
 "is a telnet-replacement that you might use to login. If you're using\n"
@@ -7878,73 +8487,73 @@ msgid ""
 "encrypted -- so some attackers can steal your password if you use\n"
 "it. ssh is encrypted and doesn't allow for this eavesdropping."
 msgstr ""
-"G�l�n E'tibarl� Qab�q (ssh) ba�lant�lar�na icaz� verm�k ist�yiriniz? Bu, "
+"Gələn E'tibarlı Qabıq (ssh) bağlantılarına icazə vermək istəyiriniz? Bu, "
 "bir\n"
-"c�r telnet �v�zidir. �ndi telnet i�l�dirsinizs� onda \"ssh\"y� "
-"ke�m�lisiniz. \n"
-"Telnet kodlama i�l�tmir, ona g�r� d�b�'zi h�kerl�r parolunuzu o�urlaya "
-"bil�r. \n"
-"ssh bunlara icaz� verm�z."
+"cür telnet əvəzidir. İndi telnet işlədirsinizsə onda \"ssh\"yə "
+"keçməlisiniz. \n"
+"Telnet kodlama işlətmir, ona görə dəbə'zi həkerlər parolunuzu oğurlaya "
+"bilər. \n"
+"ssh bunlara icazə verməz."
 
-#: ../../tinyfirewall.pm_.c:37
+#: ../../tinyfirewall.pm_.c:36
 msgid ""
 "Do you want to allow incoming telnet connections?\n"
 "This is horribly unsafe, as we explained in the previous screen. We\n"
 "strongly recommend answering No here and using ssh in place of\n"
 "telnet.\n"
 msgstr ""
-"G�l�n telnet ba�lant�lar�na icaz� verim?\n"
-"Bu �ox e'tibars�zd�r. Bunu siz� �vv�lki ekranda s�yl�dik. Buna \n"
-"yox cavab� verm�yinizi t�vsiyy� edirik. Yerin� ssh i�l�din.\n"
+"Gələn telnet bağlantılarına icazə verim?\n"
+"Bu çox e'tibarsızdır. Bunu sizə əvvəlki ekranda söylədik. Buna \n"
+"yox cavabı verməyinizi tövsiyyə edirik. Yerinə ssh işlədin.\n"
 
-#: ../../tinyfirewall.pm_.c:42
+#: ../../tinyfirewall.pm_.c:41
 msgid ""
 "Are you running an FTP server here that you need accessible to the\n"
 "Internet? If you are, we strongly recommend that you only use it for\n"
 "Anonymous transfers. Any passwords sent by FTP can be stolen by some\n"
 "attackers, since FTP also uses no encryption for transferring passwords.\n"
 msgstr ""
-"�nternetd�n yeti�il� bil�n bir FTP vericisi i�l�dirsiniz? �g�r "
-"i�l�dirsinizs�,\n"
-"t�kc� Anonim k���rm�l�r ���n olmas�n� t�vsiyy� ed�rik. FTP il� g�nd�ril�n\n"
-"parollar h�kerl�r t�r�find�n o�urlana bil�r. FTP parollar� kodlaya bilmir "
-"ax�.\n"
+"İnternetdən yetişilə bilən bir FTP vericisi işlədirsiniz? Əgər "
+"işlədirsinizsə,\n"
+"təkcə Anonim köçürmələr üçün olmasını tövsiyyə edərik. FTP ilə göndərilən\n"
+"parollar həkerlər tərəfindən oğurlana bilər. FTP parolları kodlaya bilmir "
+"axı.\n"
 
-#: ../../tinyfirewall.pm_.c:47
+#: ../../tinyfirewall.pm_.c:46
 msgid ""
 "Are you running a mail server here? If you're sending you \n"
 "messages through pine, mutt or any other text-based mail client,\n"
 "you probably are.  Otherwise, you should firewall this off.\n"
 "\n"
 msgstr ""
-"Burada m�ktub vericisi i�l�dirsiniz? �g�r ismar�clar�n�z� pine\n"
-"mutt v� ya ba�qa m�tn �sasl� m�ktub al�c�s�ndan g�nd�rirsinizs�,\n"
-"dem�k ki, i�l�dirsiniz.  Yoxsa firewall bunu ba�lamal�d�r.\n"
+"Burada məktub vericisi işlədirsiniz? Əgər ismarıclarınızı pine\n"
+"mutt və ya başqa mətn əsaslı məktub alıcısından göndərirsinizsə,\n"
+"demək ki, işlədirsiniz.  Yoxsa firewall bunu bağlamalıdır.\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:52
+#: ../../tinyfirewall.pm_.c:51
 msgid ""
 "Are you running a POP or IMAP server here? This would\n"
 "be used to host non-web-based mail accounts for people via \n"
 "this machine.\n"
 "\n"
 msgstr ""
-"Burada POP v� ya IMAP vericisi i�l�dirsiniz? Bu is�\n"
-"komp�terd� veb �sasl� olmayan m�ktub hesablar� qurmaq ���n laz�md�r.\n"
+"Burada POP və ya IMAP vericisi işlədirsiniz? Bu isə\n"
+"kompüterdə veb əsaslı olmayan məktub hesabları qurmaq üçün lazımdır.\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:57
+#: ../../tinyfirewall.pm_.c:56
 msgid ""
 "You appear to be running a 2.2 kernel.  If your network IP\n"
 "is automatically set by a computer in your home or office \n"
 "(dynamically assigned), we need to allow for this.  Is\n"
 "this the case?\n"
 msgstr ""
-"D�y�s�n 2.2 ��kird�k i�l�dirsiniz. �g�r komp�terinizin\n"
-"IPsi ba�qa bir komp�ter t�r�find�n dinamik olaraq verilirs�,\n"
-"onda buna icaz� verm�k olar. Beledir?\n"
+"Dəyəsən 2.2 çəkirdək işlədirsiniz. Əgər kompüterinizin\n"
+"IPsi başqa bir kompüter tərəfindən dinamik olaraq verilirsə,\n"
+"onda buna icazə vermək olar. Beledir?\n"
 
-#: ../../tinyfirewall.pm_.c:62
+#: ../../tinyfirewall.pm_.c:61
 msgid ""
 "Is your computer getting time syncronized to another computer?\n"
 "Mostly, this is used by medium-large Unix/Linux organizations\n"
@@ -7952,281 +8561,1487 @@ msgid ""
 "of a larger office and haven't heard of this, you probably \n"
 "aren't."
 msgstr ""
-"Komp�terinizin vaxt� ba�qa bir komp�terl� sinxronla�d�r�r?\n"
-"Bu, daha �ox orta v� geni� Unix/Linuks �irk�tl�ri t�r�find�n i�l�dilir.\n"
-"�g�r bir �irk�tin bir par�as� deyilsinizs�, dem�k ki, i�l�tmirsiniz."
+"Kompüterinizin vaxtı başqa bir kompüterlə sinxronlaşdırır?\n"
+"Bu, daha çox orta və geniş Unix/Linuks şirkətləri tərəfindən işlədilir.\n"
+"Əgər bir şirkətin bir parçası deyilsinizsə, demək ki, işlətmirsiniz."
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
 "\n"
 "\n"
 msgstr ""
-"Qurulum qurtar�ld�. D�yi�iklikl�ri disk� yaz�m?\n"
+"Qurulum qurtarıldı. Dəyişiklikləri diskə yazım?\n"
 "\n"
 "\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
-msgstr "%s a��la bilmir: %s\n"
+msgstr "%s açıla bilmir: %s\n"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, c-format
 msgid "Can't open %s for writing: %s\n"
-msgstr "Yazmaq ���n %s a��la bilmir: %s\n"
+msgstr "Yazmaq üçün %s açıla bilmir: %s\n"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "SSH daxil bir �ox protokollar�n al�c�lar�"
+msgid "Web/FTP"
+msgstr "Verici, Veb/FTP"
 
 #: ../../share/compssUsers:999
-msgid "Development"
-msgstr "T�cr�bi"
+msgid "Network Computer (client)"
+msgstr "Şəbəkə Kompüteri (alıcı)"
 
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Masa �st�"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS vericisi, SMB vericisi, SSH vericisi, Vəkil Verici"
 
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Verici, Firewall/Ruter"
+msgid "Office"
+msgstr "İş Yeri"
 
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "��xsi M�'lumat �dar��isi"
+msgid "Gnome Workstation"
+msgstr "Gnome iş stansiyası"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimedya - Qrafika"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Palm Pilot və ya Visorunuz üçün vasitələr"
 
 #: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "�nternet"
+msgid "Workstation"
+msgstr "Masa üstü"
 
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "��b�k� Komp�teri (al�c�)"
+msgid "Firewall/Router"
+msgstr "Verici, Firewall/Ruter"
 
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgid "Domain Name and Network Information Server"
+msgstr "Domeyn Ad bə Şəbəkə Mə'lumat Vericisi"
+
+#: ../../share/compssUsers:999
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
-"S�s il� �laq�d�r vasit�l�r: mp3 v� ya midi �al����lar, qar��d�r���lar, vs."
+"İdarə proqramları: kəlmə işləyənlər (kword, abiword), hesablayıcılar və pdf "
+"göstəriciləri, vs."
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "�nternet stansiyas�"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
+"Səs ilə əlaqədər vasitələr: mp3 və ya midi çalğıçılar, qarışdırıçılar, vs."
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "�� Yeri"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linuks və pulsuz proqram tə'minatıları Kitablar və Howtoları"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimedya stansiyas�"
+msgid "KDE Workstation"
+msgstr "KDE iş stansiyası"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Elektronik m�ktub v� x�b�r oxuyucusu (pine, mutt, tin..) v� Web s�yyahlar�"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, vs."
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C v� C++ inki�af kitabxanalar�, proqramlar� v� daxil edil�c�k fayllar"
+msgid "Multimedia - Video"
+msgstr "Multimedya - Video"
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Domeyn Ad b� ��b�k� M�'lumat Vericisi"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Məktub, xəbərlər, fayl daşınması, chat vasitələri"
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "��xsi maliyy� idar��il�ri, m�s�l�n gnucash"
+msgid "Database"
+msgstr "Databeyz"
 
 #: ../../share/compssUsers:999
 msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL v� ya MySQL databeyz vericisi"
+msgstr "PostgreSQL və ya MySQL databeyz vericisi"
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS vericisi, SMB vericisi, SSH vericisi, V�kil Verici"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Kompüter qurğularını asandlaşdıran vasitələr"
+
+#: ../../share/compssUsers:999
+msgid "Multimedia - Sound"
+msgstr "Multimedya - Səs"
+
+#: ../../share/compssUsers:999
+msgid "Utilities"
+msgstr "Vasitələr"
 
 #: ../../share/compssUsers:999
 msgid "Documentation"
-msgstr "S�n�dl�r"
+msgstr "Sənədlər"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, vs."
+msgid "Console Tools"
+msgstr "Konsol Vasitələri"
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Vasit�l�r"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix məktub vericisi, Inn xəbər vericisi"
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS "
+msgid "Internet station"
+msgstr "İnternet stansiyası"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Qrafiki Ara �z"
+msgid "Multimedia station"
+msgstr "Multimedya stansiyası"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedya - S�s"
+#, fuzzy
+msgid "Configuration"
+msgstr "Yerli Şəbəkə Quraşdırılması"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "M�z�li proqramlar: arkad, l�vh� oyunlar�, strategiya, vs"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Başqa qrafiki ara üzlər (Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Video �al����lar� v� editorlar�"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "KDE, əsas qrafiki ara üz və yardımçi proqramlar kolleksiyası"
 
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsol Vasit�l�ri"
+msgid "Graphical Environment"
+msgstr "Qrafiki Ara Üz"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "S�s v� video �al�nmas�/d�z�li� proqramlar�"
+msgid "Development"
+msgstr "Təcrübi"
 
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Elmi i� stansiyas�"
+msgid "Apache, Pro-ftpd"
+msgstr "Apache və Pro-ftpd"
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editorlar, r�fl�r, fayl vasit�l�ri, terminallar"
+msgid "Tools to create and burn CD's"
+msgstr "CD yazmaq və yandırmaq proqramları"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Linuks v� pulsuz proqram t�'minat�lar� Kitablar v� Howtolar�"
+msgid "Office Workstation"
+msgstr "İş Yeri Stansiyası"
 
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"�stifad��i dostu proqram v� masa �st� il� b�rab�r qrafiki ara �z vasit�l�ri"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, IceWM, Windows Maker, Enlightement, Fvwm, vs."
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix m�ktub vericisi, Inn x�b�r vericisi"
+msgid "Graphics programs such as The Gimp"
+msgstr "Qrafika proqramları, məsələn The Gimp"
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "Oyunlar"
+msgid "DNS/NIS "
+msgstr "DNS/NIS "
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedya - Video"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C və C++ inkişaf kitabxanaları, proqramları və daxil ediləcək fayllar"
 
 #: ../../share/compssUsers:999
 msgid "Network Computer server"
-msgstr "��b�k� Komp�teri vericisi"
+msgstr "Şəbəkə Kompüteri vericisi"
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Qrafika proqramlar�, m�s�l�n The Gimp"
+msgid "Mail/Groupware/News"
+msgstr "Verici, ePoçt/Groupware/Xəbərlər"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "�� Yeri Stansiyas�"
+msgid "Game station"
+msgstr "Oyun stansiyası"
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr "KDE, �sas qrafiki ara �z v� yard�m�i proqramlar kolleksiyas�"
+msgid "Video players and editors"
+msgstr "Video çalğıçıları və editorları"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Ba�qa qrafiki ara �zl�r (Gnome, IceWM)"
+msgid "Multimedia - Graphics"
+msgstr "Multimedya - Qrafika"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "CD yazmaq v� yand�rmaq proqramlar�"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Məzəli proqramlar: arkad, lövhə oyunları, strategiya, vs"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedya - CD Yand�rma"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Elektronik məktub və xəbər oxuyucusu (pine, mutt, tin..) və Web səyyahları"
 
 #: ../../share/compssUsers:999
 msgid "Archiving, emulators, monitoring"
-msgstr "Arxivl�m�, emulyatorlar, izl�m�"
+msgstr "Arxivləmə, emulyatorlar, izləmə"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Databeyz"
+msgid "Personal Finance"
+msgstr "Şəxsi Maliyyə"
 
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
 msgstr ""
-"�dar� proqramlar�: k�lm� i�l�y�nl�r (kword, abiword), hesablay�c�lar v� pdf "
-"g�st�ricil�ri, vs."
+"İstifadəçi dostu proqram və masa üstü ilə bərabər qrafiki ara üz vasitələri"
 
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Verici, Veb/FTP"
+msgid "Clients for different protocols including ssh"
+msgstr "SSH daxil bir çox protokolların alıcıları"
 
 #: ../../share/compssUsers:999
-msgid "Server"
-msgstr "Verici"
+msgid "Internet gateway"
+msgstr "İnternet keçişı"
 
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "��xsi Maliyy�"
+msgid "Sound and video playing/editing programs"
+msgstr "Səs və video çalınması/düzəliş proqramları"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Qura�d�rma"
+msgid "Other Graphical Desktops"
+msgstr "Başqa qrafiki ara üzlər"
 
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE i� stansiyas�"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editorlar, rəflər, fayl vasitələri, terminallar"
 
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Ba�qa qrafiki ara �zl�r"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Şəxsi maliyyə idarəçiləri, məsələn gnucash"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache v� Pro-ftpd"
+msgid "Games"
+msgstr "Oyunlar"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Verici, ePo�t/Groupware/X�b�rl�r"
+msgid "Personal Information Management"
+msgstr "Şəxsi Mə'lumat İdarəçisi"
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome i� stansiyas�"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedya - CD Yandırma"
 
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "�nternet ke�i��"
+msgid "Scientific Workstation"
+msgstr "Elmi iş stansiyası"
+
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "/etc/sysconfig/autologin  oxunmaq üçün açıla bilmir: %s"
+
+#~ msgid "Do you want to restart the network"
+#~ msgstr "Şəbəkəni yenidən başlatmaq istəyirsiniz?"
+
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "Razısınız?"
+
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "Şəbəkə avadanlığını yenidən başlatmalıyam:\n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "%s avadanlığını yenidən başladacam. Razısınız?"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
+#~ "(primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+#~ msgstr ""
+#~ "Başqa bir şəkildə seçilməmiş isə, ümumiyyətlə bu seçki \"/dev/hda\" \n"
+#~ "(Birinci ali IDE disk) ya da \"/dev/sda\" (birinci SCSI disk)\n"
+#~ "olacaqdır."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "Aşağıda yazıçıdakı növbələr verilmişdir.\n"
+#~ "Yenilərini əlavə edə bilər, və ya mövcud olanları dəyişdirə bilərsiniz."
+
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "Bağlantı növü:"
+
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "Əsas istifadəçini seçin:"
+
+#~ msgid "Test the mouse here."
+#~ msgstr "Siçanınızı buradan sınayın."
+
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ msgstr "Qurulma və sistem istifadəsi üçün bir dil seçin."
+
+#~ msgid ""
+#~ "You need to accept the terms of the above license to continue "
+#~ "installation.\n"
+#~ "\n"
+#~ "\n"
+#~ "Please click on \"Accept\" if you agree with its terms.\n"
+#~ "\n"
+#~ "\n"
+#~ "Please click on \"Refuse\" if you disagree with its terms. Installation "
+#~ "will end without modifying your current\n"
+#~ "configuration."
+#~ msgstr ""
+#~ "Davam edə bilmək üçün yuxarıdakı lisenziyanın maddələrini qəbul "
+#~ "etməlisiniz.\n"
+#~ "\n"
+#~ "\n"
+#~ "Xahiş edirik, maddələrlə razı isəniz \"Qəbul\" düyməsinə basın.\n"
+#~ "\n"
+#~ "\n"
+#~ "Xahiş edirik, maddələrlə razı deyilsəniz ,\"Rədd\" düyməsinə basın\n"
+#~ "Yükləmə indiki qurğularınız dəyişdirilmədən bitiriləcək."
+
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr "Yuxarıdakı siyahıdan klaviaturanıza uyöun gələn düzülüşü seçiniz"
+
+#~ msgid ""
+#~ "If you wish other languages (than the one you choose at\n"
+#~ "beginning of installation) will be available after installation, please "
+#~ "chose\n"
+#~ "them in list above. If you want select all, you just need to select \"All"
+#~ "\"."
+#~ msgstr ""
+#~ "Əgər yükləmədən sonra işlətmək üçün fərqli dillər (yükləmənin əvvəlində "
+#~ "seçdiyinizdən) seçmək istəyirsinizsə,\n"
+#~ "xahiş edirik, onları yuxarıdakı siyahıdan seçin.\n"
+#~ "Əgər hamısını seçmək istəyirsiniz isə \"Hamısını\" seçin."
+
+#~ msgid ""
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Customized: If you are familiar enough with GNU/Linux, you may then "
+#~ "choose\n"
+#~ "    the primary usage for your machine. See below for details.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
+#~ "    perform a highly customized installation. As for a \"Customized\"\n"
+#~ "    installation class, you will be able to select the usage for your "
+#~ "system.\n"
+#~ "    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
+#~ "DOING!"
+#~ msgstr ""
+#~ "Seç:\n"
+#~ "\n"
+#~ "  - Xüsusi: Əgər Linuksa aşina isəniz  bu seçənəyə tıqlayın.\n"
+#~ "    Sonra sistemin sinifini seçə biləcəksiniz.\n"
+#~ "     Ayrınrılar üçün aşağıya baxın.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Usta: Əgər GNU/Linuks haqqında yaxşı bilik sahibi isəniz bunu seçin.\n"
+#~ "    Daha sonra \"Xüsusi\" seçkisində olduğu kimi sistemin sinifini seçə "
+#~ "biləcəksiniz.\n"
+#~ "    Ancaq artıq dərəcədə xahiş edirik, NƏ ETDİYİNİZİ BİLMİRSƏNİZ BU  "
+#~ "SİNİFİ SEÇMƏYİN!."
+
+#~ msgid ""
+#~ "You must now define your machine usage. Choices are:\n"
+#~ "\n"
+#~ "* Workstation: this the ideal choice if you intend to use your machine "
+#~ "primarily for everyday use, at office or\n"
+#~ "  at home.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Development: if you intend to use your machine primarily for software "
+#~ "development, it is the good choice. You\n"
+#~ "  will then have a complete collection of software installed in order to "
+#~ "compile, debug and format source code,\n"
+#~ "  or create software packages.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Server: if you intend to use this machine as a server, it is the good "
+#~ "choice. Either a file server (NFS or\n"
+#~ "  SMB), a print server (Unix style or Microsoft Windows style), an "
+#~ "authentication server (NIS), a database\n"
+#~ "  server and so on. As such, do not expect any gimmicks (KDE, GNOME, "
+#~ "etc.) to be installed."
+#~ msgstr ""
+#~ "İndi isə kompüterinizi necə işlədəcəyinizə qerar verin.Seç:\n"
+#~ "\n"
+#~ "* Masa üstü: kompüterinizi gündəlik işlər (idarə işləri, qrafika vs.)\n"
+#~ " üçün istifadə edəcək isəniz, bunu seçin.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Təcrübi: Kompüterinizi proqram tə'minatı inkişafı üçün işlədəcəksəniz, "
+#~ "sizin üçün ideal seçkidir.\n"
+#~ " O zaman qaynaq kodları yazmaq, şəkilləndirmək və xətadan ayıqlamaq və ya "
+#~ "proqram paketləri hazırlamaq üçün lazımi hər cür proqramın daxil olduğu "
+#~ "bir kolleksiya kompüterinizə qurulacaqdır.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Verici: Kompüterinizə Linuks-Mandrakeni verici olaraq işlətmək üçün "
+#~ "quracaqsanız, bu yaxşı bir seçkidir.\n"
+#~ " Bir fayl vericisi (NFS ya da SMB),çap edici vericisi(Unixin lp protokolu "
+#~ "ya da Windows tərzi SMB çap),\n"
+#~ " tanıdıcı verici (NIS), mə'lumat tabanı vericisi və oxşarı...Onda KDE, "
+#~ "GNOME kimi məzəli şeylərin qurulmağını gözləməyin."
+
+#~ msgid ""
+#~ "You may now select the group of packages you wish to\n"
+#~ "install or upgrade.\n"
+#~ "\n"
+#~ "\n"
+#~ "DrakX will then check whether you have enough room to install them all. "
+#~ "If not,\n"
+#~ "it will warn you about it. If you want to go on anyway, it will proceed "
+#~ "onto the\n"
+#~ "installation of all selected groups but will drop some packages of "
+#~ "lesser\n"
+#~ "interest. At the bottom of the list you can select the option \n"
+#~ "\"Individual package selection\"; in this case you will have to browse "
+#~ "through\n"
+#~ "more than 1000 packages..."
+#~ msgstr ""
+#~ "İndi qurmaq ya da güncəlləmək istədiyiniz paket qruplarını\n"
+#~ "seçə bilərsiniz.\n"
+#~ "\n"
+#~ "Sonra DrakX seçdiklərinizi qurmaq ya da güncəlləmək üçün lazımi \n"
+#~ "boş yerinizin olub olmadığını sınayacaq. Əgər yoxsa, sizə bunu \n"
+#~ "söyləyəcək. Nə olursa olsun davam etmək istəsəniz,yükləmə davam edəcək.\n"
+#~ "Amma daha az ehtiyac olan paketlər qurulmayacaq.\n"
+#~ "Siyahının üstündə \"Şəxsi paket seçilməsi\"\n"
+#~ "seçənəyini işarətləsiniz 1000dən artıqpaket arasından seçə bilərsiniz."
+
+#~ msgid ""
+#~ "You can now choose individually all the packages you\n"
+#~ "wish to install.\n"
+#~ "\n"
+#~ "\n"
+#~ "You can expand or collapse the tree by clicking on options in the left "
+#~ "corner of\n"
+#~ "the packages window.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you prefer to see packages sorted in alphabetic order, click on the "
+#~ "icon\n"
+#~ "\"Toggle flat and group sorted\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you want not to be warned on dependencies, click on \"Automatic\n"
+#~ "dependencies\". If you do this, note that unselecting one package may "
+#~ "silently\n"
+#~ "unselect several other packages which depend on it."
+#~ msgstr ""
+#~ "İndi isə siz istədiyiniz paketi qurmaq üçün\n"
+#~ "seçə bilərsiniz.\n"
+#~ "\n"
+#~ "\n"
+#~ "Paket pəncərəsi solundakı bucaqdaki seçənəyə tıqlayaraqağacı həm aça\n"
+#~ "həm də sıxışdıra bilərsiniz.\n"
+#~ "\n"
+#~ "\n"
+#~ "Paketlərin əlifba sırasına görə düzülməsini istəyirsinizsə\n"
+#~ "\"Otaq və grupu  düz\"\n"
+#~ "düyməsinə basın.\n"
+#~ "\n"
+#~ "\n"
+#~ "Paket ehtiyacları xəbərdarlıqlarını istəmirsəniz \"Avtomatik\n"
+#~ "ehtiyaclar\"ı seçə bilərsiniz.\n"
+#~ "Amma bunu işarətlədiyiniz vaxt unutmayın bir paketin işarətini "
+#~ "qaldırdığınızda\n"
+#~ "ehtiyacı olan digər paketlerin de işarəti səssizcə qalxar."
+
+#~ msgid ""
+#~ "If you have all the CDs in the list above, click Ok. If you have\n"
+#~ "none of those CDs, click Cancel. If only some CDs are missing, unselect "
+#~ "them,\n"
+#~ "then click Ok."
+#~ msgstr ""
+#~ "Yuxarıdakı siyahıdakı bütün CDlərə sahibsəniz, OLDUya tıqlayın.\n"
+#~ "Bu CD'lərin heç birinə sahib deyilsəniz, Ləğv et'i tıqlayın.\n"
+#~ "CD'lərdən bə'ziləri əksiksə, bunları seçili vəziyyətdən çıxarıb OLDUya "
+#~ "tıqlayın."
+
+#~ msgid ""
+#~ "If you wish to connect your computer to the Internet or\n"
+#~ "to a local network please choose the correct option. Please turn on your "
+#~ "device\n"
+#~ "before choosing the correct option to let DrakX detect it automatically.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you do not have any connection to the Internet or a local network, "
+#~ "choose\n"
+#~ "\"Disable networking\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you wish to configure the network later after installation or if you "
+#~ "have\n"
+#~ "finished to configure your network connection, choose \"Done\"."
+#~ msgstr ""
+#~ "Kompüterinizi internete və ya yerli networka bağlamaq\n"
+#~ "istəyirsinizsə xahiş edirik doğru xüsusiyəti seçin. Ayrıca DrakXin bunu "
+#~ "tapması üçün avadanlığınızı açın.\n"
+#~ "\n"
+#~ "\n"
+#~ "İnternet və ya yerli networka heç girişiniz yox isə\"Şəbəkə qurğularını "
+#~ "keç\"\n"
+#~ "seçənəyini işarətləyin.\n"
+#~ "\n"
+#~ "\n"
+#~ "Şəbəkə qurğularını sonraya buraxmaq istəyirsinizsəvə ya qurğular bitdiysə "
+#~ "\"Oldu\" seçənəyini işarətləyin."
+
+#~ msgid ""
+#~ "No modem has been detected. Please select the serial port on which it is "
+#~ "plugged.\n"
+#~ "\n"
+#~ "\n"
+#~ "For information, the first serial port (called \"COM1\" under Microsoft\n"
+#~ "Windows) is called \"ttyS0\" under Linux."
+#~ msgstr ""
+#~ "Modem tapılmadı. Xahiş edirik modemin bağlı olduğu serial qapını seçin.\n"
+#~ "\n"
+#~ "\n"
+#~ "Xəbəriniz olsun, birinci serial qapı (Windows altında\n"
+#~ "\"COM1\") linux altında\"ttyS0\" deyə adlandırılır."
+
+#~ msgid ""
+#~ "You may now enter dialup options. If you don't know\n"
+#~ "or are not sure what to enter, the correct informations can be obtained "
+#~ "from\n"
+#~ "your Internet Service Provider. If you do not enter the DNS (name "
+#~ "server)\n"
+#~ "information here, this information will be obtained from your Internet "
+#~ "Service\n"
+#~ "Provider at connection time."
+#~ msgstr ""
+#~ "İndi isə çevirməli bağlantı xüsusiyyətləri seçə bilərsiniz.\n"
+#~ "Əgər bilmirsinizsə və ya ne girəcəyinizə qerar vermədinizsə\n"
+#~ "(Məsələn, İXV (ISP) və DNS nömrələri kimi) bunları\n"
+#~ "daha sonra da internete girərək öyrənə bilərsiniz."
+
+#~ msgid ""
+#~ "If your modem is an external modem, please turn on it now to let DrakX "
+#~ "detect it automatically."
+#~ msgstr ""
+#~ "Modeminiz xarici isə modeminizi açın ki DrakX onu avtomatik olaraq tapsın."
+
+#~ msgid "Please turn on your modem and choose the correct one."
+#~ msgstr "Xahiş edirik modeminizi açın ve doğru seçənəyi işarətləyin."
+
+#~ msgid ""
+#~ "If you are not sure if informations above are\n"
+#~ "correct or if you don't know or are not sure what to enter, the correct\n"
+#~ "informations can be obtained from your Internet Service Provider. If you "
+#~ "do not\n"
+#~ "enter the DNS (name server) information here, this information will be "
+#~ "obtained\n"
+#~ "from your Internet Service Provider at connection time."
+#~ msgstr ""
+#~ "Əgər yuxarıdakılar haqqında mə'lumatınız yox isə və ya ne girəcəyinizə "
+#~ "qərar vermədinizsə\n"
+#~ "(Məsələn, İXV (ISP) və DNS nömrələri kimi)bunları\n"
+#~ "daha sonra da internete girərək öyrənə bilərsiniz."
+
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, the correct informations can "
+#~ "be\n"
+#~ "obtained from your Internet Service Provider."
+#~ msgstr ""
+#~ "İndi isə ev sahibi bilgilərini girin. Ne girəcəyinizə\n"
+#~ "qerar vermədinizsə\n"
+#~ "(Məsələn, İXV (ISP) və DNS nömrələri kimi)bunları\n"
+#~ "daha sonra da internete girərək öyrənə bilərsiniz."
+
+#~ msgid ""
+#~ "You may now configure your network device.\n"
+#~ "\n"
+#~ "   * IP address: if you don't know or are not sure what to enter, ask "
+#~ "your network administrator.\n"
+#~ "     You should not enter an IP address if you select the option "
+#~ "\"Automatic IP\" below.\n"
+#~ "\n"
+#~ "   * Netmask: \"255.255.255.0\" is generally a good choice. If you don't "
+#~ "know or are not sure what to enter,\n"
+#~ "     ask your network administrator.\n"
+#~ "\n"
+#~ "   * Automatic IP: if your network uses BOOTP or DHCP protocol, select "
+#~ "this option. If selected, no value is needed in\n"
+#~ "    \"IP address\". If you don't know or are not sure if you need to "
+#~ "select this option, ask your network administrator."
+#~ msgstr ""
+#~ "Seç:\n"
+#~ "\n"
+#~ " - IP ünvanı: Əgər IP ünvanını bilmirsinizsə, sistem idarəcisinəya da \n"
+#~ "İnternet xidmət vericisinə danışın.\n"
+#~ "\n"
+#~ " - Şəbəkə maskası: Ümumiyyətlə \"255.255.255.0\" yaxşı bir seçkidir. Əgər "
+#~ "əmin \n"
+#~ "deyilsəniz, yenə sistem idarəcinizə ya da xidmət vericinizəsoruşun.\n"
+#~ "\n"
+#~ "\n"
+#~ " - Avtomatik IP : Əgər networkunuz bootp ya da dhcp protokollarından bir "
+#~ "dənəsini \n"
+#~ "istifadə edirsə bu seçənəyi işarətləyin."
+
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, ask your network administrator."
+#~ msgstr ""
+#~ "Əgər şəbəkədə NIS işlədilirsə, \"NIS kullan\" seçənəyini işarətləyin. "
+#~ "Əgər \n"
+#~ "bilmirsinizsə sistem idarəcinizə soruşun."
+
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, leave blank."
+#~ msgstr "İndi ev sahibi adını girin. Bilmirsinizsə boş buraxın."
+
+#~ msgid ""
+#~ "You may now enter dialup options. If you're not sure what to enter, the\n"
+#~ "correct information can be obtained from your ISP."
+#~ msgstr ""
+#~ "İndi çevirməli bağlantı seçənəklərini girə bilərsiniz. Əgər nə yazılması "
+#~ "lazım olduğunu\n"
+#~ "bilmirsinizsə İnternet xidmət vericinizdən lazımi bilgiləri alın."
+
+#~ msgid ""
+#~ "If you will use proxies, please configure them now. If you don't know if\n"
+#~ "you should use proxies, ask your network administrator or your ISP."
+#~ msgstr "Əgə vəkil (proxy) verici istifadə edacəmsəniz bunları girin."
+
+#~ msgid ""
+#~ "You can install cryptographic package if your internet connection has "
+#~ "been\n"
+#~ "set up correctly. First choose a mirror where you wish to download "
+#~ "packages and\n"
+#~ "after that select the packages to install.\n"
+#~ "\n"
+#~ "\n"
+#~ "Note you have to select mirror and cryptographic packages according\n"
+#~ "to your legislation."
+#~ msgstr ""
+#~ "Əgər İnternet bağlantınız doğru şəkildə qurulmuş isə kriptoqrafik "
+#~ "paketi \n"
+#~ "də qura bilərsiniz. Əvvəl bir əks ünvanı seçin və daha sonra qurulacaq \n"
+#~ "paketləri quraşdırın."
+
+#~ msgid "You can now select your timezone according to where you live."
+#~ msgstr "İndi isə yaşadığınız yerə görə zaman zolağını seçin."
+
+#~ msgid ""
+#~ "You can configure a local printer (connected to your computer) or remote\n"
+#~ "printer (accessible via a Unix, Netware or Microsoft Windows network)."
+#~ msgstr ""
+#~ "Siz indi yerli və ya çevirməli yazıçını qura bilərsiniz\n"
+#~ "(Unix, Netware və ya Microsoft Windows networkundakı)."
+
+#~ msgid ""
+#~ "If you wish to be able to print, please choose one printing system "
+#~ "between\n"
+#~ "CUPS and LPR.\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS is a new, powerful and flexible printing system for Unix systems "
+#~ "(CUPS\n"
+#~ "means \"Common Unix Printing System\"). It is the default printing system "
+#~ "in\n"
+#~ "Mandrake Linux.\n"
+#~ "\n"
+#~ "\n"
+#~ "LPR is the old printing system used in previous Mandrake Linux "
+#~ "distributions.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you don't have printer, click on \"None\"."
+#~ msgstr ""
+#~ "Yazdırma funksiyası istəyirsinizsə CUPS və LPR arasında seçici\n"
+#~ "davranmalısınız.\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS yeni, güclü ve elastik bir Unix yazdırma sistemidir\n"
+#~ "CUPS yəni \"Common Unix Printing System\". Bu da Linuks Mandrake\n"
+#~ "də əsas yazdırma sistemidir.\n"
+#~ "\n"
+#~ "\n"
+#~ "LPR Linuks Mandrakenin köhne sistemidir.\n"
+#~ "\n"
+#~ "\n"
+#~ "Printeriniz yox isə  \"Yox\" düyməsinə tıqlayın."
+
+#~ msgid ""
+#~ "GNU/Linux can deal with many types of printer. Each of these types "
+#~ "requires\n"
+#~ "a different setup.\n"
+#~ "\n"
+#~ "\n"
+#~ "If your printer is physically connected to your computer, select \"Local\n"
+#~ "printer\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you want to access a printer located on a remote Unix machine, select\n"
+#~ "\"Remote printer\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you want to access a printer located on a remote Microsoft Windows "
+#~ "machine\n"
+#~ "(or on Unix machine using SMB protocol), select \"SMB/Windows 95/98/NT\"."
+#~ msgstr ""
+#~ "GNU/Linuks bir çox çap edici növü işlədə bilər. Hər bir növ\n"
+#~ "müxtəlif quruluş istəyər.\n"
+#~ "\n"
+#~ "\n"
+#~ "Çap ediciniz fiziki olaraq kompüterinizə bağlı isə\n"
+#~ "\"Yerli çap edici\"nı seçin.\n"
+#~ "\n"
+#~ "\n"
+#~ "Unix sisteminə bağlı çap ediciyə uzaqdan bağlanmaq istəyirsinizsə\n"
+#~ "\"Uzaqdan bağlanılan çap edici\".\n"
+#~ "\n"
+#~ "\n"
+#~ " MS Windows kompüterinə (və ya SMB protokolunu\n"
+#~ "işlədən Unix kompüterinə) bağlı bir çap ediciyə çatmaq üçün\n"
+#~ "\"SMB/Windows95/98/NT\" seçənəyini işarətləyin."
+
+#~ msgid ""
+#~ "Please turn on your printer before continuing to let DrakX detect it.\n"
+#~ "\n"
+#~ "You have to enter some informations here.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Name of printer: the print spooler uses \"lp\" as default printer "
+#~ "name. So, you must have a printer named \"lp\".\n"
+#~ "     If you have only one printer, you can use several names for it. You "
+#~ "just need to separate them by a pipe\n"
+#~ "     character (a \"|\"). So, if you prefer a more meaningful name, you "
+#~ "have to put it first, eg: \"My printer|lp\".\n"
+#~ "     The printer having \"lp\" in its name(s) will be the default "
+#~ "printer.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Description: this is optional but can be useful if several printers "
+#~ "are connected to your computer or if you allow\n"
+#~ "     other computers to access to this printer.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Location: if you want to put some information on your\n"
+#~ "     printer location, put it here (you are free to write what\n"
+#~ "     you want, for example \"2nd floor\").\n"
+#~ msgstr ""
+#~ "Xahiş edirik DrakXin tapa bilməsi üçün yazıçınızı açın.\n"
+#~ "\n"
+#~ "Burada bir neçə mə'lumat verməlisiniz.\n"
+#~ "\n"
+#~ "\n"
+#~ "*Çap Edici adı: yazıçılar üçün \"lp\" işlədilir.\n"
+#~ "Ona görə də yazıçınızın adı \"lp\" olmalıdır.\n"
+#~ "Bir neçə çap ediciniz var isə istədiyiniz adı verə bilərsiniz. Sadəcə "
+#~ "olaraq ə aralarına boru işarəti \"|\" qoymalısınız.\n"
+#~ "Məsələn \"Mənim yazıçım|lp\".\n"
+#~ "Adında \"lp\" olan çap edici baş çap edici olacaqdır.\n"
+#~ "\n"
+#~ "\n"
+#~ "*Təsvir: İstəyə bağlıdır. Amma bir neçə çap ediciniz var isə\n"
+#~ "bir xeyli faydalı ola bilər.\n"
+#~ "\n"
+#~ "\n"
+#~ "*Yerləşmə: Çap Edicinin yeri haqqında istədiyinizi yaza bilərsiniz."
+#~ "Məsələn, \"2ci mərtəbə\".\n"
+
+#~ msgid ""
+#~ "You need to enter some informations here.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Name of queue: the print spooler uses \"lp\" as default printer "
+#~ "name. So, you need have a printer named \"lp\".\n"
+#~ "    If you have only one printer, you can use several names for it. You "
+#~ "just need to separate them by a pipe\n"
+#~ "    character (a \"|\"). So, if you prefer to have a more meaningful "
+#~ "name, you have to put it first, eg: \"My printer|lp\".\n"
+#~ "    The printer having \"lp\" in its name(s) will be the default "
+#~ "printer.\n"
+#~ "\n"
+#~ "  \n"
+#~ "   * Spool directory: it is in this directory that printing jobs are "
+#~ "stored. Keep the default choice\n"
+#~ "     if you don't know what to use\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Printer Connection: If your printer is physically connected to your "
+#~ "computer, select \"Local printer\".\n"
+#~ "     If you want to access a printer located on a remote Unix machine, "
+#~ "select \"Remote lpd printer\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     If you want to access a printer located on a remote Microsoft "
+#~ "Windows machine (or on Unix machine using SMB\n"
+#~ "     protocol), select \"SMB/Windows 95/98/NT\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     If you want to acces a printer located on NetWare network, select "
+#~ "\"NetWare\".\n"
+#~ msgstr ""
+#~ "Burada bir neçə mə'lumat verməlisiniz.\n"
+#~ "\n"
+#~ "\n"
+#~ "*İstək adı:  yazıçılar üçün \"lp\" işlədilir.\n"
+#~ "Ona görə də yazıçınızın adı \"lp\" olmalıdır.\n"
+#~ "Bir neçə çap ediciniz var isə istədiyiniz adı verə bilərsiniz. Sadəcə "
+#~ "əolaraq aralarına boru işarəti \"|\" qoymalısınız.\n"
+#~ "Məsələn \"Mənim yazıçım|lp\".\n"
+#~ "Adında \"lp\" olan çap edici baş çap edici olacaqdır.\n"
+#~ "\n"
+#~ "\n"
+#~ "*Saxlama qovluğu: Çap Edici sifarişlərinizi saxlanıldığı yer.\n"
+#~ "Mövzudan bixəbər isəniz əsas qurğunu seçin.\n"
+#~ "\n"
+#~ "\n"
+#~ "*Çap Edici bağlantısı: Çap Edici fiziki olaraq kompüterə bağlı ise\n"
+#~ "\"Yerli Çap Edici\" seçin.\n"
+#~ "Uzaq bir Unix sistemə bağlı çap edici isə\"Uzaqdan idarəli lpd Çap Edici"
+#~ "\" seçin.\n"
+#~ "\n"
+#~ "\n"
+#~ "Uzaq SMB vericisi işlədən Unix və ya Windows sisteminə bağlıyazıçı üçün "
+#~ "isə \"SMB/Windows 95/98/NT\" seçin.\n"
+#~ "\n"
+#~ "\n"
+#~ "NetWare şəbəkədə yerləşən çap edici üçün isə\"NetWare\" seçin.\n"
+
+#~ msgid ""
+#~ "Your printer has not been detected. Please enter the name of the device "
+#~ "on\n"
+#~ "which it is connected.\n"
+#~ "\n"
+#~ "\n"
+#~ "For information, most printers are connected on the first parallel port. "
+#~ "This\n"
+#~ "one is called \"/dev/lp0\" under GNU/Linux and \"LPT1\" under Microsoft "
+#~ "Windows."
+#~ msgstr ""
+#~ "Sizin çap edici tapılmadı. Xahiş edirik bağlı olduğu avadanlığın\n"
+#~ "adını girin.\n"
+#~ "\n"
+#~ "\n"
+#~ "Xəbəriniz olsun, bir çox çap edici birinci paralel qapıya bağlıdır.\n"
+#~ "Bu da GNU/Linuksda \"/dev/lp0\", Windowsda isə \"LPT1\"dir."
+
+#~ msgid "You must now select your printer in the above list."
+#~ msgstr "İndi yuxarıdakı siyahıdan çap edici seçmalisiniz."
+
+#~ msgid ""
+#~ "Please select the right options according to your printer.\n"
+#~ "Please see its documentation if you don't know what choose here.\n"
+#~ "\n"
+#~ "\n"
+#~ "You will be able to test your configuration in next step and you will be "
+#~ "able to modify it if it doesn't work as you want."
+#~ msgstr ""
+#~ "Xahiş edirik yazıcınız üçün doğru qurğuları girin.\n"
+#~ "Nə seçəcəyinizi bilmirsiniz isə sənədlərə baxın\n"
+#~ "\n"
+#~ "\n"
+#~ "Bir sonrakı addımda yazıcınızı sınaya bilərsiniz və\n"
+#~ "daha sonra da istədiyiniz zaman dəyişdirə bilər."
+
+#~ msgid ""
+#~ "You can now enter the root password for your Mandrake Linux system.\n"
+#~ "The password must be entered twice to verify that both password entries "
+#~ "are identical.\n"
+#~ "\n"
+#~ "\n"
+#~ "Root is the system's administrator and is the only user allowed to modify "
+#~ "the\n"
+#~ "system configuration. Therefore, choose this password carefully. \n"
+#~ "Unauthorized use of the root account can be extemely dangerous to the "
+#~ "integrity\n"
+#~ "of the system, its data and other system connected to it.\n"
+#~ "\n"
+#~ "\n"
+#~ "The password should be a mixture of alphanumeric characters and at least "
+#~ "8\n"
+#~ "characters long. It should never be written down.\n"
+#~ "\n"
+#~ "\n"
+#~ "Do not make the password too long or complicated, though: you must be "
+#~ "able to\n"
+#~ "remember it without too much effort."
+#~ msgstr ""
+#~ "Linuks sisteminiz üçün bir idarəci parolu verilməlidir. Bu parol\n"
+#~ "yazılış xətalarına meydan verməməsi və e'tibarlı olması səbəbi ilə iki "
+#~ "dəfə\n"
+#~ "girilməlidir.\n"
+#~ "\n"
+#~ "\n"
+#~ "Bu parolu diqqətli seçməlisiniz. Sadəcə idarəi parolunu bilən \n"
+#~ "adamlar sistemi idarə və dəyişiklik edə bilirlər. Ayrıca idarəci \n"
+#~ "parolu ilə sistemə girən bir adam bütün veriləri silib, sistema zərər \n"
+#~ "verə bilər. Seçdiyiniz parol alfanumerik xarakterlər daxil edib en az 8 "
+#~ "xarakter uzunluğunda olmalıdır. Hər hansı bir kağıza, dəftara qeyd\n"
+#~ "alınmamalıdır. Çox uzun bir parol və ya çox qarışıq bir parol işlədilir "
+#~ "isə \n"
+#~ "parolun xatırlanması çətinləşir.\n"
+#~ "\n"
+#~ "\n"
+#~ "İdarəci olaraq sistemə girəcayiniz zaman, giriş sırasında \"login\"\n"
+#~ "yazan qismə \"root\" və \"password\" yazan qismə idarəci parolunu\n"
+#~ "yazmalısınız."
+
+#~ msgid ""
+#~ "You may now create one or more \"regular\" user account(s), as\n"
+#~ "opposed to the \"privileged\" user account, root. You can create\n"
+#~ "one or more account(s) for each person you want to allow to use\n"
+#~ "the computer. Note that each user account will have its own\n"
+#~ "preferences (graphical environment, program settings, etc.)\n"
+#~ "and its own \"home directory\", in which these preferences are\n"
+#~ "stored.\n"
+#~ "\n"
+#~ "\n"
+#~ "First of all, create an account for yourself! Even if you will be the "
+#~ "only user\n"
+#~ "of the machine, you may NOT connect as root for daily use of the system: "
+#~ "it's a\n"
+#~ "very high security risk. Making the system unusable is very often a typo "
+#~ "away.\n"
+#~ "\n"
+#~ "\n"
+#~ "Therefore, you should connect to the system using the user account\n"
+#~ "you will have created here, and login as root only for administration\n"
+#~ "and maintenance purposes."
+#~ msgstr ""
+#~ "İndi bir ya da daha çox adamın Linuks sisteminizi istifadə etməsinə "
+#~ "icazə\n"
+#~ "verə bilərsiniz. Hər istifadəçi hesabı üçün edilən dəyişikliklər sadəcə\n"
+#~ "o istifadəçi ve istifadəçinin \"istifadəçi sırası\" üçün hökmlü olar.\n"
+#~ "\n"
+#~ "\n"
+#~ "Sistemi sadəcə siz istifadə edeceksəniz belə ayrı bir istifadəçi hesabı "
+#~ "açaraq\n"
+#~ "normal işler üçün bu hesabı istifadə etməlisiniz. İdarəçi \"root\" "
+#~ "hesabı\n"
+#~ "gündəlik işlərdə istifadə edilməməlidir. Bu bir təhlükəsizlik riski "
+#~ "təşkil edər.\n"
+#~ "Sadə bir istifadəçi hesabı ilə işləmək sizi və sistemi size qarşı\n"
+#~ "qoruyar. İdarəci hesabı olan \"root\" sadəcə, sadə bir istifadəçi hesabı\n"
+#~ "ilə etməyəcəyiniz idarə və təmir işləri üçün istifadə edilməlidir."
+
+#~ msgid ""
+#~ "Creating a boot disk is strongly recommended. If you can't\n"
+#~ "boot your computer, it's the only way to rescue your system without\n"
+#~ "reinstalling it."
+#~ msgstr ""
+#~ "Başlanğıc disketi yaradılması aşırı dərəcədə tövsiyyə edilir.\n"
+#~ "Sistemi aça bilmədiyiniz zaman bu, sizin üçün tək qurtuluş yolu olar.\n"
+#~ "Yoxsa sistemi yenidən yükləmək məcburiyyətindəsiniz."
+
+#~ msgid ""
+#~ "LILO and grub main options are:\n"
+#~ "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
+#~ "partition) that contains the boot sector. Unless you know specifically\n"
+#~ "otherwise, choose \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Delay before booting default image: Specifies the number in tenths\n"
+#~ "of a second the boot loader should wait before booting the first image.\n"
+#~ "This is useful on systems that immediately boot from the hard disk after\n"
+#~ "enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+#~ "omitted or is set to zero.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Video mode: This specifies the VGA text mode that should be selected\n"
+#~ "when booting. The following values are available: \n"
+#~ "\n"
+#~ "    * normal: select normal 80x25 text mode.\n"
+#~ "\n"
+#~ "    * <number>:  use the corresponding text mode.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Clean \"/tmp\" at each boot: if you want delete all files and "
+#~ "directories\n"
+#~ "stored in \"/tmp\" when you boot your system, select this option.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Precise RAM if needed: unfortunately, there is no standard method to "
+#~ "ask the\n"
+#~ "BIOS about the amount of RAM present in your computer. As consequence, "
+#~ "Linux may\n"
+#~ "fail to detect your amount of RAM correctly. If this is the case, you "
+#~ "can\n"
+#~ "specify the correct amount or RAM here. Please note that a difference of "
+#~ "2 or 4\n"
+#~ "MB between detected memory and memory present in your system is normal."
+#~ msgstr ""
+#~ "LILO və grub ana seçənəkləri bunlardır: \n"
+#~ "- Açılış avadanlığı: Açılış sektorunu olduğu sabit disk bölməsini daxil "
+#~ "edən avadanlığın\n"
+#~ "adını təyin edər.\n"
+#~ "Əgər heç bir şey bilmirsinizsə \"/dev/hda\"yı seçin.\n"
+#~ "\n"
+#~ "\n"
+#~ "- Əsas əks ilə açmadan əvvəl gecikmə: Açılış sistem yükləyicisinin ilk \n"
+#~ "əksi açmadan əvvəl gözləyəcəyi zamanın, saniyənin onda biri cinsindən "
+#~ "miqdarıdır.\n"
+#~ "Bu, klaviaturanın fəallaşmasından həmən sonra sabit diskdən açılan "
+#~ "sistemlər üçün faydalıdır.\n"
+#~ "Sistem yükləyicisi, əgər \"delay\" sıfır olaraq verilmiş isə\n"
+#~ "heç gözləməz.\n"
+#~ "\n"
+#~ "\n"
+#~ "- Ekran modu: Açılışda bir neçə mətn ekran modu seçilə bilər:\n"
+#~ "   * sadə: 80x25 mətn ekran açılır.\n"
+#~ "    * <rəqəm>: Göstərilənn rəqəmlərə görə mətn ekran rezolyusiyası "
+#~ "quraşdırılır.\n"
+#~ "\n"
+#~ "\n"
+#~ "- \"/tmp\"I hər açılışda təmizlə: Əgər hər açılışda \"/tmp\" cərgəsində "
+#~ "olan bütün\n"
+#~ "olan bütün cərgə və qovluqların silinməsini istəyirsinizsə, bu seçənəyi "
+#~ "seçin.\n"
+#~ "\n"
+#~ "\n"
+#~ "- Var olan RAM miqdarı: Təəsüf ki, Linuks həmişə RAM miqdarını BIOSdan "
+#~ "düzgün\n"
+#~ "bir şəkildə öyrənəməyə bilər. Onda siz çzünüz sisteminizdə olan həqiq RAM "
+#~ "miqdarını buradan\n"
+#~ "girə bilərsiniz. Yadda saxlayın ki, həqiqi RAM ilə sistemin tapdığı "
+#~ "miqdar arasında 2\n"
+#~ "və ya 4 MBlıq fərq ola bilər."
+
+#~ msgid ""
+#~ "SILO is a bootloader for SPARC: it is able to boot\n"
+#~ "either GNU/Linux or any other operating system present on your computer.\n"
+#~ "Normally, these other operating systems are correctly detected and\n"
+#~ "installed. If this is not the case, you can add an entry by hand in this\n"
+#~ "screen. Be careful as to choose the correct parameters.\n"
+#~ "\n"
+#~ "\n"
+#~ "You may also want not to give access to these other operating systems to\n"
+#~ "anyone, in which case you can delete the corresponding entries. But\n"
+#~ "in this case, you will need a boot disk in order to boot them!"
+#~ msgstr ""
+#~ "SILO (Linuks Yükləyici) SPARC üçün bir sistem yükləyicidir: sistemi "
+#~ "Linuks\n"
+#~ "ya da kompüterinizdəki başqa bir əməliyyat sistemiylə aça bilirlər.\n"
+#~ "Əsasən bu digər əməliyyat sistemləri doğru bir şəkildə təsbit edilib "
+#~ "açılışa\n"
+#~ "qurula bilərlər. Əgər bir problem olarsa, buradan əllə əlavə edilə "
+#~ "bilərlər.\n"
+#~ "Parametrlər mövzusunda diqqətli olun."
+
+#~ msgid ""
+#~ "SILO main options are:\n"
+#~ "  - Bootloader installation: Indicate where you want to place the\n"
+#~ "information required to boot to GNU/Linux. Unless you know exactly\n"
+#~ "what you are doing, choose \"First sector of drive (MBR)\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Delay before booting default image: Specifies the number in tenths\n"
+#~ "of a second the boot loader should wait before booting the first image.\n"
+#~ "This is useful on systems that immediately boot from the hard disk after\n"
+#~ "enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+#~ "omitted or is set to zero."
+#~ msgstr ""
+#~ "  - Açılış avadanlığı: Açılış sektorunu olduğu sabit disk bölməsini daxil "
+#~ "edən avadanlığın\n"
+#~ "adını təyin edər.\n"
+#~ "Əgər heç bir şey bilmirsinizsə \"/dev/hda\"yı seçin.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Ana əks ilə açmadan əvvəl gecikmə: Açılış sistem yükləyicisinin ilk \n"
+#~ "görünüşü açmadan əvvəl gözləyəcəyi zamanın, saniyənin onda biri cinsindən "
+#~ "miqdarıdır.\n"
+#~ "Bu, klaviaturanın aktivləşməsindən həmən sonra sabit diskdən açılan "
+#~ "sistemlər üçün faydalıdır.\n"
+#~ "Sistem yükləyicisi, əgər delay sıfır olaraq verilmiş isə\n"
+#~ "heç gözləməz."
+
+#~ msgid ""
+#~ "Now it's time to configure the X Window System, which is the\n"
+#~ "core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
+#~ "you must configure your video card and monitor. Most of these\n"
+#~ "steps are automated, though, therefore your work may only consist\n"
+#~ "of verifying what has been done and accept the settings :)\n"
+#~ "\n"
+#~ "\n"
+#~ "When the configuration is over, X will be started (unless you\n"
+#~ "ask DrakX not to) so that you can check and see if the\n"
+#~ "settings suit you. If they don't, you can come back and\n"
+#~ "change them, as many times as necessary."
+#~ msgstr ""
+#~ "Buradan etibarən, Linuks GUI (Qrafik İstifadəçi Ara üzü) çəkirdəyini\n"
+#~ "əmələ gətirən X Window sistemini quracağıq. Buna görə də ekran kartınızı\n"
+#~ "və monitorunuzu qurmalısınız. Bu addımların çoxu onsuz da avtomatik "
+#~ "olaraq\n"
+#~ "keçiləcək və sizə sadəcə olaraq tövsiyə edilən qurğuları incələmək və "
+#~ "qəbul etmək\n"
+#~ "düşəcək. :-)\n"
+#~ "\n"
+#~ "\n"
+#~ "Quruluş qurtardığında əgər DrakXdən əksini istəmədiniz isə X Window \n"
+#~ "başlayacaqdır. Qurğuşarınıza baxın və yoxlayın. Qurğularınızı yoxlayaraq\n"
+#~ "uyuşmazlıq olub olmadığına baxın, lazım gəlirsə geriyə dönün."
+
+#~ msgid ""
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
+#~ msgstr "X qurğularında problem olarsa aşağıdakı seçənəkləri istifadə edin."
+
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "Əgər sistemə girərkən qrafik arar üzünün gəlməsini istəyirsənız isə \"Bəli"
+#~ "\",əks halda \"Xeyr\" düyməsinə basın."
+
+#~ msgid ""
+#~ "You can choose a security level for your system. Please refer to the "
+#~ "manual for complete\n"
+#~ "  information. Basically, if you don't know what to choose, keep the "
+#~ "default option.\n"
+#~ msgstr ""
+#~ "Sisteminiz üçün təhlükəsizlik səviyyəsini seçə bilərsiniz. Ətraflı "
+#~ "mə'lumat üçün xahiş edirik bələdçiyə\n"
+#~ " baş vurun. Əsasən , nə seçəcəyinizi bilmirsiniz isə buraya heç "
+#~ "toxunmayın.\n"
+
+#~ msgid ""
+#~ "Your system is going to reboot.\n"
+#~ "\n"
+#~ "After rebooting, your new Mandrake Linux system will load automatically.\n"
+#~ "If you want to boot into another existing operating system, please read\n"
+#~ "the additional instructions."
+#~ msgstr ""
+#~ "İndi sistem yenidən qapanıb açılacaqdır.\n"
+#~ "\n"
+#~ "Açıldıqdan sonra Linuks Mandrake avtomatik olaraq yüklənəcəkdir. Əgər "
+#~ "başqa \n"
+#~ "bir əməliyyat sistemi də işlədəcəksəniz əlavə xəbərdarlıqları oxuyun."
+
+#~ msgid "Czech (Programmers)"
+#~ msgstr "Çex dili (Proqramcılar)"
+
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "Slovakca (Proqramcılar)"
+
+#~ msgid "Name of the profile to create:"
+#~ msgstr "Yaradılacaq profil adı:"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "/etc/fstab-a Yaz"
+
+#~ msgid "Restore from file"
+#~ msgstr "Fayldan geri çağır"
+
+#~ msgid "Save in file"
+#~ msgstr "Fayla qeyd et"
+
+#~ msgid "Restore from floppy"
+#~ msgstr "Disketdən geri çağır"
+
+#~ msgid "Format all"
+#~ msgstr "Hamısını şəkilləndir"
+
+#~ msgid "After formatting all partitions,"
+#~ msgstr "Bütün bölmələri şəkilləndirdikdən sonra, "
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "bu bölmələrdəki bütün verilər itəcəkdir"
+
+#~ msgid "Reload"
+#~ msgstr "Yenidən yüklə"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr ""
+#~ "Linuks köçürülməsi üçün bir dənə avtomatik qurulum disketi yaratmaq "
+#~ "istəyərmisiniz?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "ADSL quraşdırılması"
+
+#~ msgid ""
+#~ "With a remote CUPS server, you do not have to configure\n"
+#~ "any printer here; printers will be automatically detected\n"
+#~ "unless you have a server on a different network; in the\n"
+#~ "latter case, you have to give the CUPS server IP address\n"
+#~ "and optionally the port number."
+#~ msgstr ""
+#~ "Uzaq CUPS vericiləri üçün heç bir quraşdırmaya lüzüm yoxdur \n"
+#~ "Buradakı hər çap edici avtomatik tapılacaqdır. \n"
+#~ "Əgər uzaq çap edici vericiniz var ise CUPS vercisinin \n"
+#~ "IP ünvanını verməlisiniz. Qapı nömrəsi vacib \n"
+#~ "deyil."
+
+#, fuzzy
+#~ msgid "Remote queue name missing!"
+#~ msgstr "Uzaqdakı növbə adı"
 
-#: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Palm Pilot v� ya Visorunuz ���n vasit�l�r"
+#, fuzzy
+#~ msgid "Command line"
+#~ msgstr "Sahə(domain) adı"
 
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Oyun stansiyas�"
+#, fuzzy
+#~ msgid "Modify printer"
+#~ msgstr "Çap Edicisiz"
 
-#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, IceWM, Windows Maker, Enlightement, Fvwm, vs."
+#, fuzzy
+#~ msgid "start it"
+#~ msgstr "məhdudlaşdır"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Komp�ter qur�ular�n� asandla�d�ran vasit�l�r"
+#~ msgid "Network Monitoring"
+#~ msgstr "Şəbəkə Monitoru"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "M�ktub, x�b�rl�r, fayl da��nmas�, chat vasit�l�ri"
+#~ msgid "Profile "
+#~ msgstr "Profil "
+
+#~ msgid "Statistics"
+#~ msgstr "Statistikalar"
+
+#~ msgid "Sending Speed:"
+#~ msgstr "Yollama Sür'əti:"
+
+#~ msgid "Receiving Speed:"
+#~ msgstr "Alam Sür'əti:"
+
+#, fuzzy
+#~ msgid "Connection Time: "
+#~ msgstr "Bağlantı növü:"
+
+#~ msgid "Connecting to Internet "
+#~ msgstr "İnternetə bağlanılır"
+
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "İnternet ilə bağlantını kəs"
+
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "İnternet ilə bağlantı kəsilməsi bacarılmadı."
+
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "İnternet ilə bağlantı kəsilməsi qurtardı."
+
+#~ msgid "Connection complete."
+#~ msgstr "Bağlantı qurtardı."
+
+#~ msgid ""
+#~ "Connection failed.\n"
+#~ "Verify your configuration in the Mandrake Control Center."
+#~ msgstr ""
+#~ "Bağlantı iflas etdi.\n"
+#~ "Qurğularınızı Mandrake İdarə Mərkəzindən yoxlayın."
+
+#, fuzzy
+#~ msgid "Color configuration"
+#~ msgstr "Quraşdırma"
+
+#~ msgid "sent: "
+#~ msgstr "yollandı:"
+
+#~ msgid "received: "
+#~ msgstr "alındı:"
+
+#~ msgid "Connect"
+#~ msgstr "Bağlan"
+
+#~ msgid "Disconnect"
+#~ msgstr "Bağlantını kəs"
+
+#~ msgid "/File/_New"
+#~ msgstr "/Fayl/_Yeni"
+
+#~ msgid "<control>N"
+#~ msgstr "<control>Y"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Fayl/_Aç"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>A"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/Fayl/_Qeyd Et"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>Q"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Fayl/_Fərqli Qeyd Et"
+
+#~ msgid "/File/-"
+#~ msgstr "/Fayl/-"
+
+#~ msgid "/_Options"
+#~ msgstr "/_Seçənəklər"
+
+#~ msgid "/Options/Test"
+#~ msgstr "/Seçənəklər/Sınaq"
+
+#~ msgid "/_Help"
+#~ msgstr "/_Yardım"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/Yardım/_Haqqında..."
+
+#~ msgid "Default Runlevel"
+#~ msgstr "Əsas Runlevel"
+
+#~ msgid "Europe"
+#~ msgstr "Avropa"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#~ msgid "Remove queue"
+#~ msgstr "Növbəni sil"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "Quraşdırma faylının içindəkilərlə oynanılmaz"
+
+#~ msgid "Unrecognized config file"
+#~ msgstr "Tanınmaz quraşdırma faylı"
+
+#~ msgid "Adapter"
+#~ msgstr "Adapter"
+
+#, fuzzy
+#~ msgid "Disable network"
+#~ msgstr "Bağla"
+
+#, fuzzy
+#~ msgid "Enable network"
+#~ msgstr "Aç"
+
+#~ msgid ""
+#~ "You can now test your mouse. Use buttons and wheel to verify\n"
+#~ "if settings are good. If not, you can click on \"Cancel\" to choose "
+#~ "another\n"
+#~ "driver."
+#~ msgstr ""
+#~ "İndi siçanı sınaya bilərsiniz. Hər şeyin yolunda olduğunu \n"
+#~ "sınamaq üçün düymə və çarxı işlədin. Qurğular yaxşı isə\n"
+#~ "problem yoxdur. Əgər deyilsə onda \"Ləğv et\"i tıqlayaraq\n"
+#~ "başqa siçan sürücüsü seçə bilərsiniz."
+
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "DSL (və ya ADSL) bağlantısı"
+
+#, fuzzy
+#~ msgid "Choose"
+#~ msgstr "Qapat"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr "CUPS ilə çap ediciyə yetişmək üçün URIni verməlisiniz"
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "Bəli, ASCII sınaq səhifəsi çap et"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "Bəli, PostScript sınaq səhifəsi çap et"
+
+#~ msgid "Paper Size"
+#~ msgstr "Kağız Böyüklüyü"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "İş bittikdən sonra səhifə atılsın mı?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "Uniprint sürücü seçənəkləri"
+
+#~ msgid "Color depth options"
+#~ msgstr "Rəng dərinlik seçənəkləri"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "Mətni PostScript olaraq yazdırsın mı?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Mətn pilləli olaraq düzəldilsin mi?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "Hər yekun səhifəsinin nömrəsi"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "Sağ/Sol boşluqlar nöqtəvi(inch'in 1/72'si"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "Üst/Alt boşluqlar nöqtəvi (inch'in 1/72'si)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "Əlavə GhostScript seçənəkləri"
+
+#~ msgid "Extra Text options"
+#~ msgstr "Əlavə mətn seçənəkləri"
+
+#~ msgid "Reverse page order"
+#~ msgstr "Tərs səhifə sıralaması"
+
+#~ msgid "CUPS starting"
+#~ msgstr "CUPS başlayır"
+
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Çap Edici Bağlantısı Seçin"
+
+#~ msgid ""
+#~ "Every printer need a name (for example lp).\n"
+#~ "Other parameters such as the description of the printer or its location\n"
+#~ "can be defined. What name should be used for this printer and\n"
+#~ "how is the printer connected?"
+#~ msgstr ""
+#~ "Hər çap edicinin bir adı olmalıdır (məsələn lp).\n"
+#~ "Çap edicinin təsviri və yeri də göstərilməlidir.\n"
+#~ "Bu çap edicinin adı nədir və yeri haradadır?"
+
+#~ msgid ""
+#~ "Every print queue (which print jobs are directed to) needs a\n"
+#~ "name (often lp) and a spool directory associated with it. What\n"
+#~ "name and directory should be used for this queue and how is the printer "
+#~ "connected?"
+#~ msgstr ""
+#~ "Hər çap edici növbəsinin (çap edici işlərinin yollandığı yer) bir adı "
+#~ "olar \n"
+#~ "(çoxunda lp) və gözləmə qovluğuna ehtiyac duyar. Bu növbə üçün\n"
+#~ "hansı ad və qovluq istifadə edilsin?"
+
+#~ msgid "Name of queue"
+#~ msgstr "Növbənin adı"
+
+#~ msgid "Spool directory"
+#~ msgstr "Gözləmə qovluğu"
+
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "Daha e'tibarlı bir sistem üçün \"Kölgə parol işlət\" və \"MD5 kodlama \n"
+#~ "işlət\" seçənəklərini işarətlayin."
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "Əgər şəbəkədə NIS istifadə edilirsə, \"NIS işlət\" seçəneyini "
+#~ "işarətləyin.  Əgər \n"
+#~ "bilmirsinizsə sistem idarəcinizə soruşun."
+
+#~ msgid "yellow pages"
+#~ msgstr "sarı səhifələr"
+
+#, fuzzy
+#~ msgid "Light configuration"
+#~ msgstr "Yerli Şəbəkə quraşdırılması"
+
+#~ msgid "Provider dns 1"
+#~ msgstr "İXM dns 1"
+
+#~ msgid "Provider dns 2"
+#~ msgstr "İXM dns 2"
+
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "İnternetə necə bağlanmaq istəyirsiniz?"
diff --git a/perl-install/share/po/be.po b/perl-install/share/po/be.po
index 66e241c59..5513308cb 100644
--- a/perl-install/share/po/be.po
+++ b/perl-install/share/po/be.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-02 17:16+0200\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
 "PO-Revision-Date: 2000-09-24 12:30 +0100\n"
 "Last-Translator: Alexander Bokovoy <ab@avilink.net>\n"
 "Language-Team: be\n"
@@ -13,57 +13,57 @@ msgstr ""
 "Content-Type: text/plain; charset=windows-1251\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
+#: ../../Xconfigurator.pm_.c:231
+msgid "Configure all heads independently"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, fuzzy, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr "����i�������� ��� �����"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 #, fuzzy
 msgid "Multi-head configuration"
 msgstr "������� ��������i"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:239
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "�i��������"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "������� �i��������"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "������� X ������"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "X server"
 msgstr "X ������"
 
-#: ../../Xconfigurator.pm_.c:309 ../../Xconfigurator.pm_.c:316
-#: ../../Xconfigurator.pm_.c:366
+#: ../../Xconfigurator.pm_.c:307 ../../Xconfigurator.pm_.c:313
+#: ../../Xconfigurator.pm_.c:363 ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s"
 msgstr "������ XFree86 %s"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:310
 msgid "Which configuration of XFree do you want to have?"
 msgstr "���� ����i������� XFree �� ������� ��������?"
 
-#: ../../Xconfigurator.pm_.c:324
+#: ../../Xconfigurator.pm_.c:321
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -72,19 +72,20 @@ msgstr ""
 "��������� 3D-���������� � ����� ��������� �������� ����� � XFree %s.\n"
 "XFree %s ���� ������������� ����� 2D-���������� ��� ����� ���������."
 
-#: ../../Xconfigurator.pm_.c:326 ../../Xconfigurator.pm_.c:359
+#: ../../Xconfigurator.pm_.c:323 ../../Xconfigurator.pm_.c:356
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with XFree %s."
 msgstr ""
 "���� �i�������� ���� ���� 3D-����������, ���� ��������i������ �����i XFree %"
 "s."
 
-#: ../../Xconfigurator.pm_.c:328 ../../Xconfigurator.pm_.c:361
+#: ../../Xconfigurator.pm_.c:325 ../../Xconfigurator.pm_.c:358
+#: ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s with 3D hardware acceleration"
 msgstr "XFree %s � ���������� 3D-����������"
 
-#: ../../Xconfigurator.pm_.c:336 ../../Xconfigurator.pm_.c:350
+#: ../../Xconfigurator.pm_.c:333 ../../Xconfigurator.pm_.c:347
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -95,12 +96,12 @@ msgstr ""
 "����� �� �����, ��� ���� ����������������� ��������� I ���� �������I ��\n"
 "���I����� ������ ����'�����."
 
-#: ../../Xconfigurator.pm_.c:338 ../../Xconfigurator.pm_.c:352
+#: ../../Xconfigurator.pm_.c:335 ../../Xconfigurator.pm_.c:349
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "XFree %s � ����������������� ���������� 3D-����������"
 
-#: ../../Xconfigurator.pm_.c:347
+#: ../../Xconfigurator.pm_.c:344
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -113,27 +114,31 @@ msgstr ""
 "���I����� ������ ����'�����. ���� �i�������� ��������i������ XFree %s, ��i\n"
 "����� ��������i��� ����� � 2D-�����������."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "��������� XFree"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "�������� ����� �i��������i"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "������� ���������� ��������i ��� �������"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "������� ���i���"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Monitor"
 msgstr "���i���"
 
-#: ../../Xconfigurator.pm_.c:483
+#: ../../Xconfigurator.pm_.c:519
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -156,39 +161,39 @@ msgstr ""
 "�� ������ ��������� ���i���.\n"
 "���i �� ������������, ������� �������������� ��������i."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "������� �������������� ��������i"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "������� ������������ ��������i"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "���i��� ������ �� ���������"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "�i�������� ���� �� ������i��������"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "������ ������ ���� �� ���������"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "�i ������� �������i������ ��������i?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "������������: ����i������� �� ����� �i�������� ����������"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "�������� ��������� ��������i"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -196,153 +201,157 @@ msgstr ""
 "\n"
 "����������� ����i�� ��������� ���������"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "�������:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "��������� %d �������"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "���� ��������� ��������� ��������i?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "�������� �������, ����������� ����i�� ���������"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "������ ������"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "����� ������ ������ i ����i�i ������"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "�i��������: %s"
 
-#: ../../Xconfigurator.pm_.c:734
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "������ XFree86: %s"
 
-#: ../../Xconfigurator.pm_.c:750 ../../standalone/draknet_.c:280
-#: ../../standalone/draknet_.c:283
+#: ../../Xconfigurator.pm_.c:829 ../../printerdrake.pm_.c:1885
+#: ../../standalone/draknet_.c:298 ../../standalone/draknet_.c:301
 #, fuzzy
 msgid "Expert Mode"
 msgstr "�������"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "�������� ��"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "������ ������"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "��� ����i�����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "��� ����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "���: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1333
+#: ../../Xconfigurator.pm_.c:1440
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "���i���: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1334
+#: ../../Xconfigurator.pm_.c:1441
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "������� ���.����. ���i����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "������� ����.����. ���i����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "�i��������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "�i��������: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "�i���������: %s ��\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "��������� ����i�i ������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "������ ������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1342
+#: ../../Xconfigurator.pm_.c:1450
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "������ XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1343
+#: ../../Xconfigurator.pm_.c:1451
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "������ XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "���������� ��������i X-Window"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "��� �� ������� ����i��?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "����i�� ���i���"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "����i�� �i��������"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "����i�� ��������i �������"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "����i�� ������ ������"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "I���������"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "��������� ���� ���"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "�����"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -355,20 +364,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "���i �����, �������i�� � %s ��� ��������i ���������"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "���i �����, �����i��, � ����� ����������� Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "������ X ��� ������ �i�����"
 
-#: ../../Xconfigurator.pm_.c:1447
+#: ../../Xconfigurator.pm_.c:1556
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -421,217 +430,228 @@ msgid "8 MB"
 msgstr "8 ��"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
+#, fuzzy
+msgid "16 MB"
+msgstr "1 ��"
+
+#: ../../Xconfigurator_consts.pm_.c:113
+#, fuzzy
+msgid "32 MB"
+msgstr "2 ��"
+
+#: ../../Xconfigurator_consts.pm_.c:114
+#, fuzzy
+msgid "64 MB or more"
 msgstr "16 �� �i �����"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "���������� VGA, 640x480 ��� 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 ��� 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "������� � 8514, 1024x768 ��� 87 Hz ����������� (���� 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Super VGA, 1024x768 ��i 87 Hz �����������, 800x600 ��� 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "Extended Super VGA, 800x600 ��� 60 Hz, 640x480 ��� 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "������������� SVGA, 1024x768 ��� 60 Hz, 800x600 ��� 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "�������������� SVGA, 1024x768 ��� 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:127
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "�������������, ��i ������� ��������i���� 1280x1024 ��� 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:128
+#: ../../Xconfigurator_consts.pm_.c:130
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "�������������, ��i ������� ��������i���� 1280x1024 ��� 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:129
+#: ../../Xconfigurator_consts.pm_.c:131
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "�������������, ��i ������� ��������i���� 1280x1024 ��� 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "���i���, ��i ������� ��������i���� 1600x1200 ��� 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "���i���, ��i ������� ��������i���� 1600x1200 ��� 76 Hz"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124
+#: ../../any.pm_.c:96 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "����� ������ ������������ ��������"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124 ../../any.pm_.c:197
+#: ../../any.pm_.c:96 ../../any.pm_.c:121 ../../any.pm_.c:194
 msgid "First sector of drive (MBR)"
 msgstr "����� ������ ������� (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "����������� SILO"
 
-#: ../../any.pm_.c:104 ../../any.pm_.c:117
+#: ../../any.pm_.c:101 ../../any.pm_.c:114
 msgid "Where do you want to install the bootloader?"
 msgstr "���� �� ������� ���������� ��������� ���������?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "����������� LILO/GRUB"
 
-#: ../../any.pm_.c:128 ../../any.pm_.c:142
+#: ../../any.pm_.c:125 ../../any.pm_.c:139
 msgid "SILO"
 msgstr "SILO"
 
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:127
 msgid "LILO with text menu"
 msgstr ""
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr ""
 
-#: ../../any.pm_.c:134
+#: ../../any.pm_.c:131
 msgid "Grub"
 msgstr "Grub"
 
-#: ../../any.pm_.c:138
+#: ../../any.pm_.c:135
 msgid "Boot from DOS/Windows (loadlin)"
 msgstr ""
 
-#: ../../any.pm_.c:140 ../../any.pm_.c:142
+#: ../../any.pm_.c:137 ../../any.pm_.c:139
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: ../../any.pm_.c:148 ../../any.pm_.c:180
+#: ../../any.pm_.c:145 ../../any.pm_.c:177
 msgid "Bootloader main options"
 msgstr "������� ����i ����������� ����������"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 #, fuzzy
 msgid "Bootloader to use"
 msgstr "������� ����i ����������� ����������"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "����������� ����������"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "����������� �������"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (�� ������ ��� ������ ����i�� BIOS)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "���������"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "���������"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "�i���-�����"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "�������� ����� ��������� ������� �� ���������"
 
-#: ../../any.pm_.c:160 ../../any.pm_.c:741
-#: ../../install_steps_interactive.pm_.c:904 ../../netconnect.pm_.c:629
-#: ../../printerdrake.pm_.c:98 ../../printerdrake.pm_.c:132
-#: ../../standalone/draknet_.c:569
+#: ../../any.pm_.c:157 ../../any.pm_.c:730
+#: ../../install_steps_interactive.pm_.c:938 ../../network/modem.pm_.c:46
+#: ../../printerdrake.pm_.c:402 ../../printerdrake.pm_.c:481
+#: ../../standalone/draknet_.c:603
 msgid "Password"
 msgstr "������"
 
-#: ../../any.pm_.c:161 ../../any.pm_.c:742
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../any.pm_.c:158 ../../any.pm_.c:731
+#: ../../install_steps_interactive.pm_.c:939
 msgid "Password (again)"
 msgstr "�������� ������"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "����������� ������ ���������� �����"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "�����������"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "�������� /tmp ��� ������ ��������"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "�������� �������� ����� RAM (��������� %d M�)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "�������� ���� ����i���"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "�������� ����� RAM � M�"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "����� ``����������� ������ ���������� �����'' �� ��������������� ��� ������"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "Please try again"
 msgstr "����������� ���� ���"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "The passwords do not match"
 msgstr "�����i �� ���������"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
 msgstr ""
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr ""
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
 msgstr ""
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
 msgstr ""
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr ""
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 #, fuzzy
 msgid "Default OS?"
 msgstr "�� ���������"
 
-#: ../../any.pm_.c:210
+#: ../../any.pm_.c:207
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -639,148 +659,146 @@ msgstr ""
 "� ���� ������ ��������� ������.\n"
 "�� ������ ������ ����, ����� ����i�� i�������."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "������"
 
-#: ../../any.pm_.c:220 ../../any.pm_.c:729 ../../diskdrake.pm_.c:46
-#: ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217 ../../any.pm_.c:718 ../../diskdrake.pm_.c:161
+#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:1846
+#: ../../printerdrake.pm_.c:1847 ../../printerdrake.pm_.c:1904
+#: ../../printerdrake.pm_.c:1948
 msgid "Done"
 msgstr "��������"
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:217
 #, fuzzy
 msgid "Modify"
 msgstr "����i�� RAID"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "��i ��� ������ ������� ������?"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Other OS (SunOS...)"
 msgstr "I���� �� (SunOS,...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "I���� �� (MacOS,...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "I���� �� (windows...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "������"
 
-#: ../../any.pm_.c:253 ../../any.pm_.c:264
+#: ../../any.pm_.c:247 ../../any.pm_.c:258
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:254 ../../any.pm_.c:283
+#: ../../any.pm_.c:248 ../../any.pm_.c:277
 msgid "Append"
 msgstr "��������"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "�������-���i�"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "����i��"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "����������"
 
-#: ../../any.pm_.c:274 ../../any.pm_.c:279 ../../any.pm_.c:282
+#: ../../any.pm_.c:268 ../../any.pm_.c:273 ../../any.pm_.c:276
 msgid "Label"
 msgstr "�����"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "�� ���������"
 
-#: ../../any.pm_.c:284
+#: ../../any.pm_.c:278
 #, fuzzy
 msgid "Initrd-size"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
 msgstr ""
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "�����i�� ���i�"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "������ ����� �� �����������"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "����� ����� ��� ���������������"
 
-#: ../../any.pm_.c:317
-#, fuzzy
-msgid "What type of partitioning?"
-msgstr "��i ��� �������i �� �����?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "��������� %s %s i���������"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "�i ���� � ��� i���?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "�i ���� � ��� %s i��������?"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
-#: ../../printerdrake.pm_.c:237
+#: ../../any.pm_.c:601 ../../any.pm_.c:760 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "No"
 msgstr "��"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
+#: ../../any.pm_.c:601 ../../any.pm_.c:759 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "Yes"
 msgstr "���"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "��. ��i����� ������������"
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:648
+#: ../../any.pm_.c:637
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "����������� �������� ��� %s ����� %s"
 
-#: ../../any.pm_.c:649
+#: ../../any.pm_.c:638
 #, c-format
 msgid "(module %s)"
 msgstr "(������ %s)"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:660
+#: ../../any.pm_.c:649
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "��i ������� %s ������������?"
 
-#: ../../any.pm_.c:668
+#: ../../any.pm_.c:657
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -797,20 +815,20 @@ msgstr ""
 "� ������� ���������� i��������i? �������, ����i������� ��������\n"
 "�� �������� ����'�����, ��� ��� �i���� �� ������."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "���������"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "�������� ���������"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "�� �� ������ ������ ����i ������ %s."
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -821,11 +839,11 @@ msgstr ""
 "����i - � ������� ``i��=�������� i��2=��������2 ...''.\n"
 "���������, ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "����i ������:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -834,35 +852,35 @@ msgstr ""
 "�������� ������ %s �� �������.\n"
 "������� ������������ � i����i ����������i?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(��� ��������� %s)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "���� ������ ������� ������"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "���i �����, �����i�� i�� ����������i��"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "I�� ����������i�� ���i��� �������� �i���� �����i �� �i��i� ���i����, \n"
 "�i���, `-' i `_'"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "���� i�� ����������i�� ��� ���������"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "������ ����������i��"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -871,49 +889,62 @@ msgstr ""
 "�����i�� i�� ����������i��\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "������� ����������i��"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "������� i��"
 
-#: ../../any.pm_.c:740 ../../printerdrake.pm_.c:97
-#: ../../printerdrake.pm_.c:131
+#: ../../any.pm_.c:729 ../../printerdrake.pm_.c:401
+#: ../../printerdrake.pm_.c:480
 msgid "User name"
 msgstr "I�� ����������i��:"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "��������:"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "�i��������"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:756
 msgid "Autologin"
 msgstr "����������� ������ � �i�����"
 
-#: ../../any.pm_.c:767
+#: ../../any.pm_.c:757
+#, fuzzy
 msgid ""
 "I can set up your computer to automatically log on one user.\n"
-"If you don't want to use this feature, click on the cancel button."
+"Do you want to use this feature?"
 msgstr ""
 "����� ������i�� �i����� ��� ������������ ������� � �i����� ���\n"
 "������ ����������i��. ���i �� �� ������� ������, ���i��i�� \"������\"."
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "������� �������� ����������i��:"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "������� �������� �����:"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "���i �����, ������� ���� ��� ����������."
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr "�� ������ ������ ����� ����, ��i� ������ �������� ����� �����������"
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "��"
+
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:262 ../../bootloader.pm_.c:608
+#: ../../bootloader.pm_.c:259
 #, c-format
 msgid ""
 "Welcome to %s the operating system chooser!\n"
@@ -925,51 +956,56 @@ msgstr ""
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:809
+#: ../../bootloader.pm_.c:835
 msgid "Welcome to GRUB the operating system chooser!"
 msgstr "Welcome to GRUB the operating system chooser!"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:812
+#: ../../bootloader.pm_.c:838
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
 msgstr "Use the %c and %c keys for selecting which entry is highlighted."
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:815
+#: ../../bootloader.pm_.c:841
 msgid "Press enter to boot the selected OS, 'e' to edit the"
 msgstr "Press enter to boot the selected OS, 'e' to edit the"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:818
+#: ../../bootloader.pm_.c:844
 msgid "commands before booting, or 'c' for a command-line."
 msgstr "commands before booting, or 'c' for a command-line."
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:821
+#: ../../bootloader.pm_.c:847
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr "The highlighted entry will be booted automatically in %d seconds."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
 msgstr "�� ����� �������� �������� � /boot"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
 #. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:918
+#: ../../bootloader.pm_.c:951
 msgid "Desktop"
 msgstr "������� ����"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:920
+#: ../../bootloader.pm_.c:953
 msgid "Start Menu"
 msgstr "��������� ����"
 
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "���� �� ������� ���������� ��������� ���������?"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
 msgstr ""
@@ -984,601 +1020,584 @@ msgstr "��������� ������"
 msgid "/_File"
 msgstr "�����:\n"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr ""
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr ""
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr ""
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr ""
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr ""
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
+#: ../../bootlook.pm_.c:80
+msgid "/File/_Quit"
 msgstr ""
 
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
+#: ../../bootlook.pm_.c:80
+msgid "<control>Q"
 msgstr ""
 
 #: ../../bootlook.pm_.c:91
-msgid "/File/-"
+msgid "NewStyle Categorizing Monitor"
 msgstr ""
 
+#: ../../bootlook.pm_.c:92
+#, fuzzy
+msgid "NewStyle Monitor"
+msgstr "���i���"
+
 #: ../../bootlook.pm_.c:93
-msgid "/File/_Quit"
-msgstr ""
+#, fuzzy
+msgid "Traditional Monitor"
+msgstr "����i�� ���i���"
 
 #: ../../bootlook.pm_.c:94
-msgid "<control>Q"
-msgstr ""
-
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr ""
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr ""
-
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
+msgid "Traditional Gtk+ Monitor"
 msgstr ""
 
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
+#: ../../bootlook.pm_.c:95
+msgid "Launch Aurora at boot time"
 msgstr ""
 
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
+#: ../../bootlook.pm_.c:100
 #, fuzzy
-msgid "Configure"
-msgstr "��������� X Window"
+msgid "Lilo/grub mode"
+msgstr "����� ��������"
 
-#: ../../bootlook.pm_.c:114
+#: ../../bootlook.pm_.c:102
 #, fuzzy, c-format
 msgid ""
 "You are currently using %s as Boot Manager.\n"
 "Click on Configure to launch the setup wizard."
 msgstr "�������� I�������-��������"
 
-#: ../../bootlook.pm_.c:121
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
 #, fuzzy
-msgid "Lilo/grub mode"
-msgstr "����� ��������"
-
-#: ../../bootlook.pm_.c:131
-msgid "NewStyle Categorizing Monitor"
-msgstr ""
-
-#: ../../bootlook.pm_.c:134
-#, fuzzy
-msgid "NewStyle Monitor"
-msgstr "���i���"
-
-#: ../../bootlook.pm_.c:137
-#, fuzzy
-msgid "Traditional Monitor"
-msgstr "����i�� ���i���"
-
-#: ../../bootlook.pm_.c:140
-msgid "Traditional Gtk+ Monitor"
-msgstr ""
-
-#: ../../bootlook.pm_.c:144
-msgid "Launch Aurora at boot time"
-msgstr ""
+msgid "Configure"
+msgstr "��������� X Window"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:108
 #, fuzzy
 msgid "Boot mode"
 msgstr "����������� �������"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr ""
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr ""
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr ""
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr ""
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr ""
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "�� ���������"
-
-#: ../../bootlook.pm_.c:236 ../../standalone/draknet_.c:88
-#: ../../standalone/draknet_.c:120 ../../standalone/draknet_.c:184
-#: ../../standalone/draknet_.c:302 ../../standalone/draknet_.c:396
-#: ../../standalone/draknet_.c:473 ../../standalone/draknet_.c:509
-#: ../../standalone/draknet_.c:617
+#: ../../bootlook.pm_.c:155 ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:140 ../../standalone/draknet_.c:208
+#: ../../standalone/draknet_.c:320 ../../standalone/draknet_.c:433
+#: ../../standalone/draknet_.c:507 ../../standalone/draknet_.c:543
+#: ../../standalone/draknet_.c:644
 msgid "OK"
 msgstr ""
 
-#: ../../bootlook.pm_.c:238 ../../install_steps_gtk.pm_.c:576
-#: ../../interactive.pm_.c:114 ../../interactive.pm_.c:269
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:357
-#: ../../my_gtk.pm_.c:360 ../../my_gtk.pm_.c:617
-#: ../../standalone/drakgw_.c:639 ../../standalone/draknet_.c:95
-#: ../../standalone/draknet_.c:127 ../../standalone/draknet_.c:295
-#: ../../standalone/draknet_.c:485 ../../standalone/draknet_.c:631
-#: ../../standalone/tinyfirewall_.c:63
+#: ../../bootlook.pm_.c:156 ../../install_steps_gtk.pm_.c:516
+#: ../../interactive.pm_.c:122 ../../interactive.pm_.c:286
+#: ../../interactive.pm_.c:308 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:416 ../../my_gtk.pm_.c:419 ../../my_gtk.pm_.c:716
+#: ../../printerdrake.pm_.c:1158 ../../standalone/drakgw_.c:648
+#: ../../standalone/draknet_.c:115 ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:313 ../../standalone/draknet_.c:519
+#: ../../standalone/draknet_.c:658 ../../standalone/tinyfirewall_.c:63
 msgid "Cancel"
 msgstr "������"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr ""
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
 msgstr ""
 
-#: ../../bootlook.pm_.c:435 ../../standalone/drakboot_.c:47
+#: ../../bootlook.pm_.c:336 ../../standalone/drakboot_.c:47
 msgid "Installation of LILO failed. The following error occured:"
 msgstr "����������� LILO �� ����������. ���i��� ��������� �������:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "��������"
-
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "�������i������"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "��i�����"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "������������"
+#: ../../common.pm_.c:93 ../../install_steps_graphical.pm_.c:287
+#: ../../install_steps_graphical.pm_.c:334
+msgid "MB"
+msgstr "��"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:653
-msgid "Resize"
-msgstr "�������� ������"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "���"
+#: ../../common.pm_.c:109
+#, c-format
+msgid "%d minutes"
+msgstr "%d ��i�i�"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "������ ����i�������"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 ��i�i��"
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "���i� /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d �������"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "����� ��������"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "��-������, ����i�� ���������� ���i� ����� ��������"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "�������� �����"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "������� �����i��!"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "��������� � �����"
+#: ../../diskdrake.pm_.c:103
+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 ""
+"���i �� �������� ������������� boot ��������, ���� �������i�� ��\n"
+" �� ����� �� 2048 ������� �� ������� �����"
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "��������� � ����"
+#: ../../diskdrake.pm_.c:122 ../../diskdrake_interactive.pm_.c:313
+#: ../../diskdrake_interactive.pm_.c:328 ../../install_steps.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:37
+#: ../../install_steps_interactive.pm_.c:310 ../../interactive_http.pm_.c:119
+#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:62
+msgid "Error"
+msgstr "�������"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "������� ���������"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "��������� � �������"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "����"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "��������� �� �������"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+#, fuzzy
+msgid "Remote"
+msgstr "��i�����"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "�����i�� ��"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "������ ����i�������"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "����������� ��"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "����i"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "������������ ����������"
+#: ../../diskdrake.pm_.c:211 ../../diskdrake.pm_.c:417
+#: ../../diskdrake.pm_.c:534 ../../diskdrake_interactive.pm_.c:353
+#: ../../diskdrake_interactive.pm_.c:488
+msgid "Type"
+msgstr "���"
 
-#: ../../diskdrake.pm_.c:59
-msgid "All primary partitions are used"
-msgstr "��� ��������� �������� �����������"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "�������i������"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "������ ������� ���������"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "����i�������"
 
-#: ../../diskdrake.pm_.c:59
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "������� �������"
+
+#: ../../diskdrake.pm_.c:235
 msgid ""
-"To have more partitions, please delete one to be able to create an extended "
-"partition"
+"You have one big FAT partition\n"
+"(generally used by MicroSoft Dos/Windows).\n"
+"I suggest you first resize that partition\n"
+"(click on it, then click on \"Resize\")"
 msgstr ""
-"��� ����i�� ����� �������, �����i�� ���i� i �������� �������� ������� "
-"(extended)"
+"����� �� ����� �����i ���i� ���i�i ������� FAT\n"
+"(�� �������� ������������ MS Dos/Windows).\n"
+"��������, ��-������, ����i�� ������ ��������\n"
+"(��i��i�� �� ���, � ����� �� \"�������� ������\")"
+
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "��������� �� �������"
 
-#: ../../diskdrake.pm_.c:61
+#: ../../diskdrake.pm_.c:240
 #, fuzzy
-msgid "Not enough space for auto-allocating"
-msgstr "�� ����� �������� ��� ��������� ����� ��������"
+msgid "Please click on a media"
+msgstr "��������� �� �������"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "�����"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "��������� �� �������"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "���i� ����i�� ��������"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-#, fuzzy
-msgid "More"
-msgstr "�������"
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "������������i"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
+#, fuzzy
+msgid "Journalised FS"
+msgstr "������� ����i�������"
+
+#: ../../diskdrake.pm_.c:395
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Swap"
 msgstr "Swap"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:396 ../../diskdrake_interactive.pm_.c:952
 msgid "Empty"
 msgstr "�����"
 
-#: ../../diskdrake.pm_.c:117 ../../install_steps_gtk.pm_.c:407
-#: ../../mouse.pm_.c:145
+#: ../../diskdrake.pm_.c:396 ../../install_steps_gtk.pm_.c:373
+#: ../../install_steps_gtk.pm_.c:433 ../../mouse.pm_.c:161
+#: ../../services.pm_.c:161
 msgid "Other"
 msgstr "�����"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "���� �������� �i�����:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "������������i"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "��������"
 
-#: ../../diskdrake.pm_.c:147
-msgid ""
-"You have one big FAT partition\n"
-"(generally used by MicroSoft Dos/Windows).\n"
-"I suggest you first resize that partition\n"
-"(click on it, then click on \"Resize\")"
-msgstr ""
-"����� �� ����� �����i ���i� ���i�i ������� FAT\n"
-"(�� �������� ������������ MS Dos/Windows).\n"
-"��������, ��-������, ����i�� ������ ��������\n"
-"(��i��i�� �� ���, � ����� �� \"�������� ������\")"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "�������������� ``%s'' ������"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "��-������, ����i�� ���������� ���i� ����� ��������"
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "��i�����"
 
-#: ../../diskdrake.pm_.c:152 ../../diskdrake.pm_.c:170
-#: ../../diskdrake.pm_.c:179 ../../diskdrake.pm_.c:570
-#: ../../diskdrake.pm_.c:592
-msgid "Read carefully!"
-msgstr "������� �����i��!"
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "�������� ����i�� ``Unmount''"
 
-#: ../../diskdrake.pm_.c:155
+#: ../../diskdrake.pm_.c:424 ../../diskdrake_interactive.pm_.c:480
+#, c-format
 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"
+"After changing type of partition %s, all data on this partition will be lost"
+msgstr "��� �������� � �������� %s ������ �������� ����� ����� ��� ����"
+
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "���� �� ������� ����i������ ������� %s?"
+
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Mount options"
+msgstr "����i ������:"
+
+#: ../../diskdrake.pm_.c:507
+msgid "Various"
 msgstr ""
-"���i �� �������� ������������� boot ��������, ���� �������i�� ��\n"
-" �� ����� �� 2048 ������� �� ������� �����"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "������� �����i��. ����� �������� ������ �����i��"
+#: ../../diskdrake.pm_.c:525
+#, fuzzy
+msgid "Removable media"
+msgstr "��������i������� ������� ���������������"
 
-#: ../../diskdrake.pm_.c:214 ../../install_steps.pm_.c:72
-#: ../../install_steps_interactive.pm_.c:37
-#: ../../install_steps_interactive.pm_.c:322 ../../standalone/diskdrake_.c:66
-msgid "Error"
-msgstr "�������"
+#: ../../diskdrake.pm_.c:532
+#, fuzzy
+msgid "Change type"
+msgstr "����i�� ��� ��������"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "����� ����i�������:"
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+#, fuzzy
+msgid "Which filesystem do you want?"
+msgstr "���� �i����� ����� �� ������� �������������?"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "�������:"
+#: ../../diskdrake.pm_.c:564
+msgid "Scanning available nfs shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:569
 #, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "�i���� ��� DOS-�����: %s (�����)\n"
+msgid "Scanning available nfs shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:244 ../../diskdrake.pm_.c:251
-#: ../../diskdrake.pm_.c:301
-msgid "Type: "
-msgstr "���: "
+#: ../../diskdrake.pm_.c:578 ../../diskdrake.pm_.c:648
+msgid "If the list above doesn't contain the wanted entry, enter it here:"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:248
-msgid "Name: "
-msgstr "I��: "
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+#, fuzzy
+msgid "Server"
+msgstr "������"
 
-#: ../../diskdrake.pm_.c:253
-#, c-format
-msgid "Start: sector %s\n"
-msgstr "�������: ������ %s\n"
+#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
+msgid "Shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Size: %s"
-msgstr "�����: %s"
+#: ../../diskdrake.pm_.c:615
+msgid "Scanning available samba shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:256
+#: ../../diskdrake.pm_.c:626 ../../diskdrake.pm_.c:639
 #, c-format
-msgid ", %s sectors"
-msgstr ", %s �������"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:258
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "���i���� � %d �� %d\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose a partition"
+msgstr "������� �������"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "������������\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose another partition"
+msgstr "��������� ������ ��������"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "�� �������������\n"
+#: ../../diskdrake_interactive.pm_.c:188
+#, fuzzy
+msgid "Exit"
+msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "������i������\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "����� ��������"
 
-#: ../../diskdrake.pm_.c:262
-#, c-format
-msgid "RAID md%s\n"
-msgstr "RAID md%s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to normal mode"
+msgstr "�������� �����"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "����(�) �i��������� �������� �i�����: %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "�����"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"���������� ������� �� ���������\n"
-"    (��� �������i MS-DOS, � �� ��� lilo)\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "������� ����������?"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "�������� %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "�����i ��� ���������"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "����� ��������� %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "�����i ��� ���i�� ����i�� ��������"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "RAID-����i %s\n"
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "�i ������� �������i������ ��������i?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "I�� ����� �i��������� �������� �i�����: %s"
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "������������ ����������"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "�����i�� ��"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+#, fuzzy
+msgid "More"
+msgstr "�������"
+
+#: ../../diskdrake_interactive.pm_.c:250
+#, fuzzy
+msgid "Hard drive information"
+msgstr "I���������"
+
+#: ../../diskdrake_interactive.pm_.c:267
+#, fuzzy
+msgid "Not enough space for auto-allocating"
+msgstr "�� ����� �������� ��� ��������� ����� ��������"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "��� ��������� �������� �����������"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "������ ������� ���������"
+
+#: ../../diskdrake_interactive.pm_.c:275
 msgid ""
-"\n"
-"Chances are, this partition is\n"
-"a Driver partition, you should\n"
-"probably leave it alone.\n"
+"To have more partitions, please delete one to be able to create an extended "
+"partition"
 msgstr ""
+"��� ����i�� ����� �������, �����i�� ���i� i �������� �������� ������� "
+"(extended)"
+
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "���i� ����i�� ��������"
+
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "���������� ����i�� ��������"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "���������� ����i�� ��������"
+
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "���������� ����i�� ��������"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "��������i������� ������� ���������������"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "������� ����"
+
+#: ../../diskdrake_interactive.pm_.c:308
 msgid ""
-"\n"
-"This special Bootstrap\n"
-"partition is for\n"
-"dual-booting your system.\n"
+"The backup partition table has not the same size\n"
+"Still continue?"
 msgstr ""
+"����i�� ����������� ����������� ����� ��� i��� �����\n"
+"���������� �����?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "��������� �� �������"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "�����!"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "�����: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"������ ������� � ��������\n"
+"��� �������� �� ����� ������� ������ ��������"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "���������: %s ���i����, %s �������, %s �������\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "���������� ���������� ����i�� ��������"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "LVM-����i %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+#, fuzzy
+msgid "Detailed information"
+msgstr "I���������"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "��� ����i�� ��������: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "�������� ������"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "�� ���� %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "�������"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "����i�������"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "������������"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "�������"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "������ �� RAID"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "�����i�� � RAID"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "����i�� RAID"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "������ �� LVM"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "�����i�� � RAID"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "�����i�� � LVM"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "����i�� RAID"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "������������� ��� �i��������� �������� �i�����"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "������� �������"
-
-#: ../../diskdrake.pm_.c:435
-msgid ""
-"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
-"1024).\n"
-"Either you use LILO and it won't work, or you don't use LILO and you don't "
-"need /boot"
-msgstr ""
-"��������, ��� ������ �������� /boot �� ����� ����� (�� ���i���� > 1024).\n"
-"��� �� ������� ������������� LILO - ���� ���� �� ����� ���������, LILO �� "
-"��������������, ���� /boot �� ��������."
-
-#: ../../diskdrake.pm_.c:439
-msgid ""
-"The partition you've selected to add as root (/) is physically located "
-"beyond\n"
-"the 1024th cylinder of the hard drive, and you have no /boot partition.\n"
-"If you plan to use the LILO boot manager, be careful to add a /boot partition"
-msgstr ""
-"������ ��� ������� � �����i ���������� (/) ������� �i�i��� �������i�� �����\n"
-"1024-�� ���i���� ��������� �����, � � ��� ���� �������� /boot .\n"
-"���i ����� �������������� �������� �������i LILO, �� ����������� ������\n"
-"������� /boot"
-
-#: ../../diskdrake.pm_.c:445
-msgid ""
-"You've selected a software RAID partition as root (/).\n"
-"No bootloader is able to handle this without a /boot partition.\n"
-"So be careful to add a /boot partition"
-msgstr ""
-"�� �����i RAID ������� �� ��������.\n"
-"���� ����������, ��i � ������i��� ��� /boot ��������.\n"
-"������� ������ /boot, ���i �����."
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "��������� ������ ��������"
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "�������������� ``%s'' ������"
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "��������� ������:"
 
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "�������� ����i�� ``Unmount''"
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "����� � ��:"
 
-#: ../../diskdrake.pm_.c:469 ../../diskdrake.pm_.c:513
-#, c-format
-msgid ""
-"After changing type of partition %s, all data on this partition will be lost"
-msgstr "��� �������� � �������� %s ������ �������� ����� ����� ��� ����"
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "��� �������� �i�����:"
 
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "������� ����������?"
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "����� ����i�������:"
 
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "�����i ��� ���������"
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "���������: "
 
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "�����i ��� ���i�� ����i�� ��������"
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "������������ �i���������� �������� %s"
 
-#: ../../diskdrake.pm_.c:516
+#: ../../diskdrake_interactive.pm_.c:486
 msgid "Change partition type"
 msgstr "����i�� ��� ��������"
 
-#: ../../diskdrake.pm_.c:517
-#, fuzzy
-msgid "Which filesystem do you want?"
-msgstr "���� �i����� ����� �� ������� �������������?"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "�� �� ������ ����i���� �� �������, ����� ��i� ����� �� 32 ��"
+#: ../../diskdrake_interactive.pm_.c:491
+msgid "Switching from ext2 to ext3"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake_interactive.pm_.c:521
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "���� �� ������� ����i������ �i��������� ������� %s?"
 
-#: ../../diskdrake.pm_.c:538
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "���� �� ������� ����i������ ������� %s?"
-
-#: ../../diskdrake.pm_.c:542
+#: ../../diskdrake_interactive.pm_.c:528
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1587,224 +1606,381 @@ msgstr ""
 "�i��������� �������� �i�����.\n"
 "�������� �����i�� �i��������� �i�����"
 
-#: ../../diskdrake.pm_.c:561
-#, c-format
-msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr "��� �������� � �������� %s ������ �������� ����� ������������"
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "����� ���� �������� �i����� FAT"
 
-#: ../../diskdrake.pm_.c:563
-msgid "Formatting"
-msgstr "������������"
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "�������� ������"
 
-#: ../../diskdrake.pm_.c:564
-#, c-format
-msgid "Formatting loopback file %s"
-msgstr "������������ �i���������� �������� %s"
+#: ../../diskdrake_interactive.pm_.c:578
+#, fuzzy
+msgid "This partition is not resizeable"
+msgstr "������ ����� �������� �� ������� ����i��?"
 
-#: ../../diskdrake.pm_.c:565 ../../install_steps_interactive.pm_.c:430
-#, c-format
-msgid "Formatting partition %s"
-msgstr "������������ �������� %s"
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "��� �������� � ����� �������� ���i��� ���� ����i�������"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "����� ������������ ��i� ��������,"
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr "��� �������� � �������� %s ������ ��������"
 
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "��� �������� � ����� ��������� ������ ��������"
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "����� ����� ������"
 
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "�������"
+#: ../../diskdrake_interactive.pm_.c:591
+#, fuzzy
+msgid "New size in MB: "
+msgstr "����� � ��:"
 
-#: ../../diskdrake.pm_.c:577
+#: ../../diskdrake_interactive.pm_.c:631
 msgid "Which disk do you want to move it to?"
 msgstr "�� ��i ���� ���������?"
 
-#: ../../diskdrake.pm_.c:578
+#: ../../diskdrake_interactive.pm_.c:632
 msgid "Sector"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:579
+#: ../../diskdrake_interactive.pm_.c:633
 msgid "Which sector do you want to move it to?"
 msgstr "�� ��i ������ ���������?"
 
-#: ../../diskdrake.pm_.c:582
+#: ../../diskdrake_interactive.pm_.c:636
 msgid "Moving"
 msgstr "��������"
 
-#: ../../diskdrake.pm_.c:582
+#: ../../diskdrake_interactive.pm_.c:636
 msgid "Moving partition..."
 msgstr "���������� �������..."
 
-#: ../../diskdrake.pm_.c:592
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "������� i������ RAID ��� �������"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "����"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "�������� i������ LVM ��� ���������"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr ""
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "���� ������� �� ���� ���� ����������� ��� �i��������� �������� �i�����"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "�i��������� �������� �i����� (loopback)"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "I�� �i���������� ��������"
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "������� i��"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr ""
+"���� ��� ��������������� i���� �i��������� �i������. ���i �����, \n"
+"������� i���� �����"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "���� ��� i����. ����������� ���?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "�������"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "��������"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "����� �����"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "������� �����i��. ����� �������� ������ �����i��"
+
+#: ../../diskdrake_interactive.pm_.c:816
+#, fuzzy
+msgid "What type of partitioning?"
+msgstr "��i ��� �������i �� �����?"
+
+#: ../../diskdrake_interactive.pm_.c:834
+msgid ""
+"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
+"1024).\n"
+"Either you use LILO and it won't work, or you don't use LILO and you don't "
+"need /boot"
+msgstr ""
+"��������, ��� ������ �������� /boot �� ����� ����� (�� ���i���� > 1024).\n"
+"��� �� ������� ������������� LILO - ���� ���� �� ����� ���������, LILO �� "
+"��������������, ���� /boot �� ��������."
+
+#: ../../diskdrake_interactive.pm_.c:838
+msgid ""
+"The partition you've selected to add as root (/) is physically located "
+"beyond\n"
+"the 1024th cylinder of the hard drive, and you have no /boot partition.\n"
+"If you plan to use the LILO boot manager, be careful to add a /boot partition"
+msgstr ""
+"������ ��� ������� � �����i ���������� (/) ������� �i�i��� �������i�� �����\n"
+"1024-�� ���i���� ��������� �����, � � ��� ���� �������� /boot .\n"
+"���i ����� �������������� �������� �������i LILO, �� ����������� ������\n"
+"������� /boot"
+
+#: ../../diskdrake_interactive.pm_.c:844
+msgid ""
+"You've selected a software RAID partition as root (/).\n"
+"No bootloader is able to handle this without a /boot partition.\n"
+"So be careful to add a /boot partition"
+msgstr ""
+"�� �����i RAID ������� �� ��������.\n"
+"���� ����������, ��i � ������i��� ��� /boot ��������.\n"
+"������� ������ /boot, ���i �����."
+
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "����i�� ����������� ������� %s ����� ���i���� �� ����!"
 
-#: ../../diskdrake.pm_.c:594
+#: ../../diskdrake_interactive.pm_.c:868
 msgid "You'll need to reboot before the modification can take place"
 msgstr "��� �������i �����i�i � �������, ��������� ����������i���"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "����� ���� �������� �i����� FAT"
+#: ../../diskdrake_interactive.pm_.c:879
+#, c-format
+msgid "After formatting partition %s, all data on this partition will be lost"
+msgstr "��� �������� � �������� %s ������ �������� ����� ������������"
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "�������� ������"
+#: ../../diskdrake_interactive.pm_.c:881
+msgid "Formatting"
+msgstr "������������"
 
-#: ../../diskdrake.pm_.c:643
+#: ../../diskdrake_interactive.pm_.c:882
+#, c-format
+msgid "Formatting loopback file %s"
+msgstr "������������ �i���������� �������� %s"
+
+#: ../../diskdrake_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:419
+#, c-format
+msgid "Formatting partition %s"
+msgstr "������������ �������� %s"
+
+#: ../../diskdrake_interactive.pm_.c:894
 #, fuzzy
-msgid "This partition is not resizeable"
-msgstr "������ ����� �������� �� ������� ����i��?"
+msgid "Hide files"
+msgstr "mkraid �� ������������"
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "��� �������� � ����� �������� ���i��� ���� ����i�������"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "�� ����� �������� ��� ��������� ����� ��������"
 
-#: ../../diskdrake.pm_.c:650
+#: ../../diskdrake_interactive.pm_.c:895
 #, c-format
-msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "��� �������� � �������� %s ������ ��������"
+msgid ""
+"Directory %s already contain some data\n"
+"(%s)"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "����� ����� ������"
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "�� ����� �������� ��� ��������� ����� ��������"
 
-#: ../../diskdrake.pm_.c:660 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
-msgid "MB"
-msgstr "��"
+#: ../../diskdrake_interactive.pm_.c:910
+#, c-format
+msgid "Copying %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "��������� ������ ��������"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "������ ������: %s\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "��������� ������:"
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "�������:"
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "����� � ��:"
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "�i���� ��� DOS-�����: %s (�����)\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "��� �������� �i�����:"
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "���: "
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "���������: "
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "I��: "
 
-#: ../../diskdrake.pm_.c:798
-msgid "This partition can't be used for loopback"
-msgstr "���� ������� �� ���� ���� ����������� ��� �i��������� �������� �i�����"
+#: ../../diskdrake_interactive.pm_.c:954
+#, c-format
+msgid "Start: sector %s\n"
+msgstr "�������: ������ %s\n"
 
-#: ../../diskdrake.pm_.c:808
-msgid "Loopback"
-msgstr "�i��������� �������� �i����� (loopback)"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "�����: %s"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "I�� �i���������� ��������"
+#: ../../diskdrake_interactive.pm_.c:957
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s �������"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr ""
-"���� ��� ��������������� i���� �i��������� �i������. ���i �����, \n"
-"������� i���� �����"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "���i���� � %d �� %d\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "���� ��� i����. ����������� ���?"
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "������������\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "������� ����"
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "�� �������������\n"
 
-#: ../../diskdrake.pm_.c:876
-msgid ""
-"The backup partition table has not the same size\n"
-"Still continue?"
-msgstr ""
-"����i�� ����������� ����������� ����� ��� i��� �����\n"
-"���������� �����?"
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "������i������\n"
 
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "�����!"
+#: ../../diskdrake_interactive.pm_.c:963
+#, c-format
+msgid "RAID md%s\n"
+msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:885
+#: ../../diskdrake_interactive.pm_.c:965
+#, fuzzy, c-format
 msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
+"Loopback file(s):\n"
+"   %s\n"
+msgstr "����(�) �i��������� �������� �i�����: %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:966
+msgid ""
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
-"������ ������� � ��������\n"
-"��� �������� �� ����� ������� ������ ��������"
+"���������� ������� �� ���������\n"
+"    (��� �������i MS-DOS, � �� ��� lilo)\n"
 
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "���������� ���������� ����i�� ��������"
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "�������� %s\n"
 
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "�������"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "����� ��������� %s\n"
 
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "��������"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "RAID-����i %s\n"
 
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "����� �����"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "I�� ����� �i��������� �������� �i�����: %s"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "������� i������ RAID ��� �������"
+#: ../../diskdrake_interactive.pm_.c:975
+msgid ""
+"\n"
+"Chances are, this partition is\n"
+"a Driver partition, you should\n"
+"probably leave it alone.\n"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "����"
+#: ../../diskdrake_interactive.pm_.c:978
+msgid ""
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "�������� i������ LVM ��� ���������"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "�����: %s\n"
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr ""
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "���������: %s ���i����, %s �������, %s �������\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "��������i������� ������� ���������������"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "I���������: "
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "���������� ����i�� ��������"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM-����i %s\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "����������i��"
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "��� ����i�� ��������: %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "�� ���� %d id %d\n"
+
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "����i: %s"
 
-#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
-#: ../../fs.pm_.c:113
+#: ../../fs.pm_.c:447 ../../fs.pm_.c:457 ../../fs.pm_.c:461 ../../fs.pm_.c:465
+#: ../../fs.pm_.c:469 ../../fs.pm_.c:473
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s ������� ������������ %s"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "�� ����� �� ������������� %s � ����� %s"
 
-#: ../../fs.pm_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "������� ����i�������"
+
+#: ../../fs.pm_.c:588
+#, c-format
+msgid "fsck failed with exit code %d or signal %d"
+msgstr ""
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
 msgid "mount failed: "
 msgstr "������� ����i�������: "
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "������� �������i������� %s: %s"
@@ -1817,41 +1993,45 @@ msgstr ""
 msgid "server"
 msgstr "������"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+#, fuzzy
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "�� �� ������ ����i���� �� �������, ����� ��i� ����� �� 16 ��"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "�� �� ������ ����i���� �� �������, ����� ��i� ����� �� 32 ��"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "����� ����i������� ���i��� ��������� � /"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "��� ���� ������� � ������� ����i������� %s\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "����i������� ����� %s\n"
-
-#: ../../fsedit.pm_.c:285
+#: ../../fsedit.pm_.c:476
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr ""
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
 msgstr "���� ������� ������ ���������� ������ ��������� �������� ������"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "��� ��������� ������ ����i���� ��� �������� �i����� (ext2, reiserfs)\n"
 "��� ����� �����i ����i�������\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "������� �������� %s ��� ���i��: %s"
 
-#: ../../fsedit.pm_.c:453
+#: ../../fsedit.pm_.c:681
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
@@ -1859,287 +2039,380 @@ msgstr ""
 "�������: ��� ��������� ����� �������� �i����� �� ��������� ���������� \n"
 "�������. �������� ������������ ��� ������ i�������� �������."
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "�� �� �������i ��i��i� ��������!"
 
-#: ../../help.pm_.c:9
+#: ../../help.pm_.c:13
 msgid ""
-"Please choose your preferred language for installation and system usage."
+"GNU/Linux is a multiuser system, and this means that each user can have his\n"
+"own preferences, his own files and so on. You can read the ``User Guide''\n"
+"to learn more. But unlike \"root\", which is the administrator, the users\n"
+"you will add here will not be entitled to change anything except their own\n"
+"files and their own configuration. You will have to create at least one\n"
+"regular user for yourself. That account is where you should log in for\n"
+"routine use. Although it is very practical to log in as \"root\" everyday,\n"
+"it may also be very dangerous! The slightest mistake could mean that your\n"
+"system would not work any more. If you make a serious mistake as a regular\n"
+"user, you may only lose some information, but not the entire system.\n"
+"\n"
+"First, you have to enter your real name. This is not mandatory, of course -\n"
+"as you can actually enter whatever you want. DrakX will then take the first\n"
+"word you have entered in the box and will bring it over to the \"User\n"
+"name\". This is the name this particular user will use to log into the\n"
+"system. You can change it. You then have to enter a password here. A\n"
+"non-privileged (regular) user's password is not as crucial as that of\n"
+"\"root\" from a security point of view, but that is no reason to neglect it\n"
+"- after all, your files are at risk.\n"
+"\n"
+"If you click on \"Accept user\", you can then add as many as you want. Add\n"
+"a user for each one of your friends: your father or your sister, for\n"
+"example. When you finish adding all the users you want, select \"Done\".\n"
+"\n"
+"Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
+"for that user (bash by default)."
 msgstr ""
 
-#: ../../help.pm_.c:12
+#: ../../help.pm_.c:41
+#, fuzzy
 msgid ""
-"You need to accept the terms of the above license to continue installation.\n"
+"Listed above are the existing Linux partitions detected on your hard drive.\n"
+"You can keep the choices made by the wizard, they are good for most common\n"
+"installs. If you make any changes, you must at least define a root\n"
+"partition (\"/\"). Do not choose too small a partition or you will not be\n"
+"able to install enough software. If you want to store your data on a\n"
+"separate partition, you will also need to create a partition for \"/home\"\n"
+"(only possible if you have more than one Linux partition available).\n"
 "\n"
+"Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"Please click on \"Accept\" if you agree with its terms.\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"
-"Please click on \"Refuse\" if you disagree with its terms. Installation will "
-"end without modifying your current\n"
-"configuration."
-msgstr ""
-"�� ������ ������� ����� ����糳, ��� ���������� ������������.\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"
-"��� �����, ��������� \"�������\", ��� �� ������� � ������ ����糳.\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"
-"��� �����, ��������� \"����������\", ��� �� �� ������� � ������ ����糳."
-"����������� ����� ��������\n"
-"��� ����� ����� ������� ������������."
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "������� ��������� ���� ����i����� � ������������ ��i��"
-
-#: ../../help.pm_.c:25
-msgid ""
-"If you wish other languages (than the one you choose at\n"
-"beginning of installation) will be available after installation, please "
-"chose\n"
-"them in list above. If you want select all, you just need to select \"All\"."
+" * \"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 ""
-"��� �� ������� ��� ����� ����������� ��� �������� ����� ����\n"
-"(������ ���, ���� �� ��� ����� ��������� �����������), ��� ������������\n"
-"�� � ����� ������������ ����. ��� �� ������� ������ �� ��������� \"���\"."
-
-#: ../../help.pm_.c:30
-msgid ""
-"Please choose \"Install\" if there are no previous version of Linux-"
-"Mandrake\n"
-"installed or if you wish to use several operating systems.\n"
+"����� ��������� ��� �������� �������� Linux, ���������� �� ����� �����,\n"
+" ��� �������� �������� ��������� �����. �� ������ ������� �� ��� � "
+"������������\n"
+" �����, �� ��� ����� ����������� ��� ���������� ������������. ��� ��\n"
+" ������ �����, �� ������, �������� ���� ������� (\"/\"). �����\n"
+" ������� �� ����� �����, �� � ���������� ������� �� �� �������� ����������\n"
+" ���������� ����������� ������������.��� �� ������� �������� ����� "
+"��������\n"
+" �� ������� ��������, �� ������ ������ ����� ������������ \"/home\".\n"
 "\n"
+"����� ������� ��������� ��������� ����� \"���\", \"��������\".\n"
 "\n"
-"Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\n"
 "\n"
+"\"���\" �������� ��� - \"��� �����\", \"����� �����\", \"����� ��������\" \n"
+"(���������, \"hda1\").\n"
 "\n"
-"Depend of your knowledge in GNU/Linux, you can choose one of the following "
-"levels to install or update your\n"
-"Linux-Mandrake operating system:\n"
 "\n"
-"\t* Recommended: if you have never installed a GNU/Linux operating system "
-"choose this. Installation will be\n"
-"\t  be very easy and you will be asked only on few questions.\n"
+"\"��� �����\" �������� �� \"hd\", ��� ���� IDE, � \"sd\" ��� SCSI.\n"
+"   * \"�\" \"master\" �� ��������� ������ IDE \n"
+"   * \"b\" \"slave\" �� ��������� ������ IDE\n"
+"   * \"c\" \"master\" �� ��������� ������ IDE\n"
+"   * \"d\" \"slave\" �� ��������� ������ IDE\n"
 "\n"
 "\n"
-"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
-"the primary usage (workstation, server,\n"
-"\t  development) of your system. You will need to answer to more questions "
-"than in \"Recommended\" installation\n"
-"\t  class, so you need to know how GNU/Linux works to choose this "
-"installation class.\n"
+"��� SCSI ����� - \"a\" ���� \"�������� ����� ����\", \"b\" - \"�������� "
+"����� ����\", � �.�."
+
+#: ../../help.pm_.c:72
+msgid ""
+"The Mandrake Linux installation is spread out over several CDROMs. DrakX\n"
+"knows if a selected package is located on another CDROM and will eject the\n"
+"current CD and ask you to insert a different one as required."
+msgstr ""
+
+#: ../../help.pm_.c:77
+msgid ""
+"It is now time to specify which programs you wish to install on your\n"
+"system. There are thousands of packages available for Mandrake Linux, and\n"
+"you are not supposed to know them all by heart.\n"
 "\n"
+"If you are performing a standard installation from CDROM, you will first be\n"
+"asked to specify the CDs you currently have (in Expert mode only). Check\n"
+"the CD labels and highlight the boxes corresponding to the CDs you have\n"
+"available for installation. Click \"OK\" when you are ready to continue.\n"
 "\n"
-"\t* Expert: if you have a good knowledge in GNU/Linux, you can choose this "
-"installation class. As in \"Customized\"\n"
-"\t  installation class, you will be able to choose the primary usage "
-"(workstation, server, development). Be very\n"
-"\t  careful before choose this installation class. You will be able to "
-"perform a higly customized installation.\n"
-"\t  Answer to some questions can be very difficult if you haven't a good "
-"knowledge in GNU/Linux. So, don't choose\n"
-"\t  this installation class unless you know what you are doing."
-msgstr ""
-"��� �����, ��������� \"����븢��\" ��� �� ������ ������� �������������� "
-"Linux-Mandrake\n"
-"����� �� ������� ������������� ������� ����������� ������.\n"
+"Packages are sorted in groups corresponding to a particular use of your\n"
+"machine. The groups themselves are sorted into four sections:\n"
 "\n"
+" * \"Workstation\": if you plan to use your machine as a workstation, "
+"select\n"
+"one or more of the corresponding groups.\n"
 "\n"
-"� ���������� �� ����� ���� GNU/Linux, �� ������ ������ ���� � ��������� "
-"�����, ��� ����븢���� � ������������ \n"
-"����� ����������� ������ Linux-Mandrake:\n"
+" * \"Development\": if the machine is to be used for programming, choose "
+"the\n"
+"desired group(s).\n"
 "\n"
-"\t* �������������: ������� ���� ����, ��� �� ����� �� ����븢���GNU/"
-"Linux. ����������� ����� ����� �������,\n"
-"\t ��� ����� ������ ����� ������� ��������.\n"
+" * \"Server\": finally, if the machine is intended to be a server, you will\n"
+"be able to select which of the most common services you wish to see\n"
+"installed on the machine.\n"
 "\n"
+" * \"Graphical Environment\": this is where you will choose your preferred\n"
+"graphical environment. At least one must be selected if you want to have a\n"
+"graphical workstation!\n"
 "\n"
-"\t* �� ������: ��� �� ���������� ������ � GNU/Linux, �� ������ ������ "
-"����� �� ������������� ������ �� ��������\n"
-"\t �������, ������, ����������. �� ������ ������� �������� �� ������� "
-"��������� �������� ��� ��� ��� �����������\n"
-"\t ����� \"�������������\", ���� �� ������ ������, �� ������ GNU/Linux, ��� "
-"������ ���� ���� �����������.\n"
+"Moving the mouse cursor over a group name will display a short explanatory\n"
+"text about that group.\n"
 "\n"
+"You can check the \"Individual package selection\" box, which is useful if\n"
+"you are familiar with the packages being offered or if you want to have\n"
+"total control over what will be installed.\n"
 "\n"
-"\t* �������: �� ������ ������ ���� ����, ��� �� ����� ������ ���� � GNU/"
-"Linux. �� � ��� ����������� �����\n"
-"\t \"���������\", �� ������ ������ ����� �� ������������� ������ �� "
-"�������� �������, ������,\n"
-"\t ����������. ������� ����� ���������� ����� ���, �� ������ ���� ���� "
-"�����������. �� ������� �������� �������� ����������� �\n"
-"\t ������������ � ����� ��������. ������ �� ��������� ������� ������ ���� "
-"����� ���������, ��� �� �� ����� ������ ���� � GNU/Linux.\n"
-"\t ���� �� ������� ���� ���� ����������, ��� �� �� ������� ���, ��� �����."
+"If you started the installation in \"Update\" mode, you can unselect all\n"
+"groups to avoid installing any new package. This is useful for repairing or\n"
+"updating an existing system."
+msgstr ""
 
-#: ../../help.pm_.c:56
+#: ../../help.pm_.c:115
 msgid ""
-"Select:\n"
-"\n"
-"  - Customized: If you are familiar enough with GNU/Linux, you may then "
-"choose\n"
-"    the primary usage for your machine. See below for details.\n"
+"Finally, depending on your choice of whether or not to select individual\n"
+"packages, you will be presented a tree containing all packages classified\n"
+"by groups and subgroups. While browsing the tree, you can select entire\n"
+"groups, subgroups, or individual packages.\n"
 "\n"
+"Whenever you select a package on the tree, a description appears on the\n"
+"right. When your selection is finished, click the \"Install\" button which\n"
+"will then launch the installation process. Depending on the speed of your\n"
+"hardware and the number of packages that need to be installed, it may take\n"
+"a while to complete the process. A time to complete estimate is displayed\n"
+"on the screen to help you gauge if there is sufficient time to enjoy a cup\n"
+"of coffee.\n"
 "\n"
-"  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
-"    perform a highly customized installation. As for a \"Customized\"\n"
-"    installation class, you will be able to select the usage for your "
-"system.\n"
-"    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
-"DOING!"
-msgstr ""
-"�������: \n"
-"\n"
-"  - �� ������: ���� ����� ������������� � ��� �������, ���i �� ��������i \n"
-"    ����� � GNU/Linux, i ������� ���i ������� ����������\n"
-"    ������ i ������������ ��� ������ ����'�����. �����i�� �i��� "
-"�������������.\n"
+"!! If a server package has been selected either intentionally or because it\n"
+"was part of a whole group, you will be asked to confirm that you really\n"
+"want those servers to be installed. Under Mandrake Linux, any installed\n"
+"servers are started by default at boot time. Even if they are safe and have\n"
+"no known issues at the time the distribution was shipped, it may happen\n"
+"that security holes are discovered after this version of Mandrake Linux was\n"
+"finalized. If you do not know what a particular service is supposed to do\n"
+"or why it is being installed, then click \"No\". Clicking \"Yes\" will\n"
+"install the listed services and they will be started automatically by\n"
+"default. !!\n"
 "\n"
+"The \"Automatic dependencies\" option simply disables the warning dialog\n"
+"which appears whenever the installer automatically selects a package. This\n"
+"occurs because it has determined that it needs to satisfy a dependency with\n"
+"another package in order to successfully complete the installation.\n"
 "\n"
-"  - �������: ����� ������ ������ ��������, ��� �� �������� ��������� GNU/"
-"Linux\n"
-"    i ������� ������������� �����i �������� �����������. �� i � ������� \n"
-"    \"�� ������\"��� �������� ����� ������� ���������� �������� i \n"
-"    ������������ ������ ���������.\n"
-"    ���i �����, �� ���I����� ���� �����, ���I �� ��ݡ����, ��� ���I�� "
-"����I����!"
+"The tiny floppy disc icon at the bottom of the list allows to load the\n"
+"packages list chosen during a previous installation. Clicking on this icon\n"
+"will ask you to insert a floppy disk previously created at the end of\n"
+"another installation. See the second tip of last step on how to create such\n"
+"a floppy."
+msgstr ""
 
-#: ../../help.pm_.c:68
+#: ../../help.pm_.c:151
 msgid ""
-"You must now define your machine usage. Choices are:\n"
-"\n"
-"\t* Workstation: this the ideal choice if you intend to use your machine "
-"primarily for everyday use, at office or\n"
-"\t  at home.\n"
+"If you wish to connect your computer to the Internet or to a local network,\n"
+"please choose the correct option. Please turn on your device before\n"
+"choosing the correct option to let DrakX detect it automatically.\n"
 "\n"
+"Mandrake Linux proposes the configuration of an Internet connection at\n"
+"installation time. Available connections are: traditional modem, ISDN\n"
+"modem, ADSL connection, cable modem, and finally a simple LAN connection\n"
+"(Ethernet).\n"
 "\n"
-"\t* Development: if you intend to use your machine primarily for software "
-"development, it is the good choice. You\n"
-"\t  will then have a complete collection of software installed in order to "
-"compile, debug and format source code,\n"
-"\t  or create software packages.\n"
+"Here, we will not detail each configuration. Simply make sure that you have\n"
+"all the parameters from your Internet Service Provider or system\n"
+"administrator.\n"
 "\n"
+"You can consult the manual chapter about Internet connections for details\n"
+"about the configuration, or simply wait until your system is installed and\n"
+"use the program described there to configure your connection.\n"
 "\n"
-"\t* Server: if you intend to use this machine as a server, it is the good "
-"choice. Either a file server (NFS or\n"
-"\t  SMB), a print server (Unix style or Microsoft Windows style), an "
-"authentication server (NIS), a database\n"
-"\t  server and so on. As such, do not expect any gimmicks (KDE, GNOME, etc.) "
-"to be installed."
+"If you wish to configure the network later after installation or if you\n"
+"have finished configuring your network connection, click \"Cancel\"."
 msgstr ""
 
-#: ../../help.pm_.c:84
+#: ../../help.pm_.c:172
 msgid ""
-"DrakX will attempt to look for PCI SCSI adapter(s). If DrakX\n"
-"finds an SCSI adapter and knows which driver to use, it will be "
-"automatically\n"
-"installed.\n"
+"You may now choose which services you wish to start at boot time.\n"
 "\n"
+"Here are presented all the services available with the current\n"
+"installation. Review them carefully and uncheck those which are not always\n"
+"needed at boot time.\n"
 "\n"
-"If you have no SCSI adapter, an ISA SCSI adapter or a PCI SCSI adapter that\n"
-"DrakX doesn't recognize, you will be asked if a SCSI adapter is present in "
-"your\n"
-"system. If there is no adapter present, you can click on \"No\". If you "
-"click on\n"
-"\"Yes\", a list of drivers will be presented from which you can select your\n"
-"specific adapter.\n"
+"You can get a short explanatory text about a service by selecting a\n"
+"specific service. However, if you are not sure whether a service is useful\n"
+"or not, it is safer to leave the default behavior.\n"
 "\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."
+msgstr ""
+
+#: ../../help.pm_.c:188
+msgid ""
+"GNU/Linux manages time in GMT (Greenwich Manage Time) and translates it in\n"
+"local time according to the time zone you selected."
+msgstr ""
+
+#: ../../help.pm_.c:192
+msgid ""
+"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
+"on which all the graphics environments (KDE, Gnome, AfterStep,\n"
+"WindowMaker...) bundled with Mandrake Linux rely. In this section, DrakX\n"
+"will try to configure X automatically.\n"
 "\n"
-"If you have to manually specify your adapter, DrakX will ask if you want to\n"
-"specify options for it. You should allow DrakX to probe the hardware for "
-"the\n"
-"options. This usually works well.\n"
+"It is extremely rare for it to fail, unless the hardware is very old (or\n"
+"very new). If it succeeds, it will start X automatically with the best\n"
+"resolution possible depending on the size of the monitor. A window will\n"
+"then appear and ask you if you can see it.\n"
 "\n"
+"If you are doing an \"Expert\" install, you will enter the X configuration\n"
+"wizard. See the corresponding section of the manual for more information\n"
+"about this wizard.\n"
 "\n"
-"If not, you will need to provide options to the driver. Please review the "
-"User\n"
-"Guide (chapter 3, section \"Collective informations on your hardware) for "
-"hints\n"
-"on retrieving this information from hardware documentation, from the\n"
-"manufacturer's Web site (if you have Internet access) or from Microsoft "
-"Windows\n"
-"(if you have it on your system)."
+"If you can see the message and answer \"Yes\", then DrakX will proceed to\n"
+"the next step. If you cannot see the message, it simply means that the\n"
+"configuration was wrong and the test will automatically end after 10\n"
+"seconds, restoring the screen."
 msgstr ""
 
-#: ../../help.pm_.c:108
+#: ../../help.pm_.c:212
 msgid ""
-"At this point, you need to choose where to install your\n"
-"Linux-Mandrake operating system on your hard drive. If it is empty or if an\n"
-"existing operating system uses all the space available on it, you need to\n"
-"partition it. Basically, partitioning a hard drive consists of logically\n"
-"dividing it to create space to install your new Linux-Mandrake system.\n"
+"The first time you try the X configuration, you may not be very satisfied\n"
+"with its display (screen is too small, shifted left or right...). Hence,\n"
+"even if X starts up correctly, DrakX then asks you if the configuration\n"
+"suits you. It will also propose to change it by displaying a list of valid\n"
+"modes it could find, asking you to select one.\n"
 "\n"
+"As a last resort, if you still cannot get X to work, choose \"Change\n"
+"graphics card\", select \"Unlisted card\", and when prompted on which\n"
+"server you want, choose \"FBDev\". This is a failsafe option which works\n"
+"with any modern graphics card. Then choose \"Test again\" to be sure."
+msgstr ""
+
+#: ../../help.pm_.c:224
+msgid ""
+"Finally, you will be asked whether you want to see the graphical interface\n"
+"at boot. Note this question will be asked even if you chose not to test the\n"
+"configuration. Obviously, you want to answer \"No\" if your machine is to\n"
+"act as a server, or if you were not successful in getting the display\n"
+"configured."
+msgstr ""
+
+#: ../../help.pm_.c:231
+msgid ""
+"The Mandrake Linux CDROM has a built-in rescue mode. You can access it by\n"
+"booting from the CDROM, press the >>F1<< key at boot and type >>rescue<< at\n"
+"the prompt. But in case your computer cannot boot from the CDROM, you\n"
+"should come back to this step for help in at least two situations:\n"
 "\n"
-"Because the effects of the partitioning process are usually irreversible,\n"
-"partitioning can be intimidating and stressful if you are an inexperienced "
-"user.\n"
-"This wizard simplifies this process. Before beginning, please consult the "
-"manual\n"
-"and take your time.\n"
+" * when installing the boot loader, DrakX will rewrite the boot sector "
+"(MBR)\n"
+"of your main disk (unless you are using another boot manager) so that you\n"
+"can start up with either Windows or GNU/Linux (assuming you have Windows in\n"
+"your system). If you need to reinstall Windows, the Microsoft install\n"
+"process will rewrite the boot sector, and then you will not be able to\n"
+"start GNU/Linux!\n"
 "\n"
+" * if a problem arises and you cannot start up GNU/Linux from the hard "
+"disk,\n"
+"this floppy disk will be the only means of starting up GNU/Linux. It\n"
+"contains a fair number of system tools for restoring a system, which has\n"
+"crashed due to a power failure, an unfortunate typing error, a typo in a\n"
+"password, or any other reason.\n"
 "\n"
-"You need at least two partitions. One is for the operating system itself and "
-"the\n"
-"other is for the virtual memory (also called Swap).\n"
+"When you click on this step, you will be asked to enter a disk inside the\n"
+"drive. The floppy disk you will insert must be empty or contain data which\n"
+"you do not need. You will not have to format it since DrakX will rewrite\n"
+"the whole disk."
+msgstr ""
+
+#: ../../help.pm_.c:255
+#, fuzzy
+msgid ""
+"At this point you need to choose where on your hard drive to install your\n"
+"Mandrake Linux operating system. If your hard drive is empty or if an\n"
+"existing operating system is using all the space available, you will need\n"
+"to partition it. Basically, partitioning a hard drive consists of logically\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
+"Because the effects of the partitioning process are usually irreversible,\n"
+"partitioning can be intimidating and stressful if you are an inexperienced\n"
+"user. Fortunately, there is a wizard which simplifies this process. Before\n"
+"beginning, please consult the manual and take your time.\n"
 "\n"
-"If partitions have been already defined (from a previous installation or "
-"from\n"
-"another partitioning tool), you just need choose those to use to install "
-"your\n"
-"Linux system.\n"
+"If you are running the install in Expert mode, you will enter DiskDrake,\n"
+"the Mandrake Linux partitioning tool, which allows you to fine-tune your\n"
+"partitions. See the DiskDrake chapter of the manual. From the installation\n"
+"interface, you can use the wizards as described here by clicking the\n"
+"\"Wizard\" button of the dialog.\n"
 "\n"
+"If partitions have already been defined, either from a previous\n"
+"installation or from another partitioning tool, simply select those to\n"
+"install your Linux system.\n"
 "\n"
-"If partitions haven't been already defined, you need to create them. \n"
-"To do that, use the wizard available above. Depending of your hard drive\n"
-"configuration, several solutions can be available:\n"
+"If partitions are not defined, you will need to create them using the\n"
+"wizard. Depending on your hard drive configuration, several options are\n"
+"available:\n"
 "\n"
-"\t* Use existing partition: the wizard has detected one or more existing "
-"Linux partitions on your hard drive. If\n"
-"\t  you want to keep them, choose this option. \n"
+" * \"Use free space\": this option will simply lead to an automatic\n"
+"partitioning of your blank drive(s). You will not be prompted further.\n"
 "\n"
+" * \"Use existing partition\": the wizard has detected one or more existing\n"
+"Linux partitions on your hard drive. If you want to use them, choose this\n"
+"option.\n"
 "\n"
-"\t* Erase entire disk: if you want delete all data and all partitions "
-"present on your hard drive and replace them by\n"
-"\t  your new Linux-Mandrake system, you can choose this option. Be careful "
-"with this solution, you will not be\n"
-"\t  able to revert your choice after confirmation.\n"
+" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+"installed on your hard drive and takes all the space available on it, you\n"
+"have to create free space for Linux data. To do that, you can delete your\n"
+"Microsoft Windows partition and data (see \"Erase entire disk\" or \"Expert\n"
+"mode\" solutions) or resize your Microsoft Windows partition. Resizing can\n"
+"be performed without the loss of any data. This solution is recommended if\n"
+"you want to use both Mandrake Linux and Microsoft Windows on same computer.\n"
 "\n"
+"   Before choosing this option, please understand that after this "
+"procedure,\n"
+"the size of your Microsoft Windows partition will be smaller than at the\n"
+"present time. You will have less free space under Microsoft Windows to\n"
+"store your data or to install new software.\n"
 "\n"
-"\t* Use the free space on the Windows partition: if Microsoft Windows is "
-"installed on your hard drive and takes\n"
-"\t  all space available on it, you have to create free space for Linux data. "
-"To do that you can delete your\n"
-"\t  Microsoft Windows partition and data (see \"Erase entire disk\" or "
-"\"Expert mode\" solutions) or resize your\n"
-"\t  Microsoft Windows partition. Resizing can be performed without loss of "
-"any data. This solution is\n"
-"\t  recommended if you want use both Linux-Mandrake and Microsoft Windows on "
-"same computer.\n"
+" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
+"present on your hard drive and replace them with your new Mandrake Linux\n"
+"system, choose this option. Be careful with this solution because you will\n"
+"not be able to revert your choice after confirmation.\n"
 "\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"\t  Before choosing this solution, please understand that the size of your "
-"Microsoft\n"
-"\t  Windows partition will be smaller than at present time. It means that "
-"you will have less free space under\n"
-"\t  Microsoft Windows to store your data or install new software.\n"
+" * \"Remove Windows\": this will simply erase everything on the drive and\n"
+"begin fresh, partitioning everything from scratch. All data on your disk\n"
+"will be lost.\n"
 "\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"\t* Expert mode: if you want to partition manually your hard drive, you can "
-"choose this option. Be careful before\n"
-"\t  choosing this solution. It is powerful but it is very dangerous. You can "
-"lose all your data very easily. So,\n"
-"\t  don't choose this solution unless you know what you are doing."
+" * \"Expert mode\": choose this option if you want to manually partition\n"
+"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"can very easily lose all your data. Hence, do not choose this unless you\n"
+"know what you are doing."
 msgstr ""
 "� ����� ������, �� ������ ������ ��� �� ����� ������ \n"
-"����� ���������� ����������� ������ Linux-Mandrake. ��� ���� �����\n"
+"����� ���������� ����������� ������ Mandrake Linux. ��� ���� �����\n"
 "����� ����������� ����������� ����������� ������ ������������ ���\n"
 "�������� ��������, �� ������ ������� ��� �� ��������. � �������,\n"
 "������� �������� �������� ����� ���������� � �������� �������� ���\n"
-"�������� �������� ����� ����������� ����� ����� ������ Linux-Mandrake.\n"
+"�������� �������� ����� ����������� ����� ����� ������ Mandrake Linux.\n"
 "\n"
 "���� �� ����� ������� �������� �������� �����������, ���� ������ \n"
 "���� ���� �������� � ����������, ��� �� ��������� ������������. ����\n"
@@ -2158,332 +2431,101 @@ msgstr ""
 "����, ����������� �������, ���������� �����. � ���������� �� \n"
 "������������ ��������� �����, ����� ���� �������� ���������:\n"
 "\n"
-"\t* ������������ ��������� ��������: ������� ������ ���� �� �������.\n"
+"* ������������ ��������� ��������: ������� ������ ���� �� �������.\n"
 "�������� �������� �� ����� ������ �����. ��� �� ������� �� ��������,\n"
 "������� ����� �����.\n"
 "\n"
 "\n"
-"\t* ����� ������� �����: ������� ����, ��� �� ������� ������� ����������� "
-"� �������� ��� �������\n"
-"\t �� ����� ����� � �������� �� Linux-Mandrake. ������ ������� � "
-"�����������, �� ���� ������ ����������.\n"
+"* ����� ������� �����: ������� ����, ��� �� ������� ������� ����������� � "
+"�������� ��� �������\n"
+" �� ����� ����� � �������� �� Mandrake Linux. ������ ������� � �����������, "
+"�� ���� ������ ����������.\n"
 "\n"
 "\n"
-"\t* ������������ ������� �������� �� �������� Windows: ��� MicrosoftWindows "
+"* ������������ ������� �������� �� �������� Windows: ��� MicrosoftWindows "
 "���������� �� ����� ������\n"
-"\t ����� � ������������ ��� ��������� ��������, �� ������ ��������������� "
+" ����� � ������������ ��� ��������� ��������, �� ������ ��������������� "
 "�������� ��� �������� Linux\n"
-"\t��� ������ ����, �� ������ �������� ��� ������� Windows � ��������(��."
+"��� ������ ����, �� ������ �������� ��� ������� Windows � ��������(��."
 "\"������� ����� �����\" �����\n"
-"\t \"����� ��������\") ����� ������� ������ ������ �������� Windows�������� "
+" \"����� ��������\") ����� ������� ������ ������ �������� Windows�������� "
 "������ ���� ���� ��������\n"
-"\t ��� ������ ��������. ����� ����� �������������, ��� �� "
-"�������������������� Linux-Mandrake �\n"
-"\t Microsoft Windows �� ����� � ��� ��  ����'�����.\n"
+" ��� ������ ��������. ����� ����� �������������, ��� �� "
+"�������������������� Mandrake Linux �\n"
+" Microsoft Windows �� ����� � ��� ��  ����'�����.\n"
 "\n"
-"\t ����� ������� ������, ��� �����, ��������� �����, �� ���, ������������� "
+" ����� ������� ������, ��� �����, ��������� �����, �� ���, ������������� "
 "��������� �������\n"
-"\t �������� ��� Microsoft Windows ���������.\n"
+" �������� ��� Microsoft Windows ���������.\n"
 "\n"
 "\n"
-"\t* ����� ��������: �� ������ ������ ����� �����, ��� �� ������������� "
+"* ����� ��������: �� ������ ������ ����� �����, ��� �� ������������� "
 "�������� ������ �����.\n"
-"\t ������ �������� ������� ����. ����� ����� �������� ��� "
-"����������������, �� ������\n"
-"\t ���� ������ ���� ��������. ���� �� ������� ����� ����� ��� ���� "
-"������� ��� �����."
+" ������ �������� ������� ����. ����� ����� �������� ��� ����������������, "
+"�� ������\n"
+" ���� ������ ���� ��������. ���� �� ������� ����� ����� ��� ���� ������� "
+"��� �����."
 
-#: ../../help.pm_.c:160
+#: ../../help.pm_.c:319
 msgid ""
-"At this point, you need to choose what\n"
-"partition(s) to use to install your new Linux-Mandrake system. If "
-"partitions\n"
-"have been already defined (from a previous installation of GNU/Linux or "
-"from\n"
-"another partitioning tool), you can use existing partitions. In other "
-"cases,\n"
-"hard drive partitions must be defined.\n"
-"\n"
-"\n"
-"To create partitions, you must first select a hard drive. You can select "
-"the\n"
-"disk for partitioning by clicking on \"hda\" for the first IDE drive, \"hdb"
-"\" for\n"
-"the second or \"sda\" for the first SCSI drive and so on.\n"
-"\n"
-"\n"
-"To partition the selected hard drive, you can use these options:\n"
-"\n"
-"   * Clear all: this option deletes all partitions available on the selected "
-"hard drive.\n"
-"\n"
-"\n"
-"   * Auto allocate: this option allows you to automatically create Ext2 and "
-"swap partitions in free space of your\n"
-"     hard drive.\n"
-"\n"
-"\n"
-"   * Rescue partition table: if your partition table is damaged, you can try "
-"to recover it using this option. Please\n"
-"     be careful and remember that it can fail.\n"
-"\n"
+"There you are. Installation is now complete and your GNU/Linux system is\n"
+"ready to use. Just click \"OK\" to reboot the system. You can start\n"
+"GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
+"soon as the computer has booted up again.\n"
 "\n"
-"   * Undo: you can use this option to cancel your changes.\n"
+"The \"Advanced\" button (in Expert mode only) shows two more buttons to:\n"
 "\n"
+" * \"generate auto-install floppy\": to create an installation floppy disk\n"
+"which will automatically perform a whole installation without the help of\n"
+"an operator, similar to the installation you just configured.\n"
 "\n"
-"   * Reload: you can use this option if you wish to undo all changes and "
-"load your initial partitions table\n"
+"   Note that two different options are available after clicking the button:\n"
 "\n"
+"    * \"Replay\". This is a partially automated install as the partitioning\n"
+"step (and only this one) remains interactive.\n"
 "\n"
-"   * Wizard: If you wish to use a wizard to partition your hard drive, you "
-"can use this option. It is recommended if\n"
-"     you do not have a good knowledge in partitioning.\n"
+"    * \"Automated\". Fully automated install: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
 "\n"
+"   This feature is very handy when installing a great number of similar\n"
+"machines. See the Auto install section at our web site.\n"
 "\n"
-"   * Restore from floppy: if you have saved your partition table on a floppy "
-"during a previous installation, you can\n"
-"     recover it using this option.\n"
+" * \"Save packages selection\"(*): saves the packages selection as made\n"
+"previously. Then, when doing another installation, insert the floppy inside\n"
+"the driver and run the installation going to the help screen by pressing on\n"
+"the [F1] key, and by issuing >>linux defcfg=\"floppy\"<<.\n"
 "\n"
-"\n"
-"   * Save on floppy: if you wish to save your partition table on a floppy to "
-"be able to recover it, you can use this\n"
-"     option. It is strongly recommended to use this option\n"
-"\n"
-"\n"
-"   * Done: when you have finished partitioning your hard drive, use this "
-"option to save your changes.\n"
-"\n"
-"\n"
-"For information, you can reach any option using the keyboard: navigate "
-"trough the partitions using Tab and Up/Down arrows.\n"
-"\n"
-"\n"
-"When a partition is selected, you can use:\n"
-"\n"
-"           * Ctrl-c to create a new partition (when a empty partition is "
-"selected)\n"
-"\n"
-"           * Ctrl-d to delete a partition\n"
-"\n"
-"           * Ctrl-m to set the mount point\n"
-"           \n"
-"\n"
-"           \n"
-"If you are installing on a PPC Machine, you will want to create a small HFS "
-"'bootstrap' partition of at least 1MB for use\n"
-"by the yaboot bootloader. If you opt to make the partition a bit larger, say "
-"50MB, you may find it a useful place to store \n"
-"a spare kernel and ramdisk image for emergency boot situations."
+"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
+"\"mformat a:\")"
 msgstr ""
 
-#: ../../help.pm_.c:224
-msgid ""
-"Above are listed the existing Linux partitions detected on\n"
-"your hard drive. You can keep choices make by the wizard, they are good for "
-"a\n"
-"common usage. If you change these choices, you must at least define a root\n"
-"partition (\"/\"). Don't choose a too little partition or you will not be "
-"able\n"
-"to install enough software. If you want store your data on a separate "
-"partition,\n"
-"you need also to choose a \"/home\" (only possible if you have more than "
-"one\n"
-"Linux partition available).\n"
-"\n"
-"\n"
-"For information, each partition is listed as follows: \"Name\", \"Capacity"
-"\".\n"
-"\n"
-"\n"
-"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
-"\n"
-"\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and "
-"\"sd\"\n"
-"if it is an SCSI hard drive.\n"
-"\n"
-"\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE "
-"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"
-"\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc..."
-msgstr ""
-"����� ��������� ��� �������� �������� Linux, ���������� �� ����� �����,\n"
-" ��� �������� �������� ��������� �����. �� ������ ������� �� ��� � "
-"������������\n"
-" �����, �� ��� ����� ����������� ��� ���������� ������������. ��� ��\n"
-" ������ �����, �� ������, �������� ���� ������� (\"/\"). �����\n"
-" ������� �� ����� �����, �� � ���������� ������� �� �� �������� ����������\n"
-" ���������� ����������� ������������.��� �� ������� �������� ����� "
-"��������\n"
-" �� ������� ��������, �� ������ ������ ����� ������������ \"/home\".\n"
-"\n"
-"����� ������� ��������� ��������� ����� \"���\", \"��������\".\n"
-"\n"
-"\n"
-"\"���\" �������� ��� - \"��� �����\", \"����� �����\", \"����� ��������\" \n"
-"(���������, \"hda1\").\n"
-"\n"
-"\n"
-"\"��� �����\" �������� �� \"hd\", ��� ���� IDE, � \"sd\" ��� SCSI.\n"
-"   * \"�\" \"master\" �� ��������� ������ IDE \n"
-"   * \"b\" \"slave\" �� ��������� ������ IDE\n"
-"   * \"c\" \"master\" �� ��������� ������ IDE\n"
-"   * \"d\" \"slave\" �� ��������� ������ IDE\n"
-"\n"
-"\n"
-"��� SCSI ����� - \"a\" ���� \"�������� ����� ����\", \"b\" - \"�������� "
-"����� ����\", � �.�."
-
-#: ../../help.pm_.c:258
-msgid ""
-"Choose the hard drive you want to erase to install your\n"
-"new Linux-Mandrake partition. Be careful, all data present on it will be "
-"lost\n"
-"and will not be recoverable."
-msgstr ""
-"������� ����� ���� �� ������� �������� ��� �����������\n"
-"������ �������� Linux-Mandrake. ������ ��������, ��� �������� �� ����� "
-"������\n"
-" �������� � �� ��������� ����� �������."
-
-#: ../../help.pm_.c:263
-msgid ""
-"Click on \"OK\" if you want to delete all data and\n"
-"partitions present on this hard drive. Be careful, after clicking on \"OK\", "
-"you\n"
-"will not be able to recover any data and partitions present on this hard "
-"drive,\n"
-"including any Windows data.\n"
-"\n"
-"\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
-"partitions present on this hard drive."
-msgstr ""
-"��������� \"���\", ��� ������� ������� ��� ��������\n"
-"� �������� �� ����� �����. ������ ��������, ����� ����� �������� �� ��\n"
-"\n"
-"�������� ������� ����� �������� � ��������, �������� � �������� Windows\n"
-"\n"
-"\n"
-"��������� \"������\" ��� �������� �������� ��� ������ �������� � ��������"
-
-#: ../../help.pm_.c:273
-msgid ""
-"More than one Microsoft Windows partition have been\n"
-"detected on your hard drive. Please choose the one you want resize to "
-"install\n"
-"your new Linux-Mandrake operating system.\n"
-"\n"
-"\n"
-"For information, each partition is listed as follow; \"Linux name\", "
-"\"Windows\n"
-"name\" \"Capacity\".\n"
-"\n"
-"\"Linux name\" is coded as follow: \"hard drive type\", \"hard drive number"
-"\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
-"\n"
-"\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and \"sd"
-"\"\n"
-"if it is an SCSI hard drive.\n"
-"\n"
-"\n"
-"\"Hard drive number\" is always a letter putted after \"hd\" or \"sd\". With "
-"IDE 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, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc.\n"
-"\n"
-"\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first "
-"disk\n"
-"or partition is called \"C:\")."
-msgstr ""
-"�� ����� ����� ���� ��������� ����� �� ���� �������\n"
-"Windows. ��� �����, ������� ���, ����� ����� ������� �������, "
-"�������������\n"
-"������ Linux-Mandrake.\n"
-"\n"
-"\n"
-"��� i��������, ����� ������� ��������� ��: \"Linux ���\", \"Windows\n"
-"���\" \"C�������\".\n"
-"\"Linux ���\" �������� ��� - \"��� �����\", \"����� �����\",\"����� "
-"��������\n"
-"(���������, \"hda1\").\n"
-"\n"
-"\n"
-"\"��� �����\" �������� �� \"hd\", ��� ���� IDE, � \"sd\" ��� SCSI.\n"
-"\n"
-"\"����� �����\" - ����� ����� \"hd\" �� \"sd\". ��� IDE �����:\n"
-"   * \"�\" \"master\" �� ��������� ������ IDE \n"
-"   * \"b\" \"slave\" �� ��������� ������ IDE\n"
-"   * \"c\" \"master\" �� ��������� ������ IDE\n"
-"   * \"d\" \"slave\" �� ��������� ������ IDE\n"
-"\n"
-"\n"
-"��� SCSI ����� - \"a\" ���� \"�������� ����� ����\", \"b\" - \"�������� "
-"����� ����\", � �.�.\n"
-"\n"
-"\"Windows ���\" ����� ������ ����� � Windows (����� ���� ��\n"
-"������� ����������� �� \"C:\")."
-
-#: ../../help.pm_.c:306
-msgid "Please be patient. This operation can take several minutes."
-msgstr "��� �����, ���������. ����� �������� ����� ����� ���."
-
-#: ../../help.pm_.c:309
+#: ../../help.pm_.c:350
+#, fuzzy
 msgid ""
-"Any partitions that have been newly defined must be\n"
-"formatted for use (formatting meaning creating a filesystem).\n"
-"\n"
+"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 "
-"erase\n"
-"the data they contain. If you wish do that, please also select the "
-"partitions\n"
-"you want to format.\n"
-"\n"
-"\n"
-"Please note that it is not necessary to reformat all pre-existing "
-"partitions.\n"
-"You must reformat the partitions containing the operating system (such as \"/"
-"\",\n"
-"\"/usr\" or \"/var\") but do you no have to reformat partitions containing "
-"data\n"
-"that you wish to keep (typically /home).\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 selecting partitions, after formatting, all data will be\n"
-"deleted and you will not be able to recover any of them.\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"
+"any of them.\n"
 "\n"
 "Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
+"Click on \"Cancel\" if you want to choose another partition for your new\n"
+"Mandrake Linux operating system installation.\n"
 "\n"
-"Click on \"Cancel\" if you want to choose other partitions to install your "
-"new\n"
-"Linux-Mandrake operating system."
+"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
+"for bad blocks on the disc."
 msgstr ""
 "��� ��������, ��� ��� ����� ��������� ������ ����\n"
 "������������� (����������� - ������� �������� �������� ������).\n"
@@ -2512,84 +2554,19 @@ msgstr ""
 "\n"
 "��������� \"������\" ��� ������� ������ ����� �������� ��� "
 "����������������\n"
-"����� ����������� ������ Linux-Mandrake."
-
-#: ../../help.pm_.c:335
-msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
-"\n"
-"\n"
-"DrakX will then check whether you have enough room to install them all. If "
-"not,\n"
-"it will warn you about it. If you want to go on anyway, it will proceed onto "
-"the\n"
-"installation of all selected groups but will drop some packages of lesser\n"
-"interest. At the bottom of the list you can select the option \n"
-"\"Individual package selection\"; in this case you will have to browse "
-"through\n"
-"more than 1000 packages..."
-msgstr ""
-
-#: ../../help.pm_.c:347
-msgid ""
-"You can now choose individually all the packages you\n"
-"wish to install.\n"
-"\n"
-"\n"
-"You can expand or collapse the tree by clicking on options in the left "
-"corner of\n"
-"the packages window.\n"
-"\n"
-"\n"
-"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
-"\"Toggle flat and group sorted\".\n"
-"\n"
-"\n"
-"If you want not to be warned on dependencies, click on \"Automatic\n"
-"dependencies\". If you do this, note that unselecting one package may "
-"silently\n"
-"unselect several other packages which depend on it."
-msgstr ""
-"����� �� ������ ������� ����������� ��� ������, ��� �������\n"
-"����������.\n"
-"\n"
-"\n"
-"�� ������ ����������� � �������� ����� ������, ���������� �������\n"
-"� ����� ���� ����� ������.\n"
-"\n"
-"\n"
-"��� �� ������� ������ ������ � ��������� �������, ��������� �����\n"
-"\"�����������\".\n"
-"\n"
-"\n"
-"��� �� �� ������� ���������� ������������ ������� �����������, \n"
-"��������� \"���������� ����������\". ��� �� ������ ����, �������, ���\n"
-"��� �� ����� ������ ������ ����� �� ������������ ������� ������,\n"
-"��� �� ��� ��������."
+"����� ����������� ������ Mandrake Linux."
 
-#: ../../help.pm_.c:364
+#: ../../help.pm_.c:376
 #, fuzzy
 msgid ""
-"If you have all the CDs in the list above, click Ok. If you have\n"
-"none of those CDs, click Cancel. If only some CDs are missing, unselect "
-"them,\n"
-"then click Ok."
-msgstr ""
-"���i �� ����� ��� CD ����i �� ��i�� �i���, ���i��i�� ��.\n"
-"���i �� �� ����� ��i ������� � ����� CD �����, ���i��i�� �����i��.\n"
-"���i ��������� � CD ����� �� �����, �����i�� i� ���������� i ���i��i�� ��."
-
-#: ../../help.pm_.c:369
-msgid ""
-"Your new Linux-Mandrake operating system is currently being\n"
-"installed. This operation should take a few minutes (it depends on size you\n"
-"choose to install and the speed of your computer).\n"
-"\n"
+"Your new Mandrake Linux operating system is currently being installed.\n"
+"Depending on the number of packages you will be installing and the speed of\n"
+"your computer, this operation could take from a few minutes to a\n"
+"significant amount of time.\n"
 "\n"
 "Please be patient."
 msgstr ""
-"���� ����� ����������� ������ Linux-Mandrake ����� ����븢������.\n"
+"���� ����� ����������� ������ Mandrake Linux ����� ����븢������.\n"
 "���� �������� ����� ����� ���(��� �������� �� ������ �������� ����������� � "
 "��������\n"
 " ����'�����) .\n"
@@ -2597,570 +2574,367 @@ msgstr ""
 "\n"
 "��� �����, ���������."
 
-#: ../../help.pm_.c:377
+#: ../../help.pm_.c:384
 msgid ""
-"You can now test your mouse. Use buttons and wheel to verify\n"
-"if settings are good. If not, you can click on \"Cancel\" to choose another\n"
-"driver."
+"Before continuing you should read carefully the terms of the license. It\n"
+"covers the whole Mandrake Linux distribution, and if you do not agree with\n"
+"all the terms in it, click on the \"Refuse\" button which will immediately\n"
+"terminate the installation. To continue with the installation, click the\n"
+"\"Accept\" button."
 msgstr ""
-"����� �� ������ ����������� ���� ���. ���������� �� ����� �\n"
-"����� ����. ��� ����������� ���������� ��������� \"������\" ��� ����������\n"
-"���� �������."
 
-#: ../../help.pm_.c:382
+#: ../../help.pm_.c:391
 msgid ""
-"Please select the correct port. For example, the COM1\n"
-"port under MS Windows is named ttyS0 under GNU/Linux."
+"At this point, it is time to choose the security level desired for the\n"
+"machine. As a rule of thumb, the more exposed the machine is, and the more\n"
+"the data stored in it is crucial, the higher the security level should be.\n"
+"However, a higher security level is generally obtained at the expenses of\n"
+"easiness of use. Refer to the MSEC chapter of the ``Reference Manual'' to\n"
+"get more information about the meaning of these levels.\n"
+"\n"
+"If you do not know what to choose, keep the default option."
 msgstr ""
 
-#: ../../help.pm_.c:386
+#: ../../help.pm_.c:401
 msgid ""
-"If you wish to connect your computer to the Internet or\n"
-"to a local network please choose the correct option. Please turn on your "
-"device\n"
-"before choosing the correct option to let DrakX detect it automatically.\n"
+"At this point, you need to choose what partition(s) will be used for the\n"
+"installation of your Mandrake Linux system. If partitions have been already\n"
+"defined, either from a previous installation of GNU/Linux or from 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"
-"If you do not have any connection to the Internet or a local network, "
-"choose\n"
-"\"Disable networking\".\n"
+"To partition the selected hard drive, you can use these options:\n"
 "\n"
+" * \"Clear all\": this option deletes all partitions on the selected hard\n"
+"drive.\n"
 "\n"
-"If you wish to configure the network later after installation or if you "
-"have\n"
-"finished to configure your network connection, choose \"Done\"."
-msgstr ""
-"��� �� ������� ���������� ��� ����'���� �� Internet �� ���, ��� �����,\n"
-"������� ��������� �����. �������� ���� ������� ����� ������� ��������� "
-"�����, DrakX������� ����\n"
-"����������\n"
+" * \"Auto allocate\": this option allows you to automatically create Ext2\n"
+"and swap partitions in free space of your hard drive.\n"
 "\n"
+" * \"Rescue partition table\": if your partition table is damaged, you can\n"
+"try to recover it using this option. Please be careful and remember that it\n"
+"can fail.\n"
 "\n"
-"��� ��� �� �������� ����������� �� Internet �� ���, ���������\n"
-"\"��������� ��������� ����\".\n"
-"��� �� ������� ��������������� ����� ����� ����������� �� �� ����������\n"
-"�� ��������������, ��������� \"��������\"."
-
-#: ../../help.pm_.c:399
-msgid ""
-"No modem has been detected. Please select the serial port on which it is "
-"plugged.\n"
+" * \"Undo\": use this option to cancel your changes.\n"
 "\n"
+" * \"Reload\": you can use this option if you wish to undo all changes and\n"
+"load your initial partitions table.\n"
 "\n"
-"For information, the first serial port (called \"COM1\" under Microsoft\n"
-"Windows) is called \"ttyS0\" under Linux."
-msgstr ""
-"����� �� ���������. ������� ��������� ���� �� ����� �� ����������.\n"
+" * \"Wizard\": 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 knowledge of\n"
+"partitioning.\n"
 "\n"
+" * \"Restore from floppy\": this option will allow you to restore a\n"
+"previously saved partition table from floppy disk.\n"
 "\n"
-"����� ��������� ���� (����� \"COM1\" � Microsoft Windows) �������\n"
-"\"ttyS0\" � Linux."
-
-#: ../../help.pm_.c:406
-msgid ""
-"You may now enter dialup options. If you don't know\n"
-"or are not sure what to enter, the correct informations can be obtained "
-"from\n"
-"your Internet Service Provider. If you do not enter the DNS (name server)\n"
-"information here, this information will be obtained from your Internet "
-"Service\n"
-"Provider at connection time."
-msgstr ""
-"����� �� ������ ������ ��������� ���������� ����������.\n"
-"��� �� �� ������� �� �� �������� ��� ����� ������, ���������� � "
-"������nternet\n"
-"����������. ��� �� �� ������� ���������� �� DNS ��������, ��� ����� \n"
-"�������� ��� ��� �������� � ����� Internet-�����������."
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-"��� � ��� ������� �����, ��� �����, �������� ���, � ����� DrakX������ ��� "
-"����������."
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "��� �����, �������� ����� � ������� �������."
-
-#: ../../help.pm_.c:419
-msgid ""
-"If you are not sure if informations above are\n"
-"correct or if you don't know or are not sure what to enter, the correct\n"
-"informations can be obtained from your Internet Service Provider. If you do "
-"not\n"
-"enter the DNS (name server) information here, this information will be "
-"obtained\n"
-"from your Internet Service Provider at connection time."
-msgstr ""
-"��� �� �� ��������, �� �'�������� ����� �����������\n"
-"���������� ��������� �� �� �� ������� ����� ����������� ��� ����� ������\n"
-"����������\n"
-"���������� ���� ���� �������� �� ������ ���������� Internet. ��� �� ��\n"
-"������� ���������� �� DNS, ����� ���������� ����� �������� �� ������\n"
-"���������� ��� ��� ��������."
-
-#: ../../help.pm_.c:426
-#, fuzzy
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, the correct informations can be\n"
-"obtained from your Internet Service Provider."
-msgstr ""
-"����� ����� �����i ��������� �������� ���� ����� (dialup). ���i ��\n"
-"�� �������, ��� �������� �i����,\n"
-"����������� �������� ��������� i��������� � ������ ���������� Internet (ISP)."
-
-#: ../../help.pm_.c:431
-msgid ""
-"You may now configure your network device.\n"
+" * \"Save to floppy\": saves the partition table to a floppy. Useful for\n"
+"later partition-table recovery if necessary. It is strongly recommended to\n"
+"perform this step.\n"
 "\n"
-"   * IP address: if you don't know or are not sure what to enter, ask your "
-"network administrator.\n"
-"     You should not enter an IP address if you select the option \"Automatic "
-"IP\" below.\n"
+" * \"Done\": when you have finished partitioning your hard drive, this will\n"
+"save your changes back to disc.\n"
 "\n"
-"   * Netmask: \"255.255.255.0\" is generally a good choice. If you don't "
-"know or are not sure what to enter,\n"
-"     ask your network administrator.\n"
+"Note: you can reach any option using the keyboard. Navigate through the\n"
+"partitions using [Tab] and [Up/Down] arrows.\n"
 "\n"
-"   * Automatic IP: if your network uses BOOTP or DHCP protocol, select this "
-"option. If selected, no value is needed in\n"
-"    \"IP address\". If you don't know or are not sure if you need to select "
-"this option, ask your network administrator."
-msgstr ""
-
-#: ../../help.pm_.c:443
-#, fuzzy
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, ask your network administrator."
-msgstr ""
-"��� ���������, �� ������ ������ ��� ������ �����. ��� ��\n"
-"�� ������� �� �� ��������, ��� ����� �������. ������ ���� ������."
-
-#: ../../help.pm_.c:447
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, leave blank."
-msgstr ""
-"��� ���������, �� ������ ������ ��� ������ �����. ��� ��\n"
-"�� ������� �� �� ��������, ��� ����� �������. ������ ���� ������."
-
-#: ../../help.pm_.c:451
-msgid ""
-"You may now enter dialup options. If you're not sure what to enter, the\n"
-"correct information can be obtained from your ISP."
-msgstr ""
-"����� ����� �����i ��������� �������� ���� ����� (dialup). ���i ��\n"
-"�� �������, ��� �������� �i����,\n"
-"����������� �������� ��������� i��������� � ������ ���������� Internet (ISP)."
-
-#: ../../help.pm_.c:455
-msgid ""
-"If you will use proxies, please configure them now. If you don't know if\n"
-"you should use proxies, ask your network administrator or your ISP."
-msgstr ""
-"���i �� ��i������� ������������� proxy, i� ������ ����� �����i �����.\n"
-"���i �� �� �������, �� ��� i��� �������, �����i���� �� ���i�i��������\n"
-"����i �i �� Internet-����������."
-
-#: ../../help.pm_.c:459
-msgid ""
-"You can install cryptographic package if your internet connection has been\n"
-"set up correctly. First choose a mirror where you wish to download packages "
-"and\n"
-"after that select the packages to install.\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"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
-msgstr ""
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "����� �� ������ ������ ������ ���� ������ � ������ ���������."
-
-#: ../../help.pm_.c:471
-msgid ""
-"GNU/Linux manages time in GMT (Greenwich Manage\n"
-"Time) and translates it in local time according to the time zone you have\n"
-"selected.\n"
+" * Ctrl-d to delete a partition;\n"
 "\n"
+" * Ctrl-m to set the mount point.\n"
 "\n"
-"If you use Microsoft Windows on this computer, choose \"No\"."
+"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"
+"boot loader. 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_.c:479
+#: ../../help.pm_.c:460
+#, fuzzy
 msgid ""
-"You may now choose which services you want to start at boot time.\n"
+"More than one Microsoft Windows partition has been detected on your hard\n"
+"drive. Please choose the one you want 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"
-"When your mouse comes over an item, a small balloon help will popup which\n"
-"describes the role of the service.\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"
-"Be very careful in this step if you intend to use your machine as a server: "
-"you\n"
-"will probably want not to start any services that you don't need. Please\n"
-"remember that several services can be dangerous if they are enable on a "
-"server.\n"
-"In general, select only the services that you really need."
-msgstr ""
-
-#: ../../help.pm_.c:492
-msgid ""
-"You can configure a local printer (connected to your computer) or remote\n"
-"printer (accessible via a Unix, Netware or Microsoft Windows network)."
-msgstr ""
-"�� ������ ������������� �������� ������� (������� � ����� ����'������)\n"
-"�� �������� ������� (�������� ���� Unix, Netware �� ����� MS Windows)."
-
-#: ../../help.pm_.c:496
-msgid ""
-"If you wish to be able to print, please choose one printing system between\n"
-"CUPS and LPR.\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"
-"CUPS is a new, powerful and flexible printing system for Unix systems (CUPS\n"
-"means \"Common Unix Printing System\"). It is the default printing system "
-"in\n"
-"Linux-Mandrake.\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"
-"LPR is the old printing system used in previous Linux-Mandrake "
-"distributions.\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"
-"If you don't have printer, click on \"None\"."
+"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"disk or partition is called \"C:\")."
 msgstr ""
-"��� �� ������� ���� ����, ��� �����, ������� ���� � ������ �����\n"
-"CUPS �� LPR.\n"
-"\n"
-"\n"
-"CUPS ���� �����, �������� � ������� ������ ����� ��� Unix ������ (CUPS\n"
-"- \"Common Unix Printing System\"). ���� ������ ����� �� ���������\n"
-"����������� ������ Linux-Mandrake.\n"
-"\n"
-"\n"
-"LPR - ������ ������ ����� � ���������� ������ ������������Linux-Mandrake.\n"
-"\n"
-"\n"
-"��� �� �� ����� ��������, ��������� \"����\"."
-
-#: ../../help.pm_.c:511
-msgid ""
-"GNU/Linux can deal with many types of printer. Each of these types requires\n"
-"a different setup.\n"
-"\n"
-"\n"
-"If your printer is physically connected to your computer, select \"Local\n"
-"printer\".\n"
-"\n"
-"\n"
-"If you want to access a printer located on a remote Unix machine, select\n"
-"\"Remote printer\".\n"
+"�� ����� ����� ���� ��������� ����� �� ���� �������\n"
+"Windows. ��� �����, ������� ���, ����� ����� ������� �������, "
+"�������������\n"
+"������ Mandrake Linux.\n"
 "\n"
 "\n"
-"If you want to access a printer located on a remote Microsoft Windows "
-"machine\n"
-"(or on Unix machine using SMB protocol), select \"SMB/Windows 95/98/NT\"."
-msgstr ""
-"GNU/Linux ���� ��������� �� ������� ����� ��������. ����� � �������\n"
-"�������� ������ �����������.\n"
+"��� i��������, ����� ������� ��������� ��: \"Linux ���\", \"Windows\n"
+"���\" \"C�������\".\n"
+"\"Linux ���\" �������� ��� - \"��� �����\", \"����� �����\",\"����� "
+"��������\n"
+"(���������, \"hda1\").\n"
 "\n"
 "\n"
-"��� ������� ����� ���������� �� ����'�����, ������� \"��������\n"
-"�������\".\n"
+"\"��� �����\" �������� �� \"hd\", ��� ���� IDE, � \"sd\" ��� SCSI.\n"
 "\n"
+"\"����� �����\" - ����� ����� \"hd\" �� \"sd\". ��� IDE �����:\n"
+"   * \"�\" \"master\" �� ��������� ������ IDE \n"
+"   * \"b\" \"slave\" �� ��������� ������ IDE\n"
+"   * \"c\" \"master\" �� ��������� ������ IDE\n"
+"   * \"d\" \"slave\" �� ��������� ������ IDE\n"
 "\n"
-"��� ������� ���������� �� ��������� Unix ������, �������\n"
-"\"�������� �������\".\n"
 "\n"
+"��� SCSI ����� - \"a\" ���� \"�������� ����� ����\", \"b\" - \"�������� "
+"����� ����\", � �.�.\n"
 "\n"
-"��� ������� ���������� �� ��������� ������ Microsoft Windows (�� �� Unix\n"
-"������, ���� ������������ �������� SMB), ������� \"SMB/Windows 95/98/NT\"."
+"\"Windows ���\" ����� ������ ����� � Windows (����� ���� ��\n"
+"������� ����������� �� \"C:\")."
+
+#: ../../help.pm_.c:491
+msgid "Please be patient. This operation can take several minutes."
+msgstr "��� �����, ���������. ����� �������� ����� ����� ���."
 
-#: ../../help.pm_.c:527
+#: ../../help.pm_.c:494
+#, fuzzy
 msgid ""
-"Please turn on your printer before continuing to let DrakX detect it.\n"
-"\n"
-"You have to enter some informations here.\n"
+"DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
+"installation or if you want to have greater control (\"Expert\"). You also\n"
+"have the choice of performing a new install or an upgrade of an existing\n"
+"Mandrake Linux system. Clicking \"Install\" will completely wipe out the\n"
+"old system. Select \"Upgrade\" if you are upgrading or repairing an\n"
+"existing system.\n"
 "\n"
+"Please choose \"Install\" if there are no previous version of Mandrake\n"
+"Linux installed or if you wish to boot between various operating systems.\n"
 "\n"
-"   * Name of printer: the print spooler uses \"lp\" as default printer name. "
-"So, you must have a printer named \"lp\".\n"
-"     If you have only one printer, you can use several names for it. You "
-"just need to separate them by a pipe\n"
-"     character (a \"|\"). So, if you prefer a more meaningful name, you have "
-"to put it first, eg: \"My printer|lp\".\n"
-"     The printer having \"lp\" in its name(s) will be the default printer.\n"
+"Please choose \"Update\" if you wish to update or repair an already\n"
+"installed version of Mandrake Linux.\n"
 "\n"
+"Depending on your knowledge of GNU/Linux, please choose one of the\n"
+"following to install or update your Mandrake Linux operating system:\n"
 "\n"
-"   * Description: this is optional but can be useful if several printers are "
-"connected to your computer or if you allow\n"
-"     other computers to access to this printer.\n"
+" * Recommended: choose this if you have never installed a GNU/Linux\n"
+"operating system. The installation will be very easy and you will only be\n"
+"asked a few questions.\n"
 "\n"
-"\n"
-"   * Location: if you want to put some information on your\n"
-"     printer location, put it here (you are free to write what\n"
-"     you want, for example \"2nd floor\").\n"
+" * Expert: if you have a good knowledge of GNU/Linux, you can choose this\n"
+"installation class. The expert installation will allow you to perform a\n"
+"highly customized installation. Answering some of the questions can be\n"
+"difficult if you do not have a good knowledge of GNU/Linux so do not choose\n"
+"this unless you know what you are doing."
 msgstr ""
-"��� ����� �������� ��� ������� ����� ��������,� DrakX ������� ���.\n"
+"��� �����, ��������� \"����븢��\" ��� �� ������ ������� �������������� "
+"Mandrake Linux\n"
+"����� �� ������� ������������� ������� ����������� ������.\n"
 "\n"
-"�� ������ ������� ��������� ����������.\n"
 "\n"
+"� ���������� �� ����� ���� GNU/Linux, �� ������ ������ ���� � ��������� "
+"�����, ��� ����븢���� � ������������ \n"
+"����� ����������� ������ Mandrake Linux:\n"
 "\n"
-"   * ��� ��������: ����� �������� ������������ �� �������� ��� \"lp\"�� "
-"��� ��������\n"
-"���, �� ������ ���� ������� ����� \"lp\".\n"
-"     ��� �� ����� ����� ���� �������, �� ������ ���� ��� ��� "
-"������������. �� ����� ������ �������� �� ����� ������ ( \"|\").\n"
-"     ���, ��� ����� ����� ������������� �����, �� ������ �������� ������ "
-"�� , �����.: \"My printer|lp\".\n"
-"     ������� � ���� \"lp\" ����� ��������� ��������� �� ��������.\n"
+"* �������������: ������� ���� ����, ��� �� ����� �� ����븢���GNU/Linux. "
+"����������� ����� ����� �������,\n"
+" ��� ����� ������ ����� ������� ��������.\n"
 "\n"
 "\n"
-"   * �������: ���� ������������, ��� ���� ���� �������, ��� ������� "
-"�������� ������� ������ ����'������ �� �� ��\n"
-"     ���������� ������ ����� ����'������ �� ������ ��������.\n"
+"* �� ������: ��� �� ���������� ������ � GNU/Linux, �� ������ ������ ����� "
+"�� ������������� ������ �� ��������\n"
+" �������, ������, ����������. �� ������ ������� �������� �� ������� "
+"��������� �������� ��� ��� ��� �����������\n"
+" ����� \"�������������\", ���� �� ������ ������, �� ������ GNU/Linux, ��� "
+"������ ���� ���� �����������.\n"
 "\n"
 "\n"
-"   * �����������: ��� �� ������� �������i�� ������ ���������� �������\n"
-"     ����������� ��������, ������ �� ���� (�� ������� ����� �� ���\n"
-"     �������, ��������� \"2nd floor\").\n"
+"* �������: �� ������ ������ ���� ����, ��� �� ����� ������ ���� � GNU/"
+"Linux. �� � ��� ����������� �����\n"
+" \"���������\", �� ������ ������ ����� �� ������������� ������ �� "
+"�������� �������, ������,\n"
+" ����������. ������� ����� ���������� ����� ���, �� ������ ���� ���� "
+"�����������. �� ������� �������� �������� ����������� �\n"
+" ������������ � ����� ��������. ������ �� ��������� ������� ������ ���� "
+"����� ���������, ��� �� �� ����� ������ ���� � GNU/Linux.\n"
+" ���� �� ������� ���� ���� ����������, ��� �� �� ������� ���, ��� �����."
 
-#: ../../help.pm_.c:548
+#: ../../help.pm_.c:521
 msgid ""
-"You need to enter some informations here.\n"
-"\n"
-"\n"
-"   * Name of queue: the print spooler uses \"lp\" as default printer name. "
-"So, you need have a printer named \"lp\".\n"
-"    If you have only one printer, you can use several names for it. You just "
-"need to separate them by a pipe\n"
-"    character (a \"|\"). So, if you prefer to have a more meaningful name, "
-"you have to put it first, eg: \"My printer|lp\".\n"
-"    The printer having \"lp\" in its name(s) will be the default printer.\n"
-"\n"
-"  \n"
-"   * Spool directory: it is in this directory that printing jobs are stored. "
-"Keep the default choice\n"
-"     if you don't know what to use\n"
+"Normally, DrakX selects the right keyboard for you (depending on the\n"
+"language you have chosen) and you will not even see this step. However, you\n"
+"might not have a keyboard that corresponds exactly to your language: for\n"
+"example, if you are an English speaking Swiss person, you may still want\n"
+"your keyboard to be a Swiss keyboard. Or if you speak English but are\n"
+"located in Quebec, you may find yourself in the same situation. In both\n"
+"cases, you will have to go back to this installation step and select an\n"
+"appropriate keyboard from the list.\n"
 "\n"
-"\n"
-"   * Printer Connection: If your printer is physically connected to your "
-"computer, select \"Local printer\".\n"
-"     If you want to access a printer located on a remote Unix machine, "
-"select \"Remote lpd printer\".\n"
-"\n"
-"\n"
-"     If you want to access a printer located on a remote Microsoft Windows "
-"machine (or on Unix machine using SMB\n"
-"     protocol), select \"SMB/Windows 95/98/NT\".\n"
-"\n"
-"\n"
-"     If you want to acces a printer located on NetWare network, select "
-"\"NetWare\".\n"
+"Click on the \"More\" button to be presented with the complete list of\n"
+"supported keyboards."
 msgstr ""
-"��� �� ������ ������ ��������� ����������.\n"
-"\n"
-"\n"
-"   * ��� ����: ��������������� \"lp\" �� ��� �������� �� ��������. ���, "
-"�� ������ ���� ������� ����� \"lp\".\n"
-"     ��� �� ����� ����� ���� �������, �� ������ ���� ��� ��� "
-"������������. �� ����� ������ �������� �� ����� ������ ( \"|\").\n"
-"     ���, ��� ����� ����� ������������� �����, �� ������ �������� ������ "
-"�� , �����.: \"My printer|lp\".\n"
-"     ������� � ���� \"lp\" ����� ��������� ��������� �� ��������.\n"
-"\n"
-"  \n"
-"   * ���������� spool: � �� ����������� ������ �� ��������� �����. ��������� "
-"�������\n"
-"     �� ��������, ��� �� ������� �� ����� ����������.\n"
-"\n"
-"\n"
-"   * ����������� ��������: ��� ������� ������ ������� � ����'������, "
-"������� \"�������� �������\".\n"
-"     ��� ������� ���������� �� ��������� Unix ������, ������� \"�������� "
-"lpd �������\".\n"
-"\n"
-"\n"
-"     ��� �� ������� ���������� �� ��������� ������ MS Windows (�� �� Unix "
-"������, ���� ������������ �������� SMB,\n"
-"     ������� \"SMB/Windows 95/98/NT\".\n"
-"\n"
-"\n"
-"     ��� ������� ���������� �� ���� NetWare, ������� \"NetWare\".\n"
 
-#: ../../help.pm_.c:573
+#: ../../help.pm_.c:534
 msgid ""
-"Your printer has not been detected. Please enter the name of the device on\n"
-"which it is connected.\n"
+"Please choose your preferred language for installation and system usage.\n"
 "\n"
+"Clicking on the \"Advanced\" button will allow you to select other\n"
+"languages to be installed on your workstation. Selecting other languages\n"
+"will install the language-specific files for system documentation and\n"
+"applications. For example, if you will host users from Spain on your\n"
+"machine, select English as the main language in the tree view and in the\n"
+"Advanced section click on the grey star corresponding to \"Spanish|Spain\".\n"
 "\n"
-"For information, most printers are connected on the first parallel port. "
-"This\n"
-"one is called \"/dev/lp0\" under GNU/Linux and \"LPT1\" under Microsoft "
-"Windows."
+"Note that multiple languages may be installed. Once you have selected any\n"
+"additional locales click the \"OK\" button to continue."
 msgstr ""
-"��� ������� �� ��� ���������. ��� ����� ������� ��� ������� �� ���� ��\n"
-"����������.\n"
-"\n"
-"\n"
-"�������� �������� ������������ �� ������� ������������ �����.��\n"
-"������� \"/dev/lp0\" � GNU/Linux � \"LPT1\" � Microsoft Windows."
-
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "�� ������ ������ ��� ������� �� ����."
 
-#: ../../help.pm_.c:584
+#: ../../help.pm_.c:547
 msgid ""
-"Please select the right options according to your printer.\n"
-"Please see its documentation if you don't know what choose here.\n"
+"By default, DrakX assumes you have a two-button mouse and will set it up\n"
+"for third-button emulation. DrakX will automatically know whether it is a\n"
+"PS/2, serial or USB mouse.\n"
 "\n"
+"If you wish to specify a different type of mouse select the appropriate\n"
+"type from the list provided.\n"
 "\n"
-"You will be able to test your configuration in next step and you will be "
-"able to modify it if it doesn't work as you want."
+"If you choose a mouse other than the default you will be presented with a\n"
+"mouse test screen. Use the buttons and wheel to verify that the settings\n"
+"are good. If the mouse is not working correctly press the space bar or\n"
+"RETURN to \"Cancel\" and choose again."
+msgstr ""
+
+#: ../../help.pm_.c:560
+msgid ""
+"Please select the correct port. For example, the COM1 port under MS Windows\n"
+"is named ttyS0 under GNU/Linux."
 msgstr ""
-"��� �����, ������� �������� ����� � ������������� ������ ��������.\n"
-"��� �����,������� ������������ ��� �� ������� ��� ������.\n"
-"\n"
-"\n"
-"��� �� �������, �� ������� �������� ������������ ����� ������������\n"
-"�� ��������� ����� � �������� ��."
 
-#: ../../help.pm_.c:591
+#: ../../help.pm_.c:564
 msgid ""
-"You can now enter the root password for your Linux-Mandrake system.\n"
-"The password must be entered twice to verify that both password entries are "
-"identical.\n"
+"This is the most crucial decision point for the security of your GNU/Linux\n"
+"system: you have to enter the \"root\" password. \"root\" is the system\n"
+"administrator and is the only one authorized to make updates, add users,\n"
+"change the overall system configuration, and so on. In short, \"root\" can\n"
+"do everything! That is why you must choose a password that is difficult to\n"
+"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
+"choose not to enter a password, but we strongly advise you against this if\n"
+"only for one reason: do not think that because you booted GNU/Linux that\n"
+"your other operating systems are safe from mistakes. Since \"root\" can\n"
+"overcome all limitations and unintentionally erase all data on partitions\n"
+"by carelessly accessing the partitions themselves, it is important for it\n"
+"to be difficult to become \"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 too\n"
+"easy to compromise a system.\n"
 "\n"
-"Root is the system's administrator and is the only user allowed to modify "
-"the\n"
-"system configuration. Therefore, choose this password carefully. \n"
-"Unauthorized use of the root account can be extemely dangerous to the "
-"integrity\n"
-"of the system, its data and other system connected to it.\n"
+"However, please do not make the password too long or complicated because\n"
+"you must be able to remember it without too much effort.\n"
 "\n"
+"The password will not be displayed on screen as you type it in. Hence, you\n"
+"will have to type the password twice to reduce the chance of a typing\n"
+"error. If you do happen to make the same typing error twice, this\n"
+"\"incorrect\" password will have to be used the first time you connect.\n"
 "\n"
-"The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. It should never be written down.\n"
+"In expert mode, you will be asked if you will be connecting to an\n"
+"authentication server, like NIS or LDAP.\n"
 "\n"
+"If your network uses LDAP (or NIS) protocol for authentication, select\n"
+"\"LDAP\" (or \"NIS\") as authentication. If you do not know, ask your\n"
+"network administrator.\n"
 "\n"
-"Do not make the password too long or complicated, though: you must be able "
-"to\n"
-"remember it without too much effort."
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
 
-#: ../../help.pm_.c:609
+#: ../../help.pm_.c:600
 msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"��� ������i�� ������� �i�����, ��������� ������ \"���������� ������� ����\"\n"
-"i \"���������� �����i MD5\"."
-
-#: ../../help.pm_.c:613
-msgid ""
-"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
-"network administrator."
-msgstr ""
-"���i � ����� ����� ��������������� NIS, ������� \"������������ NIS\". "
-"���i\n"
-"�� �������, ��������� ���i�i�������� ����i."
-
-#: ../../help.pm_.c:617
-msgid ""
-"You may now create one or more \"regular\" user account(s), as\n"
-"opposed to the \"privileged\" user account, root. You can create\n"
-"one or more account(s) for each person you want to allow to use\n"
-"the computer. Note that each user account will have its own\n"
-"preferences (graphical environment, program settings, etc.)\n"
-"and its own \"home directory\", in which these preferences are\n"
-"stored.\n"
+"LILO and GRUB are boot loaders for GNU/Linux. This stage, normally, is\n"
+"totally automated. In fact, DrakX analyzes the disk boot sector and acts\n"
+"accordingly, depending on what it finds here:\n"
 "\n"
+" * if Windows boot sector is found, it will replace it with a GRUB/LILO "
+"boot\n"
+"sector. Hence, you will be able to load either GNU/Linux or another OS;\n"
 "\n"
-"First of all, create an account for yourself! Even if you will be the only "
-"user\n"
-"of the machine, you may NOT connect as root for daily use of the system: "
-"it's a\n"
-"very high security risk. Making the system unusable is very often a typo "
-"away.\n"
+" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
+"one;\n"
 "\n"
+"If in doubt, DrakX will display a dialog with various options.\n"
 "\n"
-"Therefore, you should connect to the system using the user account\n"
-"you will have created here, and login as root only for administration\n"
-"and maintenance purposes."
-msgstr ""
-"����� �� ������ �������� ���i� ����� �������i \"���������\" ��i����� "
-"���i��\n"
-"����������i��. ��� ������� ����������i�� ������� �������� �� ������ �i "
-"�������i\n"
-"��i����� ���i��. ��� ������� ��i������ ���i�� ���������� ������� ��������i\n"
-"(����i���� ����������, ��������i �������,...) i ������ \"����i �������\",\n"
-"� ��i� ���������� ����� ��������i.\n"
+" * \"Boot loader to use\": you have three choices:\n"
 "\n"
+"    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
+"interface.\n"
 "\n"
-"��-������, �������� ������ ��� ����! ����� ���i �� ������� ���i���\n"
-"����������i��� ����� ������, �� ������������� �������i�� � ������i\n"
-"���������������i�� ��� ��������� �����: ���� ������� ���i��� �������\n"
-"������i. ������� ��i����� �i����� ��������� �������� �����.\n"
+"    * \"GRUB\": if you prefer GRUB (text menu).\n"
 "\n"
+"    * \"LILO with text menu\": if you prefer LILO with its text menu "
+"interface.\n"
 "\n"
-"���� �������i�� � �i����� ��������� � ������i ���������� ����������i��,\n"
-"����� �� ����� i ��������, � �������i�� � ������i root ��������� �����i\n"
-"� �����i ���i�i����������� i ������������ �i�����."
-
-#: ../../help.pm_.c:636
-msgid ""
-"Creating a boot disk is strongly recommended. If you can't\n"
-"boot your computer, it's the only way to rescue your system without\n"
-"reinstalling it."
-msgstr ""
-"��������� boot ����� ������ �������������! ��� �� �� �������\n"
-"�������� ��� ����'����, ��� ���� ��� ����� ������ �������\n"
-"����� ��� ������ ���������������."
-
-#: ../../help.pm_.c:641
-msgid ""
-"You need to indicate where you wish\n"
-"to place the information required to boot to GNU/Linux.\n"
+" * \"Boot device\": in most cases, you will not change the default\n"
+"(\"/dev/hda\"), but if you prefer, the boot loader can be installed on the\n"
+"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\").\n"
 "\n"
+" * \"Delay before booting the default image\": when rebooting the computer,\n"
+"this is the delay granted to the user to choose - in the boot loader menu,\n"
+"another boot entry than the default one.\n"
 "\n"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"��������� ���������, ��� �� ������� �������i�� i���������, ���� ���������\n"
-"��� �������i Linux.\n"
+"!! Beware that if you choose not to install a boot loader (by selecting\n"
+"\"Cancel\" here), you must ensure that you have a way to boot your Mandrake\n"
+"Linux system! Also be sure you know what you do before changing any of the\n"
+"options. !!\n"
 "\n"
+"Clicking the \"Advanced\" button in this dialog will offer many advanced\n"
+"options, which are reserved to the expert user.\n"
 "\n"
-"���i �� �� ��������� ��������� ��������, ��� �� ���i��, \n"
-"������� \"����� ������ �� ����� (MBR)\"."
-
-#: ../../help.pm_.c:649
-msgid ""
-"Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
-" (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+"Mandrake Linux installs its own boot loader, which will let you boot either\n"
+"GNU/Linux or any other operating systems which you have on your system.\n"
+"\n"
+"If there is another operating system installed on your machine, it will be\n"
+"automatically added to the boot menu. Here, you can choose to fine-tune the\n"
+"existing options. Double-clicking on an existing entry allows you to change\n"
+"its parameters or remove it; \"Add\" creates a new entry; and \"Done\" goes\n"
+"on to the next installation step."
 msgstr ""
-"���i �� �� ������� ��������, ��� ��������� ������� �'�������� \"/dev/hda\"\n"
-"(�������� ������� IDE ����) �i \"/dev/sda\" (����� SCSI ����)."
 
-#: ../../help.pm_.c:653
+#: ../../help.pm_.c:647
+#, fuzzy
 msgid ""
-"LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
+"LILO (the LInux LOader) and GRUB are boot loaders: they are able to boot\n"
 "either GNU/Linux or any other operating system present on your computer.\n"
 "Normally, these other operating systems are correctly detected and\n"
 "installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
-"\n"
+"screen. Be careful to choose the correct parameters.\n"
 "\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
+"You may also not want to give access to these other operating systems to\n"
+"anyone. In which case, you can delete the corresponding entries. But then,\n"
+"you will need a boot disk in order to boot those other operating systems!"
 msgstr ""
 "LILO (�� LInux LOader) i Grub - ���� ���������i. ��� ������ ������i�� "
 "������\n"
@@ -3174,377 +2948,238 @@ msgstr ""
 "� ���i� ������� �������� �����i�� ���������� ���i��. ��� � ���� ��� \n"
 "�������� ����� ����������� �������, ��� ������i���!"
 
-#: ../../help.pm_.c:665
+#: ../../help.pm_.c:658
 #, fuzzy
 msgid ""
-"LILO and grub main options are:\n"
-"  - Boot device: Sets the name of the device (e.g. a hard disk\n"
-"partition) that contains the boot sector. Unless you know specifically\n"
-"otherwise, choose \"/dev/hda\".\n"
-"\n"
-"\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero.\n"
-"\n"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\n"
 "\n"
-"  - Video mode: This specifies the VGA text mode that should be selected\n"
-"when booting. The following values are available: \n"
-"\n"
-"    * normal: select normal 80x25 text mode.\n"
-"\n"
-"    * <number>:  use the corresponding text mode.\n"
-"\n"
-"\n"
-"  - Clean \"/tmp\" at each boot: if you want delete all files and "
-"directories\n"
-"stored in \"/tmp\" when you boot your system, select this option.\n"
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
+msgstr ""
+"��������� ���������, ��� �� ������� �������i�� i���������, ���� ���������\n"
+"��� �������i Linux.\n"
 "\n"
 "\n"
-"  - Precise RAM if needed: unfortunately, there is no standard method to ask "
-"the\n"
-"BIOS about the amount of RAM present in your computer. As consequence, Linux "
-"may\n"
-"fail to detect your amount of RAM correctly. If this is the case, you can\n"
-"specify the correct amount or RAM here. Please note that a difference of 2 "
-"or 4\n"
-"MB between detected memory and memory present in your system is normal."
-msgstr ""
-"������� ��������� SILO:\n"
-"  - ����������� ����������: ������� �����, ��� �� ������� �����i��\n"
-"i���������, ��������� ��� �������i GNU/Linux. ���i �� ��������, ���\n"
-"���i�� ����i����, ������� \"����� ������ ����� (MBR)\".\n"
-"\n"
-"\n"
-"  - �������� �� �������� ����� ��������� �������: ����� ��� � ��������\n"
-"�������, �� ������� ����� ��������� ����� ����� ��������� ������� �� "
-"��������.\n"
-"���� ��������� ������� ��� �i�����, ��i� ������ ����������� � ���������\n"
-"����� ������ ������ ��������� ����i�����. ��������� �� �����, ���i \"��������"
-"\"\n"
-"\"��������\" �� ����� ��������� �i ���������� �� ����."
+"���i �� �� ��������� ��������� ��������, ��� �� ���i��, \n"
+"������� \"����� ������ �� ����� (MBR)\"."
 
-#: ../../help.pm_.c:697
+#: ../../help.pm_.c:665
 msgid ""
-"Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able\n"
-"to boot either GNU/Linux, MacOS, or MacOSX, if present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
+"Here we select a printing system for your computer to use. Other OSes may\n"
+"offer you one, but Mandrake offers three.\n"
 "\n"
+" * \"pdq\" - which means ``print, don't queue'', is the choice if you have "
+"a\n"
+"direct connection to your printer and you want to be able to panic out of\n"
+"printer jams, and you do not have any networked printers. It will handle\n"
+"only very simple network cases and is somewhat slow for networks. Pick\n"
+"\"pdq\" if this is your maiden voyage to GNU/Linux. You can change your\n"
+"choices after install by running PrinterDrake from the Mandrake Control\n"
+"Center and clicking the expert button.\n"
+"\n"
+" * \"CUPS\" - ``Common Unix Printing System'' is excellent at printing to\n"
+"your local printer and also halfway round the planet. It is simple and can\n"
+"act like a server or a client for the ancient \"lpd\" printing system, so\n"
+"it is compatible with the systems that went before. It can do many tricks,\n"
+"but the basic setup is almost as easy as \"pdq\". If you need this to\n"
+"emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
+"graphical front-ends for printing or choosing printer options.\n"
+"\n"
+" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
+"approximately the same things the others can do, but it will print to\n"
+"printers mounted on a Novell Network, because it supports IPX protocol, and\n"
+"it can print directly to shell commands. If you have need of Novell or\n"
+"printing to commands without using a separate pipe construct, use lprNG.\n"
+"Otherwise, CUPS is preferable as it is simpler and better at working over\n"
+"networks."
+msgstr ""
+
+#: ../../help.pm_.c:693
+msgid ""
+"DrakX is now detecting any IDE devices present in your computer. It will\n"
+"also scan for one or more PCI SCSI card(s) on your system. If a SCSI card\n"
+"is found DrakX will automatically install the appropriate driver.\n"
+"\n"
+"Because hardware detection will sometimes not detect a piece of hardware\n"
+"DrakX will ask you to confirm if a PCI SCSI card is present. Click \"Yes\"\n"
+"if you know that there is a SCSI card installed in your machine. You will\n"
+"be presented a list of SCSI cards to choose from. Click \"No\" if you have\n"
+"no SCSI hardware. If you are unsure you can check the list of hardware\n"
+"detected in your machine by selecting \"See hardware info\" and clicking\n"
+"\"OK\". Examine the list of hardware and then click on the \"OK\" button to\n"
+"return to the SCSI interface question.\n"
 "\n"
-"Yaboot main options are:\n"
+"If you have to manually specify your adapter, DrakX will ask if you want to\n"
+"specify options for it. You should allow DrakX to probe the hardware for\n"
+"the card-specific options that the hardware needs to initialize. This\n"
+"usually works well.\n"
 "\n"
+"If DrakX is not able to probe for the options that need to be passed, you\n"
+"will need to manually provide options to the driver. Please review the\n"
+"``User Guide'' (chapter 3, section \"Collecting information on your\n"
+"hardware\") for hints on retrieving the parameters required from hardware\n"
+"documentation, from the manufacturer's web site (if you have Internet\n"
+"access) or from Microsoft Windows (if you used this hardware with Windows\n"
+"on your system)."
+msgstr ""
+
+#: ../../help.pm_.c:720
+msgid ""
+"You can add additional entries for yaboot, either for other operating\n"
+"systems, alternate kernels, or for an emergency boot image.\n"
 "\n"
-"  - Init Message: A simple text message that is displayed before the boot\n"
-"prompt.\n"
+"For other OS's, the entry consists only of a label and the root partition.\n"
 "\n"
+"For Linux, there are a few possible options:\n"
 "\n"
-"  - Boot Device: Indicate where you want to place the information required "
-"to \n"
-"boot to GNU/Linux. Generally, you will have setup a bootstrap partition "
-"earlier \n"
-"to hold this information.\n"
+" * Label: this is simply the name you will have to type at the yaboot "
+"prompt\n"
+"to select this boot option.\n"
 "\n"
+" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
+"or a variation of vmlinux with an extension.\n"
 "\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"
+" * Root: the \"root\" device or \"/\" for your Linux installation.\n"
 "\n"
+" * Append: on Apple hardware, the kernel append option is used quite often\n"
+"to assist in initializing video hardware, or to enable keyboard mouse\n"
+"button emulation for the often lacking 2nd and 3rd mouse buttons on a stock\n"
+"Apple mouse. The following are some examples:\n"
 "\n"
-"  - Kernel Boot Timeout: This timeout is similar to the LILO boot delay.  "
-"After \n"
-"selecting Linux, you will have this delay in 0.1 seconds before your "
-"default\n"
-"kernel description is selected.\n"
+"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"hda=autotune\n"
 "\n"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-"  - Enable CD Boot?: Checking this option will allow you to choose 'C' for "
-"CD at\n"
-"the first boot prompt.\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 4,096 bytes. If you\n"
+"need to allocate a large ramdisk, this option can be used.\n"
 "\n"
-"  - Enable OF Boot?: Checking this option will allow you to choose 'N' for "
-"Open\n"
-"Firmware at the first boot prompt.\n"
+" * Read-write: normally the \"root\" partition is initially brought up in\n"
+"read-only, to allow a file system check before the system becomes \"live\".\n"
+"Here, you can override 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 OS: You can select which OS will boot by default when the Open "
-"Firmware \n"
-"Delay expires."
+" * Default: selects this entry as being the default Linux selection,\n"
+"selectable by just pressing ENTER at the yaboot prompt. This entry will\n"
+"also be highlighted with a \"*\", if you press [Tab] to see the boot\n"
+"selections."
 msgstr ""
 
-#: ../../help.pm_.c:738
+#: ../../help.pm_.c:765
 msgid ""
-"You can add additional entries for yaboot, either for other operating "
-"systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"\n"
-"For other OS's - the entry consists only of a label and the root partition.\n"
-"\n"
-"\n"
-"For Linux, there are a few possible options: \n"
+"Yaboot is a boot loader for NewWorld MacIntosh hardware. It is able to boot\n"
+"either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
+"these other operating systems are correctly detected and installed. If this\n"
+"is not the case, you can add an entry by hand in this screen. Be careful as\n"
+"to choose the correct parameters.\n"
 "\n"
+"Yaboot's main options are:\n"
 "\n"
-"  - Label: This is simply the name will type at the yaboot prompt to select "
-"this \n"
-"boot option.\n"
-"\n"
-"\n"
-"  - Image: This would be the name of the kernel to boot.  Typically vmlinux "
-"or\n"
-"a variation of vmlinux with an extension.\n"
-"\n"
-"\n"
-"  - Root: The root device or '/' for your Linux installation.\n"
-"\n"
+" * Init Message: a simple text message that is displayed before the boot\n"
+"prompt.\n"
 "\n"
-"  \n"
-"  - Append: On Apple hardware, the kernel append option is used quite often "
+" * Boot Device: indicate where you want to place the information required "
 "to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button "
-"emulation\n"
-"for the often lacking 2nd and 3rd mouse buttons on a stock Apple mouse.  The "
-"following \n"
-"are some examples:\n"
-"\n"
-"\n"
-"\t\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
-"hda=autotune\n"
-"\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
-"\n"
-"\n"
-" \n"
-"  - Initrd: This option can be used either to load initial modules, before "
-"the boot \n"
-"device is available, or to load a ramdisk image for an emergency boot "
-"situation.\n"
-"\n"
+"boot to GNU/Linux. Generally, you setup a bootstrap partition earlier to\n"
+"hold this information.\n"
 "\n"
-"  - Initrd-size: The default ramdisk size is generally 4096 bytes.  If you "
-"should need\n"
-"to allocate a large ramdisk, this option can be used.\n"
+" * 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 before your\n"
+"default kernel description is selected.\n"
 "\n"
-"  - Read-write: Normally the 'root' partition is initially brought up read-"
-"only, to allow\n"
-"a filesystem check before the system becomes 'live'.  You can override this "
-"option here.\n"
-"\n"
-"\n"
-"  - NoVideo: Should the Apple video hardware prove to be exceptionally "
-"problematic, you can\n"
-"select this option to boot in 'novideo' mode, with native framebuffer "
-"support.\n"
+" * 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 "
+"Open\n"
+"Firmware at the first boot prompt.\n"
 "\n"
-"  - Default: Selects this entry as being the default Linux selection, "
-"selectable by just\n"
-"pressing ENTER at the yaboot prompt.  This entry will also be highlighted "
-"with a '*', if you\n"
-"press TAB to see the boot selections."
+" * Default OS: you can select which OS will boot by default when the Open\n"
+"Firmware Delay expires."
 msgstr ""
 
-#: ../../help.pm_.c:793
+#: ../../help.pm_.c:798
 msgid ""
-"SILO is a bootloader for SPARC: it is able to boot\n"
-"either GNU/Linux or any other operating system present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
+"Here are presented various parameters concerning your machine. Depending on\n"
+"your installed hardware, you may - or not, see the following entries:\n"
 "\n"
+" * \"Mouse\": mouse check the current mouse configuration and click on the\n"
+"button to change it if necessary.\n"
 "\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
-msgstr ""
-"SILO - ���� ��������� ��� SPARC. �� ���� ������i�� ������\n"
-"GNU/Linux �i ����� i���� ����������� �i�����, ����������� �� ���������.\n"
-"��������, ����� i���� ����������� �i����� �������� ����������� i\n"
-"����븢������. ���i ���� �� ����������, �� �� ������ ������ ���� ���i�\n"
-"����������. ������� ��������, ��� �� �����i ��������� ���������.\n"
-"\n"
+" * \"Keyboard\": keyboard check the current keyboard map configuration and\n"
+"click on the button to change that if necessary.\n"
 "\n"
-"������� �� ������ �������� i �� ������� i���� ����������� �i�����.\n"
-"� ���i� ������� �������� �����i�� ���������� ���i��. ��� � ���� ��� \n"
-"����� �������� i����������� ����, ��� ������i���."
-
-#: ../../help.pm_.c:805
-msgid ""
-"SILO main options are:\n"
-"  - Bootloader installation: Indicate where you want to place the\n"
-"information required to boot to GNU/Linux. Unless you know exactly\n"
-"what you are doing, choose \"First sector of drive (MBR)\".\n"
+" * \"Timezone\": time zoneDrakX, by default, guesses your time zone from "
+"the\n"
+"language you have chosen. But here again, as for the choice of a keyboard,\n"
+"you may not be in the country for which the chosen language should\n"
+"correspond. Hence, you may need to click on the \"Timezone\" button in\n"
+"order to configure the clock according to the time zone you are in.\n"
 "\n"
+" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
+"configuration wizard.\n"
 "\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero."
-msgstr ""
-"������� ��������� SILO:\n"
-"  - ����������� ����������: ������� �����, ��� �� ������� �����i��\n"
-"i���������, ��������� ��� �������i GNU/Linux. ���i �� ��������, ���\n"
-"���i�� ����i����, ������� \"����� ������ ����� (MBR)\".\n"
+" * \"Sound card\": if a sound card is detected on your system, it is\n"
+"displayed here. No modification possible at installation time.\n"
 "\n"
+" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
+"here. No modification possible at installation time.\n"
 "\n"
-"  - �������� �� �������� ����� ��������� �������: ����� ��� � ��������\n"
-"�������, �� ������� ����� ��������� ����� ����� ��������� ������� �� "
-"��������.\n"
-"���� ��������� ������� ��� �i�����, ��i� ������ ����������� � ���������\n"
-"����� ������ ������ ��������� ����i�����. ��������� �� �����, ���i \"��������"
-"\"\n"
-"\"��������\" �� ����� ��������� �i ���������� �� ����."
-
-#: ../../help.pm_.c:818
-msgid ""
-"Now it's time to configure the X Window System, which is the\n"
-"core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
-"you must configure your video card and monitor. Most of these\n"
-"steps are automated, though, therefore your work may only consist\n"
-"of verifying what has been done and accept the settings :)\n"
-"\n"
-"\n"
-"When the configuration is over, X will be started (unless you\n"
-"ask DrakX not to) so that you can check and see if the\n"
-"settings suit you. If they don't, you can come back and\n"
-"change them, as many times as necessary."
-msgstr ""
-"����� ������� ������i�� X Window System, ���� �'��������\n"
-"������� Linux GUI (����i��� I�������� ����������i��). ����� ������\n"
-"�������� ������i�� �i�������� i ���i���. ������� ������ ����� �����\n"
-"�������������, ���� ���� ����� ���� ���������� � ��������\n"
-"���i�� ��������i i ������������� ������� ��������� :)\n"
-"\n"
-"���i ����i��������� ����������, ����� ��������� X  (���i �� ��\n"
-"������i�� DrakX �� ���i�� ������), ��� �� �����i ���������, �i ������\n"
-"�� � ����������i. ���i ��, �� ����� ������� �������� i ������� i�\n"
-"�����i ��� ��������."
-
-#: ../../help.pm_.c:831
-msgid ""
-"If something is wrong in X configuration, use these options to correctly\n"
-"configure the X Window System."
+" * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
+"displayed here. You can click on the button to change the parameters\n"
+"associated to it."
 msgstr ""
-"���i ����� �� ��� � ���������� X, ����������� ����� ��������� ��� \n"
-"��������� ��������i X Window System."
 
-#: ../../help.pm_.c:835
+#: ../../help.pm_.c:827
+#, fuzzy
 msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
-msgstr ""
-"���i �� ������� �������� ����i����� ������� (login), ������� \"���\". I���� "
-"- \n"
-"\"��\"."
-
-#: ../../help.pm_.c:839
-msgid ""
-"You can choose a security level for your system. Please refer to the manual "
-"for complete\n"
-"  information. Basically, if you don't know what to choose, keep the default "
-"option.\n"
+"Choose the hard drive you want to erase to install your new Mandrake Linux\n"
+"partition. Be careful, all data present on it will be lost and will not be\n"
+"recoverable!"
 msgstr ""
+"������� ����� ���� �� ������� �������� ��� �����������\n"
+"������ �������� Mandrake Linux. ������ ��������, ��� �������� �� ����� "
+"������\n"
+" �������� � �� ��������� ����� �������."
 
-#: ../../help.pm_.c:844
+#: ../../help.pm_.c:832
+#, fuzzy
 msgid ""
-"Your system is going to reboot.\n"
+"Click on \"OK\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
 "\n"
-"After rebooting, your new Linux Mandrake system will load automatically.\n"
-"If you want to boot into another existing operating system, please read\n"
-"the additional instructions."
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
-"�i����� ��i������ ����������i���.\n"
+"��������� \"���\", ��� ������� ������� ��� ��������\n"
+"� �������� �� ����� �����. ������ ��������, ����� ����� �������� �� ��\n"
 "\n"
-"����� �����������i, ���� ����� �i����� Linux Mandrake ������i��� "
-"����������.\n"
-"���i �� ������� ����������i�� ��� i���� ����������� �i�����, ������� \n"
-"���������� i��������i."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "����� ����"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "���� �����������"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "���������� ��������� �����"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "��������� ����"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "����� ����i�����"
-
-#: ../../install2.pm_.c:42
-#, fuzzy
-msgid "Security"
-msgstr "��������"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "�����. �������� �i�����"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "������������ ��������"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "����� ������"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "����������� �i�����"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "������ ��� root"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "������ ����������i��"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "��������� ����i"
+"�������� ������� ����� �������� � ��������, �������� � �������� Windows\n"
+"\n"
+"\n"
+"��������� \"������\" ��� �������� �������� ��� ������ �������� � ��������"
 
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
+#: ../../install2.pm_.c:114
+#, c-format
+msgid ""
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
 
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "��������� ������"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "�������� ����. ����"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "����������� ����������"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "��������� X Window"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "���������� �����������"
-
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3559,50 +3194,39 @@ msgid ""
 "Do you really want to install these servers?\n"
 msgstr ""
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
 msgstr "��������� ������������� broadcast ��� ������ NIS"
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, fuzzy, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "������ ������� � �������� %s"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
 msgstr ""
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 msgstr ""
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "������� ������� ����� $f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "������� ������� ����� %s"
 
-#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:310
-#: ../../interactive.pm_.c:99 ../../interactive.pm_.c:114
-#: ../../interactive.pm_.c:269 ../../interactive_newt.pm_.c:166
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:356
-#: ../../my_gtk.pm_.c:617 ../../my_gtk.pm_.c:640
+#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:325
+#: ../../interactive.pm_.c:107 ../../interactive.pm_.c:122
+#: ../../interactive.pm_.c:286 ../../interactive.pm_.c:308
+#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:170
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:415
+#: ../../my_gtk.pm_.c:716 ../../my_gtk.pm_.c:738
 msgid "Ok"
 msgstr "��"
 
-#: ../../install_gtk.pm_.c:423
-msgid "Please test the mouse"
-msgstr "��� �����, ������ ������� ���� �����."
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-#, fuzzy
-msgid "To activate the mouse,"
-msgstr "��� �����, ������ ������� ���� �����."
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "����� ����� ����!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -3612,7 +3236,7 @@ msgstr ""
 "������ ������������ �������� ����������� �������� ��� �����.\n"
 "�������� ���������� ��� �� ����� �������� ���: %s"
 
-#: ../../install_interactive.pm_.c:41
+#: ../../install_interactive.pm_.c:44
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -3622,11 +3246,11 @@ msgstr ""
 "��� ������ �������� ������� (����� �������� ��� i������).\n"
 "����� ������� ``������ ����i�������'' i �������i�� �� � `/'"
 
-#: ../../install_interactive.pm_.c:46 ../../install_steps_graphical.pm_.c:259
+#: ../../install_interactive.pm_.c:49 ../../install_steps_graphical.pm_.c:259
 msgid "You must have a swap partition"
 msgstr "�� ���i��� ���� ������� swap"
 
-#: ../../install_interactive.pm_.c:47 ../../install_steps_graphical.pm_.c:261
+#: ../../install_interactive.pm_.c:50 ../../install_steps_graphical.pm_.c:261
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -3636,56 +3260,61 @@ msgstr ""
 "\n"
 "�� ���� ����������?"
 
-#: ../../install_interactive.pm_.c:68
+#: ../../install_interactive.pm_.c:53 ../../install_steps.pm_.c:165
+#, fuzzy
+msgid "You must have a FAT partition mounted in /boot/efi"
+msgstr "�� ���i��� ���� ������� swap"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "������������� ��������� ��������"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "�� ����� �������� ��� ��������� ����� ��������"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "������������� i������ �������"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "���� i������� ��������, ��i� ����� �����������"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "������������� ������� Windows ��� �i��������� �������� �i�����"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 #, fuzzy
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "������ ����� �������� �� ������� ����i��?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "����� ������"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "�������� ������� � M�: "
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "����� swap �������� � M�:"
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "������������� ��������� �������� �� �������� Windows"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "������ ����� �������� �� ������� ����i��?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "���i����� ���� �������� �i����� Windows"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -3694,13 +3323,13 @@ msgstr ""
 "� �������� ����� ������ �������� FAT �� ����������\n"
 "���������� ��� �������, �������: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "��� ������� � Windows ������� �������������. \n"
 "����������� �������� ������i�� �������� ``defrag''"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -3719,21 +3348,21 @@ msgstr ""
 "�������� i �����i ����� ��� ����i���� �� �������� �����������.\n"
 "���i �����������i��, ���i��i�� Ok."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "���� �������� �������� ��� Windows?"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "������� %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "������������ ������ �� ���������� ��� �������� FAT %s"
 
-#: ../../install_interactive.pm_.c:145
+#: ../../install_interactive.pm_.c:154
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
@@ -3741,33 +3370,33 @@ msgstr ""
 "�� ��������� �������� FAT ��� �������� ������ ����� ������������\n"
 "� �����i �i��������� �������� �i����� (�i ������������ �������� �� �����)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "�����i �������� �� ��i� �����"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "�����i�� Windows(TM)"
 
-#: ../../install_interactive.pm_.c:154
+#: ../../install_interactive.pm_.c:163
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "�� ��i � �������� ������i� ����� �� ������� ���������� Linux?"
 
-#: ../../install_interactive.pm_.c:157
+#: ../../install_interactive.pm_.c:166
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "��� i������� �������� �� ����� %s i �������� �� i� ������ ��������"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 #, fuzzy
 msgid "Custom disk partitioning"
 msgstr "������������� i������ �������"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "������������� fdisk"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -3776,30 +3405,30 @@ msgstr ""
 "�� ������ ����� ����i�� ��� ���� %s\n"
 "�� ���������i �� ����������� �������� �������i, ���������� `w'"
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 #, fuzzy
 msgid "You don't have enough free space on your Windows partition"
 msgstr "������������� ��������� �������� �� �������� Windows"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 #, fuzzy
 msgid "I can't find any room for installing"
 msgstr "������ ������� ���������"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "������� ���������i �������� DrakX ������ ��������� ��������:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "���������� ������� �� �������: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "��������� �� ����i"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "��������� �� ����i"
 
@@ -3811,12 +3440,12 @@ msgstr ""
 "���i��� �������, ���� �� ������������ �������� ����������,\n"
 "���� ����������� �� ���� ������."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "���������� ������ ����i������� %s"
 
-#: ../../install_steps.pm_.c:385
+#: ../../install_steps.pm_.c:384
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
@@ -3828,16 +3457,16 @@ msgstr ""
 "�������� cdrom �� ����� ���������, ��������������\"rpm -qpl Mandrake/RPMS/*."
 "rpm\"\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "Сардэчна запрашаем у %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "�������� ����������"
 
-#: ../../install_steps_auto_install.pm_.c:51
+#: ../../install_steps_auto_install.pm_.c:77
 #: ../../install_steps_stdio.pm_.c:23
 #, c-format
 msgid "Entering step `%s'\n"
@@ -3851,32 +3480,32 @@ msgstr "������� �������� ����� �����������"
 msgid "Total size: "
 msgstr "������� �����: "
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:437
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:387
 #, c-format
 msgid "Version: %s\n"
 msgstr "����i�: %s\n"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:438
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:388
 #, c-format
 msgid "Size: %d KB\n"
 msgstr "�����: %d K�\n"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:337
-#: ../../install_steps_interactive.pm_.c:520
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:509
 msgid "Choose the packages you want to install"
 msgstr "����� ������ ��� �����������"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:340
+#: ../../install_steps_graphical.pm_.c:465 ../../interactive_gtk.pm_.c:571
 msgid "Info"
 msgstr "I���������"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:345
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:457
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Install"
 msgstr "����븢��"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:558
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:497
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Installing"
 msgstr "����븢����"
 
@@ -3884,7 +3513,7 @@ msgstr "����븢����"
 msgid "Please wait, "
 msgstr "���������, ���i �����, "
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:570
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:510
 msgid "Time remaining "
 msgstr "��������� ���� "
 
@@ -3893,21 +3522,21 @@ msgid "Total time "
 msgstr "������� ��� "
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "���������� ������������"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:618
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:558
 #, c-format
 msgid "Installing package %s"
 msgstr "����������� ������ %s"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
+#: ../../install_steps_gtk.pm_.c:646
 msgid "Go on anyway?"
 msgstr "�� ���� ����������?"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
 msgid "There was an error ordering packages:"
 msgstr "���������� ������� ������������� ������:"
 
@@ -3915,29 +3544,33 @@ msgstr "���������� ������� ������������� ������:"
 msgid "Use existing configuration for X11?"
 msgstr "����������� i������� ��������� ��� X11?"
 
-#: ../../install_steps_gtk.pm_.c:142
+#: ../../install_steps_gtk.pm_.c:148
 msgid ""
 "Your system is low on resource. You may have some problem installing\n"
-"Linux-Mandrake. If that occurs, you can try a text install instead. For "
+"Mandrake Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "� ����� �i����� ������ ������� �������, ���� ������� ��������\n"
-"��� ����������i Linux-Mandrake. � ����� ������� ����������� ���������\n"
+"��� ����������i Mandrake Linux. � ����� ������� ����������� ���������\n"
 "�������� �����������. ��� ������ ���i��i�� `F1' � ��� �������i, � �����\n"
 "�������� `text' i ���i��i�� <ENTER>."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "���� �����������"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "���i �����, ������� ���i� � ����� �����������:"
 
-#: ../../install_steps_gtk.pm_.c:222
+#: ../../install_steps_gtk.pm_.c:228
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr "������� ����� ��� ������� ����� �����i��� ���� %d ��.\n"
 
-#: ../../install_steps_gtk.pm_.c:224
+#: ../../install_steps_gtk.pm_.c:230
 #, c-format
 msgid ""
 "If you wish to install less than this size,\n"
@@ -3952,7 +3585,7 @@ msgstr ""
 "��� �i��i� ������� ������ ���������� �����i �������� ������ ������,\n"
 "� ��� 100% ������ ���������� ��� ������� ������."
 
-#: ../../install_steps_gtk.pm_.c:229
+#: ../../install_steps_gtk.pm_.c:235
 #, c-format
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
@@ -3969,84 +3602,68 @@ msgstr ""
 "��� ����� ������� ������ ���������� �������� ������ ������;\n"
 "��� ������� %d%% ����� ���������� ������i ������ �����i �������."
 
-#: ../../install_steps_gtk.pm_.c:235
+#: ../../install_steps_gtk.pm_.c:241
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "����� �������� ����� ����� ����� ����i�� �� ��������� �����."
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "������� ������ ��� �����������"
 
-#: ../../install_steps_gtk.pm_.c:285 ../../install_steps_interactive.pm_.c:599
+#: ../../install_steps_gtk.pm_.c:291 ../../install_steps_interactive.pm_.c:619
 msgid "Package Group Selection"
 msgstr "����� ����� ������"
 
-#: ../../install_steps_gtk.pm_.c:305 ../../install_steps_interactive.pm_.c:614
+#: ../../install_steps_gtk.pm_.c:320 ../../install_steps_interactive.pm_.c:634
 msgid "Individual package selection"
 msgstr "����i��� ����� ������"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "���������� �����"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "�������� �����"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "������������ ���i� �������������� �� ����� i �������"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "������� �����: %d / %d M�"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "������ �����"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "I��: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "���������: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "������� �����: %d / %d M�"
-
-#: ../../install_steps_gtk.pm_.c:467
+#: ../../install_steps_gtk.pm_.c:411
 msgid ""
 "You can't select this package as there is not enough space left to install it"
 msgstr ""
 "�� �� ������ ������� ���� �����, ���� �� �� ����� ����� ��� ��� �����������"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "��������� ������ ������ ������ �� �i�����"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "��������� ������ ������ ��������"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "�� �� ������ �������� � �������� ��������� ������ ������"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "���� ���������� �����, ��� ��������� ������ �����i��"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
 msgstr "�� �� ������ �����i�� ��������� ������ ������. �� ��� ����������"
 
-#: ../../install_steps_gtk.pm_.c:507
+#: ../../install_steps_gtk.pm_.c:447
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -4054,25 +3671,44 @@ msgstr ""
 "���� ����� ���i��� ���� ��������\n"
 "�� ��������, ��� ������ �����i�� ���������?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "�� �� ������ �����i�� ��������� ������ ������. ��� �������� �����i��"
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:460
+#, fuzzy
+msgid "Load/Save on floppy"
+msgstr "��������� �� �������"
+
+#: ../../install_steps_gtk.pm_.c:461
+#, fuzzy
+msgid "Updating package selection"
+msgstr "����i��� ����� ������"
+
+#: ../../install_steps_gtk.pm_.c:466
+#, fuzzy
+msgid "Minimal install"
+msgstr "�����i�� � �i�����"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "��������"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 #, fuzzy
 msgid "Please wait, preparing installation"
 msgstr "���������� ������������"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d ������"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -4104,15 +3740,15 @@ msgid ""
 "copyright laws applicable to software programs.\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Accept"
 msgstr "�������"
 
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Refuse"
 msgstr "��������"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4128,7 +3764,7 @@ msgstr ""
 "���i �� �� ����� ���, ���i��i�� �����i��, ��� �����i�� ����������� � ������ "
 "Cd."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "���������� ������� ������������� ������:"
 
@@ -4136,34 +3772,21 @@ msgstr "���������� ������� ������������� ������:"
 msgid "An error occurred"
 msgstr "�������� �������"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "���i �����, ������� ���� ��� ����������."
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr "�� ������ ������ ����� ����, ��i� ������ �������� ����� �����������"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "��"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "˳�������� ������"
 
-#: ../../install_steps_interactive.pm_.c:87
+#: ../../install_steps_interactive.pm_.c:72
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Linux-"
-"Mandrake distribution \n"
+"The operating system and the different components available in the Mandrake "
+"Linux 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 Linux-Mandrake distribution.\n"
+"system and the different components of the Mandrake Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4217,7 +3840,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 Linux-Mandrake sites  which are prohibited or restricted in some "
+"from one of Mandrake Linux 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"
@@ -4254,7 +3877,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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
 "MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -4274,105 +3897,101 @@ msgid ""
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:182
-#: ../../install_steps_interactive.pm_.c:822
+#: ../../install_steps_interactive.pm_.c:168
+#: ../../install_steps_interactive.pm_.c:871
 #: ../../standalone/keyboarddrake_.c:28
 msgid "Keyboard"
 msgstr "����i�����"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "���i �����, ������� ��� ����i�����."
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "���� �����������"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "��i ���� ����������� �� �������?"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 #, fuzzy
 msgid "Install/Update"
 msgstr "����븢��"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 #, fuzzy
 msgid "Is this an install or an update?"
 msgstr "������� ����������� �i ���������"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "�������������"
 
-#: ../../install_steps_interactive.pm_.c:215
-#: ../../install_steps_interactive.pm_.c:218
+#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:204
 msgid "Expert"
 msgstr "�������"
 
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Update"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:238 ../../standalone/mousedrake_.c:41
+#: ../../install_steps_interactive.pm_.c:224 ../../standalone/mousedrake_.c:48
 msgid "Please, choose the type of your mouse."
 msgstr "���i �����, �������� ��� ����� ����."
 
-#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:57
+#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
 msgid "Mouse Port"
 msgstr "���� ����"
 
-#: ../../install_steps_interactive.pm_.c:245 ../../standalone/mousedrake_.c:58
+#: ../../install_steps_interactive.pm_.c:231 ../../standalone/mousedrake_.c:65
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "���i �����, �������� ��������� ����, �� ����� ���������� ����� ���."
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "��������� ���� PCMCIA ..."
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "Configuring IDE"
 msgstr "��������� IDE"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:295
+#: ../../install_steps_interactive.pm_.c:281
 msgid "no available partitions"
 msgstr "���� ��������� ��������"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "������� ������ ����i�������"
 
-#: ../../install_steps_interactive.pm_.c:323
+#: ../../install_steps_interactive.pm_.c:311
 #, c-format
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
@@ -4390,7 +4009,7 @@ msgstr ""
 "\n"
 "�i ������� �����i�� ��� ��������?\n"
 
-#: ../../install_steps_interactive.pm_.c:336
+#: ../../install_steps_interactive.pm_.c:324
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
@@ -4398,79 +4017,120 @@ msgstr ""
 "DiskDrake �� ���� ����i���� ��������� ����i�� �������.\n"
 "����������� �����i �� ���� ������!"
 
-#: ../../install_steps_interactive.pm_.c:361
+#: ../../install_steps_interactive.pm_.c:340
+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_.c:349
+#, fuzzy
+msgid "No root partition found to perform an upgrade"
+msgstr "�������� ������� �� ���������"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "�������� �������"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
 msgstr "��i ������ �������� (/) ��� ����� �i�����?"
 
-#: ../../install_steps_interactive.pm_.c:376
+#: ../../install_steps_interactive.pm_.c:365
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "��� �����i����� ����i�� �������� ������i����, �������� ������������."
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "����� �������� ��� ������������"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "��������� �� ��������� ������� �����?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "������������ ��������"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "��������� i ������������ ����� %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 "�� ����� ����� � ������ �������i (swap) ��� �����������, �����i��� ���."
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "������� ��������� ������"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "����� ������ ��� ���������"
 
-#: ../../install_steps_interactive.pm_.c:461
+#: ../../install_steps_interactive.pm_.c:450
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
 "���� �i����� �� ��� ��������� ����� ��� ����������� �i ��������� (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "���� (%dM�)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "�i�i������ (%dM�)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "������������� (%d��)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "�� ������"
 
-#: ../../install_steps_interactive.pm_.c:585
+#: ../../install_steps_interactive.pm_.c:522
+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_.c:525
+#, fuzzy
+msgid "Load from floppy"
+msgstr "��������� � �������"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Loading from floppy"
+msgstr "��������� � �������"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Package selection"
+msgstr "����� ����� ������"
+
+#: ../../install_steps_interactive.pm_.c:532
+#, fuzzy
+msgid "Insert a floppy containing package selection"
+msgstr "������ ������� � �������� %s"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "��������� �� �������"
+
+#: ../../install_steps_interactive.pm_.c:605
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:650
+#: ../../install_steps_interactive.pm_.c:670
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -4480,12 +4140,12 @@ msgstr ""
 "���i �� �� ����� ��i ������� � ����� CD �����, ���i��i�� �����i��.\n"
 "���i ��������� � CD ����� �� �����, �����i�� i� ���������� i ���i��i�� ��."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom ��������� \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -4494,11 +4154,21 @@ msgstr ""
 "����������� ������ %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "��������� ����� �����������"
 
-#: ../../install_steps_interactive.pm_.c:718
+#: ../../install_steps_interactive.pm_.c:719
+#, fuzzy, c-format
+msgid "Please insert the Boot floppy used in drive %s"
+msgstr "������ ������� � �������� %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, fuzzy, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "������ ������� � �������� %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -4576,98 +4246,145 @@ msgstr ""
 "75002 Paris\n"
 "FRANCE"
 
-#: ../../install_steps_interactive.pm_.c:750
+#: ../../install_steps_interactive.pm_.c:782
 msgid "Choose a mirror from which to get the packages"
 msgstr "����� ������ ��� ��������� ������"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "������ � ����� ��� ��������� ��i�� ��������� ������"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "����� ������ ��� �����������"
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "��i ��� ������ ����?"
 
-#: ../../install_steps_interactive.pm_.c:778
-msgid "Is your hardware clock set to GMT?"
+#: ../../install_steps_interactive.pm_.c:813
+#, fuzzy
+msgid "Hardware clock set to GMT"
 msgstr "��� �i������ ����i��i� ���������� �� GMT?"
 
-#: ../../install_steps_interactive.pm_.c:806 ../../printer.pm_.c:22
-#: ../../printerdrake.pm_.c:415
+#: ../../install_steps_interactive.pm_.c:814
+msgid "Automatic time synchronization (using NTP)"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:821
+#, fuzzy
+msgid "NTP Server"
+msgstr "NIS ������:"
+
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
 msgstr "�������� ������ CUPS"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 #, fuzzy
 msgid "No printer"
 msgstr "I�� �������i"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:870
 #, fuzzy
 msgid "Mouse"
 msgstr "���� ����"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:824 ../../printerdrake.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:873 ../../printerdrake.pm_.c:1773
+#: ../../printerdrake.pm_.c:1844
 msgid "Printer"
 msgstr "�������"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:875
 #, fuzzy
 msgid "ISDN card"
 msgstr "��������� ISDN �����"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 #, fuzzy
 msgid "Sound card"
 msgstr "����������"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "���� �i����� ����� �� ������� �������������?"
+#: ../../install_steps_interactive.pm_.c:917
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:945
+msgid "LDAP"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:918
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:954
+#, fuzzy
+msgid "NIS"
+msgstr "������������� NIS"
+
+#: ../../install_steps_interactive.pm_.c:919
+#: ../../install_steps_interactive.pm_.c:941
+#, fuzzy
+msgid "Local files"
+msgstr "�������� �������"
+
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "������ ��� root"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "���� ������"
 
-#: ../../install_steps_interactive.pm_.c:901
+#: ../../install_steps_interactive.pm_.c:935
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr ""
 "���� ������ ������� ������ (��� ������ ���i��� ���� �� ����� �� %d �i����)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "������������� NIS"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "��������i�����"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "����� �������i"
+#: ../../install_steps_interactive.pm_.c:949
+#, fuzzy
+msgid "Authentication LDAP"
+msgstr "��������i�����"
+
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
+#: ../../install_steps_interactive.pm_.c:951
+#, fuzzy
+msgid "LDAP Server"
+msgstr "������"
+
+#: ../../install_steps_interactive.pm_.c:957
+#, fuzzy
+msgid "Authentication NIS"
 msgstr "��������i����� NIS"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "NIS Domain"
 
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:959
 msgid "NIS Server"
 msgstr "NIS ������:"
 
-#: ../../install_steps_interactive.pm_.c:951
+#: ../../install_steps_interactive.pm_.c:994
 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 "
@@ -4688,25 +4405,25 @@ msgstr ""
 " ������������ ����������. ���� ���� ���� ������, ���i �� �� ������� \n"
 "����븢���� SILO, ���i i���� ����������� �i����� ������� SILO, �i SILO �� \n"
 "���� ��������� � ����� ����i������i. ���������� ���� ������� ���� ���� \n"
-"���������� ������� � ������������� �������� Linux Mandrake, ���� �����i \n"
+"���������� ������� � ������������� �������� Mandrake Linux, ���� �����i \n"
 "��������� ����������� �i����� ����� ����.\n"
 "\n"
 "���i ������� �������� ���������� ���� �����, ������ ������� � �����\n"
 "�������� i ���i��i�� \"Ok\"."
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "����� ��������"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "����i ��������"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "�������i��"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:1017
 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 "
@@ -4724,37 +4441,45 @@ msgstr ""
 "����븢���� LILO (�i Grub), ���i i���� ����������� �i����� ������� LILO,\n"
 "�i LILO �� ���� ��������� � ����� ����i������i. ���������� ���� ������� "
 "����\n"
-"���� ����������� ������� � ��������� �������� Linux Mandrake, ���� �����i \n"
+"���� ����������� ������� � ��������� �������� Mandrake Linux, ���� �����i \n"
 "��������� ����������� �i����� ����� ����.\n"
 "\n"
 "������� �������� ���������� ���� �����?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "���������, ��� �������� ����������"
 
-#: ../../install_steps_interactive.pm_.c:987
+#: ../../install_steps_interactive.pm_.c:1030
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "������� ��������, � ��i� ����� ��������� ����������� �������"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "������ ������� � �������� %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "��������� ����������� �������"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "���������� ����������"
 
-#: ../../install_steps_interactive.pm_.c:1010
+#: ../../install_steps_interactive.pm_.c:1055
+msgid ""
+"You appear to have an OldWorld or Unknown\n"
+" machine, the yaboot bootloader will not work for you.\n"
+"The install will continue, but you'll\n"
+" need to use BootX to boot your machine"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:1060
 msgid "Do you want to use aboot?"
 msgstr "�� ������� ������������� aboot?"
 
-#: ../../install_steps_interactive.pm_.c:1013
+#: ../../install_steps_interactive.pm_.c:1063
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -4762,52 +4487,54 @@ msgstr ""
 "������� ����������� �boot, \n"
 "���������� ����븢����, ���������� �� ���������� ��������� ������� �������?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "����������� ����������"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "������ ����������� ���������� �� ��������. ���i��� ��������� �������:"
 
-#: ../../install_steps_interactive.pm_.c:1030
+#: ../../install_steps_interactive.pm_.c:1084
+#, 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 $of_boot,\\\\:tbxi\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_.c:1038 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1092 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "�����"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "������i"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "�����i"
 
-#: ../../install_steps_interactive.pm_.c:1044 ../../standalone/draksec_.c:49
+#: ../../install_steps_interactive.pm_.c:1098 ../../standalone/draksec_.c:62
 msgid "Choose security level"
 msgstr "�������� ������i"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr ""
-"�i ������� �� �������� ������������ ����i-���� ��� ����i����i linux?"
-
-#: ../../install_steps_interactive.pm_.c:1082
+#: ../../install_steps_interactive.pm_.c:1134
+#: ../../standalone/drakautoinst_.c:80
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "������ ������� � �������� %s"
 
-#: ../../install_steps_interactive.pm_.c:1096
-#: ../../install_steps_interactive.pm_.c:1128
+#: ../../install_steps_interactive.pm_.c:1138
+#: ../../standalone/drakautoinst_.c:82
 msgid "Creating auto install floppy"
 msgstr "��������� ������� ��� �����������"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -4816,31 +4543,31 @@ msgstr ""
 "��������� ����i �� ���������.\n"
 "�� ������� ������� �����i �����?"
 
-#: ../../install_steps_interactive.pm_.c:1167
+#: ../../install_steps_interactive.pm_.c:1160
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
-"For information on fixes which are available for this release of Linux-"
-"Mandrake,\n"
-"consult the Errata available from http://www.linux-mandrake.com/.\n"
+"For information on fixes which are available for this release of Mandrake "
+"Linux,\n"
+"consult the Errata available from http://www.mandrakelinux.com/.\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Linux-Mandrake User's Guide."
+"install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
 "�i�����, ����������� ���������.\n"
 "�����i�� ���������� ���� i ���i��i�� enter ��� �����������i.\n"
-"�� i���������� ��� �������i ��������� ������� Linux-Mandrake,\n"
-"����������� �� http://www.linux-mandrake.com/.\n"
+"�� i���������� ��� �������i ��������� ������� Mandrake Linux,\n"
+"����������� �� http://www.mandrakelinux.com/.\n"
 "I��������� �� ��������� ����� �i����� ���� � �����-�����������\n"
-"����� ������ ��������i�� ����������i�� � ��i������� Linux-Mandrake."
+"����� ������ ��������i�� ����������i�� � ��i������� Mandrake Linux."
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 #, fuzzy
 msgid "Generate auto install floppy"
 msgstr "��������� ������� ��� �����������"
 
-#: ../../install_steps_interactive.pm_.c:1181
+#: ../../install_steps_interactive.pm_.c:1174
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -4849,43 +4576,60 @@ msgid ""
 "You may prefer to replay the installation.\n"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "�����������"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 #, fuzzy
 msgid "Replay"
 msgstr "����������i��"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 #, fuzzy
 msgid "Save packages selection"
 msgstr "����i��� ����� ������"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "����������� Linux-Mandrake %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "����������� Mandrake Linux %s"
 
-#: ../../install_steps_newt.pm_.c:33
+#: ../../install_steps_newt.pm_.c:34
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> ���i� ���������i  |  <Space> �����  | <F12> �������� ����� "
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
 msgstr ""
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "������� �������"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr ""
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "���i �����, ���������"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "���������� �����"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "�������� �����"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "������������ ���i� �������������� �� ����� i �������"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -4911,268 +4655,292 @@ msgstr "��� �����? (�������� %s) "
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "��� �����? (�������� %s. �����i�� `none' ��� ���������i) "
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "�����i (QWERTZ)"
 
-#: ../../keyboard.pm_.c:125 ../../keyboard.pm_.c:138 ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:141 ../../keyboard.pm_.c:155 ../../keyboard.pm_.c:180
 msgid "German"
 msgstr "������i"
 
-#: ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:142
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:127 ../../keyboard.pm_.c:164
+#: ../../keyboard.pm_.c:143 ../../keyboard.pm_.c:186
 msgid "Spanish"
 msgstr "I������i"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "�i���i"
 
-#: ../../keyboard.pm_.c:129 ../../keyboard.pm_.c:139 ../../keyboard.pm_.c:166
+#: ../../keyboard.pm_.c:145 ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:188
 msgid "French"
 msgstr "���������i"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
 msgstr "��������i"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "������i"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "����i"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "�����i"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "UK ����i�����"
 
-#: ../../keyboard.pm_.c:134 ../../keyboard.pm_.c:137 ../../keyboard.pm_.c:204
+#: ../../keyboard.pm_.c:152 ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:237
 msgid "US keyboard"
 msgstr "US ����i�����"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+#, fuzzy
+msgid "Albanian"
+msgstr "I�����i"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "�������i (�����)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "�������i (typewriter)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "�������i (���������)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "������������� (latin)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "������������� (������)"
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "�����i���i"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "��������i"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "����i����i (ABNT-2)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "���������i (�������� ���������)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "���������i (����������� ���������)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "�����i (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr ""
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "������i (���� ������i������� ����i�)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "����i"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:183
 msgid "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:184
 msgid "Dvorak (Norwegian)"
 msgstr "Dvorak (��������i)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "�������i"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "����i���i (\"������\" ���������)"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "����i���i (\"���i�����\" ���������)"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "�������i"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "��������i"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "�������i"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "I����"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "I���� (���������)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "I�����i"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "I�������i"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "I��������i"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "������i 106 ����i�"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 #, fuzzy
 msgid "Korean keyboard"
 msgstr "UK ����i�����"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "���i��-����������i"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr ""
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "��������i"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "�i����i AZERTY (�����)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "�i����i AZERTY (����)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "�i����i \"����� �����\" QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "�i����i \"���������\" QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "�������������"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr ""
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "��������i"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "������i (����������� ���������)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "������i (qwertz ���������)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "�����������i"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "�������i (������)"
 
-#: ../../keyboard.pm_.c:193
-msgid "Russian (Yawerty)"
+#: ../../keyboard.pm_.c:217
+#, fuzzy
+msgid "Romanian (qwertz)"
 msgstr "����i (�-�-�-�-�-�)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "�����i"
+#: ../../keyboard.pm_.c:218
+#, fuzzy
+msgid "Romanian (qwerty)"
+msgstr "����i (�-�-�-�-�-�)"
 
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:220
+msgid "Russian (Yawerty)"
+msgstr "����i (�-�-�-�-�-�)"
+
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "��������i"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "�������i (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "�������i (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr ""
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "������������� (������)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "������� ����i�����"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "������� ����i�����"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "������i (����������� \"F\" ������)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "������i (�������� \"Q\" ������)"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "����i���i"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "US ����i����� (�i���������)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "���������i \"����� �����\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
-msgstr ""
+#: ../../keyboard.pm_.c:240
+#, fuzzy
+msgid "Yugoslavian (latin)"
+msgstr "������������� (latin)"
+
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "����i������� ����� %s\n"
 
-#: ../../lvm.pm_.c:70
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr ""
 
@@ -5287,174 +5055,223 @@ msgstr "����"
 msgid "No mouse"
 msgstr "���� ����"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "��� �����, ������ ������� ���� �����."
+
+#: ../../mouse.pm_.c:483
+#, fuzzy
+msgid "To activate the mouse,"
+msgstr "��� �����, ������ ������� ���� �����."
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "����� ����� ����!"
+
+#: ../../my_gtk.pm_.c:380
+msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:415
 #, fuzzy
 msgid "Finish"
 msgstr "�i���i"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "����� ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
 msgstr ""
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "���� ��������?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "��������� �������� � I���������"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "��������� �� I��������"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "�i ������� ����� ������������ ��������� �� I��������?"
+#: ../../network/adsl.pm_.c:20
+msgid ""
+"The most common way to connect with adsl is pppoe.\n"
+"Some connections use pptp, a few ones use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
 
-#: ../../netconnect.pm_.c:148
-#, fuzzy
-msgid "Testing your connection..."
-msgstr "��i ��� ������ ISDN ��������?"
+#: ../../network/adsl.pm_.c:22
+msgid "Alcatel speedtouch usb"
+msgstr ""
+
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr ""
 
-#: ../../netconnect.pm_.c:154 ../../standalone/draknet_.c:196
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "������������� pppoe"
+
+#: ../../network/adsl.pm_.c:22
 #, fuzzy
-msgid "The system is now connected to Internet."
-msgstr "�� �� �������� ��������� �� I��������?"
+msgid "use pptp"
+msgstr "������������� pppoe"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
+#: ../../network/ethernet.pm_.c:37
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpcd"
 msgstr ""
+"��i dhcp ��i��� �� �������� �������������?\n"
+"�� ��������, ���� dhcpcd"
 
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
+#: ../../network/ethernet.pm_.c:88
 #, fuzzy
 msgid ""
-"The system doesn't seem to be connected to internet.\n"
-"Try to reconfigure your connection."
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
-"\n"
-"�� ������ ���������� �� ����������������� ����� ��������."
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "����i������� ����i"
+"�i ����� ethernet ������� ������� � ����� �i����� �� ���������. ���i �����, "
+"����������� ����i��������� i���������."
 
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
-msgid "ISDN Configuration"
-msgstr "��������� ISDN"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "�������� ������� i��������"
 
-#: ../../netconnect.pm_.c:222
+#: ../../network/ethernet.pm_.c:93
 msgid ""
-"Select your provider.\n"
-" If it's not in the list, choose Unlisted"
+"Please choose which network adapter you want to use to connect to Internet"
 msgstr ""
-"������� ������ ����������.\n"
-"���i ��� ���� � ����� ��i��, ������� ��� ``I���''"
-
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "��������� ��������� �� I��������"
-
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "���i �����, �����i�� �i �������� ���� �i���"
+"���i �����, �������� ������� �������, ��i �������� ������������� ��� "
+"��������� �� i�������"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "IRQ �����"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "�������� ����� �� ���������"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "������ ������ ����� (DMA)"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "��������� ����i"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "IO �����"
+#: ../../network/ethernet.pm_.c:203
+msgid ""
+"Please enter your host name if you know it.\n"
+"Some DHCP servers require the hostname to work.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''."
+msgstr ""
+"�����i�� i�� ���� ������ (host).\n"
+"I�� ����� ������ ���i��� ���� ��������� �������,\n"
+"��������� ``mybox.mylab.myco.com''.\n"
+"�� ������ ������� �����i IP ����� �����, ���i �� � ��� ����."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "IO_0 �����"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "I�� ������"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "IO_1 �����"
+#: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
+#: ../../network/netconnect.pm_.c:91 ../../network/netconnect.pm_.c:105
+#: ../../network/netconnect.pm_.c:154 ../../network/netconnect.pm_.c:164
+#: ../../network/netconnect.pm_.c:190 ../../network/netconnect.pm_.c:213
+#: ../../network/netconnect.pm_.c:221
+#, fuzzy
+msgid "Network Configuration Wizard"
+msgstr "����i������� ����i"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "��� ����i��� ��������� �����"
+#: ../../network/isdn.pm_.c:22
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "��������� ISDN �����"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "I�� ����������, ��������� ���������.net"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "��������� ISDN �����"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "����� �������� ����������"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "��i ��� ������ ISDN ��������?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "DNS 1 ����������"
+#: ../../network/isdn.pm_.c:45
+msgid ""
+"Which ISDN configuration do you prefer?\n"
+"\n"
+"* The Old configuration uses isdn4net. It contains powerfull\n"
+"  tools, but is tricky to configure, and not standard.\n"
+"\n"
+"* The New configuration is easier to understand, more\n"
+"  standard, but with less tools.\n"
+"\n"
+"We recommand the light configuration.\n"
+msgstr ""
 
-#: ../../netconnect.pm_.c:248
-msgid "Provider dns 2"
-msgstr "DNS 2 ����������"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "New configuration (isdn-light)"
+msgstr "��������� ������ �������� ������ (firewall)!"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "����� ��������"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "Old configuration (isdn4net)"
+msgstr "��������� ������ �������� ������ (firewall)!"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "I�� ��� ������� (i�� ����������i��)"
+#: ../../network/isdn.pm_.c:169 ../../network/isdn.pm_.c:187
+#: ../../network/isdn.pm_.c:197 ../../network/isdn.pm_.c:204
+#: ../../network/isdn.pm_.c:214
+msgid "ISDN Configuration"
+msgstr "��������� ISDN"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "������ ��� �������"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"������� ������ ����������.\n"
+"���i ��� ���� � ����� ��i��, ������� ��� ``I���''"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Ţ����"
+#: ../../network/isdn.pm_.c:182
+msgid "Europe protocol"
+msgstr ""
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol (EDSS1)"
 msgstr "Ţ���� (EDSS1)"
 
-#: ../../netconnect.pm_.c:263
-msgid "Rest of the world"
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
+msgid "Protocol for the rest of the world"
 msgstr "�����������"
 
-#: ../../netconnect.pm_.c:263
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
 msgid ""
-"Rest of the world \n"
+"Protocol for the rest of the world \n"
 " no D-Channel (leased lines)"
 msgstr ""
 "����������� \n"
 " �� ���� D-����� (��������� ������)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "��i �������� �� ������� �������������?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "��i ��� ����� �� �����?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "�� ������"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../netconnect.pm_.c:284
+#: ../../network/isdn.pm_.c:205
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -5467,19 +5284,19 @@ msgstr ""
 "\n"
 "���i �� ����� PCMCIA �����, �� ���i��� ������ irq i io ����� �����.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "�����i��"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "����������"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "���� � ��� ISDN �����?"
 
-#: ../../netconnect.pm_.c:314
+#: ../../network/isdn.pm_.c:234
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
@@ -5487,111 +5304,61 @@ msgstr ""
 "��������� ISDN PCI �����, ��� �������� �� ���. ���i �����, �������� PCI "
 "����� �� ��������� ������."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "����� ISDN PCI �� ���������. ���i �����, �������� �� ��������� ������."
 
-#: ../../netconnect.pm_.c:371
-#, fuzzy
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"�i ����� ethernet ������� ������� � ����� �i����� �� ���������. ���i �����, "
-"����������� ����i��������� i���������."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "�������� ������� i��������"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr ""
-"���i �����, �������� ������� �������, ��i �������� ������������� ��� "
-"��������� �� i�������"
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "������� i��������"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"�� �������?"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr ""
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "��������� ADSL"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "�� �������, ��� ����� �������� ���������� ��� ��������?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "�� ����� ����������� ����� �������� �����?"
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "��������� ������������ �������� (Dialup)"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "I�� ��������"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "����� ��������"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "I�� (login ID)"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "��������i�����"
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
+msgid "CHAP"
+msgstr "CHAP"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Script-based"
 msgstr "�� ������ �������"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "�� ������ ����i����"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "I�� ������"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 #, fuzzy
 msgid "First DNS Server (optional)"
 msgstr "����� ������ DNS"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 #, fuzzy
 msgid "Second DNS Server (optional)"
 msgstr "����i ������ DNS:"
 
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr ""
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -5599,7 +5366,7 @@ msgstr ""
 "\n"
 "�� ������ ���������� �� ����������������� ����� ��������."
 
-#: ../../netconnect.pm_.c:745 ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:33 ../../network/netconnect.pm_.c:36
 #, fuzzy
 msgid ""
 "\n"
@@ -5608,12 +5375,12 @@ msgstr ""
 "\n"
 "�� ������ ���������� �� ����������������� ����� ��������."
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 #, fuzzy
 msgid "You are currently connected to internet."
 msgstr "�� �� �������� ��������� �� I��������?"
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 #, fuzzy
 msgid ""
 "\n"
@@ -5622,104 +5389,56 @@ msgstr ""
 "\n"
 "�� ������ ���������� �� ����������������� ����� ��������."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 #, fuzzy
 msgid "You are not currently connected to Internet."
 msgstr "�� �� �������� ��������� �� I��������?"
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 #, fuzzy
 msgid "Connect to Internet"
 msgstr "��������� �� I��������"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 #, fuzzy
 msgid "Disconnect from Internet"
 msgstr "��������� �� I��������"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr ""
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "I������� �������� i ����i�������"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-#, fuzzy
-msgid "Network Configuration Wizard"
-msgstr "����i������� ����i"
-
-#: ../../netconnect.pm_.c:812
-#, fuzzy
-msgid "External ISDN modem"
-msgstr "��������� ISDN �����"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "��������� ISDN �����"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "��i ��� ������ ISDN ��������?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "��������� �� I��������"
-
-#: ../../netconnect.pm_.c:834
-msgid ""
-"The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few ones use dhcp.\n"
-"If you don't know, choose 'use pppoe'"
-msgstr ""
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr ""
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "������������� pppoe"
-
-#: ../../netconnect.pm_.c:836
-#, fuzzy
-msgid "use pptp"
-msgstr "������������� pppoe"
-
-#: ../../netconnect.pm_.c:846
-#, c-format
-msgid "I'm about to restart the network device %s. Do you agree?"
+#: ../../network/netconnect.pm_.c:96
+#, fuzzy, c-format
+msgid "We are now going to configure the %s connection."
 msgstr ""
+"\n"
+"�� ������ ���������� �� ����������������� ����� ��������."
 
-#: ../../netconnect.pm_.c:883
+#: ../../network/netconnect.pm_.c:105
+#, fuzzy, c-format
 msgid ""
-"Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
+"\n"
+"\n"
+"\n"
+"We are now going to configure the %s connection.\n"
+"\n"
+"\n"
+"Press OK to continue."
 msgstr ""
-"��i dhcp ��i��� �� �������� �������������?\n"
-"�� ��������, ���� dhcpcd"
+"\n"
+"�� ������ ���������� �� ����������������� ����� ��������."
 
-#: ../../netconnect.pm_.c:900
-#, fuzzy
-msgid "Network configuration"
+#: ../../network/netconnect.pm_.c:129 ../../network/netconnect.pm_.c:243
+#: ../../network/netconnect.pm_.c:255 ../../network/tools.pm_.c:56
+msgid "Network Configuration"
 msgstr "����i������� ����i"
 
-#: ../../netconnect.pm_.c:901
-#, fuzzy
-msgid "Do you want to restart the network"
-msgstr "�i ������� �������i������ ��������i?"
-
-#: ../../netconnect.pm_.c:904
-#, fuzzy, c-format
-msgid ""
-"A problem occured while restarting the network: \n"
-"\n"
-"%s"
-msgstr "�i ������� �������i������ ��������i?"
-
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -5727,7 +5446,7 @@ msgid ""
 "Internet & Network connection.\n"
 msgstr ""
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -5735,103 +5454,119 @@ msgid ""
 "If you don't want to use the auto detection, deselect the checkbox.\n"
 msgstr ""
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 #, fuzzy
 msgid "Choose the profile to configure"
 msgstr "������� �������� ����������i��:"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
 msgstr ""
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "���������� �������..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr ""
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, fuzzy, c-format
 msgid "detected on port %s"
 msgstr "���������� ������ ����i������� %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, fuzzy
 msgid "ISDN connection"
 msgstr "��������� ISDN"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr ""
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr ""
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+#, fuzzy
+msgid "ADSL connection"
+msgstr "�������������"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, fuzzy, c-format
 msgid "detected on interface %s"
 msgstr "������� i��������"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 #, fuzzy
 msgid "Cable connection"
 msgstr "�������� ��������"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+#, fuzzy
+msgid "cable connection detected"
+msgstr "�������� ��������"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 #, fuzzy
 msgid "LAN connection"
 msgstr "�������������"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr ""
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "�� �� �������� ��������� �� I��������?"
+#: ../../network/netconnect.pm_.c:190
+#, fuzzy
+msgid "Choose the connection you want to configure"
+msgstr "������� i���������, ��i ������� ����������"
 
-#: ../../netconnect.pm_.c:1004
+#: ../../network/netconnect.pm_.c:214
 msgid ""
-"Congratulation, The network and internet configuration is finished.\n"
+"You have configured multiple ways to connect to the Internet.\n"
+"Choose the one you want to use.\n"
 "\n"
-"The configuration will now be applied to your system."
 msgstr ""
 
-#: ../../netconnect.pm_.c:1007
-msgid ""
-"After that is done, we recommend you to restart your X\n"
-"environnement to avoid hostname changing problem."
-msgstr ""
+#: ../../network/netconnect.pm_.c:215
+#, fuzzy
+msgid "Internet connection"
+msgstr "�������� I�������-��������"
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "�������� ����� �� ���������"
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "�� �������, ��� ����� �������� ���������� ��� ��������?"
 
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "��������� ����i"
+#: ../../network/netconnect.pm_.c:239
+#, fuzzy
+msgid "Network configuration"
+msgstr "����i������� ����i"
 
-#: ../../network.pm_.c:278
+#: ../../network/netconnect.pm_.c:240
+msgid "The network needs to be restarted"
+msgstr ""
+
+#: ../../network/netconnect.pm_.c:243
+#, fuzzy, c-format
 msgid ""
-"Please enter your host name if you know it.\n"
-"Some DHCP servers require the hostname to work.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''."
+"A problem occured while restarting the network: \n"
+"\n"
+"%s"
+msgstr "�i ������� �������i������ ��������i?"
+
+#: ../../network/netconnect.pm_.c:247
+msgid ""
+"Congratulations, the network and internet configuration is finished.\n"
+"\n"
+"The configuration will now be applied to your system.\n"
 msgstr ""
-"�����i�� i�� ���� ������ (host).\n"
-"I�� ����� ������ ���i��� ���� ��������� �������,\n"
-"��������� ``mybox.mylab.myco.com''.\n"
-"�� ������ ������� �����i IP ����� �����, ���i �� � ��� ����."
 
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "I�� ������"
+#: ../../network/netconnect.pm_.c:250
+msgid ""
+"After that is done, we recommend you to restart your X\n"
+"environnement to avoid hostname changing problem."
+msgstr ""
 
-#: ../../network.pm_.c:319
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -5839,7 +5574,7 @@ msgid ""
 "Modifying the fields below will override this configuration."
 msgstr ""
 
-#: ../../network.pm_.c:324
+#: ../../network/network.pm_.c:288
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
@@ -5849,38 +5584,38 @@ msgstr ""
 "����� ����� ���i��� ���� �������� �� IP ����� � ����������-��������� \n"
 "������i (���������, 1.2.3.4)."
 
-#: ../../network.pm_.c:333 ../../network.pm_.c:334
+#: ../../network/network.pm_.c:297 ../../network/network.pm_.c:298
 #, c-format
 msgid "Configuring network device %s"
 msgstr "��������� �������� ������� %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr ""
+#: ../../network/network.pm_.c:298
+#, fuzzy, c-format
+msgid " (driver %s)"
+msgstr "������ XFree86: %s\n"
 
-#: ../../network.pm_.c:336 ../../standalone/draknet_.c:231
-#: ../../standalone/draknet_.c:427
+#: ../../network/network.pm_.c:300 ../../standalone/draknet_.c:255
+#: ../../standalone/draknet_.c:461
 msgid "IP address"
 msgstr "IP �����"
 
-#: ../../network.pm_.c:337 ../../standalone/draknet_.c:428
+#: ../../network/network.pm_.c:301 ../../standalone/draknet_.c:462
 msgid "Netmask"
 msgstr "����� ����i"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "(bootp/dhcp)"
 msgstr "(bootp/dhcp)"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "Automatic IP"
 msgstr "����������� IP"
 
-#: ../../network.pm_.c:359 ../../printerdrake.pm_.c:102
-#: ../../printerdrake.pm_.c:425
+#: ../../network/network.pm_.c:323 ../../printerdrake.pm_.c:406
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP ����� ���i��� ���� � ������� 1.2.3.4"
 
-#: ../../network.pm_.c:388
+#: ../../network/network.pm_.c:351
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -5892,43 +5627,155 @@ msgstr ""
 "��������� ``mybox.mylab.myco.com''.\n"
 "�� ������ ������� �����i IP ����� �����, ���i �� � ��� ����."
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "DNS ������"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
 msgstr "����"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "�������-����"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "��������� proxy �������� �������"
 
-#: ../../network.pm_.c:408
+#: ../../network/network.pm_.c:372
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
-#: ../../network.pm_.c:409
+#: ../../network/network.pm_.c:373
 msgid "FTP proxy"
 msgstr "FTP proxy"
 
-#: ../../network.pm_.c:412
+#: ../../network/network.pm_.c:374
+msgid "Track network card id (usefull for laptops)"
+msgstr ""
+
+#: ../../network/network.pm_.c:377
 msgid "Proxy should be http://..."
 msgstr "Proxy ���i��� ���� http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "Proxy ���i��� ���� ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "��������� �������� � I���������"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "�i ������� ����� ������������ ��������� �� I��������?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "��i ��� ������ ISDN ��������?"
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "�� �� �������� ��������� �� I��������?"
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr ""
+
+#: ../../network/tools.pm_.c:51 ../../standalone/draknet_.c:220
+#, fuzzy
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr ""
+"\n"
+"�� ������ ���������� �� ����������������� ����� ��������."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "��������� ��������� �� I��������"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "���i �����, �����i�� �i �������� ���� �i���"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "IRQ �����"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "������ ������ ����� (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "IO �����"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "IO_0 �����"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "IO_1 �����"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "��� ����i��� ��������� �����"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "I�� ����������, ��������� ���������.net"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "����� �������� ����������"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+#, fuzzy
+msgid "Provider dns 1 (optional)"
+msgstr "DNS 1 ����������"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+#, fuzzy
+msgid "Provider dns 2 (optional)"
+msgstr "DNS 2 ����������"
+
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "����� ����i�����"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "����� ��������"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+#, fuzzy
+msgid "Connection speed"
+msgstr "I�� ��������"
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "I�� ��������"
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "I�� ��� ������� (i�� ����������i��)"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "������ ��� �������"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
 msgstr "�������� ������� �� ��������i������ ����� ����������"
 
-#: ../../partition_table.pm_.c:581
+#: ../../partition_table.pm_.c:640
 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 "
@@ -5938,26 +5785,21 @@ msgstr ""
 "���i�� ����� � ���, ��� ��������i�� ��������� �������� ���, ��� ��i��� i���\n"
 "������ �� ��������� (extended) ���������"
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "������� ������� ����� %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "��������� � ����� %s �� ����������: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "������ ���� ���������� ���ii"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "������� ���i�� � ���� %s"
 
-#: ../../partition_table_raw.pm_.c:161
+#: ../../partition_table_raw.pm_.c:154
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
@@ -5984,49 +5826,213 @@ msgstr "�����"
 msgid "maybe"
 msgstr "���� ����"
 
-#: ../../printer.pm_.c:20
+#: ../../printer.pm_.c:23
+msgid "CUPS - Common Unix Printing System"
+msgstr ""
+
+#: ../../printer.pm_.c:24
+msgid "LPRng - LPR New Generation"
+msgstr ""
+
+#: ../../printer.pm_.c:25
+msgid "LPD - Line Printer Daemon"
+msgstr ""
+
+#: ../../printer.pm_.c:26
+msgid "PDQ - Print, Don't Queue"
+msgstr ""
+
+#: ../../printer.pm_.c:32
+msgid "CUPS"
+msgstr ""
+
+#: ../../printer.pm_.c:33
+msgid "LPRng"
+msgstr ""
+
+#: ../../printer.pm_.c:34
+msgid "LPD"
+msgstr ""
+
+#: ../../printer.pm_.c:35
+msgid "PDQ"
+msgstr ""
+
+#: ../../printer.pm_.c:40
 msgid "Local printer"
 msgstr "�������� �������"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "�������� �������"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
+#: ../../printer.pm_.c:42
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "�������� ������ CUPS"
+
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "�������� ������ lpd"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "������� ������� (socket)"
 
-#: ../../printer.pm_.c:25
-msgid "SMB/Windows 95/98/NT"
+#: ../../printer.pm_.c:45
+#, fuzzy
+msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:26
-msgid "NetWare"
-msgstr "NetWare"
+#: ../../printer.pm_.c:46
+#, fuzzy
+msgid "Printer on NetWare server"
+msgstr "������ �����"
 
-#: ../../printer.pm_.c:27 ../../printerdrake.pm_.c:158
-#: ../../printerdrake.pm_.c:160
-msgid "Printer Device URI"
+#: ../../printer.pm_.c:47
+#, fuzzy
+msgid "Enter a printer device URI"
 msgstr "URI ��������"
 
-#: ../../printerdrake.pm_.c:19
+#: ../../printer.pm_.c:48
+msgid "Pipe job into a command"
+msgstr ""
+
+#: ../../printer.pm_.c:418 ../../printer.pm_.c:839
+#: ../../printerdrake.pm_.c:1227 ../../printerdrake.pm_.c:2023
+msgid "Unknown model"
+msgstr ""
+
+#: ../../printer.pm_.c:546 ../../printerdrake.pm_.c:790
+msgid "Raw printer (No driver)"
+msgstr ""
+
+#: ../../printer.pm_.c:693
+#, fuzzy, c-format
+msgid "(on %s)"
+msgstr "(������ %s)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "����� ���� �������� ��������"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "�� ������� ��������?"
+
+#: ../../printerdrake.pm_.c:25
+#, fuzzy
+msgid ""
+"\n"
+"Printers on remote CUPS servers you do not have to configure\n"
+"here; these printers will be automatically detected. Please\n"
+"select \"Printer on remote CUPS server\" in this case."
+msgstr ""
+"�������� CUPS ������ �� �������� �� ��� �������� ��������\n"
+"�� ����� ������, �� ����� ��������� ����������.\n"
+"��� �� �� ��������, ������� \"�������� ������ CUPS\"."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+msgid "None"
+msgstr "����"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "������� �������� ����������i��:"
+
+#: ../../printerdrake.pm_.c:105
+msgid ""
+"With remote CUPS servers, you do not have to configure any \n"
+"printer here; CUPS servers inform your machine automatically\n"
+"about their printers. All printers known to your machine\n"
+"currently are listed in the \"Default printer\" field. Choose\n"
+"the default printer for your machine there and click the\n"
+"\"Apply/Re-read printers\" button. Click the same button to\n"
+"refresh the list (it can take up to 30 seconds after the start\n"
+"of CUPS until all remote printers are visible).\n"
+"When your CUPS server is in a different network, you have to \n"
+"give the CUPS server IP address and optionally the port number\n"
+"to get the printer information from the server, otherwise leave\n"
+"these fields blank."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:117
+msgid ""
+"\n"
+"Normally, CUPS is automatically configured according to your\n"
+"network environment, so that you can access the printers on the\n"
+"CUPS servers in your local network. If this does not work \n"
+"correctly, turn off \"Automatic CUPS configuration\" and edit\n"
+"your file /etc/cups/cupsd.conf manually. Do not forget to restart\n"
+"CUPS afterwards (command: \"service cups restart\")."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:124 ../../printerdrake.pm_.c:1290
+#: ../../printerdrake.pm_.c:1294 ../../printerdrake.pm_.c:1295
+#: ../../printerdrake.pm_.c:1296 ../../printerdrake.pm_.c:2011
+#, fuzzy
+msgid "Close"
+msgstr "���� ����"
+
+#: ../../printerdrake.pm_.c:125
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "�������� �������"
+
+#: ../../printerdrake.pm_.c:129
+#, fuzzy
+msgid "The IP address should look like 192.168.1.20"
+msgstr "IP ����� ���i��� ���� � ������� 1.2.3.4"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+msgid "The port number should be an integer!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+#, fuzzy
+msgid "Default printer"
+msgstr "�������� �������"
+
+#: ../../printerdrake.pm_.c:146
+#, fuzzy
+msgid "CUPS server IP"
+msgstr "IP ������� SMB"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "����"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "��������� ������"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "���������� �������..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "�������� �����"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "������� �����i \"%s\" ��������� �� "
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "�������� �������"
 
-#: ../../printerdrake.pm_.c:53
+#: ../../printerdrake.pm_.c:256
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -6034,37 +6040,60 @@ msgstr ""
 "�� ����� ����� �������� ��� ������� \n"
 "(/dev/lp0 ���i�������� LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "���� ��������"
 
-#: ../../printerdrake.pm_.c:74
+#: ../../printerdrake.pm_.c:261
+msgid "Device/file name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:274 ../../printerdrake.pm_.c:698
+#: ../../printerdrake.pm_.c:786
+#, fuzzy
+msgid "Reading printer database ..."
+msgstr "����� ���� �������� �������� CUPS"
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "����i ���������� �������� lpd"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:313
+#, fuzzy
 msgid ""
-"To use a remote lpd print queue, you need to supply\n"
-"the hostname of the printer server and the queue name\n"
-"on that server which jobs should be placed in."
+"To use a remote lpd printer, you need to supply\n"
+"the hostname of the printer server and the printer name\n"
+"on that server."
 msgstr ""
 "��� ��������i ��������� ����i ����� ��� ��������\n"
 "��������� i�� ���������� ������� i i�� ����i �����,\n"
 "� ���� �������� ������ ����� ��������� ������i."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
+msgstr "�������� �����"
+
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "�������� �������"
+
+#: ../../printerdrake.pm_.c:320
+#, fuzzy
+msgid "Remote host name missing!"
 msgstr "�������� �����"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "��������� ����� �����"
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "�������� �����"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "����i �������� SMB (Windows 9x/NT)"
 
-#: ../../printerdrake.pm_.c:89
+#: ../../printerdrake.pm_.c:393
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -6077,29 +6106,37 @@ msgstr ""
 "�������, ��i ��������� � �������� ���������, i�� ����������i��, ������ i "
 "i��������� �� �������� �����."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "I�� ������� SMB"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "IP ������� SMB"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "I�� ��� �������������� �������"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "�������� �����"
 
-#: ../../printerdrake.pm_.c:124
+#: ../../printerdrake.pm_.c:410
+msgid "Either the server name or the server's IP must be given!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:414
+msgid "Samba share name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:473
 msgid "NetWare Printer Options"
 msgstr "����i �������� NetWare"
 
-#: ../../printerdrake.pm_.c:125
+#: ../../printerdrake.pm_.c:474
 msgid ""
-"To print to a NetWare printer, you need to provide the\n"
+"To print on a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
 "TCP/IP hostname!) as well as the print queue name for the printer you\n"
 "wish to access and any applicable user name and password."
@@ -6108,59 +6145,228 @@ msgstr ""
 "(�� ����� ������� � i����� � ����� TCP/IP) i i�� ����i �����, ���� "
 "��������� �������� ��������, � ������� i�� ����������i�� i ������."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "������ �����"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "I�� ����i �����"
 
-#: ../../printerdrake.pm_.c:142
+#: ../../printerdrake.pm_.c:484
+msgid "NCP server name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:488
+msgid "NCP queue name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:527
 msgid "Socket Printer Options"
 msgstr "����i ������ ��������"
 
-#: ../../printerdrake.pm_.c:143
+#: ../../printerdrake.pm_.c:528
+#, fuzzy
 msgid ""
 "To print to a socket printer, you need to provide the\n"
-"hostname of the printer and optionally the port number."
+"host name of the printer and optionally the port number.\n"
+"On HP JetDirect servers the port number is usually 9100,\n"
+"on other servers it can vary. See the manual of your\n"
+"hardware."
 msgstr ""
 "��� ��������� ���� ����� �������i, ��� ��������� �����������\n"
 "i�� �������� i ������� ��� ����� �����."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
 msgstr "I�� ��������"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "����"
+#: ../../printerdrake.pm_.c:537
+#, fuzzy
+msgid "Printer host name missing!"
+msgstr "I�� ��������"
+
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "URI ��������"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "�� ������ ��������� ������� URI ��� ��������� �� �������i � CUPS."
+#: ../../printerdrake.pm_.c:567
+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 ""
+
+#: ../../printerdrake.pm_.c:582
+msgid "A valid URI must be entered!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:682
+msgid ""
+"Every printer needs a name (for example lp).\n"
+"The Description and Location fields do not need \n"
+"to be filled in. They are comments for the users."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
+#: ../../printerdrake.pm_.c:685
+msgid "Name of printer"
+msgstr "I�� �������i"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "��i�����"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "�������������"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "����� ���� �������� �������� CUPS"
+
+#: ../../printerdrake.pm_.c:793
+#, fuzzy
+msgid "Printer model selection"
+msgstr "�������� ��������"
+
+#: ../../printerdrake.pm_.c:794
+#, fuzzy
+msgid "Which printer model do you have?"
 msgstr "��i ��� �������i �� �����?"
 
-#: ../../printerdrake.pm_.c:204 ../../printerdrake.pm_.c:305
-msgid "Do you want to test printing?"
+#: ../../printerdrake.pm_.c:866
+#, fuzzy
+msgid "OKI winprinter configuration"
+msgstr "��������� �������� � I���������"
+
+#: ../../printerdrake.pm_.c:867
+msgid ""
+"You are configuring an OKI laser winprinter. These printers\n"
+"use a very special communication protocol and therefore they\n"
+"work only when connected to the first parallel port. When\n"
+"your printer is connected to another port or to a print\n"
+"server box please connect the printer to the first parallel\n"
+"port before you print a test page. Otherwise the printer\n"
+"will not work. Your connection type setting will be ignored\n"
+"by the driver."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:916 ../../printerdrake.pm_.c:946
+#, fuzzy
+msgid "Lexmark inkjet configuration"
+msgstr "��������� �������� � I���������"
+
+#: ../../printerdrake.pm_.c:917
+msgid ""
+"The inkjet printer drivers provided by Lexmark only support\n"
+"local printers, no printers on remote machines or print server\n"
+"boxes. Please connect your printer to a local port or\n"
+"configure it on the machine where it is connected to."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:947
+msgid ""
+"To be able to print with your Lexmark inkjet and this\n"
+"configuration, you need the inkjet printer drivers\n"
+"provided by Lexmark (http://www.lexmark.com/). Go to\n"
+"the US site and click on the \"Drivers\" button. Then\n"
+"choose your model and afterwards \"Linux\" as\n"
+"operating system. The drivers come as RPM packages\n"
+"or shell scripts with interactive graphical installation.\n"
+"You do not need to do this configuration by the\n"
+"graphical frontends. Cancel directly after the license\n"
+"agreement. Then print printhead alignment pages with\n"
+"\"lexmarkmaintain\" and adjust the head alignment\n"
+"settings with this program."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1079
+msgid ""
+"Printer default settings\n"
+"You should make sure that the page size and the\n"
+"ink type (if available) are set correctly. Note\n"
+"that with a very high printout quality printing\n"
+"can get substantially slower."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1090
+#, c-format
+msgid "Option %s must be an integer number!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1094
+#, c-format
+msgid "Option %s must be a number!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1099
+#, c-format
+msgid "Option %s out of range!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1136
+#, fuzzy, c-format
+msgid ""
+"Do you want to set this printer (\"%s\")\n"
+"as the default printer?"
 msgstr "������� �������i������ ����?"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "�������� �����"
+
+#: ../../printerdrake.pm_.c:1153
+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\n"
+"and on laser printers with too low memory it can even not come out.\n"
+"In most cases it is enough to print the standard test page."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1158
+#, fuzzy
+msgid "No test pages"
+msgstr "���,  ����������� ������� �������i ������"
+
+#: ../../printerdrake.pm_.c:1159
+#, fuzzy
+msgid "Print"
+msgstr "�������"
+
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "����������"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "���� �������� ��������"
+
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "���� �������� ��������"
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "���� �������� ��������"
 
-#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:324
-#, c-format
+#: ../../printerdrake.pm_.c:1200
+#, fuzzy, c-format
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
+"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"
-"Does it work properly?"
 msgstr ""
 "�������� �������i ��������� ������ �����.\n"
 "����� ���, �� ������� ��������, ���� ������i ����� ���.\n"
@@ -6169,238 +6375,604 @@ msgstr ""
 "\n"
 "�� ������ ���������?"
 
-#: ../../printerdrake.pm_.c:218 ../../printerdrake.pm_.c:328
+#: ../../printerdrake.pm_.c:1204
+#, fuzzy
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Does it work properly?"
+"Test page(s) have been sent to the printer.\n"
+"It may take some time before the printer starts.\n"
 msgstr ""
 "�������� �������i ��������� ������ �����.\n"
 "����� ���, �� ������� ��������, ���� ������i ����� ���.\n"
 "�� ������ ���������?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "���, ����������� �������� ������ ASCII"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "���, ����������� �������� ������ PostScript"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "I�� �������i"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "���,  ����������� ������� �������i ������"
+#: ../../printerdrake.pm_.c:1237
+#, 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 "
+"\"qtcups <file>\". The graphical tools allow you to choose the printer and "
+"to modify the option settings easily.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:243
-msgid "Configure Printer"
-msgstr "��������� ��������"
+#: ../../printerdrake.pm_.c:1239
+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 ""
 
-#: ../../printerdrake.pm_.c:273
-msgid "Printer options"
+#: ../../printerdrake.pm_.c:1242 ../../printerdrake.pm_.c:1254
+#: ../../printerdrake.pm_.c:1266
+#, 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 ""
+
+#: ../../printerdrake.pm_.c:1244 ../../printerdrake.pm_.c:1284
+msgid ""
+"To get a list of the options available for the current printer read either "
+"the list shown below or click on the \"Print option list\" button.\n"
+"\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1249 ../../printerdrake.pm_.c:1261
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\".\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1251 ../../printerdrake.pm_.c:1263
+#: ../../printerdrake.pm_.c:1275
+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 ""
+
+#: ../../printerdrake.pm_.c:1256 ../../printerdrake.pm_.c:1268
+msgid ""
+"To get a list of the options available for the current printer click on the "
+"\"Print option list\" button.\n"
+"\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1273
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\" or \"%s <file>\".\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1277
+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 ""
+
+#: ../../printerdrake.pm_.c:1281
+#, 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 ""
+
+#: ../../printerdrake.pm_.c:1292
+#, fuzzy, c-format
+msgid "Printing on the printer \"%s\""
+msgstr "��������� �� ����i"
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
 msgstr "����i ��������"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "������ ������"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+#, fuzzy
+msgid "Reading printer data ..."
+msgstr "����� ���� �������� �������� CUPS"
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "����������� ������ ����� �����?"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "��������� �������� � I���������"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "��������� �������� Uniprint"
+#: ../../printerdrake.pm_.c:1339
+#, c-format
+msgid ""
+"You can copy the printer configuration which you have done \n"
+"for the spooler %s to %s, your current spooler. All the\n"
+"configuration data (printer name, description, location, \n"
+"connection type, and default option settings) is overtaken,\n"
+"but jobs will not be transferred.\n"
+"Not all queues can be transferred due to the following \n"
+"reasons:\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:281
-msgid "Color depth options"
-msgstr "��������� ����i�i ������"
+#: ../../printerdrake.pm_.c:1347
+msgid ""
+"CUPS does not support printers on Novell servers or printers\n"
+"sending the data into a free-formed command.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:283
-msgid "Print text as PostScript?"
-msgstr "��������� ����� �� PostScript?"
+#: ../../printerdrake.pm_.c:1350
+msgid ""
+"PDQ only supports local printers, remote LPD printers, and\n"
+"Socket/TCP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:285
-msgid "Fix stair-stepping text?"
-msgstr "����������� ����������� �����?"
+#: ../../printerdrake.pm_.c:1353
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:287
-msgid "Number of pages per output pages"
-msgstr "����� �������i �� ��������i ������������ ��������"
+#: ../../printerdrake.pm_.c:1355
+msgid ""
+"In addition, queues not created with this program or\n"
+"\"foomatic-configure\" cannot be transferred."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:288
-msgid "Right/Left margins in points (1/72 of inch)"
-msgstr "������/����� ���i � ������� (1/72 ������)"
+#: ../../printerdrake.pm_.c:1357
+msgid ""
+"\n"
+"Also printers configured with the PPD files provided by\n"
+"their manufacturers or with native CUPS drivers can not be\n"
+"transferred."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:289
-msgid "Top/Bottom margins in points (1/72 of inch)"
-msgstr "�������/�i���� ���i � ������� (1/72 ������)"
+#: ../../printerdrake.pm_.c:1360
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:291
-msgid "Extra GhostScript options"
-msgstr "���������� ����i GhostScript"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "���������� ��������� ������"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "��������� ������� ��������"
+#: ../../printerdrake.pm_.c:1377
+#, 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 ""
 
-#: ../../printerdrake.pm_.c:345
-msgid "Would you like to configure a printer?"
-msgstr "������� ������i�� �������?"
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:351
+#: ../../printerdrake.pm_.c:1390
+#, c-format
 msgid ""
-"Here are the following print queues.\n"
-"You can add some more or change the existing ones."
+"The printer \"%s\" already exists,\n"
+"do you really want to overwrite its configuration?"
 msgstr ""
-"��� ���������� ����i �����.\n"
-"�� ������ ������ ����, ����� ����i�� i�������."
 
-#: ../../printerdrake.pm_.c:370
+#: ../../printerdrake.pm_.c:1398
 #, fuzzy
-msgid "CUPS starting"
-msgstr "��������"
+msgid "New printer name"
+msgstr "I�� �������i"
+
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1412
+#, c-format
+msgid ""
+"You have transferred your former default printer (\"%s\"),\n"
+"Should it be also the default printer under the\n"
+"new printing system %s?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:370
-msgid "Reading CUPS drivers database..."
+#: ../../printerdrake.pm_.c:1423
+#, fuzzy
+msgid "Refreshing printer data ..."
 msgstr "����� ���� �������� �������� CUPS"
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "����� ���� �������� ��������"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+#, fuzzy
+msgid "Configuration of a remote printer"
+msgstr "��������� ��������"
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "�� ������� ��������?"
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "��i ��� ������ ISDN ��������?"
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "����� ���� �������� � ��������� ���������"
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "��������� ����i"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "���i��� ������ �� ���������"
+
+#: ../../printerdrake.pm_.c:1456
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected.\n"
-"In case of doubt, select \"Remote CUPS server\"."
+"You are going to configure a remote printer. This needs working\n"
+"network access, but your network is not configured yet. If you\n"
+"go on without network configuration, you will not be able to use\n"
+"the printer which you are configuring now. How do you want \n"
+"to proceed?"
 msgstr ""
-"�������� CUPS ������ �� �������� �� ��� �������� ��������\n"
-"�� ����� ������, �� ����� ��������� ����������.\n"
-"��� �� �� ��������, ������� \"�������� ������ CUPS\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1463
 #, fuzzy
+msgid "Go on without configuring the network"
+msgstr "��������� ����i"
+
+#: ../../printerdrake.pm_.c:1496
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected\n"
-"unless you have a server on a different network; in the\n"
-"latter case, you have to give the CUPS server IP address\n"
-"and optionally the port number."
+"The network configuration done during the installation \n"
+"cannot be started now. Please check whether the network\n"
+"gets accessable after booting your system and correct the\n"
+"configuration using the Mandrake Control Center, section\n"
+"\"Network & Internet\"/\"Connection\", and afterwards set\n"
+"up the printer, also using the Mandrake Control Center,\n"
+"section \"Hardware\"/\"Printer\""
 msgstr ""
-"�������� CUPS ������ �� �������� �� ��� �������� ��������\n"
-"�� ����� ������, �� ����� ��������� ����������.\n"
-"��� �� �� ��������, ������� \"�������� ������ CUPS\"."
 
-#: ../../printerdrake.pm_.c:421
+#: ../../printerdrake.pm_.c:1503
+msgid ""
+"The network access was not running and could not be \n"
+"started. Please check your configuration and your \n"
+"hardware. Then try to configure your remote printer\n"
+"again."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1516
 #, fuzzy
-msgid "CUPS server IP"
-msgstr "IP ������� SMB"
+msgid "Restarting printing system ..."
+msgstr "���� �i����� ����� �� ������� �������������?"
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "�����i"
 
-#: ../../printerdrake.pm_.c:429
-msgid "Port number should be numeric"
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "������i������"
+
+#: ../../printerdrake.pm_.c:1549
+#, c-format
+msgid "Installing a printing system in the %s security level"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "�����i�� ����� �����"
+#: ../../printerdrake.pm_.c:1550
+#, c-format
+msgid ""
+"You are about to install the printing system %s on\n"
+"a system running in the %s security level.\n"
+"\n"
+"This printing system runs a daemon (background process)\n"
+"which waits for print jobs and handles them. This daemon\n"
+"is also accessable by remote machines through the network\n"
+"and so it is a possible point for attacks. Therefore only\n"
+"a few selected daemons are started by default in this\n"
+"security level.\n"
+"\n"
+"Do you really want to configure printing on this\n"
+"machine?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1584
+#, fuzzy
+msgid "Starting the printing system at boot time"
+msgstr "���� �i����� ����� �� ������� �������������?"
 
-#: ../../printerdrake.pm_.c:454
+#: ../../printerdrake.pm_.c:1585
+#, c-format
 msgid ""
-"Name of printer should contains only letters, numbers and the underscore"
+"The printing system (%s) will not be started automatically\n"
+"when the machine is booted.\n"
+"\n"
+"It is possible that the automatic starting was turned off \n"
+"by changing to a higher security level, because the printing\n"
+"system is a potential point for attacks.\n"
+"\n"
+"Do you want to have the automatic starting of the printing\n"
+"system turned on again?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1612 ../../printerdrake.pm_.c:1644
+#: ../../printerdrake.pm_.c:1671 ../../printerdrake.pm_.c:1701
+#: ../../printerdrake.pm_.c:1778
+msgid "Checking installed software..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:461
+#: ../../printerdrake.pm_.c:1727
+#, fuzzy
+msgid "Select Printer Spooler"
+msgstr "����� ���� �������� ��������"
+
+#: ../../printerdrake.pm_.c:1728
+#, fuzzy
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "���� �i����� ����� �� ������� �������������?"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "��������� ��������"
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "����i ��������"
+
+#: ../../printerdrake.pm_.c:1815
+#, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "����� ���� �������� �������� CUPS"
+
+#: ../../printerdrake.pm_.c:1845
+#, fuzzy
+msgid "Would you like to configure printing?"
+msgstr "������� ������i�� �������?"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1879
 msgid ""
-"Every printer need a name (for example lp).\n"
-"Other parameters such as the description of the printer or its location\n"
-"can be defined. What name should be used for this printer and\n"
-"how is the printer connected?"
+"The following printers are configured.\n"
+"Click on one of them to modify it or\n"
+"to get information about it or on \n"
+"\"Add Printer\" to add a new printer."
 msgstr ""
-"������ ����� �����, � ���� ����������� ������i ��� �����, �������� "
-"���������� i�� (�������� lp). ����i� ���������, ���i� �� ��i����� �������i "
-"�i\n"
-" ��� �������������, ������ ���� ���������. ���� i�� �� �������i �� �������\n"
-"������������ i �� ����� �������� ����������?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+#, fuzzy
+msgid "Normal Mode"
+msgstr "��������"
+
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (�� ���������)"
+
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "�������� ������ CUPS"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "�������� ������ CUPS"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+#, fuzzy
+msgid "Add printer"
 msgstr "I�� �������i"
 
-#: ../../printerdrake.pm_.c:466
-msgid "Description"
-msgstr "��i�����"
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "�i ������� �������i������ ��������i?"
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "�������������"
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "��������� �������� � I���������"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../printerdrake.pm_.c:2004
+#, c-format
 msgid ""
-"Every print queue (which print jobs are directed to) needs a\n"
-"name (often lp) and a spool directory associated with it. What\n"
-"name and directory should be used for this queue and how is the printer "
-"connected?"
+"Printer %s: %s %s\n"
+"What do you want to modify on this printer?"
 msgstr ""
-"������ ����� �����, � ���� ����������� ������i ��� �����, �������� "
-"���������� i�� (�������� lp) i ����������� � �� �������� ����i���. �������� "
-"i�� i ������� ��� ����i."
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "I�� ����i �����"
+#: ../../printerdrake.pm_.c:2012
+msgid "Do it!"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "���������� ����i���"
+#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+#, fuzzy
+msgid "Printer connection type"
+msgstr "�������� I�������-��������"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
 msgstr "�������� ��������"
 
-#: ../../raid.pm_.c:33
+#: ../../printerdrake.pm_.c:2018 ../../printerdrake.pm_.c:2081
+msgid "Printer manufacturer, model, driver"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2019 ../../printerdrake.pm_.c:2082
+msgid "Printer manufacturer, model"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2028 ../../printerdrake.pm_.c:2092
+msgid "Set this printer as the default"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2029 ../../printerdrake.pm_.c:2097
+#, fuzzy
+msgid "Print test pages"
+msgstr "���� �������� ��������"
+
+#: ../../printerdrake.pm_.c:2030 ../../printerdrake.pm_.c:2099
+msgid "Know how to print with this printer"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2031 ../../printerdrake.pm_.c:2101
+#, fuzzy
+msgid "Remove printer"
+msgstr "�������� �������"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "����� ���� �������� �������� CUPS"
+
+#: ../../printerdrake.pm_.c:2096
+#, c-format
+msgid "The printer \"%s\" is set as the default printer now."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2103
+#, fuzzy, c-format
+msgid "Do you really want to remove the printer \"%s\"?"
+msgstr "�i ������� �������i������ ��������i?"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "����� ���� �������� �������� CUPS"
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+#, fuzzy
+msgid "Proxy configuration"
+msgstr "��������� proxy �������� �������"
+
+#: ../../proxy.pm_.c:30
+msgid ""
+"Welcome to the proxy configuration utility.\n"
+"\n"
+"Here, you'll be able to set up your http and ftp proxies\n"
+"with or without login and password\n"
+msgstr ""
+
+#: ../../proxy.pm_.c:38
+msgid ""
+"Please fill in the http proxy informations\n"
+"Leave it blank if you don't want an http proxy"
+msgstr ""
+
+#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
+msgid "URL"
+msgstr ""
+
+#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
+#, fuzzy
+msgid "port"
+msgstr "����"
+
+#: ../../proxy.pm_.c:44
+#, fuzzy
+msgid "Url should begin with 'http:'"
+msgstr "Proxy ���i��� ���� http://..."
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+msgid "The port part should be numeric"
+msgstr ""
+
+#: ../../proxy.pm_.c:59
+msgid ""
+"Please fill in the ftp proxy informations\n"
+"Leave it blank if you don't want an ftp proxy"
+msgstr ""
+
+#: ../../proxy.pm_.c:65
+#, fuzzy
+msgid "Url should begin with 'ftp:'"
+msgstr "Proxy ���i��� ���� ftp://..."
+
+#: ../../proxy.pm_.c:79
+msgid ""
+"Please enter proxy login and password, if any.\n"
+"Leave it blank if you don't want login/passwd"
+msgstr ""
+
+#: ../../proxy.pm_.c:80
+#, fuzzy
+msgid "login"
+msgstr "����������� ������ � �i�����"
+
+#: ../../proxy.pm_.c:82
+#, fuzzy
+msgid "password"
+msgstr "������"
+
+#: ../../proxy.pm_.c:84
+#, fuzzy
+msgid "re-type password"
+msgstr "���� ������"
+
+#: ../../proxy.pm_.c:88
+#, fuzzy
+msgid "The passwords don't match. Try again!"
+msgstr "�����i �� ���������"
+
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "�� ������i������ ������ ������� �� _��������i������_ RAID md%d"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "�� ������i������ ���i� � ���� $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "�� ������i������ ���i� � ���� %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid �� ������������"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid �� ������������ (���� raid ������� ������i�����?)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "������������ �������� ��� RAID ������ %d\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
 msgstr ""
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron, ���������� �������� ����������i�."
 
-#: ../../services.pm_.c:18
+#: ../../services.pm_.c:17
 msgid ""
 "apmd is used for monitoring batery status and logging it via syslog.\n"
 "It can also be used for shutting down the machine when the battery is low."
@@ -6409,7 +6981,7 @@ msgstr ""
 "���������i.\n"
 "��� ����� ������������� ��� ���������� ������ ��� �i��i� ������� ������i."
 
-#: ../../services.pm_.c:20
+#: ../../services.pm_.c:19
 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."
@@ -6417,7 +6989,7 @@ msgstr ""
 "�������, ��i� �����������, �i������� �� �������� i ���� �� ���������\n"
 "i ����������� ����� ������, ���i �������� �����i �i��� �����������."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:21
 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 "
@@ -6429,7 +7001,7 @@ msgstr ""
 "������������\n"
 "UNIX cron, ��������� ����� �������� ������i i ������ ����i���������� ����i."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:24
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -6441,13 +7013,13 @@ msgstr ""
 "���i������i i ������,\n"
 "i ������� ��������� ����������� (pop-up) ���� � ��������� ������."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr ""
 
-#: ../../services.pm_.c:30
+#: ../../services.pm_.c:29
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -6455,7 +7027,7 @@ msgstr ""
 "Apache - ���� World Wide Web ������. �� ��������������� ��� ������������\n"
 "HTML ����� i CGI."
 
-#: ../../services.pm_.c:32
+#: ../../services.pm_.c:31
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -6471,13 +7043,13 @@ msgstr ""
 "�������\n"
 "��� ������, �� ��i� �� ��������."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:35
 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_.c:38
+#: ../../services.pm_.c:37
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -6488,23 +7060,23 @@ msgstr ""
 "kbdconfig.\n"
 "�� ������ ����i�� ��������� �� ��� ������� ������."
 
-#: ../../services.pm_.c:41
+#: ../../services.pm_.c:40
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
 msgstr ""
 
-#: ../../services.pm_.c:43
+#: ../../services.pm_.c:42
 msgid "Automatic detection and configuration of hardware at boot."
 msgstr ""
 
-#: ../../services.pm_.c:44
+#: ../../services.pm_.c:43
 msgid ""
 "Linuxconf will sometimes arrange to perform various tasks\n"
 "at boot-time to maintain the system configuration."
 msgstr ""
 
-#: ../../services.pm_.c:46
+#: ../../services.pm_.c:45
 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)."
@@ -6512,13 +7084,13 @@ msgstr ""
 "lpd - ���� ����� �����, �������� ��� ��������� ����� lpr. ����\n"
 "������, ��i �i��� ������ ��������(�)."
 
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:47
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
 msgstr ""
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:49
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -6526,7 +7098,7 @@ msgstr ""
 "named (BIND) - ���� ������ �������� i���, ��i ��������������� ���\n"
 "������������ i�� ����� � IP ������."
 
-#: ../../services.pm_.c:52
+#: ../../services.pm_.c:51
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -6534,7 +7106,7 @@ msgstr ""
 "����i������ i �������i������ ��� �������� �������� �i����� (NFS),\n"
 " SMB (Lan Manager/Windows) i NCP (Netware) ������ ����i�������."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -6542,7 +7114,7 @@ msgstr ""
 "�����i������/�������i������ ��� �������� i���������, �����i��������� ���\n"
 "������ ��� �������� �i�����."
 
-#: ../../services.pm_.c:56
+#: ../../services.pm_.c:55
 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"
@@ -6552,7 +7124,7 @@ msgstr ""
 "����� ������ �������������� NFS ��������, ��i ����i��������� ����\n"
 "/etc/exports ����."
 
-#: ../../services.pm_.c:59
+#: ../../services.pm_.c:58
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -6560,17 +7132,17 @@ msgstr ""
 "NFS -  ���� ������ �������� ��� ������� �� ����� ���� TCP/IP\n"
 "����i. ����� ������ ������� �� ��������� �����i ���i� NFS ������i."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
 msgstr ""
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
 msgstr ""
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:63
 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 "
@@ -6581,7 +7153,7 @@ msgstr ""
 "������ � ��������. ��� ���� �����������i ����i�������� i�, ���i �� �����\n"
 "������ i� ����, �i ��� �� ������."
 
-#: ../../services.pm_.c:67
+#: ../../services.pm_.c:66
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -6593,7 +7165,7 @@ msgstr ""
 "����������\n"
 "�� ������� ��i� �������� �� ������� ��� ���������, ��i� ������������� RPC."
 
-#: ../../services.pm_.c:70
+#: ../../services.pm_.c:69
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -6601,7 +7173,7 @@ msgstr ""
 "Postfix -  ���� ������� ����������� �����, ��������, ����\n"
 "���������� ����� � ����� ������ �� �����."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -6609,13 +7181,13 @@ msgstr ""
 "�������� i �����i�� �i������ ������i��� ��� ��� ������� �����i\n"
 "��������� ���������� ���."
 
-#: ../../services.pm_.c:74
+#: ../../services.pm_.c:73
 msgid ""
 "Assign raw devices to block devices (such as hard drive\n"
 "partitions), for the use of applications such as Oracle"
 msgstr ""
 
-#: ../../services.pm_.c:76
+#: ../../services.pm_.c:75
 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"
@@ -6625,7 +7197,7 @@ msgstr ""
 "��������� ���� RIP ��������. RIP ��������������� � ����� ������, �����\n"
 "��������� ��������� ������������i - � ���i�i� ������."
 
-#: ../../services.pm_.c:79
+#: ../../services.pm_.c:78
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -6633,7 +7205,7 @@ msgstr ""
 "�������� rstat �������� ����������i��� ����i ������i����\n"
 "������ �������i ��� ������ ������ ����i."
 
-#: ../../services.pm_.c:81
+#: ../../services.pm_.c:80
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -6641,7 +7213,7 @@ msgstr ""
 "�������� rusers �������� ����������i��� ����i ���������, ���\n"
 "������ i ������ �� ������� � �����."
 
-#: ../../services.pm_.c:83
+#: ../../services.pm_.c:82
 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)."
@@ -6649,11 +7221,11 @@ msgstr ""
 "�������� rwho ��� ���������� ����������i��� �������� ��i� ��i�\n"
 "����������i��, ��������� �� ������, ������ rwho ����� (������� �� finger)."
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:84
 msgid "Launch the sound system on your machine"
 msgstr ""
 
-#: ../../services.pm_.c:86
+#: ../../services.pm_.c:85
 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."
@@ -6662,45 +7234,89 @@ msgstr ""
 "�����������i\n"
 "� ������ ����� ���������i. ���� �����i ����� ��� ������ ����� ������ ������."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
 msgstr ""
 
-#: ../../services.pm_.c:89
+#: ../../services.pm_.c:88
 #, fuzzy
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
 msgstr "�������� i �������� X Font Server ��� �������� i ���������i."
 
-#: ../../services.pm_.c:118
+#: ../../services.pm_.c:114 ../../services.pm_.c:156
 msgid "Choose which services should be automatically started at boot time"
 msgstr "�������, ��i� ����i�� ��������� ���������� ��� ��������"
 
+#: ../../services.pm_.c:126
+#, fuzzy
+msgid "Printing"
+msgstr "�������"
+
+#: ../../services.pm_.c:127
+#, fuzzy
+msgid "Internet"
+msgstr "�i����"
+
+#: ../../services.pm_.c:130
+msgid "File sharing"
+msgstr ""
+
+#: ../../services.pm_.c:132
+#, fuzzy
+msgid "System"
+msgstr "Mouse Systems"
+
 #: ../../services.pm_.c:137
 #, fuzzy
+msgid "Remote Administration"
+msgstr "����i ���������� �������� lpd"
+
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "������ �����"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+#, fuzzy
+msgid "Services"
+msgstr "�������"
+
+#: ../../services.pm_.c:198
+#, fuzzy
 msgid "running"
 msgstr "�����!"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 #, fuzzy
 msgid "stopped"
 msgstr "��������"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr ""
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
 msgstr ""
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 #, fuzzy
 msgid "On boot"
 msgstr "Yaboot"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "����������� ������ %s"
+
+#: ../../standalone/diskdrake_.c:63
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
 "I'll try to go on blanking bad partitions"
@@ -6708,15 +7324,66 @@ msgstr ""
 "����i�� �������� �� ��������, ��� ������� ��������� ��� ���� :(\n"
 "��������� i��i ����� i ���� ���������� ������� ��������"
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+#, fuzzy
+msgid "Error!"
+msgstr "�������"
+
+#: ../../standalone/drakautoinst_.c:45
+#, c-format
+msgid "I can't find needed image file `%s'."
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:47
+#, fuzzy
+msgid "Auto Install Configurator"
+msgstr "��������� ����� �����������"
+
+#: ../../standalone/drakautoinst_.c:48
+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"
+"Do you want to continue?"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:70
+#, fuzzy
+msgid "Automatic Steps Configuration"
+msgstr "��������� ������"
+
+#: ../../standalone/drakautoinst_.c:71
+msgid ""
+"Please choose for each step whether it will replay like your install, or it "
+"will be manual"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:112 ../../standalone/drakgw_.c:599
+msgid "Congratulations!"
+msgstr "������ �i�������i!"
+
+#: ../../standalone/drakautoinst_.c:113
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:36 ../../standalone/drakgw_.c:181
 msgid "Internet Connection Sharing"
 msgstr "�������� I�������-��������"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "�������� I�������-�������� ����� �������"
 
-#: ../../standalone/drakgw_.c:119
+#: ../../standalone/drakgw_.c:120
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
@@ -6724,35 +7391,35 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 #, fuzzy
 msgid "disable"
 msgstr "����i��"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 #, fuzzy
 msgid "reconfigure"
 msgstr "��������� X Window"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 #, fuzzy
 msgid "Disabling servers..."
 msgstr "���������� �������..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 #, fuzzy
 msgid "Internet connection sharing is now disabled."
 msgstr "�������� I�������-�������� ����� ����������"
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "�������� I�������-�������� ����� ����������"
 
-#: ../../standalone/drakgw_.c:144
+#: ../../standalone/drakgw_.c:145
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -6760,29 +7427,21 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 #, fuzzy
 msgid "enable"
 msgstr "����i��"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 #, fuzzy
 msgid "Internet connection sharing is now enabled."
 msgstr "�������� I�������-�������� ����� �������"
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "�� ������������ ���������� ����� ����� ��������."
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr ""
-
-#: ../../standalone/drakgw_.c:181
+#: ../../standalone/drakgw_.c:182
 #, fuzzy
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -6799,21 +7458,21 @@ msgstr ""
 "\n"
 "�� ������� ���������� ������� ������ �� Internet?"
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:209
 #, fuzzy, c-format
 msgid "Interface %s"
 msgstr "������� i��������"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:217
 msgid "No network adapter on your system!"
 msgstr "� ����� ������ ���� �i������� ��������� ��������!"
 
-#: ../../standalone/drakgw_.c:217
+#: ../../standalone/drakgw_.c:218
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
@@ -6822,6 +7481,10 @@ msgstr ""
 "����������� ����i��������� i���������."
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "������� i��������"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -6831,7 +7494,7 @@ msgid ""
 "I am about to setup your Local Area Network with that adapter."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
@@ -6839,7 +7502,7 @@ msgstr ""
 "���i �����, ������� ������� �������, �� ����� ����������� ��� ��������� �� "
 "����� ��������� ����i."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 #, fuzzy
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
@@ -6847,15 +7510,16 @@ msgstr ""
 "�����, ������� ������� �����i��������.\n"
 "�i ������� ��������i�������� ���?"
 
-#: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
-msgstr "���������� ����� ��� �����i���� � ������� ����i�������� $_!\n"
+#: ../../standalone/drakgw_.c:254
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr "���������� ����� ��� �����i���� � ������� ����i�������� %s!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "��������� ������ �������� ������ (firewall)!"
 
-#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:263 ../../standalone/drakgw_.c:269
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
@@ -6863,24 +7527,21 @@ msgstr ""
 "�����! ��������� �������� �i����� �������� ������i (firewall). ��� ������� "
 "���������� ������������ �� ����� �����������."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 #, fuzzy
 msgid "Configuring..."
 msgstr "��������� IDE"
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "������������ �������, ����������� ��, ������ ������..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "�������� � ������������ ������ $_"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "������ �i�������i!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "�������� � ������������ ������ %s"
 
-#: ../../standalone/drakgw_.c:591
+#: ../../standalone/drakgw_.c:600
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
@@ -6891,25 +7552,25 @@ msgstr ""
 "� ����� ����'������ �  ����� ���, ������������ �����������\n"
 "��������������� (DHCP)."
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 #, fuzzy
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "�������� I�������-�������� ����� �������"
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 #, fuzzy
 msgid "Internet connection sharing configuration"
 msgstr "I������� �������� i ����i�������"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, fuzzy, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -6919,90 +7580,89 @@ msgid ""
 "Click on Configure to launch the setup wizard."
 msgstr "�������� I�������-��������"
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, fuzzy, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "����i������� ����i"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:539
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 #, fuzzy
 msgid "Profile: "
 msgstr "������� ����i�������: "
 
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:94
 msgid "Del profile..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
+#: ../../standalone/draknet_.c:134
+msgid ""
+"Name of the profile to create (the new profile is created as a copy of the "
+"current one) :"
 msgstr ""
 
-#: ../../standalone/draknet_.c:140
+#: ../../standalone/draknet_.c:160
 #, fuzzy
 msgid "Hostname: "
 msgstr "I�� ������"
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr ""
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 #, fuzzy
 msgid "Type:"
 msgstr "���: "
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "����:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Interface:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:168
+#: ../../standalone/draknet_.c:192
 msgid "Status:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:122 ../../standalone/net_monitor_.c:224
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 #, fuzzy
 msgid "Connected"
 msgstr "I�� ��������"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:83 ../../standalone/net_monitor_.c:122
-#: ../../standalone/net_monitor_.c:224
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 #, fuzzy
 msgid "Not connected"
 msgstr "�������������"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Disconnect..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:191
+#: ../../standalone/draknet_.c:215
 #, fuzzy
 msgid "Starting your connection..."
 msgstr "��i ��� ������ ISDN ��������?"
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 #, fuzzy
 msgid "Closing your connection..."
 msgstr "��i ��� ������ ISDN ��������?"
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7010,136 +7670,126 @@ msgid ""
 "in root."
 msgstr ""
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 #, fuzzy
 msgid "The system is now disconnected."
 msgstr "�� �� �������� ��������� �� I��������?"
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 #, fuzzy
 msgid "Configure Internet Access..."
 msgstr "��������� ������"
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 #, fuzzy
 msgid "LAN configuration"
 msgstr "��������� ADSL"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr ""
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 #, fuzzy
 msgid "Driver"
 msgstr "������"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 #, fuzzy
 msgid "Interface"
 msgstr "������� i��������"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr ""
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+#, fuzzy
+msgid "State"
+msgstr "��������� ����"
+
+#: ../../standalone/draknet_.c:267
 #, fuzzy
 msgid "Configure Local Area Network..."
 msgstr "��������� ��������� ����i"
 
-#: ../../standalone/draknet_.c:283
-#, fuzzy
-msgid "Normal Mode"
-msgstr "��������"
+#: ../../standalone/draknet_.c:279
+msgid "Click here to launch the wizard ->"
+msgstr ""
 
-#: ../../standalone/draknet_.c:288
+#: ../../standalone/draknet_.c:306
 msgid "Apply"
 msgstr ""
 
-#: ../../standalone/draknet_.c:307
+#: ../../standalone/draknet_.c:325
 #, fuzzy
 msgid "Please Wait... Applying the configuration"
 msgstr "�������� ��������� ��������i"
 
-#: ../../standalone/draknet_.c:391
+#: ../../standalone/draknet_.c:428
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 
-#: ../../standalone/draknet_.c:415
+#: ../../standalone/draknet_.c:450
 #, fuzzy
 msgid "LAN Configuration"
 msgstr "���������"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
 msgstr ""
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
 msgstr ""
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
 msgstr ""
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
 msgstr ""
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
 #, fuzzy
-msgid "Disable"
-msgstr "����i��"
+msgid "activate now"
+msgstr "�������"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
 #, fuzzy
-msgid "Enable"
-msgstr "����i��"
+msgid "desactivate now"
+msgstr "�������"
 
-#: ../../standalone/draknet_.c:504
+#: ../../standalone/draknet_.c:538
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
 msgstr ""
 
-#: ../../standalone/draknet_.c:528
+#: ../../standalone/draknet_.c:562
 #, fuzzy
 msgid "Internet connection configuration"
 msgstr "I������� �������� i ����i�������"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 #, fuzzy
 msgid "Internet Connection Configuration"
 msgstr "I������� �������� i ����i�������"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 #, fuzzy
 msgid "Connection type: "
 msgstr "I�� ��������"
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr ""
 
-#: ../../standalone/draknet_.c:560
-#, fuzzy
-msgid "Provider dns 1 (optional)"
-msgstr "DNS 1 ����������"
-
-#: ../../standalone/draknet_.c:561
-#, fuzzy
-msgid "Provider dns 2 (optional)"
-msgstr "DNS 2 ����������"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr ""
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr ""
 
@@ -7211,16 +7861,31 @@ msgstr ""
 "��������� �����i����i 4 ������, ��� ����� �i����� ������� ��������.\n"
 "��������� ������i ���������� �� ����i���."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "��������i ������ ������i"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "������� ���������� ��������i ��� �������"
+
+#: ../../standalone/draksec_.c:68
+msgid ""
+"A library which defends against buffer overflow and format string attacks."
+msgstr ""
+
+#: ../../standalone/draksec_.c:72
 msgid "Setting security level"
 msgstr "��������i ������ ������i"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 #, fuzzy
 msgid "Control Center"
 msgstr "��������� �� I��������"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "������� i���������, ��i ������� ����������"
 
@@ -7254,90 +7919,14 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "��������� ��������� live upgrade !!!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "serial_usb �� ��������\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "��������� ������ ������?"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "��� �����, ������ ������� ���� �����."
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-#, fuzzy
-msgid "Network Monitoring"
-msgstr "����i������� ����i"
-
-#: ../../standalone/net_monitor_.c:56
-msgid "Statistics"
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:59
-msgid "Sending Speed: "
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:61
-msgid "Receiving Speed: "
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:66
-#, fuzzy
-msgid "Close"
-msgstr "���� ����"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Connecting to Internet "
-msgstr "��������� �� I��������"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Disconnecting from Internet "
-msgstr "��������� �� I��������"
-
-#: ../../standalone/net_monitor_.c:114
-#, fuzzy
-msgid "Disconnection from Internet failed."
-msgstr "��������� �� I��������"
-
-#: ../../standalone/net_monitor_.c:115
-#, fuzzy
-msgid "Disconnection from Internet complete."
-msgstr "��������� �� I��������"
-
-#: ../../standalone/net_monitor_.c:117
-#, fuzzy
-msgid "Connection complete."
-msgstr "I�� ��������"
-
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:222
-#, fuzzy
-msgid "Connect"
-msgstr "I�� ��������"
-
-#: ../../standalone/net_monitor_.c:222
-#, fuzzy
-msgid "Disconnect"
-msgstr "��������� ISDN"
-
 #: ../../standalone/tinyfirewall_.c:29
 #, fuzzy
 msgid "Firewalling Configuration"
@@ -7363,16 +7952,85 @@ msgid ""
 "Click on Configure to set up a standard firewall"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:10
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "����� ����"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "���� �����������"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "���������� ��������� �����"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "��������� ����"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "����� ����i�����"
+
+#: ../../steps.pm_.c:19
+#, fuzzy
+msgid "Security"
+msgstr "��������"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "�����. �������� �i�����"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "������������ ��������"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "����� ������"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "����������� �i�����"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "������ ����������i��"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "��������� ����i"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "��������� ������"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "�������� ����. ����"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "����������� ����������"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "��������� X Window"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "���������� �����������"
+
+#: ../../tinyfirewall.pm_.c:9
 msgid ""
 "tinyfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Linux Mandrake machine.\n"
+"This configures a personal firewall for this Mandrake Linux machine.\n"
 "For a powerful dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:15
+#: ../../tinyfirewall.pm_.c:14
 msgid ""
 "We'll now ask you questions about which services you'd like to allow\n"
 "the Internet to connect to.  Please think carefully about these\n"
@@ -7383,7 +8041,7 @@ msgid ""
 "re-running this application!"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:22
+#: ../../tinyfirewall.pm_.c:21
 msgid ""
 "Are you running a web server on this machine that you need the whole\n"
 "Internet to see? If you are running a webserver that only needs to be\n"
@@ -7391,7 +8049,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:27
+#: ../../tinyfirewall.pm_.c:26
 msgid ""
 "Are you running a name server on this machine? If you didn't set one\n"
 "up to give away IP and zone information to the whole Internet, please\n"
@@ -7399,7 +8057,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:32
+#: ../../tinyfirewall.pm_.c:31
 msgid ""
 "Do you want to allow incoming Secure Shell (ssh) connections? This\n"
 "is a telnet-replacement that you might use to login. If you're using\n"
@@ -7408,7 +8066,7 @@ msgid ""
 "it. ssh is encrypted and doesn't allow for this eavesdropping."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:37
+#: ../../tinyfirewall.pm_.c:36
 msgid ""
 "Do you want to allow incoming telnet connections?\n"
 "This is horribly unsafe, as we explained in the previous screen. We\n"
@@ -7416,7 +8074,7 @@ msgid ""
 "telnet.\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:42
+#: ../../tinyfirewall.pm_.c:41
 msgid ""
 "Are you running an FTP server here that you need accessible to the\n"
 "Internet? If you are, we strongly recommend that you only use it for\n"
@@ -7424,7 +8082,7 @@ msgid ""
 "attackers, since FTP also uses no encryption for transferring passwords.\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:47
+#: ../../tinyfirewall.pm_.c:46
 msgid ""
 "Are you running a mail server here? If you're sending you \n"
 "messages through pine, mutt or any other text-based mail client,\n"
@@ -7432,7 +8090,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:52
+#: ../../tinyfirewall.pm_.c:51
 msgid ""
 "Are you running a POP or IMAP server here? This would\n"
 "be used to host non-web-based mail accounts for people via \n"
@@ -7440,7 +8098,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:57
+#: ../../tinyfirewall.pm_.c:56
 msgid ""
 "You appear to be running a 2.2 kernel.  If your network IP\n"
 "is automatically set by a computer in your home or office \n"
@@ -7448,7 +8106,7 @@ msgid ""
 "this the case?\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:62
+#: ../../tinyfirewall.pm_.c:61
 msgid ""
 "Is your computer getting time syncronized to another computer?\n"
 "Mostly, this is used by medium-large Unix/Linux organizations\n"
@@ -7457,7 +8115,7 @@ msgid ""
 "aren't."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
@@ -7465,293 +8123,1272 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, fuzzy, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "������� �������� %s ��� ���i��: %s"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
+msgid "Web/FTP"
 msgstr ""
 
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Development"
-msgstr "������������"
-
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Workstation"
-msgstr "��������� �����������"
+msgid "Network Computer (client)"
+msgstr "������� ������� (socket)"
 
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
+msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "�������� �������� ����������"
-
-#: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "����������� - �������"
-
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Internet"
-msgstr "�i����"
+msgid "Office"
+msgstr "�����"
 
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Network Computer (client)"
-msgstr "������� ������� (socket)"
+msgid "Gnome Workstation"
+msgstr "��������� �����������"
 
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "����������: �������������� mp3 � midi, ������ � �.�."
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "���������������� ����� ��� Palm Pilot � Visor"
 
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Internet station"
-msgstr "��������� �������� � I���������"
+msgid "Workstation"
+msgstr "��������� �����������"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Office"
-msgstr "�����"
+msgid "Firewall/Router"
+msgstr ""
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia station"
-msgstr "����������� - ���"
+msgid "Domain Name and Network Information Server"
+msgstr ""
 
 #: ../../share/compssUsers:999
 msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
-"����������� ��� ������� � ������ ����� � ����� (pine, mutt,  tin...), "
-"Web �����������"
+"������� ��������: ��������� ����� (kword, abiword), ���������� ������, "
+"����������� pdf-�����, � �.�."
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "�������� � �������� ��� ��������� �� � � �++"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "����������: �������������� mp3 � midi, ������ � �.�."
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr ""
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "��� � Howto �� Linux � Free Software"
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "�������� �������� ����� ��������, ���� gnucash"
+#, fuzzy
+msgid "KDE Workstation"
+msgstr "��������� �����������"
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
+msgid "Multimedia - Video"
+msgstr "����������� - ����"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Documentation"
-msgstr "��������i�����"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "����� ����������� ��� �����, �����, web'�, �������� �����, � chat"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Database"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "������"
-
-#: ../../share/compssUsers:999
-msgid "DNS/NIS "
+msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr ""
+#, fuzzy
+msgid "Tools to ease the configuration of your computer"
+msgstr "�i ������� �������i������ ��������i?"
 
 #: ../../share/compssUsers:999
 msgid "Multimedia - Sound"
 msgstr "����������� - ���"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "����������� ��������: ������, ������㳳 � �.�."
+msgid "Utilities"
+msgstr "������"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "��������� � �������������� ����"
+#, fuzzy
+msgid "Documentation"
+msgstr "��������i�����"
 
 #: ../../share/compssUsers:999
 msgid "Console Tools"
 msgstr "���������� ���������������� �����"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "��������� � �������������� ���� � ����"
+msgid "Postfix mail server, Inn news server"
+msgstr ""
 
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Scientific Workstation"
-msgstr "��������� �����������"
+msgid "Internet station"
+msgstr "��������� �������� � I���������"
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "���������, �������, ��������"
+#, fuzzy
+msgid "Multimedia station"
+msgstr "����������� - ���"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "��� � Howto �� Linux � Free Software"
+#, fuzzy
+msgid "Configuration"
+msgstr "���������"
+
+#: ../../share/compssUsers:999
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "���� ��������� ��������� �������� �����(Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
 msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr ""
-"��������� �������� �� ������� ����� ������������ ������� ������������ �  "
+"The K Desktop Environment - ������� ��������� �������� � ��������� "
 "���������������� ������"
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
+msgid "Graphical Environment"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "������"
+#, fuzzy
+msgid "Development"
+msgstr "������������"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "����������� - ����"
+msgid "Apache, Pro-ftpd"
+msgstr ""
+
+#: ../../share/compssUsers:999
+msgid "Tools to create and burn CD's"
+msgstr "���������������� ����� ���������� CD"
 
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Network Computer server"
-msgstr "������� ������� (socket)"
+msgid "Office Workstation"
+msgstr "��������� �����������"
+
+#: ../../share/compssUsers:999
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
 
 #: ../../share/compssUsers:999
 msgid "Graphics programs such as The Gimp"
 msgstr "��������� �������� ���� The Gimp"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
+msgid "DNS/NIS "
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"The K Desktop Environment - ������� ��������� �������� � ��������� "
-"���������������� ������"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "�������� � �������� ��� ��������� �� � � �++"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "���� ��������� ��������� �������� �����(Gnome, IceWM)"
+#, fuzzy
+msgid "Network Computer server"
+msgstr "������� ������� (socket)"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "���������������� ����� ���������� CD"
+msgid "Mail/Groupware/News"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "����������� - ��������� CD"
+#, fuzzy
+msgid "Game station"
+msgstr "����������� - ���"
 
 #: ../../share/compssUsers:999
-msgid "Archiving, emulators, monitoring"
-msgstr "����������, ���������, ����������"
+msgid "Video players and editors"
+msgstr "��������� � �������������� ����"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr ""
+msgid "Multimedia - Graphics"
+msgstr "����������� - �������"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"������� ��������: ��������� ����� (kword, abiword), ���������� ������, "
-"����������� pdf-�����, � �.�."
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "����������� ��������: ������, ������㳳 � �.�."
 
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
+"����������� ��� ������� � ������ ����� � ����� (pine, mutt,  tin...), "
+"Web �����������"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Server"
-msgstr "������"
+msgid "Archiving, emulators, monitoring"
+msgstr "����������, ���������, ����������"
 
 #: ../../share/compssUsers:999
 msgid "Personal Finance"
 msgstr "������������ �������"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "���������"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"��������� �������� �� ������� ����� ������������ ������� ������������ �  "
+"���������������� ������"
 
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
+msgid "Clients for different protocols including ssh"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "����� ��������� �������� �����"
+#, fuzzy
+msgid "Internet gateway"
+msgstr "��������� �������� � I���������"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr ""
+msgid "Sound and video playing/editing programs"
+msgstr "��������� � �������������� ���� � ����"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr ""
+msgid "Other Graphical Desktops"
+msgstr "����� ��������� �������� �����"
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr ""
+msgid "Editors, shells, file tools, terminals"
+msgstr "���������, �������, ��������"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "��������� �������� � I���������"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "�������� �������� ����� ��������, ���� gnucash"
 
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "���������������� ����� ��� Palm Pilot � Visor"
+msgid "Games"
+msgstr "������"
 
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr ""
+msgid "Personal Information Management"
+msgstr "�������� �������� ����������"
 
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr ""
+msgid "Multimedia - CD Burning"
+msgstr "����������� - ��������� CD"
 
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Tools to ease the configuration of your computer"
-msgstr "�i ������� �������i������ ��������i?"
+msgid "Scientific Workstation"
+msgstr "��������� �����������"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "����� ����������� ��� �����, �����, web'�, �������� �����, � chat"
+#, fuzzy
+#~ msgid "Do you want to restart the network"
+#~ msgstr "�i ������� �������i������ ��������i?"
+
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "�� �������?"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
+#~ "(primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+#~ msgstr ""
+#~ "���i �� �� ������� ��������, ��� ��������� ������� �'�������� \"/dev/hda"
+#~ "\"\n"
+#~ "(�������� ������� IDE ����) �i \"/dev/sda\" (����� SCSI ����)."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "��� ���������� ����i �����.\n"
+#~ "�� ������ ������ ����, ����� ����i�� i�������."
+
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "I�� ��������"
+
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "������� �������� ����������i��:"
+
+#, fuzzy
+#~ msgid "Test the mouse here."
+#~ msgstr "��� �����, ������ ������� ���� �����."
+
+#~ msgid ""
+#~ "You need to accept the terms of the above license to continue "
+#~ "installation.\n"
+#~ "\n"
+#~ "\n"
+#~ "Please click on \"Accept\" if you agree with its terms.\n"
+#~ "\n"
+#~ "\n"
+#~ "Please click on \"Refuse\" if you disagree with its terms. Installation "
+#~ "will end without modifying your current\n"
+#~ "configuration."
+#~ msgstr ""
+#~ "�� ������ ������� ����� ����糳, ��� ���������� ������������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� �����, ��������� \"�������\", ��� �� ������� � ������ ����糳.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� �����, ��������� \"����������\", ��� �� �� ������� � ������ "
+#~ "����糳.����������� ����� ��������\n"
+#~ "��� ����� ����� ������� ������������."
+
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr "������� ��������� ���� ����i����� � ������������ ��i��"
+
+#~ msgid ""
+#~ "If you wish other languages (than the one you choose at\n"
+#~ "beginning of installation) will be available after installation, please "
+#~ "chose\n"
+#~ "them in list above. If you want select all, you just need to select \"All"
+#~ "\"."
+#~ msgstr ""
+#~ "��� �� ������� ��� ����� ����������� ��� �������� ����� ����\n"
+#~ "(������ ���, ���� �� ��� ����� ��������� �����������), ��� "
+#~ "������������\n"
+#~ "�� � ����� ������������ ����. ��� �� ������� ������ �� ��������� \"���"
+#~ "\"."
+
+#~ msgid ""
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Customized: If you are familiar enough with GNU/Linux, you may then "
+#~ "choose\n"
+#~ "    the primary usage for your machine. See below for details.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
+#~ "    perform a highly customized installation. As for a \"Customized\"\n"
+#~ "    installation class, you will be able to select the usage for your "
+#~ "system.\n"
+#~ "    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
+#~ "DOING!"
+#~ msgstr ""
+#~ "�������: \n"
+#~ "\n"
+#~ "  - �� ������: ���� ����� ������������� � ��� �������, ���i �� "
+#~ "��������i \n"
+#~ "    ����� � GNU/Linux, i ������� ���i ������� ����������\n"
+#~ "    ������ i ������������ ��� ������ ����'�����. �����i�� �i��� "
+#~ "�������������.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - �������: ����� ������ ������ ��������, ��� �� �������� ��������� GNU/"
+#~ "Linux\n"
+#~ "    i ������� ������������� �����i �������� �����������. �� i � "
+#~ "������� \n"
+#~ "    \"�� ������\"��� �������� ����� ������� ���������� �������� i \n"
+#~ "    ������������ ������ ���������.\n"
+#~ "    ���i �����, �� ���I����� ���� �����, ���I �� ��ݡ����, ��� ���I�� "
+#~ "����I����!"
+
+#~ msgid ""
+#~ "You can now choose individually all the packages you\n"
+#~ "wish to install.\n"
+#~ "\n"
+#~ "\n"
+#~ "You can expand or collapse the tree by clicking on options in the left "
+#~ "corner of\n"
+#~ "the packages window.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you prefer to see packages sorted in alphabetic order, click on the "
+#~ "icon\n"
+#~ "\"Toggle flat and group sorted\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you want not to be warned on dependencies, click on \"Automatic\n"
+#~ "dependencies\". If you do this, note that unselecting one package may "
+#~ "silently\n"
+#~ "unselect several other packages which depend on it."
+#~ msgstr ""
+#~ "����� �� ������ ������� ����������� ��� ������, ��� �������\n"
+#~ "����������.\n"
+#~ "\n"
+#~ "\n"
+#~ "�� ������ ����������� � �������� ����� ������, ���������� �������\n"
+#~ "� ����� ���� ����� ������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� �� ������� ������ ������ � ��������� �������, ��������� �����\n"
+#~ "\"�����������\".\n"
+#~ "\n"
+#~ "\n"
+#~ "��� �� �� ������� ���������� ������������ ������� �����������, \n"
+#~ "��������� \"���������� ����������\". ��� �� ������ ����, �������, "
+#~ "���\n"
+#~ "��� �� ����� ������ ������ ����� �� ������������ ������� ������,\n"
+#~ "��� �� ��� ��������."
+
+#, fuzzy
+#~ msgid ""
+#~ "If you have all the CDs in the list above, click Ok. If you have\n"
+#~ "none of those CDs, click Cancel. If only some CDs are missing, unselect "
+#~ "them,\n"
+#~ "then click Ok."
+#~ msgstr ""
+#~ "���i �� ����� ��� CD ����i �� ��i�� �i���, ���i��i�� ��.\n"
+#~ "���i �� �� ����� ��i ������� � ����� CD �����, ���i��i�� �����i��.\n"
+#~ "���i ��������� � CD ����� �� �����, �����i�� i� ���������� i ���i��i�� "
+#~ "��."
+
+#~ msgid ""
+#~ "If you wish to connect your computer to the Internet or\n"
+#~ "to a local network please choose the correct option. Please turn on your "
+#~ "device\n"
+#~ "before choosing the correct option to let DrakX detect it automatically.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you do not have any connection to the Internet or a local network, "
+#~ "choose\n"
+#~ "\"Disable networking\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you wish to configure the network later after installation or if you "
+#~ "have\n"
+#~ "finished to configure your network connection, choose \"Done\"."
+#~ msgstr ""
+#~ "��� �� ������� ���������� ��� ����'���� �� Internet �� ���, ��� �����,\n"
+#~ "������� ��������� �����. �������� ���� ������� ����� ������� ��������� "
+#~ "�����, DrakX������� ����\n"
+#~ "����������\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ��� �� �������� ����������� �� Internet �� ���, ���������\n"
+#~ "\"��������� ��������� ����\".\n"
+#~ "��� �� ������� ��������������� ����� ����� ����������� �� �� "
+#~ "����������\n"
+#~ "�� ��������������, ��������� \"��������\"."
+
+#~ msgid ""
+#~ "No modem has been detected. Please select the serial port on which it is "
+#~ "plugged.\n"
+#~ "\n"
+#~ "\n"
+#~ "For information, the first serial port (called \"COM1\" under Microsoft\n"
+#~ "Windows) is called \"ttyS0\" under Linux."
+#~ msgstr ""
+#~ "����� �� ���������. ������� ��������� ���� �� ����� �� ����������.\n"
+#~ "\n"
+#~ "\n"
+#~ "����� ��������� ���� (����� \"COM1\" � Microsoft Windows) �������\n"
+#~ "\"ttyS0\" � Linux."
+
+#~ msgid ""
+#~ "You may now enter dialup options. If you don't know\n"
+#~ "or are not sure what to enter, the correct informations can be obtained "
+#~ "from\n"
+#~ "your Internet Service Provider. If you do not enter the DNS (name "
+#~ "server)\n"
+#~ "information here, this information will be obtained from your Internet "
+#~ "Service\n"
+#~ "Provider at connection time."
+#~ msgstr ""
+#~ "����� �� ������ ������ ��������� ���������� ����������.\n"
+#~ "��� �� �� ������� �� �� �������� ��� ����� ������, ���������� � "
+#~ "������nternet\n"
+#~ "����������. ��� �� �� ������� ���������� �� DNS ��������, ��� ����� \n"
+#~ "�������� ��� ��� �������� � ����� Internet-�����������."
+
+#~ msgid ""
+#~ "If your modem is an external modem, please turn on it now to let DrakX "
+#~ "detect it automatically."
+#~ msgstr ""
+#~ "��� � ��� ������� �����, ��� �����, �������� ���, � ����� DrakX������ "
+#~ "��� ����������."
+
+#~ msgid "Please turn on your modem and choose the correct one."
+#~ msgstr "��� �����, �������� ����� � ������� �������."
+
+#~ msgid ""
+#~ "If you are not sure if informations above are\n"
+#~ "correct or if you don't know or are not sure what to enter, the correct\n"
+#~ "informations can be obtained from your Internet Service Provider. If you "
+#~ "do not\n"
+#~ "enter the DNS (name server) information here, this information will be "
+#~ "obtained\n"
+#~ "from your Internet Service Provider at connection time."
+#~ msgstr ""
+#~ "��� �� �� ��������, �� �'�������� ����� �����������\n"
+#~ "���������� ��������� �� �� �� ������� ����� ����������� ��� ����� ������\n"
+#~ "����������\n"
+#~ "���������� ���� ���� �������� �� ������ ���������� Internet. ��� �� ��\n"
+#~ "������� ���������� �� DNS, ����� ���������� ����� �������� �� ������\n"
+#~ "���������� ��� ��� ��������."
+
+#, fuzzy
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, the correct informations can "
+#~ "be\n"
+#~ "obtained from your Internet Service Provider."
+#~ msgstr ""
+#~ "����� ����� �����i ��������� �������� ���� ����� (dialup). ���i ��\n"
+#~ "�� �������, ��� �������� �i����,\n"
+#~ "����������� �������� ��������� i��������� � ������ ���������� Internet "
+#~ "(ISP)."
+
+#, fuzzy
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, ask your network administrator."
+#~ msgstr ""
+#~ "��� ���������, �� ������ ������ ��� ������ �����. ��� ��\n"
+#~ "�� ������� �� �� ��������, ��� ����� �������. ������ ���� ������."
+
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, leave blank."
+#~ msgstr ""
+#~ "��� ���������, �� ������ ������ ��� ������ �����. ��� ��\n"
+#~ "�� ������� �� �� ��������, ��� ����� �������. ������ ���� ������."
+
+#~ msgid ""
+#~ "You may now enter dialup options. If you're not sure what to enter, the\n"
+#~ "correct information can be obtained from your ISP."
+#~ msgstr ""
+#~ "����� ����� �����i ��������� �������� ���� ����� (dialup). ���i ��\n"
+#~ "�� �������, ��� �������� �i����,\n"
+#~ "����������� �������� ��������� i��������� � ������ ���������� Internet "
+#~ "(ISP)."
+
+#~ msgid ""
+#~ "If you will use proxies, please configure them now. If you don't know if\n"
+#~ "you should use proxies, ask your network administrator or your ISP."
+#~ msgstr ""
+#~ "���i �� ��i������� ������������� proxy, i� ������ ����� �����i �����.\n"
+#~ "���i �� �� �������, �� ��� i��� �������, �����i���� �� ���i�i��������\n"
+#~ "����i �i �� Internet-����������."
+
+#~ msgid "You can now select your timezone according to where you live."
+#~ msgstr "����� �� ������ ������ ������ ���� ������ � ������ ���������."
+
+#~ msgid ""
+#~ "You can configure a local printer (connected to your computer) or remote\n"
+#~ "printer (accessible via a Unix, Netware or Microsoft Windows network)."
+#~ msgstr ""
+#~ "�� ������ ������������� �������� ������� (������� � ����� ����'������)\n"
+#~ "�� �������� ������� (�������� ���� Unix, Netware �� ����� MS Windows)."
+
+#~ msgid ""
+#~ "If you wish to be able to print, please choose one printing system "
+#~ "between\n"
+#~ "CUPS and LPR.\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS is a new, powerful and flexible printing system for Unix systems "
+#~ "(CUPS\n"
+#~ "means \"Common Unix Printing System\"). It is the default printing system "
+#~ "in\n"
+#~ "Mandrake Linux.\n"
+#~ "\n"
+#~ "\n"
+#~ "LPR is the old printing system used in previous Mandrake Linux "
+#~ "distributions.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you don't have printer, click on \"None\"."
+#~ msgstr ""
+#~ "��� �� ������� ���� ����, ��� �����, ������� ���� � ������ �����\n"
+#~ "CUPS �� LPR.\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS ���� �����, �������� � ������� ������ ����� ��� Unix ������ "
+#~ "(CUPS\n"
+#~ "- \"Common Unix Printing System\"). ���� ������ ����� �� ���������\n"
+#~ "����������� ������ Mandrake Linux.\n"
+#~ "\n"
+#~ "\n"
+#~ "LPR - ������ ������ ����� � ���������� ������ ������������Mandrake "
+#~ "Linux.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� �� �� ����� ��������, ��������� \"����\"."
+
+#~ msgid ""
+#~ "GNU/Linux can deal with many types of printer. Each of these types "
+#~ "requires\n"
+#~ "a different setup.\n"
+#~ "\n"
+#~ "\n"
+#~ "If your printer is physically connected to your computer, select \"Local\n"
+#~ "printer\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you want to access a printer located on a remote Unix machine, select\n"
+#~ "\"Remote printer\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you want to access a printer located on a remote Microsoft Windows "
+#~ "machine\n"
+#~ "(or on Unix machine using SMB protocol), select \"SMB/Windows 95/98/NT\"."
+#~ msgstr ""
+#~ "GNU/Linux ���� ��������� �� ������� ����� ��������. ����� � �������\n"
+#~ "�������� ������ �����������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ������� ����� ���������� �� ����'�����, ������� \"��������\n"
+#~ "�������\".\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ������� ���������� �� ��������� Unix ������, �������\n"
+#~ "\"�������� �������\".\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ������� ���������� �� ��������� ������ Microsoft Windows (�� �� "
+#~ "Unix\n"
+#~ "������, ���� ������������ �������� SMB), ������� \"SMB/Windows 95/98/NT"
+#~ "\"."
+
+#~ msgid ""
+#~ "Please turn on your printer before continuing to let DrakX detect it.\n"
+#~ "\n"
+#~ "You have to enter some informations here.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Name of printer: the print spooler uses \"lp\" as default printer "
+#~ "name. So, you must have a printer named \"lp\".\n"
+#~ "     If you have only one printer, you can use several names for it. You "
+#~ "just need to separate them by a pipe\n"
+#~ "     character (a \"|\"). So, if you prefer a more meaningful name, you "
+#~ "have to put it first, eg: \"My printer|lp\".\n"
+#~ "     The printer having \"lp\" in its name(s) will be the default "
+#~ "printer.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Description: this is optional but can be useful if several printers "
+#~ "are connected to your computer or if you allow\n"
+#~ "     other computers to access to this printer.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Location: if you want to put some information on your\n"
+#~ "     printer location, put it here (you are free to write what\n"
+#~ "     you want, for example \"2nd floor\").\n"
+#~ msgstr ""
+#~ "��� ����� �������� ��� ������� ����� ��������,� DrakX ������� ���.\n"
+#~ "\n"
+#~ "�� ������ ������� ��������� ����������.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * ��� ��������: ����� �������� ������������ �� �������� ��� \"lp\"�� "
+#~ "��� ��������\n"
+#~ "���, �� ������ ���� ������� ����� \"lp\".\n"
+#~ "     ��� �� ����� ����� ���� �������, �� ������ ���� ��� ��� "
+#~ "������������. �� ����� ������ �������� �� ����� ������ ( \"|\").\n"
+#~ "     ���, ��� ����� ����� ������������� �����, �� ������ �������� "
+#~ "������ �� , �����.: \"My printer|lp\".\n"
+#~ "     ������� � ���� \"lp\" ����� ��������� ��������� �� ��������.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * �������: ���� ������������, ��� ���� ���� �������, ��� ������� "
+#~ "�������� ������� ������ ����'������ �� �� ��\n"
+#~ "     ���������� ������ ����� ����'������ �� ������ ��������.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * �����������: ��� �� ������� �������i�� ������ ���������� �������\n"
+#~ "     ����������� ��������, ������ �� ���� (�� ������� ����� �� ���\n"
+#~ "     �������, ��������� \"2nd floor\").\n"
 
-#~ msgid "%d minutes"
-#~ msgstr "%d ��i�i�"
+#~ msgid ""
+#~ "You need to enter some informations here.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Name of queue: the print spooler uses \"lp\" as default printer "
+#~ "name. So, you need have a printer named \"lp\".\n"
+#~ "    If you have only one printer, you can use several names for it. You "
+#~ "just need to separate them by a pipe\n"
+#~ "    character (a \"|\"). So, if you prefer to have a more meaningful "
+#~ "name, you have to put it first, eg: \"My printer|lp\".\n"
+#~ "    The printer having \"lp\" in its name(s) will be the default "
+#~ "printer.\n"
+#~ "\n"
+#~ "  \n"
+#~ "   * Spool directory: it is in this directory that printing jobs are "
+#~ "stored. Keep the default choice\n"
+#~ "     if you don't know what to use\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Printer Connection: If your printer is physically connected to your "
+#~ "computer, select \"Local printer\".\n"
+#~ "     If you want to access a printer located on a remote Unix machine, "
+#~ "select \"Remote lpd printer\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     If you want to access a printer located on a remote Microsoft "
+#~ "Windows machine (or on Unix machine using SMB\n"
+#~ "     protocol), select \"SMB/Windows 95/98/NT\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     If you want to acces a printer located on NetWare network, select "
+#~ "\"NetWare\".\n"
+#~ msgstr ""
+#~ "��� �� ������ ������ ��������� ����������.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * ��� ����: ��������������� \"lp\" �� ��� �������� �� ��������. "
+#~ "���, �� ������ ���� ������� ����� \"lp\".\n"
+#~ "     ��� �� ����� ����� ���� �������, �� ������ ���� ��� ��� "
+#~ "������������. �� ����� ������ �������� �� ����� ������ ( \"|\").\n"
+#~ "     ���, ��� ����� ����� ������������� �����, �� ������ �������� "
+#~ "������ �� , �����.: \"My printer|lp\".\n"
+#~ "     ������� � ���� \"lp\" ����� ��������� ��������� �� ��������.\n"
+#~ "\n"
+#~ "  \n"
+#~ "   * ���������� spool: � �� ����������� ������ �� ��������� �����. "
+#~ "��������� �������\n"
+#~ "     �� ��������, ��� �� ������� �� ����� ����������.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * ����������� ��������: ��� ������� ������ ������� � ����'������, "
+#~ "������� \"�������� �������\".\n"
+#~ "     ��� ������� ���������� �� ��������� Unix ������, ������� \"�������� "
+#~ "lpd �������\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     ��� �� ������� ���������� �� ��������� ������ MS Windows (�� �� "
+#~ "Unix ������, ���� ������������ �������� SMB,\n"
+#~ "     ������� \"SMB/Windows 95/98/NT\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     ��� ������� ���������� �� ���� NetWare, ������� \"NetWare\".\n"
+
+#~ msgid ""
+#~ "Your printer has not been detected. Please enter the name of the device "
+#~ "on\n"
+#~ "which it is connected.\n"
+#~ "\n"
+#~ "\n"
+#~ "For information, most printers are connected on the first parallel port. "
+#~ "This\n"
+#~ "one is called \"/dev/lp0\" under GNU/Linux and \"LPT1\" under Microsoft "
+#~ "Windows."
+#~ msgstr ""
+#~ "��� ������� �� ��� ���������. ��� ����� ������� ��� ������� �� ���� ��\n"
+#~ "����������.\n"
+#~ "\n"
+#~ "\n"
+#~ "�������� �������� ������������ �� ������� ������������ �����.��\n"
+#~ "������� \"/dev/lp0\" � GNU/Linux � \"LPT1\" � Microsoft Windows."
+
+#~ msgid "You must now select your printer in the above list."
+#~ msgstr "�� ������ ������ ��� ������� �� ����."
+
+#~ msgid ""
+#~ "Please select the right options according to your printer.\n"
+#~ "Please see its documentation if you don't know what choose here.\n"
+#~ "\n"
+#~ "\n"
+#~ "You will be able to test your configuration in next step and you will be "
+#~ "able to modify it if it doesn't work as you want."
+#~ msgstr ""
+#~ "��� �����, ������� �������� ����� � ������������� ������ ��������.\n"
+#~ "��� �����,������� ������������ ��� �� ������� ��� ������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� �� �������, �� ������� �������� ������������ ����� ������������\n"
+#~ "�� ��������� ����� � �������� ��."
+
+#~ msgid ""
+#~ "You may now create one or more \"regular\" user account(s), as\n"
+#~ "opposed to the \"privileged\" user account, root. You can create\n"
+#~ "one or more account(s) for each person you want to allow to use\n"
+#~ "the computer. Note that each user account will have its own\n"
+#~ "preferences (graphical environment, program settings, etc.)\n"
+#~ "and its own \"home directory\", in which these preferences are\n"
+#~ "stored.\n"
+#~ "\n"
+#~ "\n"
+#~ "First of all, create an account for yourself! Even if you will be the "
+#~ "only user\n"
+#~ "of the machine, you may NOT connect as root for daily use of the system: "
+#~ "it's a\n"
+#~ "very high security risk. Making the system unusable is very often a typo "
+#~ "away.\n"
+#~ "\n"
+#~ "\n"
+#~ "Therefore, you should connect to the system using the user account\n"
+#~ "you will have created here, and login as root only for administration\n"
+#~ "and maintenance purposes."
+#~ msgstr ""
+#~ "����� �� ������ �������� ���i� ����� �������i \"���������\" ��i����� "
+#~ "���i��\n"
+#~ "����������i��. ��� ������� ����������i�� ������� �������� �� ������ �i "
+#~ "�������i\n"
+#~ "��i����� ���i��. ��� ������� ��i������ ���i�� ���������� ������� "
+#~ "��������i\n"
+#~ "(����i���� ����������, ��������i �������,...) i ������ \"����i �������"
+#~ "\",\n"
+#~ "� ��i� ���������� ����� ��������i.\n"
+#~ "\n"
+#~ "\n"
+#~ "��-������, �������� ������ ��� ����! ����� ���i �� ������� ���i���\n"
+#~ "����������i��� ����� ������, �� ������������� �������i�� � ������i\n"
+#~ "���������������i�� ��� ��������� �����: ���� ������� ���i��� �������\n"
+#~ "������i. ������� ��i����� �i����� ��������� �������� �����.\n"
+#~ "\n"
+#~ "\n"
+#~ "���� �������i�� � �i����� ��������� � ������i ���������� ����������i��,\n"
+#~ "����� �� ����� i ��������, � �������i�� � ������i root ��������� �����i\n"
+#~ "� �����i ���i�i����������� i ������������ �i�����."
+
+#~ msgid ""
+#~ "Creating a boot disk is strongly recommended. If you can't\n"
+#~ "boot your computer, it's the only way to rescue your system without\n"
+#~ "reinstalling it."
+#~ msgstr ""
+#~ "��������� boot ����� ������ �������������! ��� �� �� �������\n"
+#~ "�������� ��� ����'����, ��� ���� ��� ����� ������ �������\n"
+#~ "����� ��� ������ ���������������."
+
+#, fuzzy
+#~ msgid ""
+#~ "LILO and grub main options are:\n"
+#~ "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
+#~ "partition) that contains the boot sector. Unless you know specifically\n"
+#~ "otherwise, choose \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Delay before booting default image: Specifies the number in tenths\n"
+#~ "of a second the boot loader should wait before booting the first image.\n"
+#~ "This is useful on systems that immediately boot from the hard disk after\n"
+#~ "enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+#~ "omitted or is set to zero.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Video mode: This specifies the VGA text mode that should be selected\n"
+#~ "when booting. The following values are available: \n"
+#~ "\n"
+#~ "    * normal: select normal 80x25 text mode.\n"
+#~ "\n"
+#~ "    * <number>:  use the corresponding text mode.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Clean \"/tmp\" at each boot: if you want delete all files and "
+#~ "directories\n"
+#~ "stored in \"/tmp\" when you boot your system, select this option.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Precise RAM if needed: unfortunately, there is no standard method to "
+#~ "ask the\n"
+#~ "BIOS about the amount of RAM present in your computer. As consequence, "
+#~ "Linux may\n"
+#~ "fail to detect your amount of RAM correctly. If this is the case, you "
+#~ "can\n"
+#~ "specify the correct amount or RAM here. Please note that a difference of "
+#~ "2 or 4\n"
+#~ "MB between detected memory and memory present in your system is normal."
+#~ msgstr ""
+#~ "������� ��������� SILO:\n"
+#~ "  - ����������� ����������: ������� �����, ��� �� ������� �����i��\n"
+#~ "i���������, ��������� ��� �������i GNU/Linux. ���i �� ��������, ���\n"
+#~ "���i�� ����i����, ������� \"����� ������ ����� (MBR)\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - �������� �� �������� ����� ��������� �������: ����� ��� � ��������\n"
+#~ "�������, �� ������� ����� ��������� ����� ����� ��������� ������� �� "
+#~ "��������.\n"
+#~ "���� ��������� ������� ��� �i�����, ��i� ������ ����������� � ���������\n"
+#~ "����� ������ ������ ��������� ����i�����. ��������� �� �����, ���i "
+#~ "\"��������\"\n"
+#~ "\"��������\" �� ����� ��������� �i ���������� �� ����."
+
+#~ msgid ""
+#~ "SILO is a bootloader for SPARC: it is able to boot\n"
+#~ "either GNU/Linux or any other operating system present on your computer.\n"
+#~ "Normally, these other operating systems are correctly detected and\n"
+#~ "installed. If this is not the case, you can add an entry by hand in this\n"
+#~ "screen. Be careful as to choose the correct parameters.\n"
+#~ "\n"
+#~ "\n"
+#~ "You may also want not to give access to these other operating systems to\n"
+#~ "anyone, in which case you can delete the corresponding entries. But\n"
+#~ "in this case, you will need a boot disk in order to boot them!"
+#~ msgstr ""
+#~ "SILO - ���� ��������� ��� SPARC. �� ���� ������i�� ������\n"
+#~ "GNU/Linux �i ����� i���� ����������� �i�����, ����������� �� ���������.\n"
+#~ "��������, ����� i���� ����������� �i����� �������� ����������� i\n"
+#~ "����븢������. ���i ���� �� ����������, �� �� ������ ������ ���� ���i�\n"
+#~ "����������. ������� ��������, ��� �� �����i ��������� ���������.\n"
+#~ "\n"
+#~ "\n"
+#~ "������� �� ������ �������� i �� ������� i���� ����������� �i�����.\n"
+#~ "� ���i� ������� �������� �����i�� ���������� ���i��. ��� � ���� ��� \n"
+#~ "����� �������� i����������� ����, ��� ������i���."
+
+#~ msgid ""
+#~ "SILO main options are:\n"
+#~ "  - Bootloader installation: Indicate where you want to place the\n"
+#~ "information required to boot to GNU/Linux. Unless you know exactly\n"
+#~ "what you are doing, choose \"First sector of drive (MBR)\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Delay before booting default image: Specifies the number in tenths\n"
+#~ "of a second the boot loader should wait before booting the first image.\n"
+#~ "This is useful on systems that immediately boot from the hard disk after\n"
+#~ "enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+#~ "omitted or is set to zero."
+#~ msgstr ""
+#~ "������� ��������� SILO:\n"
+#~ "  - ����������� ����������: ������� �����, ��� �� ������� �����i��\n"
+#~ "i���������, ��������� ��� �������i GNU/Linux. ���i �� ��������, ���\n"
+#~ "���i�� ����i����, ������� \"����� ������ ����� (MBR)\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - �������� �� �������� ����� ��������� �������: ����� ��� � ��������\n"
+#~ "�������, �� ������� ����� ��������� ����� ����� ��������� ������� �� "
+#~ "��������.\n"
+#~ "���� ��������� ������� ��� �i�����, ��i� ������ ����������� � ���������\n"
+#~ "����� ������ ������ ��������� ����i�����. ��������� �� �����, ���i "
+#~ "\"��������\"\n"
+#~ "\"��������\" �� ����� ��������� �i ���������� �� ����."
+
+#~ msgid ""
+#~ "Now it's time to configure the X Window System, which is the\n"
+#~ "core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
+#~ "you must configure your video card and monitor. Most of these\n"
+#~ "steps are automated, though, therefore your work may only consist\n"
+#~ "of verifying what has been done and accept the settings :)\n"
+#~ "\n"
+#~ "\n"
+#~ "When the configuration is over, X will be started (unless you\n"
+#~ "ask DrakX not to) so that you can check and see if the\n"
+#~ "settings suit you. If they don't, you can come back and\n"
+#~ "change them, as many times as necessary."
+#~ msgstr ""
+#~ "����� ������� ������i�� X Window System, ���� �'��������\n"
+#~ "������� Linux GUI (����i��� I�������� ����������i��). ����� ������\n"
+#~ "�������� ������i�� �i�������� i ���i���. ������� ������ ����� �����\n"
+#~ "�������������, ���� ���� ����� ���� ���������� � ��������\n"
+#~ "���i�� ��������i i ������������� ������� ��������� :)\n"
+#~ "\n"
+#~ "���i ����i��������� ����������, ����� ��������� X  (���i �� ��\n"
+#~ "������i�� DrakX �� ���i�� ������), ��� �� �����i ���������, �i ������\n"
+#~ "�� � ����������i. ���i ��, �� ����� ������� �������� i ������� i�\n"
+#~ "�����i ��� ��������."
+
+#~ msgid ""
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
+#~ msgstr ""
+#~ "���i ����� �� ��� � ���������� X, ����������� ����� ��������� ��� \n"
+#~ "��������� ��������i X Window System."
 
-#~ msgid "1 minute"
-#~ msgstr "1 ��i�i��"
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "���i �� ������� �������� ����i����� ������� (login), ������� \"���\". "
+#~ "I���� - \n"
+#~ "\"��\"."
+
+#~ msgid ""
+#~ "Your system is going to reboot.\n"
+#~ "\n"
+#~ "After rebooting, your new Mandrake Linux system will load automatically.\n"
+#~ "If you want to boot into another existing operating system, please read\n"
+#~ "the additional instructions."
+#~ msgstr ""
+#~ "�i����� ��i������ ����������i���.\n"
+#~ "\n"
+#~ "����� �����������i, ���� ����� �i����� Mandrake Linux ������i��� "
+#~ "����������.\n"
+#~ "���i �� ������� ����������i�� ��� i���� ����������� �i�����, ������� \n"
+#~ "���������� i��������i."
 
-#~ msgid "%d seconds"
-#~ msgstr "%d �������"
+#~ msgid "Write /etc/fstab"
+#~ msgstr "���i� /etc/fstab"
+
+#~ msgid "Restore from file"
+#~ msgstr "��������� � �����"
+
+#~ msgid "Save in file"
+#~ msgstr "��������� � ����"
+
+#~ msgid "Restore from floppy"
+#~ msgstr "��������� � �������"
+
+#~ msgid "Format all"
+#~ msgstr "����������� ��"
+
+#~ msgid "After formatting all partitions,"
+#~ msgstr "����� ������������ ��i� ��������,"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "��� �������� � ����� ��������� ������ ��������"
+
+#~ msgid "Reload"
+#~ msgstr "����������i��"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr ""
+#~ "�i ������� �� �������� ������������ ����i-���� ��� ����i����i linux?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "��������� ADSL"
+
+#, fuzzy
+#~ msgid ""
+#~ "With a remote CUPS server, you do not have to configure\n"
+#~ "any printer here; printers will be automatically detected\n"
+#~ "unless you have a server on a different network; in the\n"
+#~ "latter case, you have to give the CUPS server IP address\n"
+#~ "and optionally the port number."
+#~ msgstr ""
+#~ "�������� CUPS ������ �� �������� �� ��� �������� ��������\n"
+#~ "�� ����� ������, �� ����� ��������� ����������.\n"
+#~ "��� �� �� ��������, ������� \"�������� ������ CUPS\"."
+
+#~ msgid "Remote queue"
+#~ msgstr "��������� ����� �����"
+
+#, fuzzy
+#~ msgid "Remote queue name missing!"
+#~ msgstr "��������� ����� �����"
+
+#, fuzzy
+#~ msgid "Command line"
+#~ msgstr "I�� ������"
+
+#, fuzzy
+#~ msgid "Modify printer"
+#~ msgstr "I�� �������i"
+
+#, fuzzy
+#~ msgid "start it"
+#~ msgstr "�����������"
+
+#, fuzzy
+#~ msgid "Network Monitoring"
+#~ msgstr "����i������� ����i"
+
+#, fuzzy
+#~ msgid "Profile "
+#~ msgstr "������� ����i�������: "
+
+#, fuzzy
+#~ msgid "Connection Time: "
+#~ msgstr "I�� ��������"
+
+#, fuzzy
+#~ msgid "Connecting to Internet "
+#~ msgstr "��������� �� I��������"
+
+#, fuzzy
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "��������� �� I��������"
+
+#, fuzzy
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "��������� �� I��������"
+
+#, fuzzy
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "��������� �� I��������"
+
+#, fuzzy
+#~ msgid "Connection complete."
+#~ msgstr "I�� ��������"
+
+#, fuzzy
+#~ msgid "Color configuration"
+#~ msgstr "���������"
+
+#, fuzzy
+#~ msgid "Connect"
+#~ msgstr "I�� ��������"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "��������� ISDN"
+
+#, fuzzy
+#~ msgid "Default Runlevel"
+#~ msgstr "�� ���������"
+
+#~ msgid "Europe"
+#~ msgstr "Ţ����"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#~ msgid "Remove queue"
+#~ msgstr "�����i�� ����� �����"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "�� ������������ ���������� ����� ����� ��������."
+
+#~ msgid "Disable network"
+#~ msgstr "����i�� ���������� �������� ��������"
+
+#, fuzzy
+#~ msgid "Enable network"
+#~ msgstr "����i�� ���������� �������� ��������"
+
+#~ msgid ""
+#~ "You can now test your mouse. Use buttons and wheel to verify\n"
+#~ "if settings are good. If not, you can click on \"Cancel\" to choose "
+#~ "another\n"
+#~ "driver."
+#~ msgstr ""
+#~ "����� �� ������ ����������� ���� ���. ���������� �� ����� �\n"
+#~ "����� ����. ��� ����������� ���������� ��������� \"������\" ��� "
+#~ "����������\n"
+#~ "���� �������."
+
+#, fuzzy
+#~ msgid "Choose"
+#~ msgstr "���� ����"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr "�� ������ ��������� ������� URI ��� ��������� �� �������i � CUPS."
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "���, ����������� �������� ������ ASCII"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "���, ����������� �������� ������ PostScript"
+
+#~ msgid "Paper Size"
+#~ msgstr "������ ������"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "����������� ������ ����� �����?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "��������� �������� Uniprint"
+
+#~ msgid "Color depth options"
+#~ msgstr "��������� ����i�i ������"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "��������� ����� �� PostScript?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "����������� ����������� �����?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "����� �������i �� ��������i ������������ ��������"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "������/����� ���i � ������� (1/72 ������)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "�������/�i���� ���i � ������� (1/72 ������)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "���������� ����i GhostScript"
+
+#~ msgid "Extra Text options"
+#~ msgstr "���������� ��������� ������"
+
+#~ msgid "Reverse page order"
+#~ msgstr "��������� ������� ��������"
+
+#, fuzzy
+#~ msgid "CUPS starting"
+#~ msgstr "��������"
+
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "����� ���� �������� � ��������� ���������"
+
+#~ msgid ""
+#~ "Every printer need a name (for example lp).\n"
+#~ "Other parameters such as the description of the printer or its location\n"
+#~ "can be defined. What name should be used for this printer and\n"
+#~ "how is the printer connected?"
+#~ msgstr ""
+#~ "������ ����� �����, � ���� ����������� ������i ��� �����, �������� "
+#~ "���������� i�� (�������� lp). ����i� ���������, ���i� �� ��i����� "
+#~ "�������i �i\n"
+#~ " ��� �������������, ������ ���� ���������. ���� i�� �� �������i �� "
+#~ "�������\n"
+#~ "������������ i �� ����� �������� ����������?"
+
+#~ msgid ""
+#~ "Every print queue (which print jobs are directed to) needs a\n"
+#~ "name (often lp) and a spool directory associated with it. What\n"
+#~ "name and directory should be used for this queue and how is the printer "
+#~ "connected?"
+#~ msgstr ""
+#~ "������ ����� �����, � ���� ����������� ������i ��� �����, �������� "
+#~ "���������� i�� (�������� lp) i ����������� � �� �������� ����i���. "
+#~ "�������� i�� i ������� ��� ����i."
+
+#~ msgid "Name of queue"
+#~ msgstr "I�� ����i �����"
+
+#~ msgid "Spool directory"
+#~ msgstr "���������� ����i���"
+
+#, fuzzy
+#~ msgid "Disable"
+#~ msgstr "����i��"
+
+#, fuzzy
+#~ msgid "Enable"
+#~ msgstr "����i��"
+
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "��� ������i�� ������� �i�����, ��������� ������ \"���������� ������� ����"
+#~ "\"\n"
+#~ "i \"���������� �����i MD5\"."
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "���i � ����� ����� ��������������� NIS, ������� \"������������ NIS\". "
+#~ "���i\n"
+#~ "�� �������, ��������� ���i�i�������� ����i."
+
+#~ msgid "yellow pages"
+#~ msgstr "����� �������i"
+
+#, fuzzy
+#~ msgid "Light configuration"
+#~ msgstr "��������� ADSL"
+
+#~ msgid "Provider dns 1"
+#~ msgstr "DNS 1 ����������"
+
+#~ msgid "Provider dns 2"
+#~ msgstr "DNS 2 ����������"
+
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "�� �� �������� ��������� �� I��������?"
 
 #, fuzzy
 #~ msgid "Lilo/Grub configuration"
@@ -7770,10 +9407,6 @@ msgstr "����� ����������� ��� �����, �����, web'�, �������� �����, � chat"
 #~ msgstr "��������� IDE"
 
 #, fuzzy
-#~ msgid "Standard tools"
-#~ msgstr "����������"
-
-#, fuzzy
 #~ msgid "Configuration de Lilo/Grub"
 #~ msgstr "���������: ������ ����i��"
 
@@ -7820,10 +9453,6 @@ msgstr "����� ����������� ��� �����, �����, web'�, �������� �����, � chat"
 #~ msgstr "���i���"
 
 #, fuzzy
-#~ msgid "Mail information"
-#~ msgstr "I���������"
-
-#, fuzzy
 #~ msgid "Firewall Configuration Wizard"
 #~ msgstr "����i������� ����i"
 
@@ -7964,7 +9593,7 @@ msgstr "����� ����������� ��� �����, �����, web'�, �������� �����, � chat"
 
 #~ msgid ""
 #~ "At this point, you may choose what partition(s) to use to install\n"
-#~ "your Linux-Mandrake system if they have been already defined (from a\n"
+#~ "your Mandrake Linux system if they have been already defined (from a\n"
 #~ "previous install of GNU/Linux or from another partitioning tool). In "
 #~ "other\n"
 #~ "cases, hard drive partitions must be defined. This operation consists of\n"
@@ -8005,7 +9634,7 @@ msgstr "����� ����������� ��� �����, �����, web'�, �������� �����, � chat"
 #~ "- Ctrl-m  to set the mount point\n"
 #~ msgstr ""
 #~ "����� ����� ���������, ��i� �������� ������������� ��� �����������\n"
-#~ "����� �i����� Linux-Mandrake, ���i ��� ��� ���i ��������� (��� "
+#~ "����� �i����� Mandrake Linux, ���i ��� ��� ���i ��������� (��� "
 #~ "����������\n"
 #~ "����������� Linux ����� i���� ���������� ����i���). � i���� ��������\n"
 #~ "�������� ��������� ����� ���i��� ���� ���������. ���� �������� ���������� "
@@ -8062,9 +9691,6 @@ msgstr "����� ����������� ��� �����, �����, web'�, �������� �����, � chat"
 #~ msgid "Bad kickstart file %s (failed %s)"
 #~ msgstr "������ �������� (kickstart) ���� %s (������� %s)"
 
-#~ msgid "CHAP"
-#~ msgstr "CHAP"
-
 #~ msgid "Category"
 #~ msgstr "���������"
 
@@ -8135,7 +9761,7 @@ msgstr "����� ����������� ��� �����, �����, web'�, �������� �����, � chat"
 #~ "Choose \"Install\" if there are no previous versions of GNU/Linux\n"
 #~ "installed, or if you wish to use multiple distributions or versions.\n"
 #~ "\n"
-#~ "Choose \"Rescue\" if you wish to rescue a version of Linux-Mandrake "
+#~ "Choose \"Rescue\" if you wish to rescue a version of Mandrake Linux "
 #~ "already installed.\n"
 #~ "\n"
 #~ "\n"
@@ -8212,9 +9838,6 @@ msgstr "����� ����������� ��� �����, �����, web'�, �������� �����, � chat"
 #~ msgid "Configure LAN"
 #~ msgstr "��������� ����i (���)"
 
-#~ msgid "Configure printer"
-#~ msgstr "��������� ��������"
-
 #~ msgid "Configure timezone"
 #~ msgstr "��������� �������� �����"
 
@@ -8265,9 +9888,6 @@ msgstr "����� ����������� ��� �����, �����, web'�, �������� �����, � chat"
 #~ msgid "Directory"
 #~ msgstr "�������"
 
-#~ msgid "Disable networking"
-#~ msgstr "����i�� ���������� �������� ��������"
-
 #~ msgid "Do not set up networking"
 #~ msgstr "�� ����븢���� �����"
 
@@ -8652,9 +10272,6 @@ msgstr "����� ����������� ��� �����, �����, web'�, �������� �����, � chat"
 #~ msgid "No more match"
 #~ msgstr "����� �� ���������"
 
-#~ msgid "No root partition found"
-#~ msgstr "�������� ������� �� ���������"
-
 #~ msgid ""
 #~ "No valid modes found\n"
 #~ "Try with another video card or monitor"
@@ -8662,9 +10279,6 @@ msgstr "����� ����������� ��� �����, �����, web'�, �������� �����, � chat"
 #~ "������������ ������ �� ���������.\n"
 #~ "����������� ������� i���� �i�������� �i ���i���"
 
-#~ msgid "None"
-#~ msgstr "����"
-
 #~ msgid "Other countries"
 #~ msgstr "I���� ���i��"
 
@@ -8695,9 +10309,6 @@ msgstr "����� ����������� ��� �����, �����, web'�, �������� �����, � chat"
 #~ msgid "Regexp"
 #~ msgstr "Regexp"
 
-#~ msgid "Remove"
-#~ msgstr "��i�����"
-
 #~ msgid "Rescue"
 #~ msgstr "�����������"
 
@@ -8837,7 +10448,7 @@ msgstr "����� ����������� ��� �����, �����, web'�, �������� �����, � chat"
 #~ "hardware.\n"
 #~ "\n"
 #~ "\n"
-#~ "If you install a Linux-Mandrake system on a machine which is part\n"
+#~ "If you install a Mandrake Linux system on a machine which is part\n"
 #~ "of an already existing network, the network administrator will\n"
 #~ "have given you all necessary information (IP address, network\n"
 #~ "submask or netmask for short, and hostname). If you're setting\n"
@@ -8865,7 +10476,7 @@ msgstr "����� ����������� ��� �����, �����, web'�, �������� �����, � chat"
 #~ "��i� �� ���������� � �����������i �� ������ ������������.\n"
 #~ "\n"
 #~ "\n"
-#~ "��� ����������� Linux-Mandrake �� ����'����, ��i ������ �� ���\n"
+#~ "��� ����������� Mandrake Linux �� ����'����, ��i ������ �� ���\n"
 #~ "���������� �����, ���i�i�������� ����i ���������� �������i��\n"
 #~ "��� ��� ���������� i��������� (IP �����, ����� �������i\n"
 #~ "�i ��������� ��������, i i�� �����). ���i �� ���������\n"
@@ -8924,9 +10535,6 @@ msgstr "����� ����������� ��� �����, �����, web'�, �������� �����, � chat"
 #~ msgid "USB Mouse (3 buttons or more)"
 #~ msgstr "USB ��� (3 �����i �i �����)"
 
-#~ msgid "Uninstall"
-#~ msgstr "�����i�� � �i�����"
-
 #~ msgid "Uninstalling the RPMs"
 #~ msgstr "��������� �������� RPM-������ � �i�����"
 
diff --git a/perl-install/share/po/ca.po b/perl-install/share/po/ca.po
index 80e3b7ac1..e92bfa983 100644
--- a/perl-install/share/po/ca.po
+++ b/perl-install/share/po/ca.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-02 17:16+0200\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
 "PO-Revision-Date: 2001-04-10 23:29+0200\n"
 "Last-Translator: Softcatal� <traddrake@softcatala.org>\n"
 "Language-Team: Catalan\n"
@@ -14,24 +14,24 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
+#: ../../Xconfigurator.pm_.c:231
+msgid "Configure all heads independently"
 msgstr "Configura tots els cap�als independentment"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
 msgstr "Utilitza l'extensi� Xinerama"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr "Configura nom�s la targeta \"%s\" (%s)"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
 msgstr "Configuraci� Multi-head"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:239
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
@@ -39,33 +39,33 @@ msgstr ""
 "El vostre sistema permet l'�s d'una configuraci� de m�ltiples cap�als.\n"
 "Qu� voleu fer?"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "Targeta gr�fica"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "Seleccioneu una targeta gr�fica"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "Escolliu un servidor X"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "X server"
 msgstr "Servidor X"
 
-#: ../../Xconfigurator.pm_.c:309 ../../Xconfigurator.pm_.c:316
-#: ../../Xconfigurator.pm_.c:366
+#: ../../Xconfigurator.pm_.c:307 ../../Xconfigurator.pm_.c:313
+#: ../../Xconfigurator.pm_.c:363 ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s"
 msgstr "XFree %s"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:310
 msgid "Which configuration of XFree do you want to have?"
 msgstr "Quina configuraci� de l'XFree voleu tenir?"
 
-#: ../../Xconfigurator.pm_.c:324
+#: ../../Xconfigurator.pm_.c:321
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -75,18 +75,19 @@ msgstr ""
 "l'Xfree %s.\n"
 "L'XFree %s, que pot tenir un suport millor en 2D, suporta la vostra targeta."
 
-#: ../../Xconfigurator.pm_.c:326 ../../Xconfigurator.pm_.c:359
+#: ../../Xconfigurator.pm_.c:323 ../../Xconfigurator.pm_.c:356
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with XFree %s."
 msgstr ""
 "La vostra targeta pot tenir acceleraci� 3D de maquinari amb l'Xfree %s."
 
-#: ../../Xconfigurator.pm_.c:328 ../../Xconfigurator.pm_.c:361
+#: ../../Xconfigurator.pm_.c:325 ../../Xconfigurator.pm_.c:358
+#: ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s with 3D hardware acceleration"
 msgstr "Xfree %s amb acceleraci� 3D de maquinari"
 
-#: ../../Xconfigurator.pm_.c:336 ../../Xconfigurator.pm_.c:350
+#: ../../Xconfigurator.pm_.c:333 ../../Xconfigurator.pm_.c:347
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -96,12 +97,12 @@ msgstr ""
 "TINGUEU EN COMPTE QUE ES TRACTA D'UN SUPORT EXPERIMENTAL; L'ORDINADOR ES POT "
 "PENJAR."
 
-#: ../../Xconfigurator.pm_.c:338 ../../Xconfigurator.pm_.c:352
+#: ../../Xconfigurator.pm_.c:335 ../../Xconfigurator.pm_.c:349
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "XFree %s amb acceleraci� 3D de maquinari EXPERIMENTAL"
 
-#: ../../Xconfigurator.pm_.c:347
+#: ../../Xconfigurator.pm_.c:344
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -114,27 +115,31 @@ msgstr ""
 "PENJAR.\n"
 "L'XFree %s, que pot tenir un suport millor en 2D, suporta la vostra targeta."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "Configuraci� de l'XFree"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "Seleccioneu la mida de mem�ria de la vostra targeta gr�fica"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "Escolliu les opcions per al servidor"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "Escolliu un monitor"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:483
+#: ../../Xconfigurator.pm_.c:519
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -157,40 +162,40 @@ msgstr ""
 "el podr�eu fer malb�.\n"
 "En cas de dubte, sigueu conservador amb aquest par�metre."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Velocitat de refresc horitzontal"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Velocitat de refresc vertical"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "El monitor no est� configurat"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "La targeta gr�fica encara no est� configurada"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "Encara no s'han escollit les resolucions"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "Voleu comprovar la configuraci�?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Av�s: la comprovaci� d'aquesta targeta gr�fica pot penjar-vos l'ordinador"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Comprova la configuraci�"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -198,152 +203,156 @@ msgstr ""
 "\n"
 "intenteu canviar alguns par�metres"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "S'ha produ�t un error:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Sortida en %d segons"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "�s aquest el par�metre corrcte?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "S'ha produ�t un error, intenteu canviar alguns par�metres"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Resoluci�"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "Escolliu la resoluci� i la profunditat de color"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Targeta gr�fica: %s"
 
-#: ../../Xconfigurator.pm_.c:734
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "Servidor xFree86: %s"
 
-#: ../../Xconfigurator.pm_.c:750 ../../standalone/draknet_.c:280
-#: ../../standalone/draknet_.c:283
+#: ../../Xconfigurator.pm_.c:829 ../../printerdrake.pm_.c:1885
+#: ../../standalone/draknet_.c:298 ../../standalone/draknet_.c:301
 msgid "Expert Mode"
 msgstr "Mode expert"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "Mostra'ls tots"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Resolucions"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Disposici� del teclat: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tipus de ratol�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Dispositiu del ratol�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1333
+#: ../../Xconfigurator.pm_.c:1440
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1334
+#: ../../Xconfigurator.pm_.c:1441
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Sincronitzaci� horitzontal del monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Refresc vertical del monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Targeta gr�fica: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Targeta gr�fica: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Mem�ria gr�fica: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Profunditat del color: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resoluci�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1342
+#: ../../Xconfigurator.pm_.c:1450
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "Servidor xFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1343
+#: ../../Xconfigurator.pm_.c:1451
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "Controlador de l'xFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "S'est� preparant la configuraci� de l'X-Window"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "Qu� voleu fer?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "Canvia el monitor"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "Canvia la targeta gr�fica"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "Canvia les opcions del servidor"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "Canvia la resoluci�"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "Mostra la informaci�"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "Torna-ho a comprovar"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "Surt"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -355,20 +364,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Si us plau, torneu a entrar a %s per activar els canvis"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Si us plau, sortiu i utilitzeu Ctrl-Alt-Enrere"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "X a l'inici"
 
-#: ../../Xconfigurator.pm_.c:1447
+#: ../../Xconfigurator.pm_.c:1556
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -422,216 +431,227 @@ msgid "8 MB"
 msgstr "8 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
+#, fuzzy
+msgid "16 MB"
+msgstr "1 MB"
+
+#: ../../Xconfigurator_consts.pm_.c:113
+#, fuzzy
+msgid "32 MB"
+msgstr "2 MB"
+
+#: ../../Xconfigurator_consts.pm_.c:114
+#, fuzzy
+msgid "64 MB or more"
 msgstr "16 MB o m�s"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "VGA est�ndard, 640x480 a 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 a 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "Compatible 8514, 1024x768 a 87 Hz entrella�ada (no 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Super VGA, 1024x768 a 87 Hz entrella�ada, 800x600 a 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "Super VGA ampliada, 800x600 a 60 Hz, 640x480 a 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "SVGA no entrella�ada, 1024x768 a 60 Hz, 800x600 a 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "SVGA d'alta freq��ncia, 1024x768 a 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:127
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Multi-freq��ncia que pot fer 1280x1024 a 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:128
+#: ../../Xconfigurator_consts.pm_.c:130
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Multi-freq��ncia que pot fer 1280x1024 a 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:129
+#: ../../Xconfigurator_consts.pm_.c:131
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Multi-freq��ncia que pot fer 1280x1024 a 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor que pot fer 1600x1200 a 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor que pot fer 1600x1200 a 76 Hz"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124
+#: ../../any.pm_.c:96 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Primer sector de la partici� d'arrencada"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124 ../../any.pm_.c:197
+#: ../../any.pm_.c:96 ../../any.pm_.c:121 ../../any.pm_.c:194
 msgid "First sector of drive (MBR)"
 msgstr "Primer sector de la unitat (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "Instal�laci� del SILO"
 
-#: ../../any.pm_.c:104 ../../any.pm_.c:117
+#: ../../any.pm_.c:101 ../../any.pm_.c:114
 msgid "Where do you want to install the bootloader?"
 msgstr "On voleu instal�lar el carregador d'arrencada?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "Instal�laci� del LILO/grub"
 
-#: ../../any.pm_.c:128 ../../any.pm_.c:142
+#: ../../any.pm_.c:125 ../../any.pm_.c:139
 msgid "SILO"
 msgstr "SILO"
 
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:127
 msgid "LILO with text menu"
 msgstr "LILO amb men� de text"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "LILO amb men� gr�fic"
 
-#: ../../any.pm_.c:134
+#: ../../any.pm_.c:131
 msgid "Grub"
 msgstr "Grub"
 
-#: ../../any.pm_.c:138
+#: ../../any.pm_.c:135
 msgid "Boot from DOS/Windows (loadlin)"
 msgstr "Arrencada des de DOS/Windows (loadlin)"
 
-#: ../../any.pm_.c:140 ../../any.pm_.c:142
+#: ../../any.pm_.c:137 ../../any.pm_.c:139
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: ../../any.pm_.c:148 ../../any.pm_.c:180
+#: ../../any.pm_.c:145 ../../any.pm_.c:177
 msgid "Bootloader main options"
 msgstr "Opcions principals del carregador d'arrencada"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
 msgstr "Carregador d'arrencada a utilitzar"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "Instal�laci� del carregador d'arrencada"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "Dispositiu d'arrencada"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (no funciona en BIOS antics)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Compacte"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "compacte"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Mode de v�deo"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "Demora abans d'arrencar la imatge predeterminada"
 
-#: ../../any.pm_.c:160 ../../any.pm_.c:741
-#: ../../install_steps_interactive.pm_.c:904 ../../netconnect.pm_.c:629
-#: ../../printerdrake.pm_.c:98 ../../printerdrake.pm_.c:132
-#: ../../standalone/draknet_.c:569
+#: ../../any.pm_.c:157 ../../any.pm_.c:730
+#: ../../install_steps_interactive.pm_.c:938 ../../network/modem.pm_.c:46
+#: ../../printerdrake.pm_.c:402 ../../printerdrake.pm_.c:481
+#: ../../standalone/draknet_.c:603
 msgid "Password"
 msgstr "Contrasenya"
 
-#: ../../any.pm_.c:161 ../../any.pm_.c:742
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../any.pm_.c:158 ../../any.pm_.c:731
+#: ../../install_steps_interactive.pm_.c:939
 msgid "Password (again)"
 msgstr "Contrasenya (un altre cop)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Limita les opcions de la l�nia d'ordres"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "limita"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "Buida /tmp en cada arrencada"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Mida exacta de la RAM, si cal (s'han trobat %d MB)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "Habilita perfils m�ltiples"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Introdu�u la mida de la RAM en Mb"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "L'opci� ``Limita les opcions de la l�nia d'ordres'' no t� cap �s sense una "
 "contrasenya"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "Please try again"
 msgstr "Si us plau, torneu-ho a intentar"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "The passwords do not match"
 msgstr "Les contrasenyes no coincideixen"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
 msgstr "Missatge d'inicialitzaci�"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr "Demora de firmware obert"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
 msgstr "Temps m�xim d'arrencada del nucli"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
 msgstr "Voleu habilitar l'arrencada des de CD?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr "Voleu habilitar l'arrencada des d'OF?"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 msgid "Default OS?"
 msgstr "OS per defecte?"
 
-#: ../../any.pm_.c:210
+#: ../../any.pm_.c:207
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -639,146 +659,145 @@ msgstr ""
 "Aquestes s�n les diferents entrades.\n"
 "Podeu afegir-ne algunes m�s o canviar-ne les existents."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "Afegeix"
 
-#: ../../any.pm_.c:220 ../../any.pm_.c:729 ../../diskdrake.pm_.c:46
-#: ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217 ../../any.pm_.c:718 ../../diskdrake.pm_.c:161
+#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:1846
+#: ../../printerdrake.pm_.c:1847 ../../printerdrake.pm_.c:1904
+#: ../../printerdrake.pm_.c:1948
 msgid "Done"
 msgstr "Fet"
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:217
 #, fuzzy
 msgid "Modify"
 msgstr "Modifica el RAID"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "Quin tipus d'entrada voleu afegir?"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Other OS (SunOS...)"
 msgstr "Un altre SO (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "Un altre SO (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "Un altre SO (Windows...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "Imatge"
 
-#: ../../any.pm_.c:253 ../../any.pm_.c:264
+#: ../../any.pm_.c:247 ../../any.pm_.c:258
 msgid "Root"
 msgstr "Arrel"
 
-#: ../../any.pm_.c:254 ../../any.pm_.c:283
+#: ../../any.pm_.c:248 ../../any.pm_.c:277
 msgid "Append"
 msgstr "Afegeix"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "Lectura-escriptura"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "Taula"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "No segur"
 
-#: ../../any.pm_.c:274 ../../any.pm_.c:279 ../../any.pm_.c:282
+#: ../../any.pm_.c:268 ../../any.pm_.c:273 ../../any.pm_.c:276
 msgid "Label"
 msgstr "Etiqueta"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "Predeterminat"
 
-#: ../../any.pm_.c:284
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
 msgstr "Initrd-size"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
 msgstr "NoVideo"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "Elimina l'entrada"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "No es permet una etiqueta buida"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "Aquesta etiqueta ja est� en �s"
 
-#: ../../any.pm_.c:317
-msgid "What type of partitioning?"
-msgstr "Quin tipus de particionament?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "S'han trobat interf�cies %2$s %1$s"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "En teniu una altra?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Teniu alguna interf�cie %s?"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
-#: ../../printerdrake.pm_.c:237
+#: ../../any.pm_.c:601 ../../any.pm_.c:760 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "No"
 msgstr "No"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
+#: ../../any.pm_.c:601 ../../any.pm_.c:759 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "Yes"
 msgstr "S�"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "Mira la informaci� del maquinari"
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:648
+#: ../../any.pm_.c:637
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "S'est� instal�lant el programa de control per a la targeta %s %s"
 
-#: ../../any.pm_.c:649
+#: ../../any.pm_.c:638
 #, c-format
 msgid "(module %s)"
 msgstr "(m�dul %s)"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:660
+#: ../../any.pm_.c:649
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Quin programa de control %s he de provar?"
 
-#: ../../any.pm_.c:668
+#: ../../any.pm_.c:657
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -795,20 +814,20 @@ msgstr ""
 "cerqui al vostre ordinador la informaci� que necessita? Aquesta recerca\n"
 "podria blocar l'ordinador, per� aix� no causaria cap dany."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "Exploraci� autom�tica"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "Especifica les opcions"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Ara podeu proporcionar les seves opcions per al m�dul %s."
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -819,11 +838,11 @@ msgstr ""
 "Les opcions estan amb el format ``nom=valor nom2=valor2 ...''.\n"
 "Per exemple, ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Opcions del m�dul:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -832,34 +851,34 @@ msgstr ""
 "Ha fallat la c�rrega del m�dul %s.\n"
 "Voleu tornar-ho a intentar amb altres par�metres?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(ja s'ha afegit %s)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "Aquesta contrasenya �s massa senzilla"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "Si us plau, introdu�u un nom d'usuari"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "El nom d'usuari nom�s pot contenir lletres en min�scula, n�meros, `-' i `_'"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "Aquest nom d'usuari ja s'ha afegit"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "Afegeix un usuari"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -868,55 +887,70 @@ msgstr ""
 "Introdu�u un usuari\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Accepta l'usuari"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "Nom real"
 
-#: ../../any.pm_.c:740 ../../printerdrake.pm_.c:97
-#: ../../printerdrake.pm_.c:131
+#: ../../any.pm_.c:729 ../../printerdrake.pm_.c:401
+#: ../../printerdrake.pm_.c:480
 msgid "User name"
 msgstr "Nom d'usuari"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "Icona"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:756
 msgid "Autologin"
 msgstr "Entrada autom�tica"
 
-#: ../../any.pm_.c:767
+#: ../../any.pm_.c:757
+#, fuzzy
 msgid ""
 "I can set up your computer to automatically log on one user.\n"
-"If you don't want to use this feature, click on the cancel button."
+"Do you want to use this feature?"
 msgstr ""
 "Puc configurar el vostre ordinador de manera que entri autom�ticament amb un "
 "nom d'usuari.\n"
 "Si no voleu utilitzar aquesta caracter�stica, feu clic al bot� Cancel�la."
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "Escolliu l'usuari per omissi�:"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "Escolliu el gestor de finestres per executar:"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "Si us plau, trieu un idioma per utilitzar."
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr ""
+"Podeu seleccionar altres idiomes, que quedaran disponibles despr�s de la "
+"instal�laci�"
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "Tots"
+
 # NOTE: this message will be displayed at boot time; that is
 # only the ascii charset will be available on most machines
 # so use only 7bit for this message (and do transliteration or
 # leave it in English, as it is the best for your language)
 # 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:262 ../../bootloader.pm_.c:608
+#: ../../bootloader.pm_.c:259
 #, c-format
 msgid ""
 "Welcome to %s the operating system chooser!\n"
@@ -941,13 +975,13 @@ msgstr ""
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:809
+#: ../../bootloader.pm_.c:835
 msgid "Welcome to GRUB the operating system chooser!"
 msgstr "Benvingut al GRUB, el selector de sistema operatiu!"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:812
+#: ../../bootloader.pm_.c:838
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
 msgstr ""
@@ -955,38 +989,43 @@ msgstr ""
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:815
+#: ../../bootloader.pm_.c:841
 msgid "Press enter to boot the selected OS, 'e' to edit the"
 msgstr "Premeu Intro per arrencar el SO seleccionat, 'e' per editar les"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:818
+#: ../../bootloader.pm_.c:844
 msgid "commands before booting, or 'c' for a command-line."
 msgstr "ordres pr�vies a l'arrencada, o 'c' per obtenir una l�nia d'ordres."
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:821
+#: ../../bootloader.pm_.c:847
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr "La posici� ressaltada arrencar� autom�ticament dintre de %d segons."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
 msgstr "no hi ha prou espai a /boot"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
 #. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:918
+#: ../../bootloader.pm_.c:951
 msgid "Desktop"
 msgstr "Escriptori"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:920
+#: ../../bootloader.pm_.c:953
 msgid "Start Menu"
 msgstr "Men� Inici"
 
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "On voleu instal�lar el carregador d'arrencada?"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
 msgstr "encara no s'ha implementat cap ajuda.\n"
@@ -999,68 +1038,39 @@ msgstr "Configuraci� del tipus d'arrencada"
 msgid "/_File"
 msgstr "/_Fitxer"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/Fitxer/_Nou"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/Fitxer/_Obre"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>O"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/Fitxer/_Desa"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>S"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/Fitxer/_Anomena i desa"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/Fitxer/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/Fitxer/_Surt"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_Opcions"
+#: ../../bootlook.pm_.c:91
+msgid "NewStyle Categorizing Monitor"
+msgstr "Monitor de categoritzaci� NewStyle"
 
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Opcions/Prova"
+#: ../../bootlook.pm_.c:92
+msgid "NewStyle Monitor"
+msgstr "Monitor NewStyle"
 
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/_Ajuda"
+#: ../../bootlook.pm_.c:93
+msgid "Traditional Monitor"
+msgstr "Monitor tradicional"
 
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/Ajuda/_Quant a..."
+#: ../../bootlook.pm_.c:94
+msgid "Traditional Gtk+ Monitor"
+msgstr "Monitor Gtk+ tradicional"
 
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "Configura"
+#: ../../bootlook.pm_.c:95
+msgid "Launch Aurora at boot time"
+msgstr "Executa l'Aurora durant l'arrencada"
+
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "Mode LILO/Grub"
 
-#: ../../bootlook.pm_.c:114
+#: ../../bootlook.pm_.c:102
 #, fuzzy, c-format
 msgid ""
 "You are currently using %s as Boot Manager.\n"
@@ -1072,451 +1082,658 @@ msgstr ""
 "\n"
 "Feu clic a Configura per executar l'auxiliar de configuraci�."
 
-#: ../../bootlook.pm_.c:121
-msgid "Lilo/grub mode"
-msgstr "Mode LILO/Grub"
-
-#: ../../bootlook.pm_.c:131
-msgid "NewStyle Categorizing Monitor"
-msgstr "Monitor de categoritzaci� NewStyle"
-
-#: ../../bootlook.pm_.c:134
-msgid "NewStyle Monitor"
-msgstr "Monitor NewStyle"
-
-#: ../../bootlook.pm_.c:137
-msgid "Traditional Monitor"
-msgstr "Monitor tradicional"
-
-#: ../../bootlook.pm_.c:140
-msgid "Traditional Gtk+ Monitor"
-msgstr "Monitor Gtk+ tradicional"
-
-#: ../../bootlook.pm_.c:144
-msgid "Launch Aurora at boot time"
-msgstr "Executa l'Aurora durant l'arrencada"
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "Configura"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
 msgstr "Mode d'arrencada"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "Mode de sistema"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr "Executa el sistema X-Window en iniciar"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr "No, no vull l'entrada autom�tica"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "S�, vull l'entrada autom�tica amb aquest (usuari, escriptori)"
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "Mode de sistema"
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "Predeterminat"
-
-#: ../../bootlook.pm_.c:236 ../../standalone/draknet_.c:88
-#: ../../standalone/draknet_.c:120 ../../standalone/draknet_.c:184
-#: ../../standalone/draknet_.c:302 ../../standalone/draknet_.c:396
-#: ../../standalone/draknet_.c:473 ../../standalone/draknet_.c:509
-#: ../../standalone/draknet_.c:617
+#: ../../bootlook.pm_.c:155 ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:140 ../../standalone/draknet_.c:208
+#: ../../standalone/draknet_.c:320 ../../standalone/draknet_.c:433
+#: ../../standalone/draknet_.c:507 ../../standalone/draknet_.c:543
+#: ../../standalone/draknet_.c:644
 msgid "OK"
 msgstr "D'acord"
 
-#: ../../bootlook.pm_.c:238 ../../install_steps_gtk.pm_.c:576
-#: ../../interactive.pm_.c:114 ../../interactive.pm_.c:269
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:357
-#: ../../my_gtk.pm_.c:360 ../../my_gtk.pm_.c:617
-#: ../../standalone/drakgw_.c:639 ../../standalone/draknet_.c:95
-#: ../../standalone/draknet_.c:127 ../../standalone/draknet_.c:295
-#: ../../standalone/draknet_.c:485 ../../standalone/draknet_.c:631
-#: ../../standalone/tinyfirewall_.c:63
+#: ../../bootlook.pm_.c:156 ../../install_steps_gtk.pm_.c:516
+#: ../../interactive.pm_.c:122 ../../interactive.pm_.c:286
+#: ../../interactive.pm_.c:308 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:416 ../../my_gtk.pm_.c:419 ../../my_gtk.pm_.c:716
+#: ../../printerdrake.pm_.c:1158 ../../standalone/drakgw_.c:648
+#: ../../standalone/draknet_.c:115 ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:313 ../../standalone/draknet_.c:519
+#: ../../standalone/draknet_.c:658 ../../standalone/tinyfirewall_.c:63
 msgid "Cancel"
 msgstr "Cancel�la"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "no es pot obrir /etc/inittab per a lectura: $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "no es pot obrir /etc/sysconfig/autologin per a lectura: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "no es pot obrir /etc/inittab per a lectura: %s"
 
-#: ../../bootlook.pm_.c:435 ../../standalone/drakboot_.c:47
+#: ../../bootlook.pm_.c:336 ../../standalone/drakboot_.c:47
 msgid "Installation of LILO failed. The following error occured:"
 msgstr "Ha fallat la instal�laci� del LILO. S'ha produ�t l'error seg�ent:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Crea"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Desmunta"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "kB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Suprimeix"
+#: ../../common.pm_.c:93 ../../install_steps_graphical.pm_.c:287
+#: ../../install_steps_graphical.pm_.c:334
+msgid "MB"
+msgstr "MB"
 
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "Formata"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr "TB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:653
-msgid "Resize"
-msgstr "Canvia la mida"
+#: ../../common.pm_.c:109
+#, c-format
+msgid "%d minutes"
+msgstr "%d minuts"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "Tipus"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 minute"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "Punt de muntatge"
-
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "Escriu a /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d segons"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "Normal > Expert"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "Si us plau, feu primer una c�pia de seguretat de les vostres dades"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "Expert > Normal"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "Llegiu-ho atentament!"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "Restaura des del fitxer"
+#: ../../diskdrake.pm_.c:103
+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 ""
+"Si penseu utilitzar aboot, assegureu-vos de deixar espai lliure (amb 2.048\n"
+"sectors n'hi ha prou) al comen�ament del disc"
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Desa al fitxer"
+#: ../../diskdrake.pm_.c:122 ../../diskdrake_interactive.pm_.c:313
+#: ../../diskdrake_interactive.pm_.c:328 ../../install_steps.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:37
+#: ../../install_steps_interactive.pm_.c:310 ../../interactive_http.pm_.c:119
+#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:62
+msgid "Error"
+msgstr "Error"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "Assistent"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Restaura des del disquet"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Nou"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Desa al disquet"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+#, fuzzy
+msgid "Remote"
+msgstr "Elimina"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "Buida-ho tot"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "Punt de muntatge"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Formata-ho tot"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Opcions"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Assigna autom�ticament"
+#: ../../diskdrake.pm_.c:211 ../../diskdrake.pm_.c:417
+#: ../../diskdrake.pm_.c:534 ../../diskdrake_interactive.pm_.c:353
+#: ../../diskdrake_interactive.pm_.c:488
+msgid "Type"
+msgstr "Tipus"
 
-#: ../../diskdrake.pm_.c:59
-msgid "All primary partitions are used"
-msgstr "S'utilitzen totes les particions prim�ries"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Desmunta"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "No puc afegir cap m�s partici�"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Munta"
+
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Trieu una acci�"
 
-#: ../../diskdrake.pm_.c:59
+#: ../../diskdrake.pm_.c:235
 msgid ""
-"To have more partitions, please delete one to be able to create an extended "
-"partition"
+"You have one big FAT partition\n"
+"(generally used by MicroSoft Dos/Windows).\n"
+"I suggest you first resize that partition\n"
+"(click on it, then click on \"Resize\")"
 msgstr ""
-"Per tenir m�s particions, suprimiu-ne una per poder crear una partici� "
-"ampliada"
+"Teniu una partici� FAT gran\n"
+"(utilitzada normalment pel DOS/Windows de Microsoft).\n"
+"Suggereixo que primer en canvieu la mida\n"
+"(feu-hi clic i despr�s feu clic a \"Canvia la mida\")"
 
-#: ../../diskdrake.pm_.c:61
-msgid "Not enough space for auto-allocating"
-msgstr "No hi ha prou espai per a l'assignaci� autom�tica"
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Si us plau, feu clic a una partici� "
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Desf�s"
+#: ../../diskdrake.pm_.c:240
+#, fuzzy
+msgid "Please click on a media"
+msgstr "Si us plau, feu clic a una partici� "
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "Escriu la taula de particions"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "Si us plau, feu clic a una partici� "
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "M�s"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "Detalls"
+
+#: ../../diskdrake.pm_.c:395
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
+#, fuzzy
+msgid "Journalised FS"
+msgstr "ha fallat el muntatge"
+
+#: ../../diskdrake.pm_.c:395
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Swap"
 msgstr "Intercanvia"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:396 ../../diskdrake_interactive.pm_.c:952
 msgid "Empty"
 msgstr "Buit"
 
-#: ../../diskdrake.pm_.c:117 ../../install_steps_gtk.pm_.c:407
-#: ../../mouse.pm_.c:145
+#: ../../diskdrake.pm_.c:396 ../../install_steps_gtk.pm_.c:373
+#: ../../install_steps_gtk.pm_.c:433 ../../mouse.pm_.c:161
+#: ../../services.pm_.c:161
 msgid "Other"
 msgstr "Altres"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "Tipus de sistema de fitxers"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "Detalls"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Crea"
+
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Utilitzeu ``%s'' al seu lloc"
+
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Suprimeix"
+
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Utilitzeu primer ``Unmount''"
 
-#: ../../diskdrake.pm_.c:147
+#: ../../diskdrake.pm_.c:424 ../../diskdrake_interactive.pm_.c:480
+#, c-format
 msgid ""
-"You have one big FAT partition\n"
-"(generally used by MicroSoft Dos/Windows).\n"
-"I suggest you first resize that partition\n"
-"(click on it, then click on \"Resize\")"
+"After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
-"Teniu una partici� FAT gran\n"
-"(utilitzada normalment pel DOS/Windows de Microsoft).\n"
-"Suggereixo que primer en canvieu la mida\n"
-"(feu-hi clic i despr�s feu clic a \"Canvia la mida\")"
+"Despr�s de canviar el tipus de la partici� %s, se'n perdran totes les dades"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Si us plau, feu primer una c�pia de seguretat de les vostres dades"
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "On voleu muntar el dispositiu %s?"
 
-#: ../../diskdrake.pm_.c:152 ../../diskdrake.pm_.c:170
-#: ../../diskdrake.pm_.c:179 ../../diskdrake.pm_.c:570
-#: ../../diskdrake.pm_.c:592
-msgid "Read carefully!"
-msgstr "Llegiu-ho atentament!"
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Mount options"
+msgstr "Opcions del m�dul:"
 
-#: ../../diskdrake.pm_.c:155
-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"
+#: ../../diskdrake.pm_.c:507
+msgid "Various"
 msgstr ""
-"Si penseu utilitzar aboot, assegureu-vos de deixar espai lliure (amb 2.048\n"
-"sectors n'hi ha prou) al comen�ament del disc"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "Aneu amb compte: aquesta operaci� �s perillosa."
+#: ../../diskdrake.pm_.c:525
+#, fuzzy
+msgid "Removable media"
+msgstr "Muntatge autom�tic del suport extra�ble"
 
-#: ../../diskdrake.pm_.c:214 ../../install_steps.pm_.c:72
-#: ../../install_steps_interactive.pm_.c:37
-#: ../../install_steps_interactive.pm_.c:322 ../../standalone/diskdrake_.c:66
-msgid "Error"
-msgstr "Error"
+#: ../../diskdrake.pm_.c:532
+#, fuzzy
+msgid "Change type"
+msgstr "Canvia el tipus de partici�"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Punt de muntatge: "
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Quin sistema de fitxers voleu?"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Dispositiu: "
+#: ../../diskdrake.pm_.c:564
+msgid "Scanning available nfs shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:569
 #, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "Lletra d'unitat del DOS: %s (nom�s �s una suposici�)\n"
+msgid "Scanning available nfs shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:244 ../../diskdrake.pm_.c:251
-#: ../../diskdrake.pm_.c:301
-msgid "Type: "
-msgstr "Tipus: "
+#: ../../diskdrake.pm_.c:578 ../../diskdrake.pm_.c:648
+msgid "If the list above doesn't contain the wanted entry, enter it here:"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:248
-msgid "Name: "
-msgstr "Nom: "
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "Servidor"
 
-#: ../../diskdrake.pm_.c:253
-#, c-format
-msgid "Start: sector %s\n"
-msgstr "Inici: sector %s\n"
+#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
+msgid "Shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Size: %s"
-msgstr "Mida: %s"
+#: ../../diskdrake.pm_.c:615
+msgid "Scanning available samba shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:256
+#: ../../diskdrake.pm_.c:626 ../../diskdrake.pm_.c:639
 #, c-format
-msgid ", %s sectors"
-msgstr ", %s sectors"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:258
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Cilindre %d a cilindre %d\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose a partition"
+msgstr "Trieu una acci�"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Formatat\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose another partition"
+msgstr "Crea una nova partici�"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "Sense formatar\n"
+#: ../../diskdrake_interactive.pm_.c:188
+#, fuzzy
+msgid "Exit"
+msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "Muntat\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "Normal > Expert"
 
-#: ../../diskdrake.pm_.c:262
-#, c-format
-msgid "RAID md%s\n"
-msgstr "RAID md%s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to normal mode"
+msgstr "Expert > Normal"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Fitxer(s) de loopback: %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Desf�s"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"La partici� s'ha arrencat per defecte\n"
-"    (per a l'arrencada de l'MS-DOS, no per a LILO)\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "Voleu continuar igualment?"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "Nivell %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "Surt sense desar"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Mida del tros %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "Voleu sortir sense desar la taula de particions?"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "Discs RAID %s\n"
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Voleu comprovar la configuraci�?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Nom del fitxer de loopback: %s"
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Assigna autom�ticament"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "Buida-ho tot"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "M�s"
+
+#: ../../diskdrake_interactive.pm_.c:250
+#, fuzzy
+msgid "Hard drive information"
+msgstr "Informaci� del correu"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "Not enough space for auto-allocating"
+msgstr "No hi ha prou espai per a l'assignaci� autom�tica"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "S'utilitzen totes les particions prim�ries"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "No puc afegir cap m�s partici�"
+
+#: ../../diskdrake_interactive.pm_.c:275
 msgid ""
-"\n"
-"Chances are, this partition is\n"
-"a Driver partition, you should\n"
-"probably leave it alone.\n"
+"To have more partitions, please delete one to be able to create an extended "
+"partition"
 msgstr ""
-"\n"
-"�s possible que aquesta partici� sigui\n"
-"una partici� de programa de control;\n"
-"�s millor que no la toqueu.\n"
+"Per tenir m�s particions, suprimiu-ne una per poder crear una partici� "
+"ampliada"
+
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "Escriu la taula de particions"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "Rescata la taula de particions"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "Rescata la taula de particions"
+
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "Rescata la taula de particions"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "Muntatge autom�tic del suport extra�ble"
+
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Seleccioneu el fitxer"
+
+#: ../../diskdrake_interactive.pm_.c:308
 msgid ""
-"\n"
-"This special Bootstrap\n"
-"partition is for\n"
-"dual-booting your system.\n"
+"The backup partition table has not the same size\n"
+"Still continue?"
 msgstr ""
-"\n"
-"Aquesta partici� Bootstrap\n"
-"especial �s per arrencar\n"
-"el vostre sistema en dual.\n"
+"La c�pia de seguretat de la taula de particions no t� la mateixa mida\n"
+"Voleu continuar igualment?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Si us plau, feu clic a una partici� "
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Advert�ncia"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Mida: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Inseriu un disquet a la unitat\n"
+"Se'n perdran totes les dades"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geometria: %s cilindres, %s cap�als, %s sectors\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "S'est� intentant rescatar la taula de particions"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "Discs LVM %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+#, fuzzy
+msgid "Detailed information"
+msgstr "Informaci� del correu"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Tipus de taula de particions: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Canvia la mida"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "al bus %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Mou"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Munta"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Formata"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Actiu"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Afegeix al RAID"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "Elimina del RAID"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "Modifica el RAID"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "Afegeix al LVM"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "Elimina del RAID"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "Elimina del LVM"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "Modifica el RAID"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "Utilitza per a loopback"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Trieu una acci�"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Crea una nova partici�"
+
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "sector d'inici: "
+
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Mida en MB: "
+
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Tipus de sistema de fitxers: "
+
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Punt de muntatge: "
+
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Prefer�ncia: "
+
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "S'est� formatant el fitxer de loopback %s"
+
+#: ../../diskdrake_interactive.pm_.c:486
+msgid "Change partition type"
+msgstr "Canvia el tipus de partici�"
+
+#: ../../diskdrake_interactive.pm_.c:491
+msgid "Switching from ext2 to ext3"
+msgstr ""
+
+#: ../../diskdrake_interactive.pm_.c:521
+#, c-format
+msgid "Where do you want to mount loopback file %s?"
+msgstr "On voleu muntar el fitxer de loopback %s?"
+
+#: ../../diskdrake_interactive.pm_.c:528
+msgid ""
+"Can't unset mount point as this partition is used for loop back.\n"
+"Remove the loopback first"
+msgstr ""
+"No es pot anul�lar el punt de muntatge, perqu� aquesta partici�\n"
+"s'utilitza per al loopback. Elimineu primer el loopback"
+
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "S'estan calculant els l�mits del sistema de fitxers de la FAT"
+
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "S'est� canviant la mida"
+
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "No es pot canviar la mida d'aquesta partici�"
+
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "Cal fer una c�pia de seguretat de totes les dades d'aquesta partici�"
+
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr ""
+"Despr�s de canviar la mida de la partici� %s, se'n perdran totes les dades"
+
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Escolliu la nova mida"
+
+#: ../../diskdrake_interactive.pm_.c:591
+#, fuzzy
+msgid "New size in MB: "
+msgstr "Mida en MB: "
+
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Which disk do you want to move it to?"
+msgstr "A quin disc us voleu despla�ar?"
+
+#: ../../diskdrake_interactive.pm_.c:632
+msgid "Sector"
+msgstr "Sector"
+
+#: ../../diskdrake_interactive.pm_.c:633
+msgid "Which sector do you want to move it to?"
+msgstr "A quin sector us voleu despla�ar?"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving"
+msgstr "S'est� despla�ant"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving partition..."
+msgstr "S'est� despla�ant la partici�..."
+
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "Escolliu un RAID existent al qual afegir"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "nou"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "Escolliu un LVM existent al qual afegir"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "Nom LVM?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "Aquesta partici� no es pot utilitzar per al loopback"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Loopback"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Nom del fitxer de loopback: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "Nom real"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "Un altre loopback ja est� utilitzant el fitxer, escolliu-ne un altre"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "El fitxer ja existeix. El voleu utilitzar?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "dispositiu"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "nivell"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "mida del tros"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "Aneu amb compte: aquesta operaci� �s perillosa."
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "Quin tipus de particionament?"
 
-#: ../../diskdrake.pm_.c:435
+#: ../../diskdrake_interactive.pm_.c:834
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -1528,7 +1745,7 @@ msgstr ""
 "O esteu utilitzant LILO, i no funcionar�, o no l'esteu utilitzant i no "
 "necessiteu el /boot"
 
-#: ../../diskdrake.pm_.c:439
+#: ../../diskdrake_interactive.pm_.c:838
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -1541,7 +1758,7 @@ msgstr ""
 "Si teniu previst utilitzar el gestor d'arrencada LILO, penseu d'afegir una "
 "partici� /boot"
 
-#: ../../diskdrake.pm_.c:445
+#: ../../diskdrake_interactive.pm_.c:844
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
 "No bootloader is able to handle this without a /boot partition.\n"
@@ -1552,281 +1769,241 @@ msgstr ""
 "boot.\n"
 "Per tant, assegureu-vos d'afegir una partici� /boot"
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
-msgid "Use ``%s'' instead"
-msgstr "Utilitzeu ``%s'' al seu lloc"
-
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "Utilitzeu primer ``Unmount''"
-
-#: ../../diskdrake.pm_.c:469 ../../diskdrake.pm_.c:513
-#, c-format
-msgid ""
-"After changing type of partition %s, all data on this partition will be lost"
-msgstr ""
-"Despr�s de canviar el tipus de la partici� %s, se'n perdran totes les dades"
-
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "Voleu continuar igualment?"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "Surt sense desar"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "Voleu sortir sense desar la taula de particions?"
-
-#: ../../diskdrake.pm_.c:516
-msgid "Change partition type"
-msgstr "Canvia el tipus de partici�"
-
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "Quin sistema de fitxers voleu?"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "No podeu utilitzar el ReiserFS per a particions inferiors a 32 MB"
-
-#: ../../diskdrake.pm_.c:537
-#, c-format
-msgid "Where do you want to mount loopback file %s?"
-msgstr "On voleu muntar el fitxer de loopback %s?"
-
-#: ../../diskdrake.pm_.c:538
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "On voleu muntar el dispositiu %s?"
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "La taula de particions de la unitat %s s'escriur� al disc!"
 
-#: ../../diskdrake.pm_.c:542
-msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
-"Remove the loopback first"
+#: ../../diskdrake_interactive.pm_.c:868
+msgid "You'll need to reboot before the modification can take place"
 msgstr ""
-"No es pot anul�lar el punt de muntatge, perqu� aquesta partici�\n"
-"s'utilitza per al loopback. Elimineu primer el loopback"
+"Us caldr� tornar a arrencar per tal que les modificacions tinguin efecte"
 
-#: ../../diskdrake.pm_.c:561
+#: ../../diskdrake_interactive.pm_.c:879
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Despr�s de formatar la partici� %s, se'n perdran totes les dades"
 
-#: ../../diskdrake.pm_.c:563
+#: ../../diskdrake_interactive.pm_.c:881
 msgid "Formatting"
 msgstr "S'est� formatant"
 
-#: ../../diskdrake.pm_.c:564
+#: ../../diskdrake_interactive.pm_.c:882
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "S'est� formatant el fitxer de loopback %s"
 
-#: ../../diskdrake.pm_.c:565 ../../install_steps_interactive.pm_.c:430
+#: ../../diskdrake_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:419
 #, c-format
 msgid "Formatting partition %s"
 msgstr "S'est� formatant la partici� %s"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "Despr�s de formatar totes les particions,"
-
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "totes les dades d'aquestes particions s'hauran perdut"
-
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Mou"
-
-#: ../../diskdrake.pm_.c:577
-msgid "Which disk do you want to move it to?"
-msgstr "A quin disc us voleu despla�ar?"
-
-#: ../../diskdrake.pm_.c:578
-msgid "Sector"
-msgstr "Sector"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "l'mkraid ha fallit"
 
-#: ../../diskdrake.pm_.c:579
-msgid "Which sector do you want to move it to?"
-msgstr "A quin sector us voleu despla�ar?"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "No hi ha prou espai lliure per assignar noves particions"
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving"
-msgstr "S'est� despla�ant"
+#: ../../diskdrake_interactive.pm_.c:895
+#, c-format
+msgid ""
+"Directory %s already contain some data\n"
+"(%s)"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving partition..."
-msgstr "S'est� despla�ant la partici�..."
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "No hi ha prou espai lliure per assignar noves particions"
 
-#: ../../diskdrake.pm_.c:592
+#: ../../diskdrake_interactive.pm_.c:910
 #, c-format
-msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "La taula de particions de la unitat %s s'escriur� al disc!"
-
-#: ../../diskdrake.pm_.c:594
-msgid "You'll need to reboot before the modification can take place"
+msgid "Copying %s"
 msgstr ""
-"Us caldr� tornar a arrencar per tal que les modificacions tinguin efecte"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "S'estan calculant els l�mits del sistema de fitxers de la FAT"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Resoluci�: %s\n"
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "S'est� canviant la mida"
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Dispositiu: "
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "No es pot canviar la mida d'aquesta partici�"
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "Lletra d'unitat del DOS: %s (nom�s �s una suposici�)\n"
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "Cal fer una c�pia de seguretat de totes les dades d'aquesta partici�"
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Tipus: "
 
-#: ../../diskdrake.pm_.c:650
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Nom: "
+
+#: ../../diskdrake_interactive.pm_.c:954
 #, c-format
-msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr ""
-"Despr�s de canviar la mida de la partici� %s, se'n perdran totes les dades"
+msgid "Start: sector %s\n"
+msgstr "Inici: sector %s\n"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Escolliu la nova mida"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Mida: %s"
 
-#: ../../diskdrake.pm_.c:660 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
-msgid "MB"
-msgstr "MB"
+#: ../../diskdrake_interactive.pm_.c:957
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s sectors"
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "Crea una nova partici�"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Cilindre %d a cilindre %d\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "sector d'inici: "
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Formatat\n"
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Mida en MB: "
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "Sense formatar\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Tipus de sistema de fitxers: "
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "Muntat\n"
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "Prefer�ncia: "
+#: ../../diskdrake_interactive.pm_.c:963
+#, c-format
+msgid "RAID md%s\n"
+msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:798
-msgid "This partition can't be used for loopback"
-msgstr "Aquesta partici� no es pot utilitzar per al loopback"
+#: ../../diskdrake_interactive.pm_.c:965
+#, fuzzy, c-format
+msgid ""
+"Loopback file(s):\n"
+"   %s\n"
+msgstr "Fitxer(s) de loopback: %s\n"
 
-#: ../../diskdrake.pm_.c:808
-msgid "Loopback"
-msgstr "Loopback"
+#: ../../diskdrake_interactive.pm_.c:966
+msgid ""
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
+msgstr ""
+"La partici� s'ha arrencat per defecte\n"
+"    (per a l'arrencada de l'MS-DOS, no per a LILO)\n"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Nom del fitxer de loopback: "
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "Nivell %s\n"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "Un altre loopback ja est� utilitzant el fitxer, escolliu-ne un altre"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Mida del tros %s\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "El fitxer ja existeix. El voleu utilitzar?"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "Discs RAID %s\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Seleccioneu el fitxer"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Nom del fitxer de loopback: %s"
 
-#: ../../diskdrake.pm_.c:876
+#: ../../diskdrake_interactive.pm_.c:975
 msgid ""
-"The backup partition table has not the same size\n"
-"Still continue?"
+"\n"
+"Chances are, this partition is\n"
+"a Driver partition, you should\n"
+"probably leave it alone.\n"
 msgstr ""
-"La c�pia de seguretat de la taula de particions no t� la mateixa mida\n"
-"Voleu continuar igualment?"
-
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "Advert�ncia"
+"\n"
+"�s possible que aquesta partici� sigui\n"
+"una partici� de programa de control;\n"
+"�s millor que no la toqueu.\n"
 
-#: ../../diskdrake.pm_.c:885
+#: ../../diskdrake_interactive.pm_.c:978
 msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
 msgstr ""
-"Inseriu un disquet a la unitat\n"
-"Se'n perdran totes les dades"
-
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "S'est� intentant rescatar la taula de particions"
-
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "dispositiu"
-
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "nivell"
-
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "mida del tros"
+"\n"
+"Aquesta partici� Bootstrap\n"
+"especial �s per arrencar\n"
+"el vostre sistema en dual.\n"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "Escolliu un RAID existent al qual afegir"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Mida: %s\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "nou"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geometria: %s cilindres, %s cap�als, %s sectors\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "Escolliu un LVM existent al qual afegir"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Informaci�: "
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr "Nom LVM?"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "Discs LVM %s\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "Muntatge autom�tic del suport extra�ble"
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Tipus de taula de particions: %s\n"
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "Rescata la taula de particions"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "al bus %d id %d\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "Torna a carregar"
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Opcions: %s"
 
-#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
-#: ../../fs.pm_.c:113
+#: ../../fs.pm_.c:447 ../../fs.pm_.c:457 ../../fs.pm_.c:461 ../../fs.pm_.c:465
+#: ../../fs.pm_.c:469 ../../fs.pm_.c:473
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s formatatge de %s ha fallat"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "no s� com formatar %s amb el tipus %s"
 
-#: ../../fs.pm_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "ha fallat el muntatge"
+
+#: ../../fs.pm_.c:588
+#, c-format
+msgid "fsck failed with exit code %d or signal %d"
+msgstr ""
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
 msgid "mount failed: "
 msgstr "ha fallat el muntatge: "
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "s'ha produ�t un error en muntar %s: %s"
@@ -1839,41 +2016,44 @@ msgstr "senzill"
 msgid "server"
 msgstr "servidor"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "No podeu utilitzar el JFS per a particions inferiors a 16 MB"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "No podeu utilitzar el ReiserFS per a particions inferiors a 32 MB"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "Els punts de muntatge han de comen�ar amb una /"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Ja hi ha una partici� amb el punt de muntatge %s\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Muntatges circulars %s\n"
-
-#: ../../fsedit.pm_.c:285
+#: ../../fsedit.pm_.c:476
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "No podeu utilitzar un volum l�gic LVM per al punt de muntatge %s"
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
 msgstr "Aquest directori s'ha de mantenir dins del sistema de fitxers de root"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "Necessiteu un sistema de fitxers real (ext2, reiserfs) per a aquest punt de "
 "muntatge\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "S'ha produ�t un error en obrir %s per escriure: %s"
 
-#: ../../fsedit.pm_.c:453
+#: ../../fsedit.pm_.c:681
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
@@ -1882,337 +2062,416 @@ msgstr ""
 "sistemes de fitxers. Si us plau, comproveu el vostre maquinari per trobar el "
 "problema"
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "No teniu cap partici�!"
 
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr ""
-"Escolliu l'idioma que voleu utilitzar per a la instal�laci� i per a l'�s del "
-"sistema."
-
-#: ../../help.pm_.c:12
+#: ../../help.pm_.c:13
+msgid ""
+"GNU/Linux is a multiuser system, and this means that each user can have his\n"
+"own preferences, his own files and so on. You can read the ``User Guide''\n"
+"to learn more. But unlike \"root\", which is the administrator, the users\n"
+"you will add here will not be entitled to change anything except their own\n"
+"files and their own configuration. You will have to create at least one\n"
+"regular user for yourself. That account is where you should log in for\n"
+"routine use. Although it is very practical to log in as \"root\" everyday,\n"
+"it may also be very dangerous! The slightest mistake could mean that your\n"
+"system would not work any more. If you make a serious mistake as a regular\n"
+"user, you may only lose some information, but not the entire system.\n"
+"\n"
+"First, you have to enter your real name. This is not mandatory, of course -\n"
+"as you can actually enter whatever you want. DrakX will then take the first\n"
+"word you have entered in the box and will bring it over to the \"User\n"
+"name\". This is the name this particular user will use to log into the\n"
+"system. You can change it. You then have to enter a password here. A\n"
+"non-privileged (regular) user's password is not as crucial as that of\n"
+"\"root\" from a security point of view, but that is no reason to neglect it\n"
+"- after all, your files are at risk.\n"
+"\n"
+"If you click on \"Accept user\", you can then add as many as you want. Add\n"
+"a user for each one of your friends: your father or your sister, for\n"
+"example. When you finish adding all the users you want, select \"Done\".\n"
+"\n"
+"Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
+"for that user (bash by default)."
+msgstr ""
+
+#: ../../help.pm_.c:41
+#, fuzzy
 msgid ""
-"You need to accept the terms of the above license to continue installation.\n"
+"Listed above are the existing Linux partitions detected on your hard drive.\n"
+"You can keep the choices made by the wizard, they are good for most common\n"
+"installs. If you make any changes, you must at least define a root\n"
+"partition (\"/\"). Do not choose too small a partition or you will not be\n"
+"able to install enough software. If you want to store your data on a\n"
+"separate partition, you will also need to create a partition for \"/home\"\n"
+"(only possible if you have more than one Linux partition available).\n"
 "\n"
+"Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"Please click on \"Accept\" if you agree with its terms.\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"
-"Please click on \"Refuse\" if you disagree with its terms. Installation will "
-"end without modifying your current\n"
-"configuration."
-msgstr ""
-"Heu d'acceptar els termes de la llic�ncia de m�s amunt per poder continuar "
-"la instal�laci�.\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"
-"Si us plau, feu clic a \"Accepto\" si hi esteu d'acord.\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"
-"Feu clic a \"No accpeto\" si no hi esteu d'acord. La instal�laci� "
-"finalitzar� sense modificar la instal�laci� actual."
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Escolliu el vostre tipus de teclat de la llista inferior"
-
-#: ../../help.pm_.c:25
-msgid ""
-"If you wish other languages (than the one you choose at\n"
-"beginning of installation) will be available after installation, please "
-"chose\n"
-"them in list above. If you want select all, you just need to select \"All\"."
-msgstr ""
-"Si desitgeu que altres idiomes (a m�s del que vau triar en\n"
-"iniciar la instal�laci�) estiguin disponibles despr�s de la instal�laci�,\n"
-"escolliu-los de la llista de m�s amunt. Si els voleu seleccionar tots,\n"
-"nom�s cal que seleccioneu \"Tots\"."
-
-#: ../../help.pm_.c:30
-msgid ""
-"Please choose \"Install\" if there are no previous version of Linux-"
-"Mandrake\n"
-"installed or if you wish to use several operating systems.\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 ""
+"Aquestes s�n les particions de Linux existents que s'han detectat a la\n"
+"vostra unitat de disc dur. Podeu conservar les eleccions fetes per "
+"l'assistent,\n"
+"s�n adequades per a un �s normal. Si les canvieu, heu de definir una "
+"partici�\n"
+"root (\"/\"); no escolliu una partici� massa petita, o no podreu instal�lar\n"
+"prou programari. Si voleu emmagatzemar les dades en una altra partici�, "
+"tamb�\n"
+"haureu de seleccionar una \"/home\" (nom�s si teniu m�s d'una partici� de\n"
+"Linux).\n"
 "\n"
-"Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\n"
 "\n"
+"Per a la vostra informaci�, cada partici� est� identificada d'aquesta "
+"manera: \"Nom\", \"Capacitat\".\n"
 "\n"
-"Depend of your knowledge in GNU/Linux, you can choose one of the following "
-"levels to install or update your\n"
-"Linux-Mandrake operating system:\n"
 "\n"
-"\t* Recommended: if you have never installed a GNU/Linux operating system "
-"choose this. Installation will be\n"
-"\t  be very easy and you will be asked only on few questions.\n"
+"\"Nom\" es compon de: \"tipus d'unitat de disc\", \"n�mero d'unitat de disc"
+"\",\n"
+"\"n�mero de la partici�\" (per exemple, \"hda1\").\n"
 "\n"
 "\n"
-"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
-"the primary usage (workstation, server,\n"
-"\t  development) of your system. You will need to answer to more questions "
-"than in \"Recommended\" installation\n"
-"\t  class, so you need to know how GNU/Linux works to choose this "
-"installation class.\n"
+"\"Tipus d'unitat de disc\" �s \"hd\" si la vostre unitat de disc �s IDE i "
+"\"sd\"\n"
+"si �s SCSI.\n"
 "\n"
 "\n"
-"\t* Expert: if you have a good knowledge in GNU/Linux, you can choose this "
-"installation class. As in \"Customized\"\n"
-"\t  installation class, you will be able to choose the primary usage "
-"(workstation, server, development). Be very\n"
-"\t  careful before choose this installation class. You will be able to "
-"perform a higly customized installation.\n"
-"\t  Answer to some questions can be very difficult if you haven't a good "
-"knowledge in GNU/Linux. So, don't choose\n"
-"\t  this installation class unless you know what you are doing."
-msgstr ""
-"Escolliu \"Instal�laci�\" si no teniu cap versi� anterior de Linux-Mandrake\n"
-"instal�lada a l'ordinador o si voleu utilitzar diversos sistemes operatius.\n"
+"\"N�mero de la unitat de disc\" �s sempre una lletra despr�s d'\"hd\" o \"sd"
+"\".\n"
+"Amb unitats de disc IDE:\n"
 "\n"
+"   * \"a\" significa \"unitat de disc mestre en el controlador IDE primari"
+"\",\n"
 "\n"
-"Escolliu \"Actualitzaci�\" si voleu actualitzar un versi� de Linux-Mandrake "
-"que ja est� instal�lada.\n"
+"   * \"b\" significa \"unitat de disc esclava en el controlador IDE primari"
+"\",\n"
 "\n"
+"   * \"c\" significa \"unitat de disc mestre en el controlador IDE secundari"
+"\",\n"
 "\n"
-"Segons els vostres coneixements de GNU/Linux, podeu escollir un dels "
-"nivells\n"
-"seg�ents d'instal�laci� o actualitzaci� del sistema operatiu Linux-"
-"Mandrake:\n"
+"   * \"d\" significa \"unitat de disc esclava en el controlador IDE secundari"
+"\".\n"
 "\n"
-"\t* Recomanada: si mai no heu instal�lat un sistema operatiu GNU/Linux,\n"
-"escolliu aquest. La instal�laci� ser� molt f�cil i nom�s se us faran\n"
-"unes poques preguntes.\n"
 "\n"
+"Amb les unitats de disc SCSI, una \"a\" significa \"unitat prim�ria de disc"
+"\", una \"b\" significa \"unitat secund�ria de disc\", etc..."
+
+#: ../../help.pm_.c:72
+msgid ""
+"The Mandrake Linux installation is spread out over several CDROMs. DrakX\n"
+"knows if a selected package is located on another CDROM and will eject the\n"
+"current CD and ask you to insert a different one as required."
+msgstr ""
+
+#: ../../help.pm_.c:77
+msgid ""
+"It is now time to specify which programs you wish to install on your\n"
+"system. There are thousands of packages available for Mandrake Linux, and\n"
+"you are not supposed to know them all by heart.\n"
 "\n"
-"\t* Personalitzada: si coneixeu prou el GNU/Linux, podeu escollir l'�s\n"
-"principal (estaci� de treball, servidor, desenvolupament) del vostre\n"
-"sistema. Haureu de respondre m�s preguntes que en la instal�laci�\n"
-"\"Recomanada\", de manera que, si escolliu aquest tipus d'instal�laci�,\n"
-"haureu de saber com funciona el GNU/Linux.\n"
+"If you are performing a standard installation from CDROM, you will first be\n"
+"asked to specify the CDs you currently have (in Expert mode only). Check\n"
+"the CD labels and highlight the boxes corresponding to the CDs you have\n"
+"available for installation. Click \"OK\" when you are ready to continue.\n"
 "\n"
+"Packages are sorted in groups corresponding to a particular use of your\n"
+"machine. The groups themselves are sorted into four sections:\n"
 "\n"
-"\t* Per a experts: si domineu el GNU/Linux, trieu aquest tipus\n"
-"d'instal�laci�. Com en el cas de la instal�laci� \"Personalitzada\"\n"
-"podreu escollir l'�s principal del vostre ordinador (estaci� de treball,\n"
-"servidor, desenvolupament). Aneu amb molt de compte abans de triar aquest\n"
-"tipus d'instal�laci�; podreu realitzar una instal�laci� altament\n"
-"personalitzada.\n"
-"\t  La resposta a algunes preguntes pot ser molt dif�cil si no teniu s�lids\n"
-"coneixements de GNU/Linux. Per tant, no escolliu aquest tipus "
-"d'instal�laci�\n"
-"tret que sapigueu qu� esteu fent."
-
-#: ../../help.pm_.c:56
-msgid ""
-"Select:\n"
+" * \"Workstation\": if you plan to use your machine as a workstation, "
+"select\n"
+"one or more of the corresponding groups.\n"
 "\n"
-"  - Customized: If you are familiar enough with GNU/Linux, you may then "
-"choose\n"
-"    the primary usage for your machine. See below for details.\n"
+" * \"Development\": if the machine is to be used for programming, choose "
+"the\n"
+"desired group(s).\n"
 "\n"
+" * \"Server\": finally, if the machine is intended to be a server, you will\n"
+"be able to select which of the most common services you wish to see\n"
+"installed on the machine.\n"
 "\n"
-"  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
-"    perform a highly customized installation. As for a \"Customized\"\n"
-"    installation class, you will be able to select the usage for your "
-"system.\n"
-"    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
-"DOING!"
-msgstr ""
-"Seleccioneu:\n"
+" * \"Graphical Environment\": this is where you will choose your preferred\n"
+"graphical environment. At least one must be selected if you want to have a\n"
+"graphical workstation!\n"
 "\n"
-"  - Personalitzada: Si esteu familiaritzat amb el Linux, podreu\n"
-"triar l'�s del sistema instal�lat entre Normal, Desenvolupament o\n"
-"Servidor. Trieu \"Normal\" per a una instal�laci� per a un �s\n"
-"general del vostre ordinador, \"Desenvolupament\" si utilitzareu\n"
-"l'ordinador principalment per a desenvolupament de programari,\n"
-"o \"Servidor\" si voleu instal�lar un servidor convencional (per\n"
-"a correu, impressions...).\n"
+"Moving the mouse cursor over a group name will display a short explanatory\n"
+"text about that group.\n"
 "\n"
+"You can check the \"Individual package selection\" box, which is useful if\n"
+"you are familiar with the packages being offered or if you want to have\n"
+"total control over what will be installed.\n"
 "\n"
-"  - Per a experts: Si domineu el GNU/Linux i voleu realitzar una\n"
-"instal�laci� totalment personalitzada, aquest �s el vostre\n"
-"tipus d'instal�laci�. Podreu seleccionar l'�s del vostre sistema\n"
-"com a \"Personalitzada\"."
+"If you started the installation in \"Update\" mode, you can unselect all\n"
+"groups to avoid installing any new package. This is useful for repairing or\n"
+"updating an existing system."
+msgstr ""
 
-#: ../../help.pm_.c:68
+#: ../../help.pm_.c:115
 msgid ""
-"You must now define your machine usage. Choices are:\n"
+"Finally, depending on your choice of whether or not to select individual\n"
+"packages, you will be presented a tree containing all packages classified\n"
+"by groups and subgroups. While browsing the tree, you can select entire\n"
+"groups, subgroups, or individual packages.\n"
 "\n"
-"\t* Workstation: this the ideal choice if you intend to use your machine "
-"primarily for everyday use, at office or\n"
-"\t  at home.\n"
+"Whenever you select a package on the tree, a description appears on the\n"
+"right. When your selection is finished, click the \"Install\" button which\n"
+"will then launch the installation process. Depending on the speed of your\n"
+"hardware and the number of packages that need to be installed, it may take\n"
+"a while to complete the process. A time to complete estimate is displayed\n"
+"on the screen to help you gauge if there is sufficient time to enjoy a cup\n"
+"of coffee.\n"
 "\n"
+"!! If a server package has been selected either intentionally or because it\n"
+"was part of a whole group, you will be asked to confirm that you really\n"
+"want those servers to be installed. Under Mandrake Linux, any installed\n"
+"servers are started by default at boot time. Even if they are safe and have\n"
+"no known issues at the time the distribution was shipped, it may happen\n"
+"that security holes are discovered after this version of Mandrake Linux was\n"
+"finalized. If you do not know what a particular service is supposed to do\n"
+"or why it is being installed, then click \"No\". Clicking \"Yes\" will\n"
+"install the listed services and they will be started automatically by\n"
+"default. !!\n"
 "\n"
-"\t* Development: if you intend to use your machine primarily for software "
-"development, it is the good choice. You\n"
-"\t  will then have a complete collection of software installed in order to "
-"compile, debug and format source code,\n"
-"\t  or create software packages.\n"
+"The \"Automatic dependencies\" option simply disables the warning dialog\n"
+"which appears whenever the installer automatically selects a package. This\n"
+"occurs because it has determined that it needs to satisfy a dependency with\n"
+"another package in order to successfully complete the installation.\n"
 "\n"
-"\n"
-"\t* Server: if you intend to use this machine as a server, it is the good "
-"choice. Either a file server (NFS or\n"
-"\t  SMB), a print server (Unix style or Microsoft Windows style), an "
-"authentication server (NIS), a database\n"
-"\t  server and so on. As such, do not expect any gimmicks (KDE, GNOME, etc.) "
-"to be installed."
+"The tiny floppy disc icon at the bottom of the list allows to load the\n"
+"packages list chosen during a previous installation. Clicking on this icon\n"
+"will ask you to insert a floppy disk previously created at the end of\n"
+"another installation. See the second tip of last step on how to create such\n"
+"a floppy."
 msgstr ""
-"Ara heu de decidir com utilitzareu l'ordinador. Les opcions s�n:\n"
-"\n"
-"\t* Estaci� de treball: l'elecci� ideal si penseu utilitzar l'ordinador "
-"b�sicament per a l'�s quotidi�, a la feina o\n"
-"\t  a casa.\n"
+
+#: ../../help.pm_.c:151
+msgid ""
+"If you wish to connect your computer to the Internet or to a local network,\n"
+"please choose the correct option. Please turn on your device before\n"
+"choosing the correct option to let DrakX detect it automatically.\n"
 "\n"
+"Mandrake Linux proposes the configuration of an Internet connection at\n"
+"installation time. Available connections are: traditional modem, ISDN\n"
+"modem, ADSL connection, cable modem, and finally a simple LAN connection\n"
+"(Ethernet).\n"
 "\n"
-"\t* Desenvolupament: si penseu utilitzar l'ordinador b�sicament per a "
-"desenvolupament de programari, aquesta �s l'elecci� ideal.\n"
-"\t  Tindreu instal�lada una completa col�lecci� de programari per poder "
-"compilar, depurar i formatar codi font,\n"
-"\t  o crear paquets de programari.\n"
+"Here, we will not detail each configuration. Simply make sure that you have\n"
+"all the parameters from your Internet Service Provider or system\n"
+"administrator.\n"
 "\n"
+"You can consult the manual chapter about Internet connections for details\n"
+"about the configuration, or simply wait until your system is installed and\n"
+"use the program described there to configure your connection.\n"
 "\n"
-"\t* Servidor: si penseu utilitzar l'ordinador com a servidor, aquesta �s "
-"l'elecci� ideal, ja sigui un servidor de fitxers (NFS o\n"
-"\t  SMB), un servidor d'impressi� (tipus Unix o Microsoft Windows), un "
-"servidor d'autenticaci� (NIS), un servidor\n"
-"\t  de bases de dades, etc. En canvi, no espereu que se us instal�lin coses "
-"com ara el KDE, el GNOME, etc.)"
+"If you wish to configure the network later after installation or if you\n"
+"have finished configuring your network connection, click \"Cancel\"."
+msgstr ""
 
-#: ../../help.pm_.c:84
+#: ../../help.pm_.c:172
+#, fuzzy
 msgid ""
-"DrakX will attempt to look for PCI SCSI adapter(s). If DrakX\n"
-"finds an SCSI adapter and knows which driver to use, it will be "
-"automatically\n"
-"installed.\n"
-"\n"
-"\n"
-"If you have no SCSI adapter, an ISA SCSI adapter or a PCI SCSI adapter that\n"
-"DrakX doesn't recognize, you will be asked if a SCSI adapter is present in "
-"your\n"
-"system. If there is no adapter present, you can click on \"No\". If you "
-"click on\n"
-"\"Yes\", a list of drivers will be presented from which you can select your\n"
-"specific adapter.\n"
+"You may now choose which services you wish to start at boot time.\n"
 "\n"
+"Here are presented all the services available with the current\n"
+"installation. Review them carefully and uncheck those which are not always\n"
+"needed at boot time.\n"
 "\n"
-"If you have to manually specify your adapter, DrakX will ask if you want to\n"
-"specify options for it. You should allow DrakX to probe the hardware for "
-"the\n"
-"options. This usually works well.\n"
-"\n"
+"You can get a short explanatory text about a service by selecting a\n"
+"specific service. However, if you are not sure whether a service is useful\n"
+"or not, it is safer to leave the default behavior.\n"
 "\n"
-"If not, you will need to provide options to the driver. Please review the "
-"User\n"
-"Guide (chapter 3, section \"Collective informations on your hardware) for "
-"hints\n"
-"on retrieving this information from hardware documentation, from the\n"
-"manufacturer's Web site (if you have Internet access) or from Microsoft "
-"Windows\n"
-"(if you have it on your system)."
+"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."
 msgstr ""
-"El DrakX intentar� trobar el(s) adaptador(s) SCSI PCI. \n"
-"Si en troba, i sap quin programa de control utilitzar, el(s)\n"
-"instal�lar� autom�ticament.\n"
+"Ara podeu triar quins serveis voleu que s'inici�n durant l'arrencada.\n"
 "\n"
 "\n"
-"Si no teniu cap adaptador SCSI, un adaptador SCSI ISA, o un\n"
-"adaptador SCSI PCI que el DrakX no reconegui, se us demanar� si teniu\n"
-"un adaptador SCSI al sistema. Si no en teniu cap, simplement feu clic a \"No"
-"\". Si feu\n"
-"clic a \"S�\", apareixer� una llista de programes de control on podreu\n"
-"seleccionar l'adaptador concret.\n"
+"Quan el ratol� passi sobre un element apareixer� un petit globus d'ajuda "
+"que\n"
+"explica la finalitat del servei.\n"
 "\n"
 "\n"
-"Si heu hagut de seleccionar l'adaptador manualment, el DrakX us preguntar�\n"
-"si voleu indicar opcions per a ell. Conv� que deixeu que el DrakX comprovi\n"
-"el maquinari per a les opcions; aix� sol funcionar b�.\n"
+"Aneu especialment amb cura en aquest pas si penseu utilitzar l'ordinador "
+"com\n"
+"a servidor: segurament no us interessar� iniciar serveis que no necessiteu.\n"
+"Recordeu que hi ha diversos serveis que poden ser perillosos si s'habiliten\n"
+"en un servidor.\n"
+"En general, seleccioneu nom�s els serveis que realment necessiteu."
+
+#: ../../help.pm_.c:188
+msgid ""
+"GNU/Linux manages time in GMT (Greenwich Manage Time) and translates it in\n"
+"local time according to the time zone you selected."
+msgstr ""
+"El GNU/Linux gestiona l'hora en GMT (Hora de Greenwich) i la\n"
+"tradueix a l'hora local segons la zona hor�ria seleccionada."
+
+#: ../../help.pm_.c:192
+msgid ""
+"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
+"on which all the graphics environments (KDE, Gnome, AfterStep,\n"
+"WindowMaker...) bundled with Mandrake Linux rely. In this section, DrakX\n"
+"will try to configure X automatically.\n"
 "\n"
+"It is extremely rare for it to fail, unless the hardware is very old (or\n"
+"very new). If it succeeds, it will start X automatically with the best\n"
+"resolution possible depending on the size of the monitor. A window will\n"
+"then appear and ask you if you can see it.\n"
 "\n"
-"Si no, us caldr� proporcionar les opcions al programa de control. Consulteu\n"
-"el cap�tol 3 de la Guia de l'usuari, secci� \"Informaci� obtinguda del\n"
-"maquinari\" per saber com treure aquesta informaci� de la documentaci� del\n"
-"maquinari, del lloc web del fabricant (si teniu acc�s a Internet) o del\n"
-"Microsoft Windows (si el teniu al sistema)."
+"If you are doing an \"Expert\" install, you will enter the X configuration\n"
+"wizard. See the corresponding section of the manual for more information\n"
+"about this wizard.\n"
+"\n"
+"If you can see the message and answer \"Yes\", then DrakX will proceed to\n"
+"the next step. If you cannot see the message, it simply means that the\n"
+"configuration was wrong and the test will automatically end after 10\n"
+"seconds, restoring the screen."
+msgstr ""
 
-#: ../../help.pm_.c:108
+#: ../../help.pm_.c:212
 msgid ""
-"At this point, you need to choose where to install your\n"
-"Linux-Mandrake operating system on your hard drive. If it is empty or if an\n"
-"existing operating system uses all the space available on it, you need to\n"
-"partition it. Basically, partitioning a hard drive consists of logically\n"
-"dividing it to create space to install your new Linux-Mandrake system.\n"
+"The first time you try the X configuration, you may not be very satisfied\n"
+"with its display (screen is too small, shifted left or right...). Hence,\n"
+"even if X starts up correctly, DrakX then asks you if the configuration\n"
+"suits you. It will also propose to change it by displaying a list of valid\n"
+"modes it could find, asking you to select one.\n"
 "\n"
+"As a last resort, if you still cannot get X to work, choose \"Change\n"
+"graphics card\", select \"Unlisted card\", and when prompted on which\n"
+"server you want, choose \"FBDev\". This is a failsafe option which works\n"
+"with any modern graphics card. Then choose \"Test again\" to be sure."
+msgstr ""
+
+#: ../../help.pm_.c:224
+msgid ""
+"Finally, you will be asked whether you want to see the graphical interface\n"
+"at boot. Note this question will be asked even if you chose not to test the\n"
+"configuration. Obviously, you want to answer \"No\" if your machine is to\n"
+"act as a server, or if you were not successful in getting the display\n"
+"configured."
+msgstr ""
+
+#: ../../help.pm_.c:231
+msgid ""
+"The Mandrake Linux CDROM has a built-in rescue mode. You can access it by\n"
+"booting from the CDROM, press the >>F1<< key at boot and type >>rescue<< at\n"
+"the prompt. But in case your computer cannot boot from the CDROM, you\n"
+"should come back to this step for help in at least two situations:\n"
 "\n"
-"Because the effects of the partitioning process are usually irreversible,\n"
-"partitioning can be intimidating and stressful if you are an inexperienced "
-"user.\n"
-"This wizard simplifies this process. Before beginning, please consult the "
-"manual\n"
-"and take your time.\n"
+" * when installing the boot loader, DrakX will rewrite the boot sector "
+"(MBR)\n"
+"of your main disk (unless you are using another boot manager) so that you\n"
+"can start up with either Windows or GNU/Linux (assuming you have Windows in\n"
+"your system). If you need to reinstall Windows, the Microsoft install\n"
+"process will rewrite the boot sector, and then you will not be able to\n"
+"start GNU/Linux!\n"
 "\n"
+" * if a problem arises and you cannot start up GNU/Linux from the hard "
+"disk,\n"
+"this floppy disk will be the only means of starting up GNU/Linux. It\n"
+"contains a fair number of system tools for restoring a system, which has\n"
+"crashed due to a power failure, an unfortunate typing error, a typo in a\n"
+"password, or any other reason.\n"
 "\n"
-"You need at least two partitions. One is for the operating system itself and "
-"the\n"
-"other is for the virtual memory (also called Swap).\n"
+"When you click on this step, you will be asked to enter a disk inside the\n"
+"drive. The floppy disk you will insert must be empty or contain data which\n"
+"you do not need. You will not have to format it since DrakX will rewrite\n"
+"the whole disk."
+msgstr ""
+
+#: ../../help.pm_.c:255
+#, fuzzy
+msgid ""
+"At this point you need to choose where on your hard drive to install your\n"
+"Mandrake Linux operating system. If your hard drive is empty or if an\n"
+"existing operating system is using all the space available, you will need\n"
+"to partition it. Basically, partitioning a hard drive consists of logically\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
+"Because the effects of the partitioning process are usually irreversible,\n"
+"partitioning can be intimidating and stressful if you are an inexperienced\n"
+"user. Fortunately, there is a wizard which simplifies this process. Before\n"
+"beginning, please consult the manual and take your time.\n"
 "\n"
-"If partitions have been already defined (from a previous installation or "
-"from\n"
-"another partitioning tool), you just need choose those to use to install "
-"your\n"
-"Linux system.\n"
+"If you are running the install in Expert mode, you will enter DiskDrake,\n"
+"the Mandrake Linux partitioning tool, which allows you to fine-tune your\n"
+"partitions. See the DiskDrake chapter of the manual. From the installation\n"
+"interface, you can use the wizards as described here by clicking the\n"
+"\"Wizard\" button of the dialog.\n"
 "\n"
+"If partitions have already been defined, either from a previous\n"
+"installation or from another partitioning tool, simply select those to\n"
+"install your Linux system.\n"
 "\n"
-"If partitions haven't been already defined, you need to create them. \n"
-"To do that, use the wizard available above. Depending of your hard drive\n"
-"configuration, several solutions can be available:\n"
+"If partitions are not defined, you will need to create them using the\n"
+"wizard. Depending on your hard drive configuration, several options are\n"
+"available:\n"
 "\n"
-"\t* Use existing partition: the wizard has detected one or more existing "
-"Linux partitions on your hard drive. If\n"
-"\t  you want to keep them, choose this option. \n"
+" * \"Use free space\": this option will simply lead to an automatic\n"
+"partitioning of your blank drive(s). You will not be prompted further.\n"
 "\n"
+" * \"Use existing partition\": the wizard has detected one or more existing\n"
+"Linux partitions on your hard drive. If you want to use them, choose this\n"
+"option.\n"
 "\n"
-"\t* Erase entire disk: if you want delete all data and all partitions "
-"present on your hard drive and replace them by\n"
-"\t  your new Linux-Mandrake system, you can choose this option. Be careful "
-"with this solution, you will not be\n"
-"\t  able to revert your choice after confirmation.\n"
+" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+"installed on your hard drive and takes all the space available on it, you\n"
+"have to create free space for Linux data. To do that, you can delete your\n"
+"Microsoft Windows partition and data (see \"Erase entire disk\" or \"Expert\n"
+"mode\" solutions) or resize your Microsoft Windows partition. Resizing can\n"
+"be performed without the loss of any data. This solution is recommended if\n"
+"you want to use both Mandrake Linux and Microsoft Windows on same computer.\n"
 "\n"
+"   Before choosing this option, please understand that after this "
+"procedure,\n"
+"the size of your Microsoft Windows partition will be smaller than at the\n"
+"present time. You will have less free space under Microsoft Windows to\n"
+"store your data or to install new software.\n"
 "\n"
-"\t* Use the free space on the Windows partition: if Microsoft Windows is "
-"installed on your hard drive and takes\n"
-"\t  all space available on it, you have to create free space for Linux data. "
-"To do that you can delete your\n"
-"\t  Microsoft Windows partition and data (see \"Erase entire disk\" or "
-"\"Expert mode\" solutions) or resize your\n"
-"\t  Microsoft Windows partition. Resizing can be performed without loss of "
-"any data. This solution is\n"
-"\t  recommended if you want use both Linux-Mandrake and Microsoft Windows on "
-"same computer.\n"
+" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
+"present on your hard drive and replace them with your new Mandrake Linux\n"
+"system, choose this option. Be careful with this solution because you will\n"
+"not be able to revert your choice after confirmation.\n"
 "\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"\t  Before choosing this solution, please understand that the size of your "
-"Microsoft\n"
-"\t  Windows partition will be smaller than at present time. It means that "
-"you will have less free space under\n"
-"\t  Microsoft Windows to store your data or install new software.\n"
+" * \"Remove Windows\": this will simply erase everything on the drive and\n"
+"begin fresh, partitioning everything from scratch. All data on your disk\n"
+"will be lost.\n"
 "\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"\t* Expert mode: if you want to partition manually your hard drive, you can "
-"choose this option. Be careful before\n"
-"\t  choosing this solution. It is powerful but it is very dangerous. You can "
-"lose all your data very easily. So,\n"
-"\t  don't choose this solution unless you know what you are doing."
+" * \"Expert mode\": choose this option if you want to manually partition\n"
+"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"can very easily lose all your data. Hence, do not choose this unless you\n"
+"know what you are doing."
 msgstr ""
 "Ara �s quan heu de decidir en quin lloc del vostre disc dur voleu "
 "instal�lar\n"
-"el sistema operatiu Linux-Mandrake. Si el disc �s buit, o si un sistema\n"
+"el sistema operatiu Mandrake Linux. Si el disc �s buit, o si un sistema\n"
 "operatiu existent n'utilitza tot l'espai disponible, us caldr� particionar-\n"
 "lo. B�sicament, particionar un disc dur consisteix en dividir-lo de manera\n"
-"l�gica per crear espai on instal�lar el nou sistema Linux-Mandrake.\n"
+"l�gica per crear espai on instal�lar el nou sistema Mandrake Linux.\n"
 "\n"
 "\n"
 "At�s que els efectes d'aquest proc�s solen ser irreversibles, el "
@@ -2237,18 +2496,18 @@ msgstr ""
 "Per fer-ho, utilitzeu l'assistent que trobareu m�s amunt; segons la\n"
 "configuraci� del vostre disc dur, hi ha diverses solucions possibles:\n"
 "\n"
-"\t* Utilitzar una partici� existent: l'assistent ha detectat al vostre\n"
+"* Utilitzar una partici� existent: l'assistent ha detectat al vostre\n"
 "disc dur una o m�s particions de Linux existents. Si voleu conservar-les,\n"
 "escolliu aquesta opci�.\n"
 "\n"
 "\n"
-"\t* Esborrar completament el disc: si voleu suprimir totes les dades i\n"
+"* Esborrar completament el disc: si voleu suprimir totes les dades i\n"
 "particions que teniu al disc dur i substituir-les pel sistema Linux-\n"
 "Mandrake, podeu escollir aquesta opci�. Aneu amb compte, per�, perqu�,\n"
 "un cop la confirmeu, no podreu fer-vos enrere.\n"
 "\n"
 "\n"
-"\t* Utilitzar l'espai lliure de la partici� del Windows: si teniu el "
+"* Utilitzar l'espai lliure de la partici� del Windows: si teniu el "
 "Microsoft\n"
 "Windows instal�lat al disc dur i n'ocupa tot l'espai diponible, us hi "
 "caldr�\n"
@@ -2257,12 +2516,12 @@ msgstr ""
 "completament\n"
 "el disc\" o \"Mode expert\") o canviar la mida de la partici� del Windows;\n"
 "aquest canvi de mida es pot dur a terme sense cap p�rdua de dades. Aquesta\n"
-"opci� �s la m�s recomanable si voleu utilitzar tant el Linux-Mandrake com "
+"opci� �s la m�s recomanable si voleu utilitzar tant el Mandrake Linux com "
 "el\n"
 "Microsoft Windows al mateix ordinador.\n"
 "\n"
 "\n"
-"\t  Abans de decidir-vos per aquesta opci�, tingueu en compte que la mida\n"
+"  Abans de decidir-vos per aquesta opci�, tingueu en compte que la mida\n"
 "de la partici� del Microsoft Windows ser� m�s petita que ara. Aix� "
 "significa\n"
 "que tindreu menys espai lliure per emmagatzemar-hi dades o instal�lar-hi "
@@ -2270,96 +2529,203 @@ msgstr ""
 "programari.\n"
 "\n"
 "\n"
-"\t* Mode expert: si voleu particionar el disc dur manualment, podeu triar\n"
+"* Mode expert: si voleu particionar el disc dur manualment, podeu triar\n"
 "aquesta opci�. Aneu amb compte, perqu� �s molt potent per� tamb� perillosa;\n"
 "podeu perdre f�cilment totes les dades. Per tant, no trieu aquesta opci� "
 "tret\n"
 "que sapigueu exactament qu� esteu fent."
 
-#: ../../help.pm_.c:160
+#: ../../help.pm_.c:319
 msgid ""
-"At this point, you need to choose what\n"
-"partition(s) to use to install your new Linux-Mandrake system. If "
-"partitions\n"
-"have been already defined (from a previous installation of GNU/Linux or "
-"from\n"
-"another partitioning tool), you can use existing partitions. In other "
-"cases,\n"
-"hard drive partitions must be defined.\n"
+"There you are. Installation is now complete and your GNU/Linux system is\n"
+"ready to use. Just click \"OK\" to reboot the system. You can start\n"
+"GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
+"soon as the computer has booted up again.\n"
 "\n"
+"The \"Advanced\" button (in Expert mode only) shows two more buttons to:\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select "
-"the\n"
-"disk for partitioning by clicking on \"hda\" for the first IDE drive, \"hdb"
-"\" for\n"
-"the second or \"sda\" for the first SCSI drive and so on.\n"
+" * \"generate auto-install floppy\": to create an installation floppy disk\n"
+"which will automatically perform a whole installation without the help of\n"
+"an operator, similar to the installation you just configured.\n"
 "\n"
+"   Note that two different options are available after clicking the button:\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"    * \"Replay\". This is a partially automated install as the partitioning\n"
+"step (and only this one) remains interactive.\n"
+"\n"
+"    * \"Automated\". Fully automated install: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
+"\n"
+"   This feature is very handy when installing a great number of similar\n"
+"machines. See the Auto install section at our web site.\n"
+"\n"
+" * \"Save packages selection\"(*): saves the packages selection as made\n"
+"previously. Then, when doing another installation, insert the floppy inside\n"
+"the driver and run the installation going to the help screen by pressing on\n"
+"the [F1] key, and by issuing >>linux defcfg=\"floppy\"<<.\n"
+"\n"
+"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
+"\"mformat a:\")"
+msgstr ""
+
+#: ../../help.pm_.c:350
+#, fuzzy
+msgid ""
+"Any partitions that have been newly defined must be formatted for use\n"
+"(formatting means creating a file system).\n"
 "\n"
-"   * Clear all: this option deletes all partitions available on the selected "
-"hard drive.\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"
-"   * Auto allocate: this option allows you to automatically create Ext2 and "
-"swap partitions in free space of your\n"
-"     hard drive.\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"
+"any of them.\n"
 "\n"
+"Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
-"   * Rescue partition table: if your partition table is damaged, you can try "
-"to recover it using this option. Please\n"
-"     be careful and remember that it can fail.\n"
+"Click on \"Cancel\" if you want to choose another partition for your new\n"
+"Mandrake Linux operating system installation.\n"
 "\n"
+"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
+"for bad blocks on the disc."
+msgstr ""
+"Les particions que s'acaben de definir s'han de formatar per poder-les\n"
+"utilitzar. El formatatge consisteix en crear-hi un sistema de fitxers).\n"
 "\n"
-"   * Undo: you can use this option to cancel your changes.\n"
 "\n"
+"En aquest punt, potser voldreu tornar a formatar algunes de les particions\n"
+"existents per eliminar les dades que contenen. Si �s aix�, seleccioneu les\n"
+"particions que voleu formatar.\n"
 "\n"
-"   * Reload: you can use this option if you wish to undo all changes and "
-"load your initial partitions table\n"
 "\n"
+"Tingueu en compte que no cal tornar a formatar totes les particions que ja\n"
+"existien; heu de tornar a formatar les particions que contenen el sistema\n"
+"operatiu (com ara \"/\", \"/usr\" o \"/var\"), per� no les que contenen "
+"dades\n"
+"que voleu conservar (habitualment, /home).\n"
 "\n"
-"   * Wizard: If you wish to use a wizard to partition your hard drive, you "
-"can use this option. It is recommended if\n"
-"     you do not have a good knowledge in partitioning.\n"
 "\n"
+"Aneu amb compte en seleccionar les particions; despr�s del formatatge, "
+"totes\n"
+"les dades s'hauran suprimit i no en podreu recuperar cap.\n"
 "\n"
-"   * Restore from floppy: if you have saved your partition table on a floppy "
-"during a previous installation, you can\n"
-"     recover it using this option.\n"
 "\n"
+"Feu clic a \"D'acord\" quan estigueu a punt per formatar les particions.\n"
 "\n"
-"   * Save on floppy: if you wish to save your partition table on a floppy to "
-"be able to recover it, you can use this\n"
-"     option. It is strongly recommended to use this option\n"
 "\n"
+"Feu clic a \"Cancel�la\" si voleu seleccionar altres particions per "
+"instal�lar\n"
+"el nou sistema Mandrake Linux."
+
+#: ../../help.pm_.c:376
+#, fuzzy
+msgid ""
+"Your new Mandrake Linux operating system is currently being installed.\n"
+"Depending on the number of packages you will be installing and the speed of\n"
+"your computer, this operation could take from a few minutes to a\n"
+"significant amount of time.\n"
 "\n"
-"   * Done: when you have finished partitioning your hard drive, use this "
-"option to save your changes.\n"
+"Please be patient."
+msgstr ""
+"El nou sistema operatiu Mandrake Linux s'est� instal�lant. Aquesta\n"
+"operaci� trigar� uns quants minuts (dependr� de la mida total que\n"
+"hagueu escollit instal�lar i de la velocitat del vostre ordinador).\n"
 "\n"
 "\n"
-"For information, you can reach any option using the keyboard: navigate "
-"trough the partitions using Tab and Up/Down arrows.\n"
+"Si us plau, tingueu paci�ncia."
+
+#: ../../help.pm_.c:384
+msgid ""
+"Before continuing you should read carefully the terms of the license. It\n"
+"covers the whole Mandrake Linux distribution, and if you do not agree with\n"
+"all the terms in it, click on the \"Refuse\" button which will immediately\n"
+"terminate the installation. To continue with the installation, click the\n"
+"\"Accept\" button."
+msgstr ""
+
+#: ../../help.pm_.c:391
+msgid ""
+"At this point, it is time to choose the security level desired for the\n"
+"machine. As a rule of thumb, the more exposed the machine is, and the more\n"
+"the data stored in it is crucial, the higher the security level should be.\n"
+"However, a higher security level is generally obtained at the expenses of\n"
+"easiness of use. Refer to the MSEC chapter of the ``Reference Manual'' to\n"
+"get more information about the meaning of these levels.\n"
+"\n"
+"If you do not know what to choose, keep the default option."
+msgstr ""
+
+#: ../../help.pm_.c:401
+#, fuzzy
+msgid ""
+"At this point, you need to choose what partition(s) will be used for the\n"
+"installation of your Mandrake Linux system. If partitions have been already\n"
+"defined, either from a previous installation of GNU/Linux or from 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"
+" * \"Clear all\": this option deletes all partitions on the selected hard\n"
+"drive.\n"
+"\n"
+" * \"Auto allocate\": this option allows you to automatically create Ext2\n"
+"and swap partitions in free space of your hard drive.\n"
+"\n"
+" * \"Rescue partition table\": if your partition table is damaged, you can\n"
+"try to recover it using this option. Please be careful and remember that it\n"
+"can fail.\n"
 "\n"
+" * \"Undo\": use this option to cancel your changes.\n"
+"\n"
+" * \"Reload\": you can use this option if you wish to undo all changes and\n"
+"load your initial partitions table.\n"
+"\n"
+" * \"Wizard\": 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 knowledge of\n"
+"partitioning.\n"
+"\n"
+" * \"Restore from floppy\": this option will allow you to restore a\n"
+"previously saved partition table from floppy disk.\n"
+"\n"
+" * \"Save to floppy\": saves the partition table to a floppy. Useful for\n"
+"later partition-table recovery if necessary. It is strongly recommended to\n"
+"perform this step.\n"
+"\n"
+" * \"Done\": when you have finished partitioning your hard drive, this will\n"
+"save your changes back to disc.\n"
+"\n"
+"Note: you can reach any option using the keyboard. Navigate through the\n"
+"partitions using [Tab] and [Up/Down] arrows.\n"
 "\n"
 "When a partition is selected, you can use:\n"
 "\n"
-"           * Ctrl-c to create a new partition (when a empty partition is "
-"selected)\n"
+" * Ctrl-c to create a new partition (when an empty partition is selected);\n"
 "\n"
-"           * Ctrl-d to delete a partition\n"
+" * Ctrl-d to delete a partition;\n"
 "\n"
-"           * Ctrl-m to set the mount point\n"
-"           \n"
+" * Ctrl-m to set the mount point.\n"
 "\n"
-"           \n"
-"If you are installing on a PPC Machine, you will want to create a small HFS "
-"'bootstrap' partition of at least 1MB for use\n"
-"by the yaboot bootloader. If you opt to make the partition a bit larger, say "
-"50MB, you may find it a useful place to store \n"
-"a spare kernel and ramdisk image for emergency boot situations."
+"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"
+"boot loader. 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 ""
 "Ara �s quan heu de decidir quina(es) partici�(ns) voleu utilitzar per\n"
-"instal�lar el sistems Linux-Mandrake. Si ja s'han definit les particions "
+"instal�lar el sistems Mandrake Linux. Si ja s'han definit les particions "
 "(amb\n"
 "una instal�laci� anterior de GNU/Linux o mitjan�ant una altra eina de\n"
 "particionament), podeu utilitzar les particiones existents. En cas "
@@ -2438,175 +2804,42 @@ msgstr ""
 "50 MB, us ser� d'utilitat per emmagatzemar un nucli de recanvi i una imatge\n"
 "del disc RAM per a situacions d'emerg�ncia durant l'arrencada."
 
-#: ../../help.pm_.c:224
+#: ../../help.pm_.c:460
+#, fuzzy
 msgid ""
-"Above are listed the existing Linux partitions detected on\n"
-"your hard drive. You can keep choices make by the wizard, they are good for "
-"a\n"
-"common usage. If you change these choices, you must at least define a root\n"
-"partition (\"/\"). Don't choose a too little partition or you will not be "
-"able\n"
-"to install enough software. If you want store your data on a separate "
-"partition,\n"
-"you need also to choose a \"/home\" (only possible if you have more than "
-"one\n"
-"Linux partition available).\n"
-"\n"
+"More than one Microsoft Windows partition has been detected on your hard\n"
+"drive. Please choose the one you want resize in order to install your new\n"
+"Mandrake Linux operating system.\n"
 "\n"
-"For information, each partition is listed as follows: \"Name\", \"Capacity"
-"\".\n"
+"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
+"\"Capacity\".\n"
 "\n"
-"\n"
-"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\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 type\" is \"hd\" if your hard drive is an IDE hard drive and "
-"\"sd\"\n"
-"if it is an SCSI hard drive.\n"
-"\n"
-"\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE "
+"\"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"
+" * \"a\" means \"master hard drive on the primary IDE controller\",\n"
 "\n"
-"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
+" * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
-"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\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"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc..."
-msgstr ""
-"Aquestes s�n les particions de Linux existents que s'han detectat a la\n"
-"vostra unitat de disc dur. Podeu conservar les eleccions fetes per "
-"l'assistent,\n"
-"s�n adequades per a un �s normal. Si les canvieu, heu de definir una "
-"partici�\n"
-"root (\"/\"); no escolliu una partici� massa petita, o no podreu instal�lar\n"
-"prou programari. Si voleu emmagatzemar les dades en una altra partici�, "
-"tamb�\n"
-"haureu de seleccionar una \"/home\" (nom�s si teniu m�s d'una partici� de\n"
-"Linux).\n"
-"\n"
-"\n"
-"Per a la vostra informaci�, cada partici� est� identificada d'aquesta "
-"manera: \"Nom\", \"Capacitat\".\n"
-"\n"
-"\n"
-"\"Nom\" es compon de: \"tipus d'unitat de disc\", \"n�mero d'unitat de disc"
-"\",\n"
-"\"n�mero de la partici�\" (per exemple, \"hda1\").\n"
-"\n"
-"\n"
-"\"Tipus d'unitat de disc\" �s \"hd\" si la vostre unitat de disc �s IDE i "
-"\"sd\"\n"
-"si �s SCSI.\n"
-"\n"
-"\n"
-"\"N�mero de la unitat de disc\" �s sempre una lletra despr�s d'\"hd\" o \"sd"
-"\".\n"
-"Amb unitats de disc IDE:\n"
-"\n"
-"   * \"a\" significa \"unitat de disc mestre en el controlador IDE primari"
-"\",\n"
-"\n"
-"   * \"b\" significa \"unitat de disc esclava en el controlador IDE primari"
-"\",\n"
-"\n"
-"   * \"c\" significa \"unitat de disc mestre en el controlador IDE secundari"
-"\",\n"
-"\n"
-"   * \"d\" significa \"unitat de disc esclava en el controlador IDE secundari"
-"\".\n"
-"\n"
-"\n"
-"Amb les unitats de disc SCSI, una \"a\" significa \"unitat prim�ria de disc"
-"\", una \"b\" significa \"unitat secund�ria de disc\", etc..."
-
-#: ../../help.pm_.c:258
-msgid ""
-"Choose the hard drive you want to erase to install your\n"
-"new Linux-Mandrake partition. Be careful, all data present on it will be "
-"lost\n"
-"and will not be recoverable."
-msgstr ""
-"Escolliu el disc dur que voleu buidar per instal�lar la nova partici� "
-"Linux-\n"
-"Mandrake. Aneu amb compte, se'n perdran totes les dades i no es podran "
-"recuperar."
-
-#: ../../help.pm_.c:263
-msgid ""
-"Click on \"OK\" if you want to delete all data and\n"
-"partitions present on this hard drive. Be careful, after clicking on \"OK\", "
-"you\n"
-"will not be able to recover any data and partitions present on this hard "
-"drive,\n"
-"including any Windows data.\n"
-"\n"
-"\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
-"partitions present on this hard drive."
-msgstr ""
-"Feu clic a \"D'acord\" si voleu suprimir totes les dades i\n"
-"particions que hi ha en aquesta unitat de disc. Aneu amb compte, perqu�, un "
-"cop hagueu fet clic a \"D'acord\", no podreu recuperar cap dada ni partici� "
-"del disc,\n"
-"incloent las dades de Windows.\n"
-"\n"
-"\n"
-"Feu clic a \"Cancel�la\" per anul�lar aquesta operaci� sense perdre cap "
-"dada\n"
-"ni partici� d'aquest disc."
-
-#: ../../help.pm_.c:273
-msgid ""
-"More than one Microsoft Windows partition have been\n"
-"detected on your hard drive. Please choose the one you want resize to "
-"install\n"
-"your new Linux-Mandrake operating system.\n"
-"\n"
-"\n"
-"For information, each partition is listed as follow; \"Linux name\", "
-"\"Windows\n"
-"name\" \"Capacity\".\n"
-"\n"
-"\"Linux name\" is coded as follow: \"hard drive type\", \"hard drive number"
-"\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
-"\n"
-"\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and \"sd"
-"\"\n"
-"if it is an SCSI hard drive.\n"
-"\n"
-"\n"
-"\"Hard drive number\" is always a letter putted after \"hd\" or \"sd\". With "
-"IDE 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, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc.\n"
-"\n"
-"\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first "
-"disk\n"
-"or partition is called \"C:\")."
+"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"disk or partition is called \"C:\")."
 msgstr ""
 "S'ha detectat m�s d'una partici� de Microsoft Windows en la unitat de disc.\n"
 "Si us plau, trieu quina d'elles voleu redimensionar per instal�lar el nou\n"
-"sistema operatiu Linux-Mandrake.\n"
+"sistema operatiu Mandrake Linux.\n"
 "\n"
 "\n"
 "Per a la vostra informaci�, cada partici� est� identificada d'aquesta "
@@ -2646,934 +2879,493 @@ msgstr ""
 "\"Nom Windows\" �s la lletra de la vostra unitat de disc sota Windows (el "
 "primer disc o partici� s'anomena \"C:\")."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:491
 msgid "Please be patient. This operation can take several minutes."
 msgstr ""
 "Si us plau, tingueu paci�ncia. Aquesta operaci� pot trigar diversos minuts."
 
-#: ../../help.pm_.c:309
+#: ../../help.pm_.c:494
+#, fuzzy
 msgid ""
-"Any partitions that have been newly defined must be\n"
-"formatted for use (formatting meaning creating a filesystem).\n"
+"DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
+"installation or if you want to have greater control (\"Expert\"). You also\n"
+"have the choice of performing a new install or an upgrade of an existing\n"
+"Mandrake Linux system. Clicking \"Install\" will completely wipe out the\n"
+"old system. Select \"Upgrade\" if you are upgrading or repairing an\n"
+"existing system.\n"
 "\n"
+"Please choose \"Install\" if there are no previous version of Mandrake\n"
+"Linux installed or if you wish to boot between various operating systems.\n"
 "\n"
-"At this time, you may wish to reformat some already existing partitions to "
-"erase\n"
-"the data they contain. If you wish do that, please also select the "
-"partitions\n"
-"you want to format.\n"
+"Please choose \"Update\" if you wish to update or repair an already\n"
+"installed version of Mandrake Linux.\n"
 "\n"
+"Depending on your knowledge of GNU/Linux, please choose one of the\n"
+"following to install or update your Mandrake Linux operating system:\n"
 "\n"
-"Please note that it is not necessary to reformat all pre-existing "
-"partitions.\n"
-"You must reformat the partitions containing the operating system (such as \"/"
-"\",\n"
-"\"/usr\" or \"/var\") but do you no have to reformat partitions containing "
-"data\n"
-"that you wish to keep (typically /home).\n"
+" * Recommended: choose this if you have never installed a GNU/Linux\n"
+"operating system. The installation will be very easy and you will only be\n"
+"asked a few questions.\n"
 "\n"
-"\n"
-"Please be careful selecting partitions, after formatting, all data will be\n"
-"deleted and you will not be able to recover any of them.\n"
-"\n"
-"\n"
-"Click on \"OK\" when you are ready to format partitions.\n"
-"\n"
-"\n"
-"Click on \"Cancel\" if you want to choose other partitions to install your "
-"new\n"
-"Linux-Mandrake operating system."
+" * Expert: if you have a good knowledge of GNU/Linux, you can choose this\n"
+"installation class. The expert installation will allow you to perform a\n"
+"highly customized installation. Answering some of the questions can be\n"
+"difficult if you do not have a good knowledge of GNU/Linux so do not choose\n"
+"this unless you know what you are doing."
 msgstr ""
-"Les particions que s'acaben de definir s'han de formatar per poder-les\n"
-"utilitzar. El formatatge consisteix en crear-hi un sistema de fitxers).\n"
+"Escolliu \"Instal�laci�\" si no teniu cap versi� anterior de Mandrake Linux\n"
+"instal�lada a l'ordinador o si voleu utilitzar diversos sistemes operatius.\n"
 "\n"
 "\n"
-"En aquest punt, potser voldreu tornar a formatar algunes de les particions\n"
-"existents per eliminar les dades que contenen. Si �s aix�, seleccioneu les\n"
-"particions que voleu formatar.\n"
-"\n"
+"Escolliu \"Actualitzaci�\" si voleu actualitzar un versi� de Mandrake Linux "
+"que ja est� instal�lada.\n"
 "\n"
-"Tingueu en compte que no cal tornar a formatar totes les particions que ja\n"
-"existien; heu de tornar a formatar les particions que contenen el sistema\n"
-"operatiu (com ara \"/\", \"/usr\" o \"/var\"), per� no les que contenen "
-"dades\n"
-"que voleu conservar (habitualment, /home).\n"
 "\n"
+"Segons els vostres coneixements de GNU/Linux, podeu escollir un dels "
+"nivells\n"
+"seg�ents d'instal�laci� o actualitzaci� del sistema operatiu Mandrake "
+"Linux:\n"
 "\n"
-"Aneu amb compte en seleccionar les particions; despr�s del formatatge, "
-"totes\n"
-"les dades s'hauran suprimit i no en podreu recuperar cap.\n"
+"* Recomanada: si mai no heu instal�lat un sistema operatiu GNU/Linux,\n"
+"escolliu aquest. La instal�laci� ser� molt f�cil i nom�s se us faran\n"
+"unes poques preguntes.\n"
 "\n"
 "\n"
-"Feu clic a \"D'acord\" quan estigueu a punt per formatar les particions.\n"
+"* Personalitzada: si coneixeu prou el GNU/Linux, podeu escollir l'�s\n"
+"principal (estaci� de treball, servidor, desenvolupament) del vostre\n"
+"sistema. Haureu de respondre m�s preguntes que en la instal�laci�\n"
+"\"Recomanada\", de manera que, si escolliu aquest tipus d'instal�laci�,\n"
+"haureu de saber com funciona el GNU/Linux.\n"
 "\n"
 "\n"
-"Feu clic a \"Cancel�la\" si voleu seleccionar altres particions per "
-"instal�lar\n"
-"el nou sistema Linux-Mandrake."
+"* Per a experts: si domineu el GNU/Linux, trieu aquest tipus\n"
+"d'instal�laci�. Com en el cas de la instal�laci� \"Personalitzada\"\n"
+"podreu escollir l'�s principal del vostre ordinador (estaci� de treball,\n"
+"servidor, desenvolupament). Aneu amb molt de compte abans de triar aquest\n"
+"tipus d'instal�laci�; podreu realitzar una instal�laci� altament\n"
+"personalitzada.\n"
+"  La resposta a algunes preguntes pot ser molt dif�cil si no teniu s�lids\n"
+"coneixements de GNU/Linux. Per tant, no escolliu aquest tipus "
+"d'instal�laci�\n"
+"tret que sapigueu qu� esteu fent."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:521
 msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
-"\n"
+"Normally, DrakX selects the right keyboard for you (depending on the\n"
+"language you have chosen) and you will not even see this step. However, you\n"
+"might not have a keyboard that corresponds exactly to your language: for\n"
+"example, if you are an English speaking Swiss person, you may still want\n"
+"your keyboard to be a Swiss keyboard. Or if you speak English but are\n"
+"located in Quebec, you may find yourself in the same situation. In both\n"
+"cases, you will have to go back to this installation step and select an\n"
+"appropriate keyboard from the list.\n"
 "\n"
-"DrakX will then check whether you have enough room to install them all. If "
-"not,\n"
-"it will warn you about it. If you want to go on anyway, it will proceed onto "
-"the\n"
-"installation of all selected groups but will drop some packages of lesser\n"
-"interest. At the bottom of the list you can select the option \n"
-"\"Individual package selection\"; in this case you will have to browse "
-"through\n"
-"more than 1000 packages..."
-msgstr ""
-"Ara podeu seleccionar el grup de paquets que voleu instal�lar o "
-"actualitzar.\n"
-"\n"
-"\n"
-"El DrakX comprovar� si teniu prou espai per instal�lar-los tots i, si no, "
-"us\n"
-"ho avisar�. Si voleu seguir igualment, continuar� amb la instal�laci� de "
-"tots\n"
-"els grups seleccionats per� no n'instal�lar� alguns de menys inter�s. Al "
-"final\n"
-"de la llista podeu seleccionar l'opci� \"Selecci� individual de paquets\", "
-"i\n"
-"en aquest cas haureu de navegar per m�s de 1.000 paquets..."
+"Click on the \"More\" button to be presented with the complete list of\n"
+"supported keyboards."
+msgstr ""
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:534
 msgid ""
-"You can now choose individually all the packages you\n"
-"wish to install.\n"
-"\n"
-"\n"
-"You can expand or collapse the tree by clicking on options in the left "
-"corner of\n"
-"the packages window.\n"
-"\n"
+"Please choose your preferred language for installation and system usage.\n"
 "\n"
-"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
-"\"Toggle flat and group sorted\".\n"
+"Clicking on the \"Advanced\" button will allow you to select other\n"
+"languages to be installed on your workstation. Selecting other languages\n"
+"will install the language-specific files for system documentation and\n"
+"applications. For example, if you will host users from Spain on your\n"
+"machine, select English as the main language in the tree view and in the\n"
+"Advanced section click on the grey star corresponding to \"Spanish|Spain\".\n"
 "\n"
-"\n"
-"If you want not to be warned on dependencies, click on \"Automatic\n"
-"dependencies\". If you do this, note that unselecting one package may "
-"silently\n"
-"unselect several other packages which depend on it."
+"Note that multiple languages may be installed. Once you have selected any\n"
+"additional locales click the \"OK\" button to continue."
 msgstr ""
-"Ara podeu triar individualment tots els paquets que voleu instal�lar.\n"
-"\n"
-"\n"
-"Podeu expandir o reduir l'arbre fent clic a les opcions del rac� esquerre de "
-"la finestra de paquets.\n"
-"\n"
-"\n"
-"Si preferiu veure els paquets ordenats alfab�ticament, feu clic a la icona\n"
-"\"Commuta entre ordenaci� plana i per grups\".\n"
-"\n"
-"\n"
-"Si no voleu ser avisat pel que fa a les depend�ncies, feu clic a "
-"\"Depend�ncies\n"
-"autom�tiques\". Si ho feu, tingueu en compte que el fet de desseleccionar\n"
-"un paquet pot causar la desselecci� d'altres paquets que en depenen, i no\n"
-"us n'assabentareu."
 
-#: ../../help.pm_.c:364
+#: ../../help.pm_.c:547
 msgid ""
-"If you have all the CDs in the list above, click Ok. If you have\n"
-"none of those CDs, click Cancel. If only some CDs are missing, unselect "
-"them,\n"
-"then click Ok."
-msgstr ""
-"Si teniu tots els CD de la llista superior, feu clic a D'acord.\n"
-"Si no teniu cap d'aquests CD, feu clic a Cancel�la.\n"
-"Si nom�s falten alguns CD, desseleccioneu-los i feu clic a D'acord."
-
-#: ../../help.pm_.c:369
-msgid ""
-"Your new Linux-Mandrake operating system is currently being\n"
-"installed. This operation should take a few minutes (it depends on size you\n"
-"choose to install and the speed of your computer).\n"
+"By default, DrakX assumes you have a two-button mouse and will set it up\n"
+"for third-button emulation. DrakX will automatically know whether it is a\n"
+"PS/2, serial or USB mouse.\n"
 "\n"
+"If you wish to specify a different type of mouse select the appropriate\n"
+"type from the list provided.\n"
 "\n"
-"Please be patient."
+"If you choose a mouse other than the default you will be presented with a\n"
+"mouse test screen. Use the buttons and wheel to verify that the settings\n"
+"are good. If the mouse is not working correctly press the space bar or\n"
+"RETURN to \"Cancel\" and choose again."
 msgstr ""
-"El nou sistema operatiu Linux-Mandrake s'est� instal�lant. Aquesta\n"
-"operaci� trigar� uns quants minuts (dependr� de la mida total que\n"
-"hagueu escollit instal�lar i de la velocitat del vostre ordinador).\n"
-"\n"
-"\n"
-"Si us plau, tingueu paci�ncia."
 
-#: ../../help.pm_.c:377
-msgid ""
-"You can now test your mouse. Use buttons and wheel to verify\n"
-"if settings are good. If not, you can click on \"Cancel\" to choose another\n"
-"driver."
-msgstr ""
-"Ara podeu provar el ratol�. Utilitzeu els botons i la bola per comprovar "
-"que\n"
-"els par�metres s�n correctes; si no ho s�n, feu clic a \"Cancel�la\" per\n"
-"seleccionar un altre controlador."
-
-#: ../../help.pm_.c:382
+#: ../../help.pm_.c:560
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1\n"
-"port under MS Windows is named ttyS0 under GNU/Linux."
+"Please select the correct port. For example, the COM1 port under MS Windows\n"
+"is named ttyS0 under GNU/Linux."
 msgstr ""
 "Si us plau, seleccioneu el port correcte. Per exemple, el port COM1 en MS\n"
 "Windows s'anomena ttyS0 en GNU/Linux."
 
-#: ../../help.pm_.c:386
-msgid ""
-"If you wish to connect your computer to the Internet or\n"
-"to a local network please choose the correct option. Please turn on your "
-"device\n"
-"before choosing the correct option to let DrakX detect it automatically.\n"
-"\n"
-"\n"
-"If you do not have any connection to the Internet or a local network, "
-"choose\n"
-"\"Disable networking\".\n"
-"\n"
-"\n"
-"If you wish to configure the network later after installation or if you "
-"have\n"
-"finished to configure your network connection, choose \"Done\"."
-msgstr ""
-"Si voleu connectar l'ordinador a Internet o a una xarxa local, seleccioneu\n"
-"l'opci� corresponent, per� abans recordeu engegar el dispositiu per tal que\n"
-"el DrakX el detecti autom�ticament.\n"
-"\n"
-"\n"
-"Si no teniu connexi� a Internet ni a cap xarxa local, escolliu \"Inhabilita "
-"el servei de xarxa\".\n"
+#: ../../help.pm_.c:564
+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 one authorized to make updates, add users,\n"
+"change the overall system configuration, and so on. In short, \"root\" can\n"
+"do everything! That is why you must choose a password that is difficult to\n"
+"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
+"choose not to enter a password, but we strongly advise you against this if\n"
+"only for one reason: do not think that because you booted GNU/Linux that\n"
+"your other operating systems are safe from mistakes. Since \"root\" can\n"
+"overcome all limitations and unintentionally erase all data on partitions\n"
+"by carelessly accessing the partitions themselves, it is important for it\n"
+"to be difficult to become \"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 too\n"
+"easy to compromise a system.\n"
 "\n"
-"Si voleu configurar la xarxa m�s endavant, despr�s de la instal�laci�, o si\n"
-"heu acabat la configuraci� de la connexi� de xarxa, trieu \"Fet\"."
-
-#: ../../help.pm_.c:399
-msgid ""
-"No modem has been detected. Please select the serial port on which it is "
-"plugged.\n"
-"\n"
+"However, please do not make the password too long or complicated because\n"
+"you must be able to remember it without too much effort.\n"
 "\n"
-"For information, the first serial port (called \"COM1\" under Microsoft\n"
-"Windows) is called \"ttyS0\" under Linux."
-msgstr ""
-"No s'ha detectat cap m�dem. Si us plau, seleccioneu el port s�rie on est� "
-"connectat.\n"
+"The password will not be displayed on screen as you type it in. Hence, you\n"
+"will have to type the password twice to reduce the chance of a typing\n"
+"error. If you do happen to make the same typing error twice, this\n"
+"\"incorrect\" password will have to be used the first time you connect.\n"
 "\n"
+"In expert mode, you will be asked if you will be connecting to an\n"
+"authentication server, like NIS or LDAP.\n"
 "\n"
-"Per a la vostra informaci�, el primer port s�rie (anomenat \"COM1\" en "
-"Microsoft Windows) s'anomena \"ttyS0\" en Linux."
-
-#: ../../help.pm_.c:406
-msgid ""
-"You may now enter dialup options. If you don't know\n"
-"or are not sure what to enter, the correct informations can be obtained "
-"from\n"
-"your Internet Service Provider. If you do not enter the DNS (name server)\n"
-"information here, this information will be obtained from your Internet "
-"Service\n"
-"Provider at connection time."
-msgstr ""
-"Ara podeu introduir les opcions de marcatge. Si no sabeu qu� heu "
-"d'introduir,\n"
-"o si no n'esteu segur, podreu aconseguir la informaci� necess�ria del "
-"vostre\n"
-"prove�dor d'Internet. Si no introdu�u aqu� la informaci� del DNS (servidor "
-"de\n"
-"noms), aquesta informaci� s'obtindr� del prove�dor en el moment de connectar."
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-"Si el m�dem que teniu �s extern, engegueu-lo per tal que el DrakX el detecti "
-"autom�ticament."
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "Si us plau, engegueu el m�dem i trieu-ne el correcte."
-
-#: ../../help.pm_.c:419
-msgid ""
-"If you are not sure if informations above are\n"
-"correct or if you don't know or are not sure what to enter, the correct\n"
-"informations can be obtained from your Internet Service Provider. If you do "
-"not\n"
-"enter the DNS (name server) information here, this information will be "
-"obtained\n"
-"from your Internet Service Provider at connection time."
-msgstr ""
-"Si no esteu segur de si la informaci� de m�s amunt �s correcta, si no sabeu\n"
-"qu� introduir o si no n'esteu segur, podreu aconseguir la informaci�\n"
-"necess�ria del vostre prove�dor d'Internet. Si no introdu�u aqu� la\n"
-"informaci� del DNS (servidor de noms), aquesta informaci� s'obtindr� del\n"
-"prove�dor en el moment de connectar."
-
-#: ../../help.pm_.c:426
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, the correct informations can be\n"
-"obtained from your Internet Service Provider."
-msgstr ""
-"Ara podeu introduir el nom del vostre ordinador central. Si no esteu segur "
-"del que hi\n"
-"heu d'introduir, el vostre prove�dor us en donar� la informaci� correcta."
-
-#: ../../help.pm_.c:431
-msgid ""
-"You may now configure your network device.\n"
-"\n"
-"   * IP address: if you don't know or are not sure what to enter, ask your "
+"If your network uses LDAP (or NIS) protocol for authentication, select\n"
+"\"LDAP\" (or \"NIS\") as authentication. If you do not know, ask your\n"
 "network administrator.\n"
-"     You should not enter an IP address if you select the option \"Automatic "
-"IP\" below.\n"
-"\n"
-"   * Netmask: \"255.255.255.0\" is generally a good choice. If you don't "
-"know or are not sure what to enter,\n"
-"     ask your network administrator.\n"
-"\n"
-"   * Automatic IP: if your network uses BOOTP or DHCP protocol, select this "
-"option. If selected, no value is needed in\n"
-"    \"IP address\". If you don't know or are not sure if you need to select "
-"this option, ask your network administrator."
-msgstr ""
-"Ara podeu configurar el voste dispositiu de xarxa.\n"
-"\n"
-"   * Adre�a IP: si no la sabeu, o no n'esteu segur, pregunteu-la a "
-"l'administrador de la xarxa.\n"
-"     No heu d'introduir cap adre�a IP si m�s avall seleccioneu l'opci� \"IP "
-"autom�tica\".\n"
-"\n"
-"  * M�scara de la xarxa: Normalment, \"255.255.255.0\" �s una bona elecci�. "
-"Si no n'esteu segur, consulteu-ho a l'administrador de la xarxa.\n"
-"\n"
-"  * IP autom�tica: si la vostra xarxa utilitza els protocols BOOTP o DHCP,\n"
-"seleccioneu aquesta opci�. Si es selecciona, no cal cap valor per a \"Adre�a "
-"IP\". Si no n'esteu segur, consulteu-ho a l'administrador de la xarxa."
-
-#: ../../help.pm_.c:443
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, ask your network administrator."
-msgstr ""
-"Ara podeu introduir el nom del vostre ordinador central, si cal. Si no el\n"
-"sabeu, o no esteu segur de qu� heu d'introduir, consulteu a l'administrador "
-"de la xarxa."
-
-#: ../../help.pm_.c:447
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, leave blank."
-msgstr ""
-"Ara podeu introduir el nom del vostre ordinador central, si cal. Si no\n"
-"el sabeu, o si esteu segur de qu� introduir, deixeu-ho en blanc."
-
-#: ../../help.pm_.c:451
-msgid ""
-"You may now enter dialup options. If you're not sure what to enter, the\n"
-"correct information can be obtained from your ISP."
-msgstr ""
-"Ara podeu introduir les opcions de marcatge. Si no esteu segur del que hi\n"
-"heu d'introduir, el vostre prove�dor us en donar� la informaci� correcta."
-
-#: ../../help.pm_.c:455
-msgid ""
-"If you will use proxies, please configure them now. If you don't know if\n"
-"you should use proxies, ask your network administrator or your ISP."
-msgstr ""
-"Si teniu previst utilitzar proxys, configureu-los ara. Si no sabeu si\n"
-"n'utilitzareu, consulteu-ho a l'administrador de la xarxa o al vostre\n"
-"prove�dor."
-
-#: ../../help.pm_.c:459
-msgid ""
-"You can install cryptographic package if your internet connection has been\n"
-"set up correctly. First choose a mirror where you wish to download packages "
-"and\n"
-"after that select the packages to install.\n"
-"\n"
 "\n"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"Podeu instal�lar el paquet criptogr�fic si la vostra connexi� a Internet\n"
-"s'ha configurat correctament. Escolliu primer una r�pilca des de la qual\n"
-"vulgueu descarregar paquets i despr�s seleccioneu els paquets a instal�lar.\n"
-"\n"
-"\n"
-"Tingueu en compte que heu de seleccionar la r�plica i els paquets\n"
-"criptogr�fics segons la vostra legislaci�."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "Ara podeu seleccionar la zona hor�ria segons el lloc on viviu."
-
-#: ../../help.pm_.c:471
-msgid ""
-"GNU/Linux manages time in GMT (Greenwich Manage\n"
-"Time) and translates it in local time according to the time zone you have\n"
-"selected.\n"
-"\n"
-"\n"
-"If you use Microsoft Windows on this computer, choose \"No\"."
-msgstr ""
-"El GNU/Linux gestiona l'hora en GMT (Hora de Greenwich) i la\n"
-"tradueix a l'hora local segons la zona hor�ria seleccionada.\n"
-"\n"
-"\n"
-"Si utilitzeu Microsoft Windows en aquest ordinador, trieu \"No\"."
 
-#: ../../help.pm_.c:479
+#: ../../help.pm_.c:600
 msgid ""
-"You may now choose which services you want to start at boot time.\n"
+"LILO and GRUB are boot loaders for GNU/Linux. This stage, normally, is\n"
+"totally automated. In fact, DrakX analyzes the disk boot sector and acts\n"
+"accordingly, depending on what it finds here:\n"
 "\n"
+" * if Windows boot sector is found, it will replace it with a GRUB/LILO "
+"boot\n"
+"sector. Hence, you will be able to load either GNU/Linux or another OS;\n"
 "\n"
-"When your mouse comes over an item, a small balloon help will popup which\n"
-"describes the role of the service.\n"
+" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
+"one;\n"
 "\n"
+"If in doubt, DrakX will display a dialog with various options.\n"
 "\n"
-"Be very careful in this step if you intend to use your machine as a server: "
-"you\n"
-"will probably want not to start any services that you don't need. Please\n"
-"remember that several services can be dangerous if they are enable on a "
-"server.\n"
-"In general, select only the services that you really need."
-msgstr ""
-"Ara podeu triar quins serveis voleu que s'inici�n durant l'arrencada.\n"
-"\n"
+" * \"Boot loader to use\": you have three choices:\n"
 "\n"
-"Quan el ratol� passi sobre un element apareixer� un petit globus d'ajuda "
-"que\n"
-"explica la finalitat del servei.\n"
+"    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
+"interface.\n"
 "\n"
+"    * \"GRUB\": if you prefer GRUB (text menu).\n"
 "\n"
-"Aneu especialment amb cura en aquest pas si penseu utilitzar l'ordinador "
-"com\n"
-"a servidor: segurament no us interessar� iniciar serveis que no necessiteu.\n"
-"Recordeu que hi ha diversos serveis que poden ser perillosos si s'habiliten\n"
-"en un servidor.\n"
-"En general, seleccioneu nom�s els serveis que realment necessiteu."
-
-#: ../../help.pm_.c:492
-msgid ""
-"You can configure a local printer (connected to your computer) or remote\n"
-"printer (accessible via a Unix, Netware or Microsoft Windows network)."
-msgstr ""
-"Podeu configurar una impressora local (connectada al vostre ordinador) o\n"
-"remota (accessible mitjan�ant una xarxa Unix, Netware o Microsoft Windows)."
-
-#: ../../help.pm_.c:496
-msgid ""
-"If you wish to be able to print, please choose one printing system between\n"
-"CUPS and LPR.\n"
+"    * \"LILO with text menu\": if you prefer LILO with its text menu "
+"interface.\n"
 "\n"
+" * \"Boot device\": in most cases, you will not change the default\n"
+"(\"/dev/hda\"), but if you prefer, the boot loader can be installed on the\n"
+"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\").\n"
 "\n"
-"CUPS is a new, powerful and flexible printing system for Unix systems (CUPS\n"
-"means \"Common Unix Printing System\"). It is the default printing system "
-"in\n"
-"Linux-Mandrake.\n"
+" * \"Delay before booting the default image\": when rebooting the computer,\n"
+"this is the delay granted to the user to choose - in the boot loader menu,\n"
+"another boot entry than the default one.\n"
 "\n"
+"!! Beware that if you choose not to install a boot loader (by selecting\n"
+"\"Cancel\" here), you must ensure that you have a way to boot your Mandrake\n"
+"Linux system! Also be sure you know what you do before changing any of the\n"
+"options. !!\n"
 "\n"
-"LPR is the old printing system used in previous Linux-Mandrake "
-"distributions.\n"
+"Clicking the \"Advanced\" button in this dialog will offer many advanced\n"
+"options, which are reserved to the expert user.\n"
 "\n"
+"Mandrake Linux installs its own boot loader, which will let you boot either\n"
+"GNU/Linux or any other operating systems which you have on your system.\n"
 "\n"
-"If you don't have printer, click on \"None\"."
+"If there is another operating system installed on your machine, it will be\n"
+"automatically added to the boot menu. Here, you can choose to fine-tune the\n"
+"existing options. Double-clicking on an existing entry allows you to change\n"
+"its parameters or remove it; \"Add\" creates a new entry; and \"Done\" goes\n"
+"on to the next installation step."
 msgstr ""
-"Si voleu imprimir, trieu un sistema de impressi� entre CUPS i LPR.\n"
-"\n"
-"\n"
-"El CUPS �s un nou sistema d'impressi�, potent i flexible, per a sistemes "
-"Unix\n"
-"(CUPS significa \"Common Unix Printing System\"). �s el sistema d'impressi�\n"
-"per defecte en Linux-Mandrake.\n"
-"\n"
-"\n"
-"L'LPR �s l'antic sistema d'impressi� utilitzat en distribucions anteriors "
-"de\n"
-"Linux-Mandrake distributions.\n"
-"\n"
-"\n"
-"Si no teniu impressora, feu clic a \"Cap\"."
 
-#: ../../help.pm_.c:511
+#: ../../help.pm_.c:647
+#, fuzzy
 msgid ""
-"GNU/Linux can deal with many types of printer. Each of these types requires\n"
-"a different setup.\n"
-"\n"
-"\n"
-"If your printer is physically connected to your computer, select \"Local\n"
-"printer\".\n"
-"\n"
-"\n"
-"If you want to access a printer located on a remote Unix machine, select\n"
-"\"Remote printer\".\n"
-"\n"
+"LILO (the LInux LOader) and GRUB are boot loaders: they are able to boot\n"
+"either GNU/Linux or any other operating system present on your computer.\n"
+"Normally, these other operating systems are correctly detected and\n"
+"installed. If this is not the case, you can add an entry by hand in this\n"
+"screen. Be careful to choose the correct parameters.\n"
 "\n"
-"If you want to access a printer located on a remote Microsoft Windows "
-"machine\n"
-"(or on Unix machine using SMB protocol), select \"SMB/Windows 95/98/NT\"."
+"You may also not want to give access to these other operating systems to\n"
+"anyone. In which case, you can delete the corresponding entries. But then,\n"
+"you will need a boot disk in order to boot those other operating systems!"
 msgstr ""
-"El GNU/Linux pot treballar amb molts tipus d'impressores, per� cada un\n"
-"d'aquests tipus requereix una configuraci� diferent.\n"
-"\n"
-"\n"
-"Si teniu la impressora connectada f�sicament a l'ordinador, seleccioneu\n"
-"\"Impressora local\".\n"
-"\n"
-"\n"
-"Si voleu accedir a una impressora que es troba en un ordinador Unix remot,\n"
-"seleccioneu \"Impressora remota\".\n"
+"El LILO (Linux Loader, carregador de Linux) i el Grub s�n carregadors\n"
+"d'arrencada: poden arrencar el GNU/Linux o qualsevol altre sistema operatiu\n"
+"que tingueu a l'ordinador. Normalment, aquests altres sistemes operatius\n"
+"es detecten i instal�len correctament, per� si no �s aix�, podeu afegir-los\n"
+"manualment en aquesta pantalla. Aneu amb compte de triar els par�metres\n"
+"correctes.\n"
 "\n"
 "\n"
-"Si voleu accedir a una impressora que es troba en un ordinador Microsoft\n"
-"Windows remot (o en un ordinador Unix que utilitza el protocol SMB),\n"
-"seleccioneu \"SMB/Windows 95/98/NT\"."
+"Tamb� �s possible que no volgueu donar acc�s a tothom a aquests sistemes\n"
+"operatius; en aquest cas podeu suprimir les entrades corresponents, per�\n"
+"aleshores us caldr� un disc d'arrencada per poder-los arrencar!"
 
-#: ../../help.pm_.c:527
+#: ../../help.pm_.c:658
+#, fuzzy
 msgid ""
-"Please turn on your printer before continuing to let DrakX detect it.\n"
-"\n"
-"You have to enter some informations here.\n"
-"\n"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\n"
 "\n"
-"   * Name of printer: the print spooler uses \"lp\" as default printer name. "
-"So, you must have a printer named \"lp\".\n"
-"     If you have only one printer, you can use several names for it. You "
-"just need to separate them by a pipe\n"
-"     character (a \"|\"). So, if you prefer a more meaningful name, you have "
-"to put it first, eg: \"My printer|lp\".\n"
-"     The printer having \"lp\" in its name(s) will be the default printer.\n"
-"\n"
-"\n"
-"   * Description: this is optional but can be useful if several printers are "
-"connected to your computer or if you allow\n"
-"     other computers to access to this printer.\n"
-"\n"
-"\n"
-"   * Location: if you want to put some information on your\n"
-"     printer location, put it here (you are free to write what\n"
-"     you want, for example \"2nd floor\").\n"
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
 msgstr ""
-"Si us plau, engegueu la impressora abans de continuar per tal que el DrakX\n"
-"la pugui detectar.\n"
-"\n"
-"Aqu� heu d'introduir algunes dades.\n"
-"\n"
-"\n"
-"   * Nom de la impressora: l'spool d'impressi� utilitza \"lp\" com a nom "
-"per\n"
-"omissi� de la impressora. Per tant, heu de tenir una impressora anomenada\n"
-"\"lp\".\n"
-"     Si nom�s teniu una impressora, podeu donar-li diversos;\n"
-"noms; nom�s cal que els separeu amb el car�cter \"|\". Per tant,\n"
-"si preferiu un nom m�s expressiu, l'heu d'indicar en primer lloc\n"
-"(per exemple: \"La meva impressora|lp\").\n"
-"     La impressora que contingui \"lp\" al(s) nom(s) ser� la impressora per "
-"omissi�.\n"
-"\n"
-"\n"
-"   * Descripci�: �s opcional, per� pot ser �til si teniu diverses\n"
-"impressores connectades a l'ordinador o si permeteu que altres\n"
-"ordinadors accedeixin a aquesta impressora.\n"
+"Heu d'indicar on voleu situar la informaci� necess�ria per\n"
+"arrencar el GNU/Linux.\n"
 "\n"
 "\n"
-"   * Ubicaci�: si voleu incloure informaci� sobre la ubicaci� de la\n"
-"impressora, feu-ho aqu� (podeu escriure el que vulgueu, (per exemple,\n"
-"\"2n pis\").\n"
+"Tret que sabeu exactament qu� esteu fent, escolliu \"Primer sector\n"
+"de la unitat (MBR)\"."
 
-#: ../../help.pm_.c:548
+#: ../../help.pm_.c:665
 msgid ""
-"You need to enter some informations here.\n"
-"\n"
-"\n"
-"   * Name of queue: the print spooler uses \"lp\" as default printer name. "
-"So, you need have a printer named \"lp\".\n"
-"    If you have only one printer, you can use several names for it. You just "
-"need to separate them by a pipe\n"
-"    character (a \"|\"). So, if you prefer to have a more meaningful name, "
-"you have to put it first, eg: \"My printer|lp\".\n"
-"    The printer having \"lp\" in its name(s) will be the default printer.\n"
-"\n"
-"  \n"
-"   * Spool directory: it is in this directory that printing jobs are stored. "
-"Keep the default choice\n"
-"     if you don't know what to use\n"
-"\n"
-"\n"
-"   * Printer Connection: If your printer is physically connected to your "
-"computer, select \"Local printer\".\n"
-"     If you want to access a printer located on a remote Unix machine, "
-"select \"Remote lpd printer\".\n"
-"\n"
+"Here we select a printing system for your computer to use. Other OSes may\n"
+"offer you one, but Mandrake offers three.\n"
 "\n"
-"     If you want to access a printer located on a remote Microsoft Windows "
-"machine (or on Unix machine using SMB\n"
-"     protocol), select \"SMB/Windows 95/98/NT\".\n"
-"\n"
-"\n"
-"     If you want to acces a printer located on NetWare network, select "
-"\"NetWare\".\n"
-msgstr ""
-"Aqu� heu d'introduir algunes dades.\n"
-"\n"
-"\n"
-"   * Nom de la cua: l'spool d'impressi� utilitza \"lp\" com a nom per\n"
-"omissi� de la impressora. Per tant, heu de tenir una impressora anomenada\n"
-"\"lp\".\n"
-"     Si nom�s teniu una impressora, podeu donar-li diversos;\n"
-"noms; nom�s cal que els separeu amb el car�cter \"|\". Per tant,\n"
-"si preferiu un nom m�s expressiu, l'heu d'indicar en primer lloc\n"
-"(per exemple: \"La meva impressora|lp\").\n"
-"     La impressora que contingui \"lp\" al(s) nom(s) ser� la impressora per "
-"omissi�.\n"
-"\n"
-"  \n"
-"   * Directori d'spool: les tasques d'impressi� s'emmagatzemen en aquest "
-"directori.Conserveu la opci� predeterminada si no sabeu quina utilitzar\n"
-"\n"
-"\n"
-"   * Printer Connection: If your printer is physically connected to your "
-"computer, select \"Local printer\".\n"
-"     Si voleu accedir a una impressora que es troba en un ordinador Unix\n"
-"remot, seleccioneu \"Impressora lpd remota\".\n"
-"\n"
-"\n"
-"     Si voleu accedir a una impressora que es troba en un ordinador\n"
-"Microsoft Windows remot (o en un ordinador Unix que utilitza el protocol\n"
-"SMB), seleccioneu \"SMB/Windows 95/98/NT\".\n"
-"\n"
-"     Si voleu accedir a una impressora que es troba en una xarxa NetWare,\n"
-"seleccioneu \"NetWare\".\n"
-
-#: ../../help.pm_.c:573
+" * \"pdq\" - which means ``print, don't queue'', is the choice if you have "
+"a\n"
+"direct connection to your printer and you want to be able to panic out of\n"
+"printer jams, and you do not have any networked printers. It will handle\n"
+"only very simple network cases and is somewhat slow for networks. Pick\n"
+"\"pdq\" if this is your maiden voyage to GNU/Linux. You can change your\n"
+"choices after install by running PrinterDrake from the Mandrake Control\n"
+"Center and clicking the expert button.\n"
+"\n"
+" * \"CUPS\" - ``Common Unix Printing System'' is excellent at printing to\n"
+"your local printer and also halfway round the planet. It is simple and can\n"
+"act like a server or a client for the ancient \"lpd\" printing system, so\n"
+"it is compatible with the systems that went before. It can do many tricks,\n"
+"but the basic setup is almost as easy as \"pdq\". If you need this to\n"
+"emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
+"graphical front-ends for printing or choosing printer options.\n"
+"\n"
+" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
+"approximately the same things the others can do, but it will print to\n"
+"printers mounted on a Novell Network, because it supports IPX protocol, and\n"
+"it can print directly to shell commands. If you have need of Novell or\n"
+"printing to commands without using a separate pipe construct, use lprNG.\n"
+"Otherwise, CUPS is preferable as it is simpler and better at working over\n"
+"networks."
+msgstr ""
+
+#: ../../help.pm_.c:693
+#, fuzzy
 msgid ""
-"Your printer has not been detected. Please enter the name of the device on\n"
-"which it is connected.\n"
+"DrakX is now detecting any IDE devices present in your computer. It will\n"
+"also scan for one or more PCI SCSI card(s) on your system. If a SCSI card\n"
+"is found DrakX will automatically install the appropriate driver.\n"
 "\n"
+"Because hardware detection will sometimes not detect a piece of hardware\n"
+"DrakX will ask you to confirm if a PCI SCSI card is present. Click \"Yes\"\n"
+"if you know that there is a SCSI card installed in your machine. You will\n"
+"be presented a list of SCSI cards to choose from. Click \"No\" if you have\n"
+"no SCSI hardware. If you are unsure you can check the list of hardware\n"
+"detected in your machine by selecting \"See hardware info\" and clicking\n"
+"\"OK\". Examine the list of hardware and then click on the \"OK\" button to\n"
+"return to the SCSI interface question.\n"
 "\n"
-"For information, most printers are connected on the first parallel port. "
-"This\n"
-"one is called \"/dev/lp0\" under GNU/Linux and \"LPT1\" under Microsoft "
-"Windows."
+"If you have to manually specify your adapter, DrakX will ask if you want to\n"
+"specify options for it. You should allow DrakX to probe the hardware for\n"
+"the card-specific options that the hardware needs to initialize. This\n"
+"usually works well.\n"
+"\n"
+"If DrakX is not able to probe for the options that need to be passed, you\n"
+"will need to manually provide options to the driver. Please review the\n"
+"``User Guide'' (chapter 3, section \"Collecting information on your\n"
+"hardware\") for hints on retrieving the parameters required from hardware\n"
+"documentation, from the manufacturer's web site (if you have Internet\n"
+"access) or from Microsoft Windows (if you used this hardware with Windows\n"
+"on your system)."
 msgstr ""
-"No s'ha detectat la vostra impressora. Si us plau, introdu�u el nom del\n"
-"dispositiu a qu� est� connectada.\n"
+"El DrakX intentar� trobar el(s) adaptador(s) SCSI PCI. \n"
+"Si en troba, i sap quin programa de control utilitzar, el(s)\n"
+"instal�lar� autom�ticament.\n"
 "\n"
 "\n"
-"Per a la vostra informaci�, la majoria d'impressores estan connectades al\n"
-"primer port paral�lel, que s'anomena  \"/dev/lp0\" en GNU/Linux i \"LPT1\"\n"
-"en Microsoft Windows."
-
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "Ara heu de seleccionar la vostra impressora a la llista superior."
-
-#: ../../help.pm_.c:584
-msgid ""
-"Please select the right options according to your printer.\n"
-"Please see its documentation if you don't know what choose here.\n"
+"Si no teniu cap adaptador SCSI, un adaptador SCSI ISA, o un\n"
+"adaptador SCSI PCI que el DrakX no reconegui, se us demanar� si teniu\n"
+"un adaptador SCSI al sistema. Si no en teniu cap, simplement feu clic a \"No"
+"\". Si feu\n"
+"clic a \"S�\", apareixer� una llista de programes de control on podreu\n"
+"seleccionar l'adaptador concret.\n"
 "\n"
 "\n"
-"You will be able to test your configuration in next step and you will be "
-"able to modify it if it doesn't work as you want."
-msgstr ""
-"Si us plau, seleccioneu les opcions correctes segons la vostra impressora;\n"
-"consulteu-ne la documentaci� si no sabeu qu� heu de seleccionar.\n"
+"Si heu hagut de seleccionar l'adaptador manualment, el DrakX us preguntar�\n"
+"si voleu indicar opcions per a ell. Conv� que deixeu que el DrakX comprovi\n"
+"el maquinari per a les opcions; aix� sol funcionar b�.\n"
 "\n"
 "\n"
-"Podreu comprovar la configuraci� en el pas seg�ent i modificar-la si no\n"
-"funciona exactament com voleu."
+"Si no, us caldr� proporcionar les opcions al programa de control. Consulteu\n"
+"el cap�tol 3 de la Guia de l'usuari, secci� \"Informaci� obtinguda del\n"
+"maquinari\" per saber com treure aquesta informaci� de la documentaci� del\n"
+"maquinari, del lloc web del fabricant (si teniu acc�s a Internet) o del\n"
+"Microsoft Windows (si el teniu al sistema)."
 
-#: ../../help.pm_.c:591
+#: ../../help.pm_.c:720
+#, fuzzy
 msgid ""
-"You can now enter the root password for your Linux-Mandrake system.\n"
-"The password must be entered twice to verify that both password entries are "
-"identical.\n"
-"\n"
-"\n"
-"Root is the system's administrator and is the only user allowed to modify "
-"the\n"
-"system configuration. Therefore, choose this password carefully. \n"
-"Unauthorized use of the root account can be extemely dangerous to the "
-"integrity\n"
-"of the system, its data and other system connected to it.\n"
-"\n"
-"\n"
-"The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. It should never be written down.\n"
-"\n"
+"You can add additional entries for yaboot, either for other operating\n"
+"systems, alternate kernels, or for an emergency boot image.\n"
 "\n"
-"Do not make the password too long or complicated, though: you must be able "
-"to\n"
-"remember it without too much effort."
-msgstr ""
-"Ara podeu introduir la contrasenya de l'usuari 'root' del vostre\n"
-"sistema Linux-Mandrake. Ho heu de fer dos cops per verificar que\n"
-"ambdues introduccions s�n id�ntiques.\n"
+"For other OS's, the entry consists only of a label and the root partition.\n"
 "\n"
+"For Linux, there are a few possible options:\n"
 "\n"
-"L'usuari 'root' �s l'administrador del sistema, i �s l'�nic\n"
-"autoritzat per modificar la configuraci� del sistema; per tant,\n"
-"trieu amb molta cura aquesta contrasenya. L'�s no autoritzat del\n"
-"compte 'root' pot ser extremadament perill�s per a la integritat\n"
-"del sistema, per a les seves dades, i per a altres sistema que hi\n"
-"estan connectats.\n"
+" * Label: this is simply the name you will have to type at the yaboot "
+"prompt\n"
+"to select this boot option.\n"
 "\n"
+" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
+"or a variation of vmlinux with an extension.\n"
 "\n"
-"La contrasenya s'ha de crear amb diversos car�cters alfanum�rics, ha de\n"
-"tenir una llargada m�nima de 8 car�cters, i mai no s'ha d'anotar enlloc.\n"
+" * Root: the \"root\" device or \"/\" for your Linux installation.\n"
 "\n"
+" * Append: on Apple hardware, the kernel append option is used quite often\n"
+"to assist in initializing video hardware, or to enable keyboard mouse\n"
+"button emulation for the often lacking 2nd and 3rd mouse buttons on a stock\n"
+"Apple mouse. The following are some examples:\n"
 "\n"
-"No obstant aix�, no creeu una contrasenya excessivament llarga o\n"
-"complicada: heu de poder recordar-la sense problemes."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"Per habilitar un sistema m�s segur, seleccioneu \"Utilitza el\n"
-"fitxer d'ombra\" i \"Utilitza les contrasenyes MD5\"."
-
-#: ../../help.pm_.c:613
-msgid ""
-"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
-"network administrator."
-msgstr ""
-"Si la vostra xarxa utilitza NIS, seleccioneu \"Utilitza NIS\". Si no ho\n"
-"sabeu, consulteu a l'administrador de la xarxa."
-
-#: ../../help.pm_.c:617
-msgid ""
-"You may now create one or more \"regular\" user account(s), as\n"
-"opposed to the \"privileged\" user account, root. You can create\n"
-"one or more account(s) for each person you want to allow to use\n"
-"the computer. Note that each user account will have its own\n"
-"preferences (graphical environment, program settings, etc.)\n"
-"and its own \"home directory\", in which these preferences are\n"
-"stored.\n"
-"\n"
+"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"hda=autotune\n"
 "\n"
-"First of all, create an account for yourself! Even if you will be the only "
-"user\n"
-"of the machine, you may NOT connect as root for daily use of the system: "
-"it's a\n"
-"very high security risk. Making the system unusable is very often a typo "
-"away.\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"
-"Therefore, you should connect to the system using the user account\n"
-"you will have created here, and login as root only for administration\n"
-"and maintenance purposes."
-msgstr ""
-"Ara podeu crear un o m�s comptes \"normals\" d'usuari, en\n"
-"contraposici� al compte \"privilegiat\", el 'root'. Podeu crear\n"
-"un o m�s comptes per a cada una de les persones a qui permetreu\n"
-"utilitzar l'ordinador. Tingueu en compte que cada compte d'usuari\n"
-"tindr� les seves pr�pies prefer�ncies (entorn gr�fic, par�metres\n"
-"del programa. etc.) i el seu propi \"directori inicial\", on\n"
-"s'emmagatzemen aquestes prefer�ncies.\n"
+" * Initrd-size: the default ramdisk size is generally 4,096 bytes. If you\n"
+"need to allocate a large ramdisk, this option can be used.\n"
 "\n"
+" * Read-write: normally the \"root\" partition is initially brought up in\n"
+"read-only, to allow a file system check before the system becomes \"live\".\n"
+"Here, you can override this option.\n"
 "\n"
-"Primer de tot, creeu-vos un compte propi! Encara que sigueu l'�nic\n"
-"usuari de l'ordinador, NO us connecteu com a 'root'\n"
-"per a l'�s quotidi� del sistema: �s un risc de seguretat molt alt.\n"
-"Tot sovint, fer el sistema inutilitzable dep�n d'un simple error\n"
-"tipogr�fic.\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"
-"\n"
-"Per tant, connecteu-vos al sistema amb el compte d'usuari que heu\n"
-"creat, i entreu-hi com a 'root' nom�s per a tasques d'administraci�\n"
-"i manteniment."
-
-#: ../../help.pm_.c:636
-msgid ""
-"Creating a boot disk is strongly recommended. If you can't\n"
-"boot your computer, it's the only way to rescue your system without\n"
-"reinstalling it."
+" * Default: selects this entry as being the default Linux selection,\n"
+"selectable by just pressing ENTER at the yaboot prompt. This entry will\n"
+"also be highlighted with a \"*\", if you press [Tab] to see the boot\n"
+"selections."
 msgstr ""
-"�s molt recomanable crear un disc d'arrencada. Si no podeu arrencar "
-"l'ordinador,\n"
-"�s l'�nica manera de solucionar-ho sense haver de reinstal�lar-ho tot."
-
-#: ../../help.pm_.c:641
-msgid ""
-"You need to indicate where you wish\n"
-"to place the information required to boot to GNU/Linux.\n"
+"Podeu afegir entrades addicionals per al yaboot, ja sigui per a altres\n"
+"sistemes operatius, nuclis alternatius, o per a una imatge per a arrencades\n"
+"d'emerg�ncia.\n"
 "\n"
 "\n"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"Heu d'indicar on voleu situar la informaci� necess�ria per\n"
-"arrencar el GNU/Linux.\n"
+"Per a altres OS, l'entrada nom�s consta d'una etiqueta i de la partici� "
+"arrel.\n"
 "\n"
 "\n"
-"Tret que sabeu exactament qu� esteu fent, escolliu \"Primer sector\n"
-"de la unitat (MBR)\"."
-
-#: ../../help.pm_.c:649
-msgid ""
-"Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
-" (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
-msgstr ""
-"Tret que sapigueu expressament que s'ha d'indicar una altra cosa, l'elecci�\n"
-"habitual �s \"/dev/hda\" (el disc IDE mestre primari) o b� \"/dev/sda\"\n"
-"(el primer disc SCSI)."
-
-#: ../../help.pm_.c:653
-msgid ""
-"LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
-"either GNU/Linux or any other operating system present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
+"Per al Linux, hi ha algunes opcions possibles: \n"
 "\n"
 "\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
-msgstr ""
-"El LILO (Linux Loader, carregador de Linux) i el Grub s�n carregadors\n"
-"d'arrencada: poden arrencar el GNU/Linux o qualsevol altre sistema operatiu\n"
-"que tingueu a l'ordinador. Normalment, aquests altres sistemes operatius\n"
-"es detecten i instal�len correctament, per� si no �s aix�, podeu afegir-los\n"
-"manualment en aquesta pantalla. Aneu amb compte de triar els par�metres\n"
-"correctes.\n"
+"  - Label: �s nom�s el nom a indicar a l'indicador del yaboot per\n"
+"seleccionar aquesta opci� d'arrencada.\n"
 "\n"
 "\n"
-"Tamb� �s possible que no volgueu donar acc�s a tothom a aquests sistemes\n"
-"operatius; en aquest cas podeu suprimir les entrades corresponents, per�\n"
-"aleshores us caldr� un disc d'arrencada per poder-los arrencar!"
-
-#: ../../help.pm_.c:665
-msgid ""
-"LILO and grub main options are:\n"
-"  - Boot device: Sets the name of the device (e.g. a hard disk\n"
-"partition) that contains the boot sector. Unless you know specifically\n"
-"otherwise, choose \"/dev/hda\".\n"
-"\n"
+"  - Image: el nom del nucli a arrencar. Normalment, vmlinux o una\n"
+"variaci� de vmlinux amb una extensi�.\n"
 "\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero.\n"
 "\n"
+"  - Rool: el dispositiu arrel o '/' per a la instal�laci� del Linux.\n"
 "\n"
-"  - Video mode: This specifies the VGA text mode that should be selected\n"
-"when booting. The following values are available: \n"
 "\n"
-"    * normal: select normal 80x25 text mode.\n"
+"  \n"
+"  - Append: en maquinari Apple, l'opci� d'addici� de nuclis s'utilitza\n"
+"for�a sovint per auxiliar en la inicialitzaci� de maquinari de v�deo o per\n"
+"habilitar l'emulaci� del bot� del ratol� de teclat per als 2n i 3r botons,\n"
+"que sovint no existeixen, d'un ratol� Apple convencional. Alguns exemples\n"
+"d'aix� s�n:\n"
 "\n"
-"    * <number>:  use the corresponding text mode.\n"
 "\n"
+"\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"hda=autotune\n"
 "\n"
-"  - Clean \"/tmp\" at each boot: if you want delete all files and "
-"directories\n"
-"stored in \"/tmp\" when you boot your system, select this option.\n"
+"\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
 "\n"
 "\n"
-"  - Precise RAM if needed: unfortunately, there is no standard method to ask "
-"the\n"
-"BIOS about the amount of RAM present in your computer. As consequence, Linux "
-"may\n"
-"fail to detect your amount of RAM correctly. If this is the case, you can\n"
-"specify the correct amount or RAM here. Please note that a difference of 2 "
-"or 4\n"
-"MB between detected memory and memory present in your system is normal."
-msgstr ""
-"Les opcions principals del LILO i del Grub s�n:\n"
-"  - Dispositiu d'arrencada: Defineix el nom del dispositiu (p.\n"
-"ex., una partici� del disc dur) que cont� el sector d'arrencada.\n"
-"Tret que sapigueu expressament que s'ha d'indicar una altra cosa,\n"
-"trieu \"/dev/hda\".\n"
+" \n"
+"  - Initrd: aquesta opci� es pot utilitzar per carregar els m�duls "
+"inicials,\n"
+"abans que el dispostiu d'arrencada estigui disponible, o per tornar a "
+"carregar\n"
+"una imatge de disc RAM en una situaci� d'arrencada d'emerg�ncia.\n"
 "\n"
 "\n"
-"  - Temps d'espera abans d'arrencar la imatge per defecte: Especifica el\n"
-"temps, en d�cimes de segon, que el carregador d'arrencada ha\n"
-"d'esperar abans de carregar la primera imatge.\n"
-"Aix� �s �til en sistemes que arrenquen immediatament des del disc\n"
-"dur despr�s d'habilitar el teclat. El carregador d'arrencada no\n"
-"esperar� si s'omet el \"temps d'espera\" o si se li d�na el valor zero.\n"
+"  - Initrd-size: la mida per defecte del disc RAM sol ser de 4.096 bytes. Si "
+"necessiteu assignar un disc RAM gran, podeu utilitzar aquesta opci�.\n"
 "\n"
 "\n"
-"  - Mode de v�deo: Amb aix� s'especifica el mode de text VGA que\n"
-"cal seleccionar en arrencar. Es poden utilitzar els valors\n"
-"seg�ents:\n"
-"    * normal: selecciona el mode de text 80x25 normal.\n"
-"    * <n�mero>: utilitza el mode de text corresponent.\n"
+"  - Read-write: normalment, la partici� 'root' es tracta inicialment com "
+"nom�s de lectura per permetre una comprovaci� del sistema de fitxers abans "
+"que el sistema esdevingui 'viu'; podeu substituir aquesta opci� aqu�.\n"
 "\n"
 "\n"
-"  - Neteja de \"/tmp\" en cada arrencada: si voleu suprimir tots els fitxers "
-"i\n"
-"directoris emmagatzemats a \"/tmp\" en arrencar el sistame, seleccioneu\n"
-"aquesta opci�.\n"
+"  - NoVideo: en cas que el maquinari de v�deo de Apple resulti sigui\n"
+"especialment problem�tic, podeu seleccionar aquesta opci� per arrencar\n"
+"en mode 'no-v�deo', amb el suport nadiu per a mem�ria interm�dia de marcs.\n"
 "\n"
 "\n"
-"  - Si cal, indicaci� de la mida exacta de la RAM: malauradament, no hi cap\n"
-"m�tode est�ndard per preguntar al BIOS la quantitat de RAM que teniu a\n"
-"l'ordinador. Per tant, �s possible que el Linux no pugui detectar\n"
-"correctament la quantitat de RAM instal�lada. Si �s aquest el cas, en podeu\n"
-"indicar aqu� la quantitat correcta, per� penseu que una difer�ncia de 2 o 4\n"
-"MB entre la mem�ria detectada i la mem�ria real �s normal."
+"  - Default: selecciona aquesta entrada com a selecci� per defecte del\n"
+"Linux; se selecciona prement simplement Retorn a l'indicador del yaboot.\n"
+"Aquesta opci� tamb� es ressaltar� amb un '*' si premeu Tab per veure les\n"
+"seleccions d'arrencada."
 
-#: ../../help.pm_.c:697
+#: ../../help.pm_.c:765
+#, fuzzy
 msgid ""
-"Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able\n"
-"to boot either GNU/Linux, MacOS, or MacOSX, if present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
-"\n"
+"Yaboot is a boot loader for NewWorld MacIntosh hardware. It is able to boot\n"
+"either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
+"these other operating systems are correctly detected and installed. If this\n"
+"is not the case, you can add an entry by hand in this screen. Be careful as\n"
+"to choose the correct parameters.\n"
 "\n"
-"Yaboot main options are:\n"
+"Yaboot's main options are:\n"
 "\n"
-"\n"
-"  - Init Message: A simple text message that is displayed before the boot\n"
+" * Init Message: a simple text message that is displayed before the boot\n"
 "prompt.\n"
 "\n"
+" * Boot Device: indicate where you want to place the information required "
+"to\n"
+"boot to GNU/Linux. Generally, you setup a bootstrap partition earlier to\n"
+"hold this information.\n"
 "\n"
-"  - Boot Device: Indicate where you want to place the information required "
-"to \n"
-"boot to GNU/Linux. Generally, you will have setup a bootstrap partition "
-"earlier \n"
-"to hold this information.\n"
-"\n"
-"\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"
-"\n"
-"  - Kernel Boot Timeout: This timeout is similar to the LILO boot delay.  "
-"After \n"
-"selecting Linux, you will have this delay in 0.1 seconds before your "
-"default\n"
-"kernel description is selected.\n"
-"\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"
-"  - Enable CD Boot?: Checking this option will allow you to choose 'C' for "
-"CD at\n"
-"the first boot prompt.\n"
+" * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
+"After selecting Linux, you will have this delay in 0.1 second before your\n"
+"default kernel description is selected.\n"
 "\n"
+" * 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 will allow you to choose 'N' for "
+" * Enable OF Boot?: checking this option allows you to choose \"N\" for "
 "Open\n"
 "Firmware at the first boot prompt.\n"
 "\n"
-"\n"
-"  - Default OS: You can select which OS will boot by default when the Open "
-"Firmware \n"
-"Delay expires."
+" * Default OS: you can select which OS will boot by default when the Open\n"
+"Firmware Delay expires."
 msgstr ""
 "El Yaboot �s un carregador d'arrencada per a maquinari NewWorld MacIntosh.\n"
 "Pot arrencar tant el GNU/Linux com el MacOS o el MacOSX, si �s que els "
@@ -3621,340 +3413,79 @@ msgstr ""
 "  - OS per defecte: podeu seleccionar amb quin OS, per defecte, s'arrencar�\n"
 "quan la demora de l'Open Firmware venci."
 
-#: ../../help.pm_.c:738
+#: ../../help.pm_.c:798
 msgid ""
-"You can add additional entries for yaboot, either for other operating "
-"systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"\n"
-"For other OS's - the entry consists only of a label and the root partition.\n"
-"\n"
-"\n"
-"For Linux, there are a few possible options: \n"
-"\n"
-"\n"
-"  - Label: This is simply the name will type at the yaboot prompt to select "
-"this \n"
-"boot option.\n"
-"\n"
-"\n"
-"  - Image: This would be the name of the kernel to boot.  Typically vmlinux "
-"or\n"
-"a variation of vmlinux with an extension.\n"
-"\n"
-"\n"
-"  - Root: The root device or '/' for your Linux installation.\n"
-"\n"
-"\n"
-"  \n"
-"  - Append: On Apple hardware, the kernel append option is used quite often "
-"to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button "
-"emulation\n"
-"for the often lacking 2nd and 3rd mouse buttons on a stock Apple mouse.  The "
-"following \n"
-"are some examples:\n"
-"\n"
-"\n"
-"\t\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
-"hda=autotune\n"
-"\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
-"\n"
-"\n"
-" \n"
-"  - Initrd: This option can be used either to load initial modules, before "
-"the boot \n"
-"device is available, or to load a ramdisk image for an emergency boot "
-"situation.\n"
-"\n"
-"\n"
-"  - Initrd-size: The default ramdisk size is generally 4096 bytes.  If you "
-"should need\n"
-"to allocate a large ramdisk, this option can be used.\n"
-"\n"
-"\n"
-"  - Read-write: Normally the 'root' partition is initially brought up read-"
-"only, to allow\n"
-"a filesystem check before the system becomes 'live'.  You can override this "
-"option here.\n"
-"\n"
+"Here are presented various parameters concerning your machine. Depending on\n"
+"your installed hardware, you may - or not, see the following entries:\n"
 "\n"
-"  - NoVideo: Should the Apple video hardware prove to be exceptionally "
-"problematic, you can\n"
-"select this option to boot in 'novideo' mode, with native framebuffer "
-"support.\n"
+" * \"Mouse\": mouse check the current mouse configuration and click on the\n"
+"button to change it if necessary.\n"
 "\n"
+" * \"Keyboard\": keyboard check the current keyboard map configuration and\n"
+"click on the button to change that if necessary.\n"
 "\n"
-"  - Default: Selects this entry as being the default Linux selection, "
-"selectable by just\n"
-"pressing ENTER at the yaboot prompt.  This entry will also be highlighted "
-"with a '*', if you\n"
-"press TAB to see the boot selections."
-msgstr ""
-"Podeu afegir entrades addicionals per al yaboot, ja sigui per a altres\n"
-"sistemes operatius, nuclis alternatius, o per a una imatge per a arrencades\n"
-"d'emerg�ncia.\n"
-"\n"
-"\n"
-"Per a altres OS, l'entrada nom�s consta d'una etiqueta i de la partici� "
-"arrel.\n"
-"\n"
-"\n"
-"Per al Linux, hi ha algunes opcions possibles: \n"
-"\n"
-"\n"
-"  - Label: �s nom�s el nom a indicar a l'indicador del yaboot per\n"
-"seleccionar aquesta opci� d'arrencada.\n"
-"\n"
-"\n"
-"  - Image: el nom del nucli a arrencar. Normalment, vmlinux o una\n"
-"variaci� de vmlinux amb una extensi�.\n"
-"\n"
-"\n"
-"  - Rool: el dispositiu arrel o '/' per a la instal�laci� del Linux.\n"
-"\n"
-"\n"
-"  \n"
-"  - Append: en maquinari Apple, l'opci� d'addici� de nuclis s'utilitza\n"
-"for�a sovint per auxiliar en la inicialitzaci� de maquinari de v�deo o per\n"
-"habilitar l'emulaci� del bot� del ratol� de teclat per als 2n i 3r botons,\n"
-"que sovint no existeixen, d'un ratol� Apple convencional. Alguns exemples\n"
-"d'aix� s�n:\n"
-"\n"
-"\n"
-"\t\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
-"hda=autotune\n"
-"\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
-"\n"
-"\n"
-" \n"
-"  - Initrd: aquesta opci� es pot utilitzar per carregar els m�duls "
-"inicials,\n"
-"abans que el dispostiu d'arrencada estigui disponible, o per tornar a "
-"carregar\n"
-"una imatge de disc RAM en una situaci� d'arrencada d'emerg�ncia.\n"
-"\n"
-"\n"
-"  - Initrd-size: la mida per defecte del disc RAM sol ser de 4.096 bytes. Si "
-"necessiteu assignar un disc RAM gran, podeu utilitzar aquesta opci�.\n"
-"\n"
-"\n"
-"  - Read-write: normalment, la partici� 'root' es tracta inicialment com "
-"nom�s de lectura per permetre una comprovaci� del sistema de fitxers abans "
-"que el sistema esdevingui 'viu'; podeu substituir aquesta opci� aqu�.\n"
+" * \"Timezone\": time zoneDrakX, by default, guesses your time zone from "
+"the\n"
+"language you have chosen. But here again, as for the choice of a keyboard,\n"
+"you may not be in the country for which the chosen language should\n"
+"correspond. Hence, you may need to click on the \"Timezone\" button in\n"
+"order to configure the clock according to the time zone you are in.\n"
 "\n"
+" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
+"configuration wizard.\n"
 "\n"
-"  - NoVideo: en cas que el maquinari de v�deo de Apple resulti sigui\n"
-"especialment problem�tic, podeu seleccionar aquesta opci� per arrencar\n"
-"en mode 'no-v�deo', amb el suport nadiu per a mem�ria interm�dia de marcs.\n"
+" * \"Sound card\": if a sound card is detected on your system, it is\n"
+"displayed here. No modification possible at installation time.\n"
 "\n"
+" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
+"here. No modification possible at installation time.\n"
 "\n"
-"  - Default: selecciona aquesta entrada com a selecci� per defecte del\n"
-"Linux; se selecciona prement simplement Retorn a l'indicador del yaboot.\n"
-"Aquesta opci� tamb� es ressaltar� amb un '*' si premeu Tab per veure les\n"
-"seleccions d'arrencada."
-
-#: ../../help.pm_.c:793
-msgid ""
-"SILO is a bootloader for SPARC: it is able to boot\n"
-"either GNU/Linux or any other operating system present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
-"\n"
-"\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
+" * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
+"displayed here. You can click on the button to change the parameters\n"
+"associated to it."
 msgstr ""
-"El SILO �s un carregador d'arrencada per a l'SPARC: pot arrencar el\n"
-"GNU/Linux o qualsevol altre sistema operatiu que tingueu a l'ordinador.\n"
-"Normalment, aquests altres sistemes operatius es detecten i instal�len\n"
-"correctament, per� si no �s aix�, podeu afegir-los manualment en aquesta\n"
-"pantalla. Aneu amb compte de triar els par�metres correctes.\n"
-"\n"
-"\n"
-"Tamb� �s possible que no volgueu donar acc�s a tothom a aquests sistemes\n"
-"operatius; en aquest cas podeu suprimir les entrades corresponents, per�\n"
-"aleshores us caldr� un disc d'arrencada per poder-los arrencar!"
 
-#: ../../help.pm_.c:805
+#: ../../help.pm_.c:827
+#, fuzzy
 msgid ""
-"SILO main options are:\n"
-"  - Bootloader installation: Indicate where you want to place the\n"
-"information required to boot to GNU/Linux. Unless you know exactly\n"
-"what you are doing, choose \"First sector of drive (MBR)\".\n"
-"\n"
-"\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero."
+"Choose the hard drive you want to erase to install your new Mandrake Linux\n"
+"partition. Be careful, all data present on it will be lost and will not be\n"
+"recoverable!"
 msgstr ""
-"Les opcions principals del SILO s�n:\n"
-"  - Instal�laci� del carregador d'arrencada: indica on voleu situar la\n"
-"informaci� necess�ria per arrencar el GNU/Linux. Tret que sapigueu\n"
-"exactament qu� esteu fent, seleccioneu \"Primer sector de la unitat\n"
-"(MBR)\".\n"
-" \n"
-"\n"
-"  - Temps d'espera abans d'arrencar la imatge per defecte: Especifica el\n"
-"temps, en d�cimes de segon, que el carregador d'arrencada ha\n"
-"d'esperar abans de carregar la primera imatge.\n"
-"Aix� �s �til en sistemes que arrenquen immediatament des del disc\n"
-"dur despr�s d'habilitar el teclat. El carregador d'arrencada no\n"
-"esperar� si s'omet el \"temps d'espera\" o si se li d�na el valor zero."
+"Escolliu el disc dur que voleu buidar per instal�lar la nova partici� "
+"Linux-\n"
+"Mandrake. Aneu amb compte, se'n perdran totes les dades i no es podran "
+"recuperar."
 
-#: ../../help.pm_.c:818
+#: ../../help.pm_.c:832
+#, fuzzy
 msgid ""
-"Now it's time to configure the X Window System, which is the\n"
-"core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
-"you must configure your video card and monitor. Most of these\n"
-"steps are automated, though, therefore your work may only consist\n"
-"of verifying what has been done and accept the settings :)\n"
+"Click on \"OK\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
 "\n"
-"\n"
-"When the configuration is over, X will be started (unless you\n"
-"ask DrakX not to) so that you can check and see if the\n"
-"settings suit you. If they don't, you can come back and\n"
-"change them, as many times as necessary."
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
-"Ara cal configurar el sistema X Window, que �s el nucli del GUI\n"
-"(Interf�cie gr�fica d'usuari) del GNU/Linux. Per a aix�, heu de\n"
-"configurar la vostra targeta gr�fica i el monitor. No obstant\n"
-"aix�, la majoria d'aquests passos estan automatitzats, aix� que pot\n"
-"ser que la vostra feina es limiti a verificar qu� s'ha fet i a\n"
-"acceptar els par�metres :)\n"
+"Feu clic a \"D'acord\" si voleu suprimir totes les dades i\n"
+"particions que hi ha en aquesta unitat de disc. Aneu amb compte, perqu�, un "
+"cop hagueu fet clic a \"D'acord\", no podreu recuperar cap dada ni partici� "
+"del disc,\n"
+"incloent las dades de Windows.\n"
 "\n"
 "\n"
-"Quan la configuraci� hagi acabat s'iniciar� X (tret que demaneu al\n"
-"Drakx que no ho faci), i podreu verificar si els par�metres us\n"
-"convenen. Si no, podreu tornar enrere i canviar-los tantes vegades\n"
-"com calgui."
-
-#: ../../help.pm_.c:831
-msgid ""
-"If something is wrong in X configuration, use these options to correctly\n"
-"configure the X Window System."
-msgstr ""
-"Si hi ha algun problema a la configuraci� X, utilitzeu aquestes opcions\n"
-"per configurar correctament l'X Window System."
-
-#: ../../help.pm_.c:835
-msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
-msgstr ""
-"Si preferiu utilitzar una entrada gr�fica, seleccioneu \"S�\". En cas\n"
-"contrari, seleccioneu \"No\"."
+"Feu clic a \"Cancel�la\" per anul�lar aquesta operaci� sense perdre cap "
+"dada\n"
+"ni partici� d'aquest disc."
 
-#: ../../help.pm_.c:839
+#: ../../install2.pm_.c:114
+#, c-format
 msgid ""
-"You can choose a security level for your system. Please refer to the manual "
-"for complete\n"
-"  information. Basically, if you don't know what to choose, keep the default "
-"option.\n"
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
-"Podeu triar un nivell de seguretat per al vostre sistema. Si us plau,\n"
-"consulteu el manual per obtenir informaci� completa. B�sicament, si no\n"
-"sabeu qu� triar, conserveu l'opci� per defecte.\n"
-
-#: ../../help.pm_.c:844
-msgid ""
-"Your system is going to reboot.\n"
-"\n"
-"After rebooting, your new Linux Mandrake system will load automatically.\n"
-"If you want to boot into another existing operating system, please read\n"
-"the additional instructions."
-msgstr ""
-"Ara, el sistema es tornar� a arrencar.\n"
-"\n"
-"Despr�s d'aix�, el sistema Linux Mandrake es carregar�\n"
-"autom�ticament. Si voleu arrencar un altre sistema operatiu existent,\n"
-"llegiu les instruccions addicionals."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Escolliu el vostre idioma"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Tipus d'instal�laci�"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Detecci� del disc dur"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Configura el ratol�"
 
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Escolliu el vostre teclat"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
-msgstr "Seguretat"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Sistemes de fitxers"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Formata les particions"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Paquets a instal�lar"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Instal�la el sistema"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "Contrasenya de 'root'"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Afegeix un usuari"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Configura la xarxa"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-msgstr "Resum"
-
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Configura els serveis"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Crea un disc d'arrencada"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Instal�la el LILO"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Configura l'X"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Surt de la instal�laci�"
-
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3969,20 +3500,20 @@ msgid ""
 "Do you really want to install these servers?\n"
 msgstr ""
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
 msgstr "No es pot utilitzar l'emissi� sense un domini NIS"
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Inseriu un disquet formatat amb FAT a la unitat %s"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
 msgstr "Aquest disquet no est� formatat en FAT"
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -3990,30 +3521,20 @@ msgstr ""
 "Per utilitzar aquesta selecci� de paquets desada, arrenqueu la instal�laci� "
 "amb ``linux defcfg=floppy''"
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "S'ha produ�t un error en llegir el fitxer $f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "S'ha produ�t un error en llegir el fitxer %s"
 
-#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:310
-#: ../../interactive.pm_.c:99 ../../interactive.pm_.c:114
-#: ../../interactive.pm_.c:269 ../../interactive_newt.pm_.c:166
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:356
-#: ../../my_gtk.pm_.c:617 ../../my_gtk.pm_.c:640
+#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:325
+#: ../../interactive.pm_.c:107 ../../interactive.pm_.c:122
+#: ../../interactive.pm_.c:286 ../../interactive.pm_.c:308
+#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:170
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:415
+#: ../../my_gtk.pm_.c:716 ../../my_gtk.pm_.c:738
 msgid "Ok"
 msgstr "D'acord"
 
-#: ../../install_gtk.pm_.c:423
-msgid "Please test the mouse"
-msgstr "Si us plau, comproveu el ratol�."
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "Per activar el ratol�,"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "MOVEU LA BOLA!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -4023,7 +3544,7 @@ msgstr ""
 "Part del maquinari del vostre ordinador necessita programes de control\n"
 "``registrats'' per poder funcionar. En podeu trobar informaci� a: %s"
 
-#: ../../install_interactive.pm_.c:41
+#: ../../install_interactive.pm_.c:44
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -4033,11 +3554,11 @@ msgstr ""
 "Per fer-ho, creeu una partici� (o feu clic a una d'existent).\n"
 "Despr�s, trieu l'acci� ``Punt de muntatge'' i doneu-li el valor '/'"
 
-#: ../../install_interactive.pm_.c:46 ../../install_steps_graphical.pm_.c:259
+#: ../../install_interactive.pm_.c:49 ../../install_steps_graphical.pm_.c:259
 msgid "You must have a swap partition"
 msgstr "Heu de tenir una partici� d'intercanvi"
 
-#: ../../install_interactive.pm_.c:47 ../../install_steps_graphical.pm_.c:261
+#: ../../install_interactive.pm_.c:50 ../../install_steps_graphical.pm_.c:261
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -4047,55 +3568,60 @@ msgstr ""
 "\n"
 "Voleu continuar igualment?"
 
-#: ../../install_interactive.pm_.c:68
+#: ../../install_interactive.pm_.c:53 ../../install_steps.pm_.c:165
+#, fuzzy
+msgid "You must have a FAT partition mounted in /boot/efi"
+msgstr "Heu de tenir una partici� d'intercanvi"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Utilitza l'espai lliure"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "No hi ha prou espai lliure per assignar noves particions"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "Utilitza la partici� existent"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "No existeix cap partici� per utilitzar"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "Utilitza la particio Windows per al loopback"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Quina partici� voleu utilitzar per al Linux4Win?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "Escolliu les mides"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "Mida de la partici� arrel en MB: "
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "Mida de la partici� d'intercanvi en MB: "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "Utilitza l'espai lliure de la partici� de Windows"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "A quina partici� voleu canviar la mida?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "S'estan calculant els l�mits del sistema de fitxers de Windows"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -4104,13 +3630,13 @@ msgstr ""
 "El redimensionador de la FAT no pot gestionar la vostra partici�, \n"
 "s'ha produ�t l'error seg�ent: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "La partici� de Windows est� massa fragmentada; si us plau, executeu "
 "``defrag'' primer"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -4131,21 +3657,21 @@ msgstr ""
 "vostres dades.\n"
 "Quan estigueu segur, premeu D'acord."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "Quina mida voleu deixar per a la partici� de Windows?"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "partici� %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Ha fallat la redimensi� de la FAT: %s"
 
-#: ../../install_interactive.pm_.c:145
+#: ../../install_interactive.pm_.c:154
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
@@ -4153,33 +3679,33 @@ msgstr ""
 "No hi ha particions FAT a qu� canviar la mida o per utilitzar-les com a "
 "loopback (o no queda prou espai)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "Esborra el disc complet"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "Elimina el Windows(TM)"
 
-#: ../../install_interactive.pm_.c:154
+#: ../../install_interactive.pm_.c:163
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "Teniu m�s d'un disc dur; en quin voleu instal�lar el Linux?"
 
-#: ../../install_interactive.pm_.c:157
+#: ../../install_interactive.pm_.c:166
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr ""
 "Es perdran TOTES les particions, i les dades que contenen, de la unitat %s"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 msgstr "Particionament personalitzat de disc"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "Utilitza l'fdisk"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -4188,29 +3714,29 @@ msgstr ""
 "Ara podeu fer les particions a %s.\n"
 "Quan acabeu, no oblideu desar-les utiltzant `w'"
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
 msgstr "No teniu prou espai lliure a la partici� de Windows"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
 msgstr "No puc trobar espai per a la instal�laci�"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr ""
 "L'assistent de particionament del DrakX ha trobat les solucions seg�ents:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Ha fallat el particionament: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "S'est� activant la xarxa"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "S'est� desactivant la xarxa"
 
@@ -4222,12 +3748,12 @@ msgstr ""
 "S'ha produ�t un error, per� no s� com gestionar-lo correctament.\n"
 "Si continueu, �s sota la vostra responsabilitat."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Duplica el punt de muntatge %s"
 
-#: ../../install_steps.pm_.c:385
+#: ../../install_steps.pm_.c:384
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
@@ -4239,16 +3765,16 @@ msgstr ""
 "Comproveu el CD-ROM en un ordinador instal�lat mitjan�ant \"rpm -qpl "
 "Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "Benvingut a %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "No hi ha cap unitat de disquet disponible"
 
-#: ../../install_steps_auto_install.pm_.c:51
+#: ../../install_steps_auto_install.pm_.c:77
 #: ../../install_steps_stdio.pm_.c:23
 #, c-format
 msgid "Entering step `%s'\n"
@@ -4262,32 +3788,32 @@ msgstr "Escolliu la mida que voleu instal�lar"
 msgid "Total size: "
 msgstr "Mida total: "
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:437
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:387
 #, c-format
 msgid "Version: %s\n"
 msgstr "Versi�: %s\n"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:438
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:388
 #, c-format
 msgid "Size: %d KB\n"
 msgstr "Mida: %d kB\n"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:337
-#: ../../install_steps_interactive.pm_.c:520
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:509
 msgid "Choose the packages you want to install"
 msgstr "Escolliu els paquets que voleu instal�lar"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:340
+#: ../../install_steps_graphical.pm_.c:465 ../../interactive_gtk.pm_.c:571
 msgid "Info"
 msgstr "Informaci�"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:345
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:457
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Install"
 msgstr "Instal�la"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:558
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:497
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Installing"
 msgstr "S'est� instal�lant"
 
@@ -4295,7 +3821,7 @@ msgstr "S'est� instal�lant"
 msgid "Please wait, "
 msgstr "Si us plau, espereu, "
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:570
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:510
 msgid "Time remaining "
 msgstr "Temps restant "
 
@@ -4304,21 +3830,21 @@ msgid "Total time "
 msgstr "Temps total "
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "S'est� preparant la instal�laci�"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:618
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:558
 #, c-format
 msgid "Installing package %s"
 msgstr "S'est� instal�lant el paquet %s"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
+#: ../../install_steps_gtk.pm_.c:646
 msgid "Go on anyway?"
 msgstr "Voleu seguir igualment?"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
 msgid "There was an error ordering packages:"
 msgstr "S'ha produ�t un error en ordenar els paquets"
 
@@ -4326,31 +3852,35 @@ msgstr "S'ha produ�t un error en ordenar els paquets"
 msgid "Use existing configuration for X11?"
 msgstr "Voleu utilitzar la configuraci� existent per a X11?"
 
-#: ../../install_steps_gtk.pm_.c:142
+#: ../../install_steps_gtk.pm_.c:148
 msgid ""
 "Your system is low on resource. You may have some problem installing\n"
-"Linux-Mandrake. If that occurs, you can try a text install instead. For "
+"Mandrake Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "El vostre sistema est� baix de recursos; podeu tenir algun problema en\n"
-"instal�lar el Linux-Mandrake. Si aix� passa, podeu provar d'instal�lar-lo "
+"instal�lar el Mandrake Linux. Si aix� passa, podeu provar d'instal�lar-lo "
 "en\n"
 "mode text. Per fer-ho, premeu `F1' en arrencar des del CD-ROM i escriviu "
 "`text'"
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Tipus d'instal�laci�"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "Si us plau, trieu un dels tipus d'instal�laci� seg�ents:"
 
-#: ../../install_steps_gtk.pm_.c:222
+#: ../../install_steps_gtk.pm_.c:228
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr ""
 "La mida total dels grups que heu seleccionat es d'aproximadament %d MB.\n"
 
-#: ../../install_steps_gtk.pm_.c:224
+#: ../../install_steps_gtk.pm_.c:230
 #, c-format
 msgid ""
 "If you wish to install less than this size,\n"
@@ -4365,7 +3895,7 @@ msgstr ""
 "Un percentatge baix instal�lar� nom�s els paquets m�s importants;\n"
 "un percentatge del 100%% instal�lar� tots els paquets seleccionats."
 
-#: ../../install_steps_gtk.pm_.c:229
+#: ../../install_steps_gtk.pm_.c:235
 #, c-format
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
@@ -4382,85 +3912,69 @@ msgstr ""
 "Un percentatge baix instal�lar� nom�s els paquets m�s importants;\n"
 "un percentatge del %d%% instal�lar� tants paquets com sigui possible."
 
-#: ../../install_steps_gtk.pm_.c:235
+#: ../../install_steps_gtk.pm_.c:241
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "Podreu fer una elecci� m�s concreta al pas seg�ent"
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "Percentatge de paquets per instal�lar"
 
-#: ../../install_steps_gtk.pm_.c:285 ../../install_steps_interactive.pm_.c:599
+#: ../../install_steps_gtk.pm_.c:291 ../../install_steps_interactive.pm_.c:619
 msgid "Package Group Selection"
 msgstr "Selecci� del grup de paquets"
 
-#: ../../install_steps_gtk.pm_.c:305 ../../install_steps_interactive.pm_.c:614
+#: ../../install_steps_gtk.pm_.c:320 ../../install_steps_interactive.pm_.c:634
 msgid "Individual package selection"
 msgstr "Selecci� individual de paquets"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr "Mostra autom�ticament els paquets seleccionats"
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "Expandeix l'arbre"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Redueix l'arbre"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Commuta entre pla i ordenat per grups"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Mida total: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Paquet incorrecte"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nom: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Import�ncia: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Mida total: %d / %d MB"
-
-#: ../../install_steps_gtk.pm_.c:467
+#: ../../install_steps_gtk.pm_.c:411
 msgid ""
 "You can't select this package as there is not enough space left to install it"
 msgstr ""
 "No podeu seleccionar aquest paquet perqu� no queda prou espai per instal�lar-"
 "lo"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "Ara s'instal�laran els paquets seg�ents"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "Ara s'eliminaran els paquets seg�ents"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "No podeu seleccionar/desseleccionar aquest paquet"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Aquest paquet �s obligatori; no es pot deseleccionar"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
 msgstr "No podeu desseleccionar aquest paquet; ja est� instal�lat"
 
-#: ../../install_steps_gtk.pm_.c:507
+#: ../../install_steps_gtk.pm_.c:447
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -4468,24 +3982,43 @@ msgstr ""
 "Aquest paquet s'ha d'actualitzar\n"
 "Esteu segur que voleu desseleccionar-lo?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "No podeu desseleccionar aquest paquet; s'ha d'actualitzar"
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr "Mostra autom�ticament els paquets seleccionats"
+
+#: ../../install_steps_gtk.pm_.c:460
+#, fuzzy
+msgid "Load/Save on floppy"
+msgstr "Desa al disquet"
+
+#: ../../install_steps_gtk.pm_.c:461
+#, fuzzy
+msgid "Updating package selection"
+msgstr "Desa la selecci� de paquets"
+
+#: ../../install_steps_gtk.pm_.c:466
+#, fuzzy
+msgid "Minimal install"
+msgstr "Desinstal�la"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "S'est� estimant"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
 msgstr "Si us plau, espereu, s'est� preparant la instal�laci�"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d paquets"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -4549,15 +4082,15 @@ msgstr ""
 "propietat intel�lectual i de copyright aplicables als programes\n"
 "inform�tics.\n"
 
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Accept"
 msgstr "Accepta"
 
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Refuse"
 msgstr "Rebutja"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4573,7 +4106,7 @@ msgstr ""
 "Si no el teniu, premeu Cancel�la per no fer la instal�laci� des d'aquest CD-"
 "ROM."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "S'ha produ�t un error en instal�lar els paquets"
 
@@ -4581,36 +4114,21 @@ msgstr "S'ha produ�t un error en instal�lar els paquets"
 msgid "An error occurred"
 msgstr "S'ha produ�t un error"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "Si us plau, trieu un idioma per utilitzar."
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr ""
-"Podeu seleccionar altres idiomes, que quedaran disponibles despr�s de la "
-"instal�laci�"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "Tots"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "Acord de llic�ncia"
 
-#: ../../install_steps_interactive.pm_.c:87
+#: ../../install_steps_interactive.pm_.c:72
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Linux-"
-"Mandrake distribution \n"
+"The operating system and the different components available in the Mandrake "
+"Linux 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 Linux-Mandrake distribution.\n"
+"system and the different components of the Mandrake Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4664,7 +4182,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 Linux-Mandrake sites  which are prohibited or restricted in some "
+"from one of Mandrake Linux 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"
@@ -4701,7 +4219,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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
 "MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -4723,11 +4241,11 @@ msgstr ""
 "Introducci�\n"
 "\n"
 "D'ara endavant, hom es referir� al sistema operatiu i als diferents\n"
-"components disponibles en la distribuci� Linux-Mandrake com als\n"
+"components disponibles en la distribuci� Mandrake Linux com als\n"
 "\"Productes de programari\". Els Productes de programari inclouen,\n"
 "per� no estan restringits a, el conjunt de programes, m�todes, regles\n"
 "i documentaci� relativa al sistema operatiu i els diferents\n"
-"components de la distribuci� Linux-Mandrake.\n"
+"components de la distribuci� Mandrake Linux.\n"
 "\n"
 "\n"
 "1. Acord de llic�ncia\n"
@@ -4771,7 +4289,7 @@ msgstr ""
 "financeres, multes i costes judicials, o qualsevol altre dany que\n"
 "resultin d'un judici, o qualsevol altre p�rdua d'import�ncia) que\n"
 "resulti de la possessi� i utilitzaci� dels components de programari o\n"
-"de la seva desc�rrega des d'un dels llocs de Linux-Mandrake, que\n"
+"de la seva desc�rrega des d'un dels llocs de Mandrake Linux, que\n"
 "estiguin prohibides o restringides en alguns pa�sos per les lleis\n"
 "locals. Aquesta responsabilitat limitada s'aplica, per� no est�\n"
 "limitada a, els potents components criptogr�fics inclosos als\n"
@@ -4806,7 +4324,7 @@ msgstr ""
 "MandrakeSoft S.A. es reserva els drets de modificar o adaptar els\n"
 "Productes de programari, totalment o parcialment, per tots els\n"
 "mitjans i amb totes les finalitats.\n"
-"\"Mandrake\", \"Linux-Mandrake\" i els logotips associats son marques\n"
+"\"Mandrake\", \"Mandrake Linux\" i els logotips associats son marques\n"
 "registrades de MandrakeSoft S.A.\n"
 "\n"
 "\n"
@@ -4824,104 +4342,100 @@ msgstr ""
 "Per a qualsevol tema relacionat amb aquest document, poseu-vos en\n"
 "contacte amb MandrakeSoft S.A.\n"
 
-#: ../../install_steps_interactive.pm_.c:182
-#: ../../install_steps_interactive.pm_.c:822
+#: ../../install_steps_interactive.pm_.c:168
+#: ../../install_steps_interactive.pm_.c:871
 #: ../../standalone/keyboarddrake_.c:28
 msgid "Keyboard"
 msgstr "Teclat"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "Si us plau, selecioneu la disposici� del vostre teclat."
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
 msgstr "Aquesta �s la llista completa de teclats disponibles"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Tipus d'instal�laci�"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "Quin tipus d'instal�laci� voleu?"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
 msgstr "Instal�la/Actualitza"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
 msgstr "Es tracta d'una instal�laci� o d'una actualitzaci�?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Recomanada"
 
-#: ../../install_steps_interactive.pm_.c:215
-#: ../../install_steps_interactive.pm_.c:218
+#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:204
 msgid "Expert"
 msgstr "Expert"
 
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Update"
 msgstr "Actualitza"
 
-#: ../../install_steps_interactive.pm_.c:238 ../../standalone/mousedrake_.c:41
+#: ../../install_steps_interactive.pm_.c:224 ../../standalone/mousedrake_.c:48
 msgid "Please, choose the type of your mouse."
 msgstr "Si us plau, seleccioneu el vostre tipus de ratol�."
 
-#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:57
+#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
 msgid "Mouse Port"
 msgstr "Port del ratol�"
 
-#: ../../install_steps_interactive.pm_.c:245 ../../standalone/mousedrake_.c:58
+#: ../../install_steps_interactive.pm_.c:231 ../../standalone/mousedrake_.c:65
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr ""
 "Si us plau, seleccioneu el port s�rie a qu� est� connectat el vostre ratol�."
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
 msgstr "Emulaci� dels botons"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
 msgstr "Emulaci� del bot� 2"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
 msgstr "Emulaci� del bot� 3"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "S'estan configurant les targetes PCMCIA..."
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "Configuring IDE"
 msgstr "S'est� configurant l'IDE"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:295
+#: ../../install_steps_interactive.pm_.c:281
 msgid "no available partitions"
 msgstr "no hi ha particions disponibles"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
 msgstr "S'estan explorant les particions per trobar els punts de muntatge"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "Escolliu els punts de muntatge"
 
-#: ../../install_steps_interactive.pm_.c:323
+#: ../../install_steps_interactive.pm_.c:311
 #, c-format
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
@@ -4937,7 +4451,7 @@ msgstr ""
 "L'altra soluci� �s impedir al DrakX que modifiqui la taula de particions.\n"
 "(l'error �s %s)\n"
 
-#: ../../install_steps_interactive.pm_.c:336
+#: ../../install_steps_interactive.pm_.c:324
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
@@ -4945,51 +4459,62 @@ msgstr ""
 "El DiskDrake no ha pogut llegir correctament la taula de particions.\n"
 "Si continueu, �s sota la vostra responsabilitat!"
 
-#: ../../install_steps_interactive.pm_.c:361
+#: ../../install_steps_interactive.pm_.c:340
+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_.c:349
+#, fuzzy
+msgid "No root partition found to perform an upgrade"
+msgstr "No s'ha trobat cap partici� arrel"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "Partici� arrel"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
 msgstr "Quina �s la partici� arrel (/) del vostre sistema?"
 
-#: ../../install_steps_interactive.pm_.c:376
+#: ../../install_steps_interactive.pm_.c:365
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 "Us caldr� tornar a arrencar per tal que les modificacions de la taula de "
 "particions tinguin efecte"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "Escolliu les particions que voleu formatar"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "Voleu comprovar els blocs incorrectes?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "S'estan formatant les particions"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "S'est� creant i formatant el fitxer %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 "No hi ha prou intercanvi per completar la instal�laci�; si us plau, afegiu-ne"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "S'estan cercant els paquets disponibles"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "S'estan cercant els paquets a actualitzar"
 
-#: ../../install_steps_interactive.pm_.c:461
+#: ../../install_steps_interactive.pm_.c:450
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
@@ -4997,30 +4522,60 @@ msgstr ""
 "Al vostre sistema no li queda prou espai per a la instal�laci� o "
 "actualitzaci� (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Completa (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "M�nima (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Recomanada (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "Personalitzada"
 
-#: ../../install_steps_interactive.pm_.c:585
+#: ../../install_steps_interactive.pm_.c:522
+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_.c:525
+#, fuzzy
+msgid "Load from floppy"
+msgstr "Restaura des del disquet"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Loading from floppy"
+msgstr "Restaura des del disquet"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Package selection"
+msgstr "Selecci� del grup de paquets"
+
+#: ../../install_steps_interactive.pm_.c:532
+#, fuzzy
+msgid "Insert a floppy containing package selection"
+msgstr "Inseriu un disquet a la unitat %s"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Desa al disquet"
+
+#: ../../install_steps_interactive.pm_.c:605
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:650
+#: ../../install_steps_interactive.pm_.c:670
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -5030,12 +4585,12 @@ msgstr ""
 "Si no teniu cap d'aquests CD, feu clic a Cancel�la.\n"
 "Si nom�s falten alguns CD, desseleccioneu-los i feu clic a D'acord."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD-ROM etiquetat com \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -5044,11 +4599,21 @@ msgstr ""
 "S'est� instal�lant el paquet %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "Publica la configuraci� de la instal�laci� "
 
-#: ../../install_steps_interactive.pm_.c:718
+#: ../../install_steps_interactive.pm_.c:719
+#, fuzzy, c-format
+msgid "Please insert the Boot floppy used in drive %s"
+msgstr "Inseriu un disquet a la unitat %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, fuzzy, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "Inseriu un disquet en blanc a la unitat %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -5115,96 +4680,143 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:750
+#: ../../install_steps_interactive.pm_.c:782
 msgid "Choose a mirror from which to get the packages"
 msgstr "Escolliu un mirror al qual aconseguir els paquets"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr ""
 "S'est� contactant amb el mirror per obtenir la llista dels paquets "
 "disponibles"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "Si us plau, escolliu els paquets que voleu instal�lar"
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "En quina zona hor�ria us trobeu?"
 
-#: ../../install_steps_interactive.pm_.c:778
-msgid "Is your hardware clock set to GMT?"
+#: ../../install_steps_interactive.pm_.c:813
+#, fuzzy
+msgid "Hardware clock set to GMT"
 msgstr "El rellotge del vostre ordinador est� regulat a GMT?"
 
-#: ../../install_steps_interactive.pm_.c:806 ../../printer.pm_.c:22
-#: ../../printerdrake.pm_.c:415
+#: ../../install_steps_interactive.pm_.c:814
+msgid "Automatic time synchronization (using NTP)"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:821
+#, fuzzy
+msgid "NTP Server"
+msgstr "Servidor NIS"
+
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
 msgstr "Servidor CUPS remot"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "Cap impressora"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Resum"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
 msgstr "Ratol�"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr "Zona hor�ria"
 
-#: ../../install_steps_interactive.pm_.c:824 ../../printerdrake.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:873 ../../printerdrake.pm_.c:1773
+#: ../../printerdrake.pm_.c:1844
 msgid "Printer"
 msgstr "Impressora"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:875
 msgid "ISDN card"
 msgstr "Targeta XDSI"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
 msgstr "Targeta de so"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr "Targeta de TV"
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "Quin sistema d'impressi� voleu utilitzar?"
+#: ../../install_steps_interactive.pm_.c:917
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:945
+msgid "LDAP"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:918
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:954
+#, fuzzy
+msgid "NIS"
+msgstr "Utilitza el NIS"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:919
+#: ../../install_steps_interactive.pm_.c:941
+#, fuzzy
+msgid "Local files"
+msgstr "Impressora local"
+
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "Contrasenya de 'root'"
+
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Sense contrasenya"
 
-#: ../../install_steps_interactive.pm_.c:901
+#: ../../install_steps_interactive.pm_.c:935
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr ""
 "Aquesta contrasenya �s massa senzilla (ha de tenir com a m�nim %d car�cters)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "Utilitza el NIS"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Autenticaci�"
+
+#: ../../install_steps_interactive.pm_.c:949
+#, fuzzy
+msgid "Authentication LDAP"
+msgstr "Autenticaci�"
+
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "p�gines grogues"
+#: ../../install_steps_interactive.pm_.c:951
+#, fuzzy
+msgid "LDAP Server"
+msgstr "Servidor"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
+#: ../../install_steps_interactive.pm_.c:957
+#, fuzzy
+msgid "Authentication NIS"
 msgstr "NIS d'autenticaci�"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "Domini del NIS"
 
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:959
 msgid "NIS Server"
 msgstr "Servidor NIS"
 
-#: ../../install_steps_interactive.pm_.c:951
+#: ../../install_steps_interactive.pm_.c:994
 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 "
@@ -5234,19 +4846,19 @@ msgstr ""
 "Si voleu crear un disc d'arrencada per al vostre sistema, inseriu un disquet "
 "a la primera unitat i premeu \"D'acord\"."
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Primera unitat de disquet"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Segona unitat de disquet"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "Omet"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:1017
 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 "
@@ -5270,34 +4882,42 @@ msgstr ""
 "imatge de rescat del Mandrake, facilitant molt la recuperaci� de fallides\n"
 "serioses del sistema. Voleu crear un disc d'arrencada per al vostre sistema?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "No hi ha cap unitat de disquet disponible"
 
-#: ../../install_steps_interactive.pm_.c:987
+#: ../../install_steps_interactive.pm_.c:1030
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 "Escolliu la unitat de disquet que voleu utilitzar per crear el disc "
 "d'arrencada"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Inseriu un disquet a la unitat %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "S'est� creant el disc d'arrencada"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "S'est� preparant el carregador d'arrencada"
 
-#: ../../install_steps_interactive.pm_.c:1010
+#: ../../install_steps_interactive.pm_.c:1055
+msgid ""
+"You appear to have an OldWorld or Unknown\n"
+" machine, the yaboot bootloader will not work for you.\n"
+"The install will continue, but you'll\n"
+" need to use BootX to boot your machine"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:1060
 msgid "Do you want to use aboot?"
 msgstr "Voleu utilitzar l'aboot?"
 
-#: ../../install_steps_interactive.pm_.c:1013
+#: ../../install_steps_interactive.pm_.c:1063
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -5306,18 +4926,24 @@ msgstr ""
 "voleu intentar igualment la instal�laci� encara que aix� destrueixi la "
 "primera partici�?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "Instal�la el LILO"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 "Ha fallat la instal�laci� del carregador d'arrencada. S'ha produ�t l'error "
 "seg�ent:"
 
-#: ../../install_steps_interactive.pm_.c:1030
+#: ../../install_steps_interactive.pm_.c:1084
+#, fuzzy, 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 $of_boot,\\\\:tbxi\n"
+" setenv boot-device %s,\\\\:tbxi\n"
 " Then type: shut-down\n"
 "At your next boot you should see the bootloader prompt."
 msgstr ""
@@ -5329,38 +4955,34 @@ msgstr ""
 " Despr�s, escriviu: shut-down\n"
 "En l'arrencada seg�ent heu de veure l'indicador del carregador d'arrencada."
 
-#: ../../install_steps_interactive.pm_.c:1038 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1092 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "Baix"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Mitj�"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Alt"
 
-#: ../../install_steps_interactive.pm_.c:1044 ../../standalone/draksec_.c:49
+#: ../../install_steps_interactive.pm_.c:1098 ../../standalone/draksec_.c:62
 msgid "Choose security level"
 msgstr "Escolliu el nivell de seguretat"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr ""
-"Voleu generar un disquet d'instal�laci� autom�tica per fer c�pies del Linux?"
-
-#: ../../install_steps_interactive.pm_.c:1082
+#: ../../install_steps_interactive.pm_.c:1134
+#: ../../standalone/drakautoinst_.c:80
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Inseriu un disquet en blanc a la unitat %s"
 
-#: ../../install_steps_interactive.pm_.c:1096
-#: ../../install_steps_interactive.pm_.c:1128
+#: ../../install_steps_interactive.pm_.c:1138
+#: ../../standalone/drakautoinst_.c:82
 msgid "Creating auto install floppy"
 msgstr "S'est� creant el diquet d'instal�laci� autom�tica"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5370,34 +4992,34 @@ msgstr ""
 "\n"
 "Segur que voleu sortir ara?"
 
-#: ../../install_steps_interactive.pm_.c:1167
+#: ../../install_steps_interactive.pm_.c:1160
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
-"For information on fixes which are available for this release of Linux-"
-"Mandrake,\n"
-"consult the Errata available from http://www.linux-mandrake.com/.\n"
+"For information on fixes which are available for this release of Mandrake "
+"Linux,\n"
+"consult the Errata available from http://www.mandrakelinux.com/.\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Linux-Mandrake User's Guide."
+"install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
 "Felicitats! La instal�laci� ha acabat.\n"
 "Traieu el suport d'arrencada i premeu Intro per tornar a arrencar.\n"
 "\n"
 "Trobareu la soluci� als problemes coneguts d'aquesta versi� del\n"
-"Linux-Mandrake a la fe d'errates que hi ha a http://www.linux-mandrake."
+"Mandrake Linux a la fe d'errates que hi ha a http://www.linux-mandrake."
 "com/.\n"
 "\n"
 "La informaci� sobre com configurar el vostre sistema est� disponible a\n"
 "l'�ltim cap�tol d'instal�laci� de la Guia Oficial de l'Usuari del\n"
-"Linux-Mandrake."
+"Mandrake Linux."
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
 msgstr "Genera un disquet per a la instal�laci� autom�tica"
 
-#: ../../install_steps_interactive.pm_.c:1181
+#: ../../install_steps_interactive.pm_.c:1174
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -5412,41 +5034,58 @@ msgstr ""
 "\n"
 "Potser preferireu repetir la instal�laci�.\n"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "Autom�tica"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
 msgstr "Repeteix"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 msgstr "Desa la selecci� de paquets"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Instal�laci� del Linux-Mandrake %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "Instal�laci� del Mandrake Linux %s"
 
-#: ../../install_steps_newt.pm_.c:33
+#: ../../install_steps_newt.pm_.c:34
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> entre elements  | <Espai> selecciona | <F12> pant. seg�ent"
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
 msgstr "El kdesu no hi �s"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "Trieu una acci�"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr "Avan�at"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "Si us plau, espereu"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Expandeix l'arbre"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Redueix l'arbre"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Commuta entre pla i ordenat per grups"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -5472,267 +5111,291 @@ msgstr "La vostra elecci�? (predeterminat %s)"
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "La vostra elecci�? (predeterminat %s  introdu�u `cap' per a cap) "
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "Txec (QWERTZ)"
 
-#: ../../keyboard.pm_.c:125 ../../keyboard.pm_.c:138 ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:141 ../../keyboard.pm_.c:155 ../../keyboard.pm_.c:180
 msgid "German"
 msgstr "Alemany"
 
-#: ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:142
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:127 ../../keyboard.pm_.c:164
+#: ../../keyboard.pm_.c:143 ../../keyboard.pm_.c:186
 msgid "Spanish"
 msgstr "Espanyol"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "Fin�s"
 
-#: ../../keyboard.pm_.c:129 ../../keyboard.pm_.c:139 ../../keyboard.pm_.c:166
+#: ../../keyboard.pm_.c:145 ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:188
 msgid "French"
 msgstr "Franc�s"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
 msgstr "Noruec"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "Polon�s"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "Rus"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "Suec"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "Teclat RU"
 
-#: ../../keyboard.pm_.c:134 ../../keyboard.pm_.c:137 ../../keyboard.pm_.c:204
+#: ../../keyboard.pm_.c:152 ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:237
 msgid "US keyboard"
 msgstr "Teclat EU"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+#, fuzzy
+msgid "Albanian"
+msgstr "Irani�"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "Armeni (antic)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "Armeni (m�quina d'escriure)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "Armeni (fon�tic)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "Azerbaidjan�s (llat�)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Azerbaidjan�s (cir�l�lic)"
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "Belga"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "B�lgar"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "Brasiler (ABNT-2)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Bielor�s"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "Su�s (disposici� alemanya)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "Su�s (disposici� francesa)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "Txec (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr "Txec (Programadors)"
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "Alemany (sense tecles inoperatives)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "Dan�s"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:183
 msgid "Dvorak (US)"
 msgstr "Dvorak (EU)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:184
 msgid "Dvorak (Norwegian)"
 msgstr "Dvorak (Noruec)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Estoni�"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgi� (disposici� \"russa\")"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgi� (disposici� \"llatina\")"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "Grec"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "Hongar�s"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "Israeli�"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "Israeli� (fon�tic)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Irani�"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "Island�s"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "Itali�"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "Japon�s de 106 tecles"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
 msgstr "Teclat core�"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "Espanyol sud-americ�"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr "Macedoni"
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "Holand�s"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Litu� AZERTY (antic)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Litu� AZERTY (nou)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Litu� \"fila de n�meros\" QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Litu� \"fon�tic\" QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "Ubicaci�"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Macedoni"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "Holand�s"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Polon�s (disposici� qwerty)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Polon�s (disposici� qwertz)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "Portugu�s"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "Canadenc (Quebec)"
 
-#: ../../keyboard.pm_.c:193
-msgid "Russian (Yawerty)"
+#: ../../keyboard.pm_.c:217
+#, fuzzy
+msgid "Romanian (qwertz)"
 msgstr "Rus (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "Suec"
+#: ../../keyboard.pm_.c:218
+#, fuzzy
+msgid "Romanian (qwerty)"
+msgstr "Rus (Yawerty)"
 
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:220
+msgid "Russian (Yawerty)"
+msgstr "Rus (Yawerty)"
+
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "Eslov�"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "Eslovac (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "Eslovac (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr "Eslovac (Programadors)"
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "Azerbaidjan�s (cir�l�lic)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Teclat tai"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "Teclat tai"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turc (tradicional, model \"F\")"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turc (modern, model \"Q\")"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ucra�n�s"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "Teclat EU (internacional)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamita \"fila num�rica\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
+#: ../../keyboard.pm_.c:240
+#, fuzzy
+msgid "Yugoslavian (latin)"
 msgstr "Iugoslau (llat�/cir�l�lic)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Muntatges circulars %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr "Elimineu primer els volums l�gics\n"
 
@@ -5844,170 +5507,221 @@ msgstr "cap"
 msgid "No mouse"
 msgstr "Cap ratol�"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Si us plau, comproveu el ratol�."
+
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "Per activar el ratol�,"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "MOVEU LA BOLA!"
+
+#: ../../my_gtk.pm_.c:380
+msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:415
 msgid "Finish"
 msgstr "Fin�s"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "Seg�ent ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
 msgstr "<- Anterior"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "Aix� �s correcte?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Configuraci� d'Internet"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Connecta't a internet"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "Voleu intentar connectar-vos a Internet ara?"
+#: ../../network/adsl.pm_.c:20
+msgid ""
+"The most common way to connect with adsl is pppoe.\n"
+"Some connections use pptp, a few ones use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"La manera m�s habitual de connectar amb ADSL �s pppoe.\n"
+"Algunes connexions utilitzen pptp, unes poques utilitzen dhcp.\n"
+"Si no ho sabeu, escolliu 'utilitza pppoe'"
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "S'est� comprovant la vostra conexi�..."
+#: ../../network/adsl.pm_.c:22
+msgid "Alcatel speedtouch usb"
+msgstr ""
 
-#: ../../netconnect.pm_.c:154 ../../standalone/draknet_.c:196
-msgid "The system is now connected to Internet."
-msgstr "Ara, el sistema est� connectat a Internet."
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "utilitza dhcp"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr "Per raons de seguretat, ara es desconnectar�."
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "utilitza pppoe"
+
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "utilitza pptp"
 
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
+#: ../../network/ethernet.pm_.c:37
 msgid ""
-"The system doesn't seem to be connected to internet.\n"
-"Try to reconfigure your connection."
+"Which dhcp client do you want to use?\n"
+"Default is dhcpcd"
 msgstr ""
-"No sembla que el sistema estigui connectat a Internet.\n"
-"Intenteu tornar a configurar la connexi�."
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "Configuraci� de xarxa"
-
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
-msgid "ISDN Configuration"
-msgstr "Configuraci� de l'XDSI"
+"Quin client dhcp voleu utilitzar?\n"
+"El predeterminat �s dhcpcd"
 
-#: ../../netconnect.pm_.c:222
+#: ../../network/ethernet.pm_.c:88
 msgid ""
-"Select your provider.\n"
-" If it's not in the list, choose Unlisted"
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
-"Seleccioneu el vostre prove�dor.\n"
-" Si no �s a la llista, seleccioneu No �s a la llista"
+"No s'ha detectat cap adaptador de xarxa ethernet al sistema.\n"
+"No puc configurar aquest tipus de connexi�."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Configuraci� de la connexi�"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Escolliu la interf�cie de xarxa"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Si us plau, ompliu o marqueu el camp inferior"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+"Si us plau, seleccioneu quin adaptador de xarxa voleu utilitzar per\n"
+"connectar-vos a Internet."
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "Targeta IRQ"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "no s'ha trobat cap targeta de xarxa"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "Targeta de mem�ria (DMA)"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "S'est� configurant la xarxa"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "Targeta d'E/S"
+#: ../../network/ethernet.pm_.c:203
+msgid ""
+"Please enter your host name if you know it.\n"
+"Some DHCP servers require the hostname to work.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''."
+msgstr ""
+"Si us plau, introdu�u el nom del vostre ordinador central, si el sabeu.\n"
+"Alguns servidors DHCP necessiten que aquest nom funcioni.\n"
+"El nom ha de ser complet,\n"
+"com ara ``mybox.mylab.myco.com''."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "Targeta d'E/S_0"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "Nom de l'ordinador central"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "Targeta d'E/S_1"
+#: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
+#: ../../network/netconnect.pm_.c:91 ../../network/netconnect.pm_.c:105
+#: ../../network/netconnect.pm_.c:154 ../../network/netconnect.pm_.c:164
+#: ../../network/netconnect.pm_.c:190 ../../network/netconnect.pm_.c:213
+#: ../../network/netconnect.pm_.c:221
+msgid "Network Configuration Wizard"
+msgstr "Assistent de configuraci� de xarxa"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "El vostre tel�fon particular"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "M�dem XDSI extern"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Nom del prove�dor (p.ex. proveidor.net)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Targeta XDSI interna"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "N�mero de tel�fon del prove�dor"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "Quin tipus de connexi� XDSI teniu?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "DNS 1 del prove�dor"
+#: ../../network/isdn.pm_.c:45
+msgid ""
+"Which ISDN configuration do you prefer?\n"
+"\n"
+"* The Old configuration uses isdn4net. It contains powerfull\n"
+"  tools, but is tricky to configure, and not standard.\n"
+"\n"
+"* The New configuration is easier to understand, more\n"
+"  standard, but with less tools.\n"
+"\n"
+"We recommand the light configuration.\n"
+msgstr ""
 
-#: ../../netconnect.pm_.c:248
-msgid "Provider dns 2"
-msgstr "DNS 2 del prove�dor"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "New configuration (isdn-light)"
+msgstr "S'ha detectat la configuraci� del sistema de tallafocs!"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "Mode de marcatge"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "Old configuration (isdn4net)"
+msgstr "S'ha detectat la configuraci� del sistema de tallafocs!"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Entrada del compte (nom d'usuari)"
+#: ../../network/isdn.pm_.c:169 ../../network/isdn.pm_.c:187
+#: ../../network/isdn.pm_.c:197 ../../network/isdn.pm_.c:204
+#: ../../network/isdn.pm_.c:214
+msgid "ISDN Configuration"
+msgstr "Configuraci� de l'XDSI"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Contrasenya del compte"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Seleccioneu el vostre prove�dor.\n"
+" Si no �s a la llista, seleccioneu No �s a la llista"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Europa"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "Protocol d'arrencada"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol (EDSS1)"
 msgstr "Europa (EDSS1)"
 
-#: ../../netconnect.pm_.c:263
-msgid "Rest of the world"
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
+msgid "Protocol for the rest of the world"
 msgstr "Resta del m�n"
 
-#: ../../netconnect.pm_.c:263
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
 msgid ""
-"Rest of the world \n"
+"Protocol for the rest of the world \n"
 " no D-Channel (leased lines)"
 msgstr ""
 "Resta del m�n \n"
 " cap canal D (l�nies llogades)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Quin protocol voleu utilitzar?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Quin tipus de targeta teniu?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "No s�"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../netconnect.pm_.c:284
+#: ../../network/isdn.pm_.c:205
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -6020,19 +5734,19 @@ msgstr ""
 "\n"
 "Si teniu una targeta PCMCIA, us en cal saber l'irq i l'io.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "Interromp"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "Continua"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "Quina targeta XDSI teniu ?"
 
-#: ../../netconnect.pm_.c:314
+#: ../../network/isdn.pm_.c:234
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
@@ -6040,112 +5754,62 @@ msgstr ""
 "He detectat una targeta PCI XDSI, per� no en conec el tipus. Si us plau, "
 "seleccioneu una targeta PCI a la pantalla seg�ent."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 "No s'ha trobat cap targeta PCI XDSI. Si us plau, seleccioneu-ne una a la "
 "pantalla seg�ent"
 
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"No s'ha detectat cap adaptador de xarxa ethernet al sistema.\n"
-"No puc configurar aquest tipus de connexi�."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "Escolliu la interf�cie de xarxa"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr ""
-"Si us plau, seleccioneu quin adaptador de xarxa voleu utilitzar per\n"
-"connectar-vos a Internet."
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "Interf�cie de la xarxa"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"Hi esteu d'acord?"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "Ara reiniciar� el dispositiu de xarxa:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "Configuraci� de l'ADSL"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "Voleu iniciar la connexi� en arrencar?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr ""
 "Si us plau, seleccioneu el port s�rie al qual teniu connectat el m�dem."
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Opcions de marcatge"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "Nom de la connexi�"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "N�mero de tel�fon"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "ID d'entrada"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "Autenticaci�"
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
+msgid "CHAP"
+msgstr "CHAP"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Script-based"
 msgstr "Basat en script"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Basat en terminal"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Nom de domini"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
 msgstr "Primer servidor DNS (opcional)"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 msgid "Second DNS Server (optional)"
 msgstr "Segon servidor DNS (opcional)"
 
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr ""
-"Ara reiniciar� el dispositiu de xarxa $netc->{NET_DEVICE}. Hi esteu d'acord?"
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -6153,7 +5817,7 @@ msgstr ""
 "\n"
 "Podeu desconnectar-vos o tornar a configurar la connexi�."
 
-#: ../../netconnect.pm_.c:745 ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:33 ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can reconfigure your connection."
@@ -6161,11 +5825,11 @@ msgstr ""
 "\n"
 "Podeu tornar a configurar la connexi�."
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "Ara mateix esteu connectat a Internet."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -6173,102 +5837,53 @@ msgstr ""
 "\n"
 "Podeu connectar-vos a Internet o tornar a configurar la connexi�."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "Ara mateix no esteu connectat a Internet."
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "Connecta't a Internet"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "Desconnecta't d'Internet"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Configura la connexi� de xarxa (LAN o Internet)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Connexi� i configuraci� d'Internet"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "Assistent de configuraci� de xarxa"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "M�dem XDSI extern"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Targeta XDSI interna"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "Quin tipus de connexi� XDSI teniu?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Connecta't a internet"
-
-#: ../../netconnect.pm_.c:834
-msgid ""
-"The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few ones use dhcp.\n"
-"If you don't know, choose 'use pppoe'"
-msgstr ""
-"La manera m�s habitual de connectar amb ADSL �s pppoe.\n"
-"Algunes connexions utilitzen pptp, unes poques utilitzen dhcp.\n"
-"Si no ho sabeu, escolliu 'utilitza pppoe'"
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "utilitza dhcp"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "utilitza pppoe"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "utilitza pptp"
-
-#: ../../netconnect.pm_.c:846
-#, c-format
-msgid "I'm about to restart the network device %s. Do you agree?"
-msgstr "Ara reiniciar� el dispositiu de xarxa %s. Hi esteu d'acord?"
-
-#: ../../netconnect.pm_.c:883
-msgid ""
-"Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
+#: ../../network/netconnect.pm_.c:96
+#, fuzzy, c-format
+msgid "We are now going to configure the %s connection."
 msgstr ""
-"Quin client dhcp voleu utilitzar?\n"
-"El predeterminat �s dhcpcd"
-
-#: ../../netconnect.pm_.c:900
-msgid "Network configuration"
-msgstr "Configuraci� de xarxa"
-
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "Voleu reiniciar la xarxa"
+"\n"
+"Podeu desconnectar-vos o tornar a configurar la connexi�."
 
-#: ../../netconnect.pm_.c:904
-#, c-format
+#: ../../network/netconnect.pm_.c:105
+#, fuzzy, c-format
 msgid ""
-"A problem occured while restarting the network: \n"
 "\n"
-"%s"
+"\n"
+"\n"
+"We are now going to configure the %s connection.\n"
+"\n"
+"\n"
+"Press OK to continue."
 msgstr ""
-"S'ha produ�t un problema en reiniciar la xarxa: \n"
 "\n"
-"%s"
+"Podeu desconnectar-vos o tornar a configurar la connexi�."
 
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:129 ../../network/netconnect.pm_.c:243
+#: ../../network/netconnect.pm_.c:255 ../../network/tools.pm_.c:56
+msgid "Network Configuration"
+msgstr "Configuraci� de xarxa"
+
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6280,7 +5895,7 @@ msgstr ""
 "Feu clic a D'acord per conservar la configuraci�, o a Cancel�la per tornar a "
 "configurar la connexi� a Internet i xarxa.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -6293,72 +5908,114 @@ msgstr ""
 "Si no voleu utilitzar la detecci� autom�tica, desactiveu el quadre de "
 "verificaci�.\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "Escolliu el perfil per configurar"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
 msgstr "Utilitza la detecci� autom�tica"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "S'estan detectant els dispositius..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr "Connexi� normal per m�dem"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
 msgstr "detectat al port %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
 msgstr "Connexi� XDSI"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr "s'ha detectat %s"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "Connexi� per DSL (o ADSL)"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+#, fuzzy
+msgid "ADSL connection"
+msgstr "Connexi� LAN"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
 msgstr "detectat a la interf�cie %s"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "Connexi� de cable"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+#, fuzzy
+msgid "cable connection detected"
+msgstr "Connexi� de cable"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
 msgstr "Connexi� LAN"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr "s'han detectat una o diverses targetes Ethernet"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "Com us voleu connectar a Internet?"
+#: ../../network/netconnect.pm_.c:190
+#, fuzzy
+msgid "Choose the connection you want to configure"
+msgstr "Escolliu l'eina que voleu utilitzar "
+
+#: ../../network/netconnect.pm_.c:214
+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_.c:215
+#, fuzzy
+msgid "Internet connection"
+msgstr "Connexi� a Internet compartida"
+
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "Voleu iniciar la connexi� en arrencar?"
+
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "Configuraci� de xarxa"
+
+#: ../../network/netconnect.pm_.c:240
+msgid "The network needs to be restarted"
+msgstr ""
+
+#: ../../network/netconnect.pm_.c:243
+#, c-format
+msgid ""
+"A problem occured while restarting the network: \n"
+"\n"
+"%s"
+msgstr ""
+"S'ha produ�t un problema en reiniciar la xarxa: \n"
+"\n"
+"%s"
 
-#: ../../netconnect.pm_.c:1004
+#: ../../network/netconnect.pm_.c:247
 msgid ""
-"Congratulation, The network and internet configuration is finished.\n"
+"Congratulations, the network and internet configuration is finished.\n"
 "\n"
-"The configuration will now be applied to your system."
+"The configuration will now be applied to your system.\n"
 msgstr ""
 "Felicitats, la configuraci� de xarxa i Internet ha finalitzat.\n"
 "\n"
-"Ara s'aplicar� la configuraci� al sistema."
+"Ara s'aplicar� la configuraci� al sistema.\n"
 
-#: ../../netconnect.pm_.c:1007
+#: ../../network/netconnect.pm_.c:250
 msgid ""
 "After that is done, we recommend you to restart your X\n"
 "environnement to avoid hostname changing problem."
@@ -6366,31 +6023,7 @@ msgstr ""
 "Despr�s d'aix�, �s recomanable que reinicieu l'entorn X per\n"
 "evitar problemes deguts al canvi de nom de l'ordinador central."
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "no s'ha trobat cap targeta de xarxa"
-
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "S'est� configurant la xarxa"
-
-#: ../../network.pm_.c:278
-msgid ""
-"Please enter your host name if you know it.\n"
-"Some DHCP servers require the hostname to work.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''."
-msgstr ""
-"Si us plau, introdu�u el nom del vostre ordinador central, si el sabeu.\n"
-"Alguns servidors DHCP necessiten que aquest nom funcioni.\n"
-"El nom ha de ser complet,\n"
-"com ara ``mybox.mylab.myco.com''."
-
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "Nom de l'ordinador central"
-
-#: ../../network.pm_.c:319
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -6401,7 +6034,7 @@ msgstr ""
 "Nom�s cal que accepteu mantenir-lo configurat.\n"
 "Si modifiqueu els camps inferiors, sobreescriureu aquesta configuraci�."
 
-#: ../../network.pm_.c:324
+#: ../../network/network.pm_.c:288
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
@@ -6411,38 +6044,38 @@ msgstr ""
 "S'ha d'introduir cada element com a una adre�a IP amb notaci� decimal amb\n"
 "punts (per exemple, 1.2.3.4)."
 
-#: ../../network.pm_.c:333 ../../network.pm_.c:334
+#: ../../network/network.pm_.c:297 ../../network/network.pm_.c:298
 #, c-format
 msgid "Configuring network device %s"
 msgstr "S'est� configurant el dispositiu de xarxa %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr " (programa de control $module)"
+#: ../../network/network.pm_.c:298
+#, c-format
+msgid " (driver %s)"
+msgstr " (programa de control %s)"
 
-#: ../../network.pm_.c:336 ../../standalone/draknet_.c:231
-#: ../../standalone/draknet_.c:427
+#: ../../network/network.pm_.c:300 ../../standalone/draknet_.c:255
+#: ../../standalone/draknet_.c:461
 msgid "IP address"
 msgstr "Adre�a IP"
 
-#: ../../network.pm_.c:337 ../../standalone/draknet_.c:428
+#: ../../network/network.pm_.c:301 ../../standalone/draknet_.c:462
 msgid "Netmask"
 msgstr "Subm�scara de la xarxa"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "(bootp/dhcp)"
 msgstr "(bootp/dhcp)"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "Automatic IP"
 msgstr "IP autom�tic"
 
-#: ../../network.pm_.c:359 ../../printerdrake.pm_.c:102
-#: ../../printerdrake.pm_.c:425
+#: ../../network/network.pm_.c:323 ../../printerdrake.pm_.c:406
 msgid "IP address should be in format 1.2.3.4"
 msgstr "L'adre�a IP ha d'estar amb el format 1.2.3.4"
 
-#: ../../network.pm_.c:388
+#: ../../network/network.pm_.c:351
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -6454,43 +6087,150 @@ msgstr ""
 "``mybox.mylab.myco.com''.\n"
 "Tamb� podeu introduir l'adre�a IP de la passarel�la, si en teniu una"
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "servidor DNS"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
 msgstr "Passarel�la"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "Dispositiu de la passarel�la"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Configuraci� dels proxys"
 
-#: ../../network.pm_.c:408
+#: ../../network/network.pm_.c:372
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
-#: ../../network.pm_.c:409
+#: ../../network/network.pm_.c:373
 msgid "FTP proxy"
 msgstr "Proxy FTP"
 
-#: ../../network.pm_.c:412
+#: ../../network/network.pm_.c:374
+msgid "Track network card id (usefull for laptops)"
+msgstr ""
+
+#: ../../network/network.pm_.c:377
 msgid "Proxy should be http://..."
 msgstr "El proxy ha de ser http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "El proxy ha de ser ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Configuraci� d'Internet"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Voleu intentar connectar-vos a Internet ara?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "S'est� comprovant la vostra conexi�..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "Ara, el sistema est� connectat a Internet."
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr "Per raons de seguretat, ara es desconnectar�."
+
+#: ../../network/tools.pm_.c:51 ../../standalone/draknet_.c:220
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr ""
+"No sembla que el sistema estigui connectat a Internet.\n"
+"Intenteu tornar a configurar la connexi�."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Configuraci� de la connexi�"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Si us plau, ompliu o marqueu el camp inferior"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "Targeta IRQ"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "Targeta de mem�ria (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "Targeta d'E/S"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "Targeta d'E/S_0"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "Targeta d'E/S_1"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "El vostre tel�fon particular"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Nom del prove�dor (p.ex. proveidor.net)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "N�mero de tel�fon del prove�dor"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "DNS 1 del prove�dor (opcional)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "DNS 2 del prove�dor (opcional)"
+
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "Escolliu el vostre teclat"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "Mode de marcatge"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+#, fuzzy
+msgid "Connection speed"
+msgstr "Tipus de connexi�: "
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "Tipus de connexi�: "
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Entrada del compte (nom d'usuari)"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Contrasenya del compte"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
 msgstr "Aquesta plataforma no suporta particions esteses"
 
-#: ../../partition_table.pm_.c:581
+#: ../../partition_table.pm_.c:640
 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 "
@@ -6500,26 +6240,21 @@ msgstr ""
 "L'�nica soluci� �s moure les particions prim�ries per fer que el forat quedi "
 "contigu a les particions ampliades"
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "S'ha produ�t un error en llegir el fitxer %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Ha fallat la restauraci� del fitxer %s: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "Fitxer de c�pia de seguretat incorrecte"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "S'ha produ�t un error en escriure al fitxer %s"
 
-#: ../../partition_table_raw.pm_.c:161
+#: ../../partition_table_raw.pm_.c:154
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
@@ -6549,49 +6284,212 @@ msgstr "bonic"
 msgid "maybe"
 msgstr "potser"
 
-#: ../../printer.pm_.c:20
+#: ../../printer.pm_.c:23
+msgid "CUPS - Common Unix Printing System"
+msgstr ""
+
+#: ../../printer.pm_.c:24
+msgid "LPRng - LPR New Generation"
+msgstr ""
+
+#: ../../printer.pm_.c:25
+msgid "LPD - Line Printer Daemon"
+msgstr ""
+
+#: ../../printer.pm_.c:26
+msgid "PDQ - Print, Don't Queue"
+msgstr ""
+
+#: ../../printer.pm_.c:32
+msgid "CUPS"
+msgstr ""
+
+#: ../../printer.pm_.c:33
+msgid "LPRng"
+msgstr ""
+
+#: ../../printer.pm_.c:34
+msgid "LPD"
+msgstr ""
+
+#: ../../printer.pm_.c:35
+msgid "PDQ"
+msgstr ""
+
+#: ../../printer.pm_.c:40
 msgid "Local printer"
 msgstr "Impressora local"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "Impressora remota"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
+#: ../../printer.pm_.c:42
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "Servidor CUPS remot"
+
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "Servidor lpd remot"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "Impressora de xarxa (s�col)"
 
-#: ../../printer.pm_.c:25
-msgid "SMB/Windows 95/98/NT"
+#: ../../printer.pm_.c:45
+#, fuzzy
+msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:26
-msgid "NetWare"
-msgstr "NetWare"
+#: ../../printer.pm_.c:46
+#, fuzzy
+msgid "Printer on NetWare server"
+msgstr "Servidor de la impressora"
 
-#: ../../printer.pm_.c:27 ../../printerdrake.pm_.c:158
-#: ../../printerdrake.pm_.c:160
-msgid "Printer Device URI"
+#: ../../printer.pm_.c:47
+#, fuzzy
+msgid "Enter a printer device URI"
 msgstr "Dispositiu URI d'impressora"
 
-#: ../../printerdrake.pm_.c:19
+#: ../../printer.pm_.c:48
+msgid "Pipe job into a command"
+msgstr ""
+
+#: ../../printer.pm_.c:418 ../../printer.pm_.c:839
+#: ../../printerdrake.pm_.c:1227 ../../printerdrake.pm_.c:2023
+msgid "Unknown model"
+msgstr ""
+
+#: ../../printer.pm_.c:546 ../../printerdrake.pm_.c:790
+msgid "Raw printer (No driver)"
+msgstr ""
+
+#: ../../printer.pm_.c:693
+#, fuzzy, c-format
+msgid "(on %s)"
+msgstr "(m�dul %s)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "Seleccioneu la connexi� de la impressora"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "Com est� connectada la impressora?"
+
+#: ../../printerdrake.pm_.c:25
+#, fuzzy
+msgid ""
+"\n"
+"Printers on remote CUPS servers you do not have to configure\n"
+"here; these printers will be automatically detected. Please\n"
+"select \"Printer on remote CUPS server\" in this case."
+msgstr ""
+"Amb un servidor CUPS remot, aqu� no us cal configurar cap\n"
+"impressora; les impressores es detectaran autom�ticament.\n"
+"En cas de dubte, seleccioneu \"Servidor CUPS remot\"."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+msgid "None"
+msgstr "Cap"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Escolliu l'usuari per omissi�:"
+
+#: ../../printerdrake.pm_.c:105
+msgid ""
+"With remote CUPS servers, you do not have to configure any \n"
+"printer here; CUPS servers inform your machine automatically\n"
+"about their printers. All printers known to your machine\n"
+"currently are listed in the \"Default printer\" field. Choose\n"
+"the default printer for your machine there and click the\n"
+"\"Apply/Re-read printers\" button. Click the same button to\n"
+"refresh the list (it can take up to 30 seconds after the start\n"
+"of CUPS until all remote printers are visible).\n"
+"When your CUPS server is in a different network, you have to \n"
+"give the CUPS server IP address and optionally the port number\n"
+"to get the printer information from the server, otherwise leave\n"
+"these fields blank."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:117
+msgid ""
+"\n"
+"Normally, CUPS is automatically configured according to your\n"
+"network environment, so that you can access the printers on the\n"
+"CUPS servers in your local network. If this does not work \n"
+"correctly, turn off \"Automatic CUPS configuration\" and edit\n"
+"your file /etc/cups/cupsd.conf manually. Do not forget to restart\n"
+"CUPS afterwards (command: \"service cups restart\")."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:124 ../../printerdrake.pm_.c:1290
+#: ../../printerdrake.pm_.c:1294 ../../printerdrake.pm_.c:1295
+#: ../../printerdrake.pm_.c:1296 ../../printerdrake.pm_.c:2011
+msgid "Close"
+msgstr "Tanca"
+
+#: ../../printerdrake.pm_.c:125
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "Impressora remota"
+
+#: ../../printerdrake.pm_.c:129
+#, fuzzy
+msgid "The IP address should look like 192.168.1.20"
+msgstr "L'adre�a IP ha d'estar amb el format 1.2.3.4"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "El n�mero de port ha de ser num�ric"
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+#, fuzzy
+msgid "Default printer"
+msgstr "Impressora local"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "IP del servidor CUPS"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Port"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "Configuraci� del tipus d'arrencada"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "S'estan detectant els dispositius..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "Ports de comprovaci�"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "S'ha detectat una impressora, model \"%s\", a"
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Dispositiu de la impressora local"
 
-#: ../../printerdrake.pm_.c:53
+#: ../../printerdrake.pm_.c:256
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -6599,37 +6497,60 @@ msgstr ""
 "A quin dispositiu est� connectada la vostra impressora?\n"
 "(tingueu en compte que /dev/lp0 equival a LPT1:)\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Dispositiu d'impressora"
 
-#: ../../printerdrake.pm_.c:74
+#: ../../printerdrake.pm_.c:261
+msgid "Device/file name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:274 ../../printerdrake.pm_.c:698
+#: ../../printerdrake.pm_.c:786
+#, fuzzy
+msgid "Reading printer database ..."
+msgstr "S'est� llegint la base de dades de controladors CUPS..."
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "Opcions de la impressora lpd remota"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:313
+#, fuzzy
 msgid ""
-"To use a remote lpd print queue, you need to supply\n"
-"the hostname of the printer server and the queue name\n"
-"on that server which jobs should be placed in."
+"To use a remote lpd printer, you need to supply\n"
+"the hostname of the printer server and the printer name\n"
+"on that server."
 msgstr ""
 "Per poder utilitzar una cua d'impressi� lpd remota, necessiteu proporcionar\n"
 "el nom de l'ordinador central del servidor de la impressora i el nom de la\n"
 "cua d'aquest servidor on s'hi han de situar les tasques."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
+msgstr "Nom de l'ordinador central remot"
+
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "Impressora remota"
+
+#: ../../printerdrake.pm_.c:320
+#, fuzzy
+msgid "Remote host name missing!"
 msgstr "Nom de l'ordinador central remot"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Cua remota"
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "Nom de l'ordinador central remot"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Opcions de la impressora SMB (Windows 9x/NT)"
 
-#: ../../printerdrake.pm_.c:89
+#: ../../printerdrake.pm_.c:393
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -6644,29 +6565,37 @@ msgstr ""
 "de compartici� de la impressora a qu� voleu accedir i el nom d'usuari,\n"
 "contrasenya i informaci� de grup si s�n necessaris."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "Ordinador central del servidor SMB"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "IP del servidor SMB"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "Nom de compartici�"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "Grup de treball"
 
-#: ../../printerdrake.pm_.c:124
+#: ../../printerdrake.pm_.c:410
+msgid "Either the server name or the server's IP must be given!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:414
+msgid "Samba share name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:473
 msgid "NetWare Printer Options"
 msgstr "Opcions de la impressora NetWare"
 
-#: ../../printerdrake.pm_.c:125
+#: ../../printerdrake.pm_.c:474
 msgid ""
-"To print to a NetWare printer, you need to provide the\n"
+"To print on a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
 "TCP/IP hostname!) as well as the print queue name for the printer you\n"
 "wish to access and any applicable user name and password."
@@ -6678,59 +6607,228 @@ msgstr ""
 "la impressora a qu� voleu accedir i el nom d'usuari i contrasenya si s�n\n"
 "necessaris."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Servidor de la impressora"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "Nom de la cua d'impressi�"
 
-#: ../../printerdrake.pm_.c:142
+#: ../../printerdrake.pm_.c:484
+msgid "NCP server name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:488
+msgid "NCP queue name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:527
 msgid "Socket Printer Options"
 msgstr "Opcions de la impressora de s�col"
 
-#: ../../printerdrake.pm_.c:143
+#: ../../printerdrake.pm_.c:528
+#, fuzzy
 msgid ""
 "To print to a socket printer, you need to provide the\n"
-"hostname of the printer and optionally the port number."
+"host name of the printer and optionally the port number.\n"
+"On HP JetDirect servers the port number is usually 9100,\n"
+"on other servers it can vary. See the manual of your\n"
+"hardware."
 msgstr ""
 "Per imprimir a una impressora de s�col, heu d'indicar el nom de l'ordinador\n"
 "central de la impressora i, opcionalment, el n�mero de port."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
 msgstr "Nom de l'ordinador central de la impressora"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Port"
+#: ../../printerdrake.pm_.c:537
+#, fuzzy
+msgid "Printer host name missing!"
+msgstr "Nom de l'ordinador central de la impressora"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "Podeu indicar directament l'URI per accedir a la impressora amb CUPS."
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "Dispositiu URI d'impressora"
+
+#: ../../printerdrake.pm_.c:567
+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 ""
+
+#: ../../printerdrake.pm_.c:582
+msgid "A valid URI must be entered!"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
+#: ../../printerdrake.pm_.c:682
+msgid ""
+"Every printer needs a name (for example lp).\n"
+"The Description and Location fields do not need \n"
+"to be filled in. They are comments for the users."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:685
+msgid "Name of printer"
+msgstr "Nom de la impressora"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Descripci�"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Ubicaci�"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "S'est� llegint la base de dades de controladors CUPS..."
+
+#: ../../printerdrake.pm_.c:793
+#, fuzzy
+msgid "Printer model selection"
+msgstr "Connexi� de la impressora"
+
+#: ../../printerdrake.pm_.c:794
+#, fuzzy
+msgid "Which printer model do you have?"
 msgstr "Quin tipus d'impressora teniu?"
 
-#: ../../printerdrake.pm_.c:204 ../../printerdrake.pm_.c:305
-msgid "Do you want to test printing?"
+#: ../../printerdrake.pm_.c:866
+#, fuzzy
+msgid "OKI winprinter configuration"
+msgstr "Configuraci� del m�dem"
+
+#: ../../printerdrake.pm_.c:867
+msgid ""
+"You are configuring an OKI laser winprinter. These printers\n"
+"use a very special communication protocol and therefore they\n"
+"work only when connected to the first parallel port. When\n"
+"your printer is connected to another port or to a print\n"
+"server box please connect the printer to the first parallel\n"
+"port before you print a test page. Otherwise the printer\n"
+"will not work. Your connection type setting will be ignored\n"
+"by the driver."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:916 ../../printerdrake.pm_.c:946
+#, fuzzy
+msgid "Lexmark inkjet configuration"
+msgstr "Configuraci� d'Internet"
+
+#: ../../printerdrake.pm_.c:917
+msgid ""
+"The inkjet printer drivers provided by Lexmark only support\n"
+"local printers, no printers on remote machines or print server\n"
+"boxes. Please connect your printer to a local port or\n"
+"configure it on the machine where it is connected to."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:947
+msgid ""
+"To be able to print with your Lexmark inkjet and this\n"
+"configuration, you need the inkjet printer drivers\n"
+"provided by Lexmark (http://www.lexmark.com/). Go to\n"
+"the US site and click on the \"Drivers\" button. Then\n"
+"choose your model and afterwards \"Linux\" as\n"
+"operating system. The drivers come as RPM packages\n"
+"or shell scripts with interactive graphical installation.\n"
+"You do not need to do this configuration by the\n"
+"graphical frontends. Cancel directly after the license\n"
+"agreement. Then print printhead alignment pages with\n"
+"\"lexmarkmaintain\" and adjust the head alignment\n"
+"settings with this program."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1079
+msgid ""
+"Printer default settings\n"
+"You should make sure that the page size and the\n"
+"ink type (if available) are set correctly. Note\n"
+"that with a very high printout quality printing\n"
+"can get substantially slower."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1090
+#, c-format
+msgid "Option %s must be an integer number!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1094
+#, c-format
+msgid "Option %s must be a number!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1099
+#, c-format
+msgid "Option %s out of range!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1136
+#, fuzzy, c-format
+msgid ""
+"Do you want to set this printer (\"%s\")\n"
+"as the default printer?"
 msgstr "Voleu comprovar la impressi�?"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "Ports de comprovaci�"
+
+#: ../../printerdrake.pm_.c:1153
+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\n"
+"and on laser printers with too low memory it can even not come out.\n"
+"In most cases it is enough to print the standard test page."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1158
+#, fuzzy
+msgid "No test pages"
+msgstr "S�, imprimeix ambdues p�gines de prova"
+
+#: ../../printerdrake.pm_.c:1159
+#, fuzzy
+msgid "Print"
+msgstr "Impressora"
+
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "Eines est�ndard"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "S'esta(n) imprimint la(es) p�gina(es) de prova... "
+
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "S'esta(n) imprimint la(es) p�gina(es) de prova... "
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "S'esta(n) imprimint la(es) p�gina(es) de prova... "
 
-#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:324
-#, c-format
+#: ../../printerdrake.pm_.c:1200
+#, fuzzy, c-format
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
+"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"
-"Does it work properly?"
 msgstr ""
 "La(es) p�gina(es) de prova s'ha(n) enviat al proc�s d'impressi�.\n"
 "Degut a aix�, pot passar un cert temps abans no comenci la impressi�.\n"
@@ -6739,239 +6837,606 @@ msgstr ""
 "\n"
 "Funciona correctament?"
 
-#: ../../printerdrake.pm_.c:218 ../../printerdrake.pm_.c:328
+#: ../../printerdrake.pm_.c:1204
+#, fuzzy
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Does it work properly?"
+"Test page(s) have been sent to the printer.\n"
+"It may take some time before the printer starts.\n"
 msgstr ""
 "La(es) p�gina(es) de prova s'ha(n) enviat al proc�s d'impressi�.\n"
 "Degut a aix�, pot passar un cert temps abans no comenci la impressi�.\n"
 "Funciona correctament?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "S�, imprimeix una p�gina ASCII de prova"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "S�, imprimeix una p�gina PostScript de prova"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Cap impressora"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "S�, imprimeix ambdues p�gines de prova"
+#: ../../printerdrake.pm_.c:1237
+#, 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 "
+"\"qtcups <file>\". The graphical tools allow you to choose the printer and "
+"to modify the option settings easily.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:243
-msgid "Configure Printer"
-msgstr "Configura la impressora"
+#: ../../printerdrake.pm_.c:1239
+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 ""
 
-#: ../../printerdrake.pm_.c:273
-msgid "Printer options"
+#: ../../printerdrake.pm_.c:1242 ../../printerdrake.pm_.c:1254
+#: ../../printerdrake.pm_.c:1266
+#, 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 ""
+
+#: ../../printerdrake.pm_.c:1244 ../../printerdrake.pm_.c:1284
+msgid ""
+"To get a list of the options available for the current printer read either "
+"the list shown below or click on the \"Print option list\" button.\n"
+"\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1249 ../../printerdrake.pm_.c:1261
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\".\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1251 ../../printerdrake.pm_.c:1263
+#: ../../printerdrake.pm_.c:1275
+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 ""
+
+#: ../../printerdrake.pm_.c:1256 ../../printerdrake.pm_.c:1268
+msgid ""
+"To get a list of the options available for the current printer click on the "
+"\"Print option list\" button.\n"
+"\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1273
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\" or \"%s <file>\".\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1277
+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 ""
+
+#: ../../printerdrake.pm_.c:1281
+#, 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 ""
+
+#: ../../printerdrake.pm_.c:1292
+#, fuzzy, c-format
+msgid "Printing on the printer \"%s\""
+msgstr "S'est� desactivant la xarxa"
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
 msgstr "Opcions de la impressora"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Mida del paper"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+#, fuzzy
+msgid "Reading printer data ..."
+msgstr "S'est� llegint la base de dades de controladors CUPS..."
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "Voleu expulsar la p�gina despr�s de la tasca?"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "Configuraci� d'Internet"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Opcions del programa de control Uniprint"
+#: ../../printerdrake.pm_.c:1339
+#, c-format
+msgid ""
+"You can copy the printer configuration which you have done \n"
+"for the spooler %s to %s, your current spooler. All the\n"
+"configuration data (printer name, description, location, \n"
+"connection type, and default option settings) is overtaken,\n"
+"but jobs will not be transferred.\n"
+"Not all queues can be transferred due to the following \n"
+"reasons:\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:281
-msgid "Color depth options"
-msgstr "Opcions de profunditat del color"
+#: ../../printerdrake.pm_.c:1347
+msgid ""
+"CUPS does not support printers on Novell servers or printers\n"
+"sending the data into a free-formed command.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:283
-msgid "Print text as PostScript?"
-msgstr "Voleu imprimir el text com a PostScript?"
+#: ../../printerdrake.pm_.c:1350
+msgid ""
+"PDQ only supports local printers, remote LPD printers, and\n"
+"Socket/TCP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:285
-msgid "Fix stair-stepping text?"
-msgstr "Voleu ajustar el text 'stair-stepping'?"
+#: ../../printerdrake.pm_.c:1353
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:287
-msgid "Number of pages per output pages"
-msgstr "Nombre de p�gines per p�gines de sortida"
+#: ../../printerdrake.pm_.c:1355
+msgid ""
+"In addition, queues not created with this program or\n"
+"\"foomatic-configure\" cannot be transferred."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:288
-msgid "Right/Left margins in points (1/72 of inch)"
-msgstr "Marges dret/esquerra en punts (1/72 de polzada)"
+#: ../../printerdrake.pm_.c:1357
+msgid ""
+"\n"
+"Also printers configured with the PPD files provided by\n"
+"their manufacturers or with native CUPS drivers can not be\n"
+"transferred."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:289
-msgid "Top/Bottom margins in points (1/72 of inch)"
-msgstr "Marges superior/inferior en punts (1/72 de polzada)"
+#: ../../printerdrake.pm_.c:1360
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:291
-msgid "Extra GhostScript options"
-msgstr "opcions addicionals del GhostScript"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "Opcions addicionals per al text"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "Inverteix l'ordre de les p�gines"
+#: ../../printerdrake.pm_.c:1377
+#, 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 ""
 
-#: ../../printerdrake.pm_.c:345
-msgid "Would you like to configure a printer?"
-msgstr "Voleu configurar una impressora?"
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr ""
+"El nom de la impressora nom�s pot constar de lletres, n�meros i el car�cter "
+"de subratllat"
 
-#: ../../printerdrake.pm_.c:351
+#: ../../printerdrake.pm_.c:1390
+#, c-format
 msgid ""
-"Here are the following print queues.\n"
-"You can add some more or change the existing ones."
+"The printer \"%s\" already exists,\n"
+"do you really want to overwrite its configuration?"
 msgstr ""
-"Aquestes s�n les cues d'impressi� seg�ents.\n"
-"Podeu afegir-ne algunes m�s o canviar-ne les existents."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "S'est� iniciant el CUPS"
+#: ../../printerdrake.pm_.c:1398
+#, fuzzy
+msgid "New printer name"
+msgstr "Cap impressora"
 
-#: ../../printerdrake.pm_.c:370
-msgid "Reading CUPS drivers database..."
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1412
+#, c-format
+msgid ""
+"You have transferred your former default printer (\"%s\"),\n"
+"Should it be also the default printer under the\n"
+"new printing system %s?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1423
+#, fuzzy
+msgid "Refreshing printer data ..."
 msgstr "S'est� llegint la base de dades de controladors CUPS..."
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "Seleccioneu la connexi� de la impressora"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+#, fuzzy
+msgid "Configuration of a remote printer"
+msgstr "Configura la impressora"
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "Com est� connectada la impressora?"
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "S'est� comprovant la vostra conexi�..."
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "Seleccioneu la connexi� de la impressora remota"
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "Configura la xarxa"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "El monitor no est� configurat"
+
+#: ../../printerdrake.pm_.c:1456
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected.\n"
-"In case of doubt, select \"Remote CUPS server\"."
+"You are going to configure a remote printer. This needs working\n"
+"network access, but your network is not configured yet. If you\n"
+"go on without network configuration, you will not be able to use\n"
+"the printer which you are configuring now. How do you want \n"
+"to proceed?"
 msgstr ""
-"Amb un servidor CUPS remot, aqu� no us cal configurar cap\n"
-"impressora; les impressores es detectaran autom�ticament.\n"
-"En cas de dubte, seleccioneu \"Servidor CUPS remot\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "S'est� configurant la xarxa"
+
+#: ../../printerdrake.pm_.c:1496
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected\n"
-"unless you have a server on a different network; in the\n"
-"latter case, you have to give the CUPS server IP address\n"
-"and optionally the port number."
+"The network configuration done during the installation \n"
+"cannot be started now. Please check whether the network\n"
+"gets accessable after booting your system and correct the\n"
+"configuration using the Mandrake Control Center, section\n"
+"\"Network & Internet\"/\"Connection\", and afterwards set\n"
+"up the printer, also using the Mandrake Control Center,\n"
+"section \"Hardware\"/\"Printer\""
 msgstr ""
-"Amb un servidor CUPS remot, aqu� no us cal configurar cap\n"
-"impressora; les impressores es detectaran autom�ticament,\n"
-"tret que tingueu un servidor en una altra xarxa; en aquest\n"
-"cas, heu d'indicar l'adre�a IP, i opcionalment el n�mero de\n"
-"port, al servidor CUPS."
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "IP del servidor CUPS"
+#: ../../printerdrake.pm_.c:1503
+msgid ""
+"The network access was not running and could not be \n"
+"started. Please check your configuration and your \n"
+"hardware. Then try to configure your remote printer\n"
+"again."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:429
-msgid "Port number should be numeric"
-msgstr "El n�mero de port ha de ser num�ric"
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
+msgstr "Quin sistema d'impressi� voleu utilitzar?"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "Elimina la cua"
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "Alt"
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Paranoic"
+
+#: ../../printerdrake.pm_.c:1549
+#, c-format
+msgid "Installing a printing system in the %s security level"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:454
+#: ../../printerdrake.pm_.c:1550
+#, c-format
 msgid ""
-"Name of printer should contains only letters, numbers and the underscore"
+"You are about to install the printing system %s on\n"
+"a system running in the %s security level.\n"
+"\n"
+"This printing system runs a daemon (background process)\n"
+"which waits for print jobs and handles them. This daemon\n"
+"is also accessable by remote machines through the network\n"
+"and so it is a possible point for attacks. Therefore only\n"
+"a few selected daemons are started by default in this\n"
+"security level.\n"
+"\n"
+"Do you really want to configure printing on this\n"
+"machine?"
 msgstr ""
-"El nom de la impressora nom�s pot constar de lletres, n�meros i el car�cter "
-"de subratllat"
 
-#: ../../printerdrake.pm_.c:461
+#: ../../printerdrake.pm_.c:1584
+#, fuzzy
+msgid "Starting the printing system at boot time"
+msgstr "Quin sistema d'impressi� voleu utilitzar?"
+
+#: ../../printerdrake.pm_.c:1585
+#, c-format
 msgid ""
-"Every printer need a name (for example lp).\n"
-"Other parameters such as the description of the printer or its location\n"
-"can be defined. What name should be used for this printer and\n"
-"how is the printer connected?"
+"The printing system (%s) will not be started automatically\n"
+"when the machine is booted.\n"
+"\n"
+"It is possible that the automatic starting was turned off \n"
+"by changing to a higher security level, because the printing\n"
+"system is a potential point for attacks.\n"
+"\n"
+"Do you want to have the automatic starting of the printing\n"
+"system turned on again?"
 msgstr ""
-"Cada impressora necessita un nom (p.ex. lp).\n"
-"Es poden definir altres par�metres, com ara la descripci� de la impressora\n"
-"o la seva ubicaci�. Quin nom cal utilitzar per a aquesta impressora, i com\n"
-"est� connectada?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Nom de la impressora"
+#: ../../printerdrake.pm_.c:1612 ../../printerdrake.pm_.c:1644
+#: ../../printerdrake.pm_.c:1671 ../../printerdrake.pm_.c:1701
+#: ../../printerdrake.pm_.c:1778
+msgid "Checking installed software..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:466
-msgid "Description"
-msgstr "Descripci�"
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Ubicaci�"
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1727
+#, fuzzy
+msgid "Select Printer Spooler"
+msgstr "Seleccioneu la connexi� de la impressora"
+
+#: ../../printerdrake.pm_.c:1728
+#, fuzzy
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Quin sistema d'impressi� voleu utilitzar?"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Configura la impressora"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Opcions de la impressora"
+
+#: ../../printerdrake.pm_.c:1815
+#, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "S'est� llegint la base de dades de controladors CUPS..."
+
+#: ../../printerdrake.pm_.c:1845
+#, fuzzy
+msgid "Would you like to configure printing?"
+msgstr "Voleu configurar una impressora?"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1879
 msgid ""
-"Every print queue (which print jobs are directed to) needs a\n"
-"name (often lp) and a spool directory associated with it. What\n"
-"name and directory should be used for this queue and how is the printer "
-"connected?"
+"The following printers are configured.\n"
+"Click on one of them to modify it or\n"
+"to get information about it or on \n"
+"\"Add Printer\" to add a new printer."
 msgstr ""
-"Cada cua d'impressi� (a qu� s'adrecen les tasques d'impressi�) necessita\n"
-"un nom (sovint lp) i un directori d'spool associada amb ell. Quin nom i\n"
-"directori cal utilitzar per a aquesta cua, i com est� connectada la "
-"impressora?"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "Nom de la cua"
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "Mode normal"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "Directori d'spool"
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Predeterminat)"
+
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "Servidor CUPS remot"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "Servidor CUPS remot"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+#, fuzzy
+msgid "Add printer"
+msgstr "Cap impressora"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "Voleu comprovar la configuraci�?"
+
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "Configuraci� del m�dem"
+
+#: ../../printerdrake.pm_.c:2004
+#, c-format
+msgid ""
+"Printer %s: %s %s\n"
+"What do you want to modify on this printer?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2012
+msgid "Do it!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+#, fuzzy
+msgid "Printer connection type"
+msgstr "Connexi� a Internet compartida"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
 msgstr "Connexi� de la impressora"
 
-#: ../../raid.pm_.c:33
+#: ../../printerdrake.pm_.c:2018 ../../printerdrake.pm_.c:2081
+msgid "Printer manufacturer, model, driver"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2019 ../../printerdrake.pm_.c:2082
+msgid "Printer manufacturer, model"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2028 ../../printerdrake.pm_.c:2092
+msgid "Set this printer as the default"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2029 ../../printerdrake.pm_.c:2097
+#, fuzzy
+msgid "Print test pages"
+msgstr "S'esta(n) imprimint la(es) p�gina(es) de prova... "
+
+#: ../../printerdrake.pm_.c:2030 ../../printerdrake.pm_.c:2099
+msgid "Know how to print with this printer"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2031 ../../printerdrake.pm_.c:2101
+#, fuzzy
+msgid "Remove printer"
+msgstr "Impressora remota"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "S'est� llegint la base de dades de controladors CUPS..."
+
+#: ../../printerdrake.pm_.c:2096
+#, c-format
+msgid "The printer \"%s\" is set as the default printer now."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2103
+#, fuzzy, c-format
+msgid "Do you really want to remove the printer \"%s\"?"
+msgstr "Voleu reiniciar la xarxa"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "S'est� llegint la base de dades de controladors CUPS..."
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+#, fuzzy
+msgid "Proxy configuration"
+msgstr "Configuraci� dels proxys"
+
+#: ../../proxy.pm_.c:30
+msgid ""
+"Welcome to the proxy configuration utility.\n"
+"\n"
+"Here, you'll be able to set up your http and ftp proxies\n"
+"with or without login and password\n"
+msgstr ""
+
+#: ../../proxy.pm_.c:38
+msgid ""
+"Please fill in the http proxy informations\n"
+"Leave it blank if you don't want an http proxy"
+msgstr ""
+
+#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
+msgid "URL"
+msgstr ""
+
+#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
+#, fuzzy
+msgid "port"
+msgstr "Port"
+
+#: ../../proxy.pm_.c:44
+#, fuzzy
+msgid "Url should begin with 'http:'"
+msgstr "El proxy ha de ser http://..."
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+#, fuzzy
+msgid "The port part should be numeric"
+msgstr "El n�mero de port ha de ser num�ric"
+
+#: ../../proxy.pm_.c:59
+msgid ""
+"Please fill in the ftp proxy informations\n"
+"Leave it blank if you don't want an ftp proxy"
+msgstr ""
+
+#: ../../proxy.pm_.c:65
+#, fuzzy
+msgid "Url should begin with 'ftp:'"
+msgstr "El proxy ha de ser ftp://..."
+
+#: ../../proxy.pm_.c:79
+msgid ""
+"Please enter proxy login and password, if any.\n"
+"Leave it blank if you don't want login/passwd"
+msgstr ""
+
+#: ../../proxy.pm_.c:80
+#, fuzzy
+msgid "login"
+msgstr "Entrada autom�tica"
+
+#: ../../proxy.pm_.c:82
+#, fuzzy
+msgid "password"
+msgstr "Contrasenya"
+
+#: ../../proxy.pm_.c:84
+#, fuzzy
+msgid "re-type password"
+msgstr "Sense contrasenya"
+
+#: ../../proxy.pm_.c:88
+#, fuzzy
+msgid "The passwords don't match. Try again!"
+msgstr "Les contrasenyes no coincideixen"
+
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "No es pot afegir una partici� a un RAID _formatat_ md%d"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "No es pot escriure al fitxer $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "No es pot escriure al fitxer %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "l'mkraid ha fallit"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "l'mkraid ha fallit (potser manquen eines del RAID?)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "No hi ha prou particions per al nivell RAID %d\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
 msgstr ""
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron, un programador d'ordres peri�diques."
 
-#: ../../services.pm_.c:18
+#: ../../services.pm_.c:17
 msgid ""
 "apmd is used for monitoring batery status and logging it via syslog.\n"
 "It can also be used for shutting down the machine when the battery is low."
@@ -6980,7 +7445,7 @@ msgstr ""
 "mitjan�ant el registre del sistema.\n"
 "Tamb� es pot utilitzar per apagar l'ordinador quan queda poca bateria."
 
-#: ../../services.pm_.c:20
+#: ../../services.pm_.c:19
 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."
@@ -6989,7 +7454,7 @@ msgstr ""
 "especificar en executar 'at', i executa les ordres 'batch' quan la\n"
 "mitjana de c�rrega �s prou baixa."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:21
 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 "
@@ -7001,7 +7466,7 @@ msgstr ""
 "caracter�stiques al cron b�sic, incloent seguretat millorada i opcions\n"
 "de configuraci� m�s potents."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:24
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -7012,13 +7477,13 @@ msgstr ""
 "el Midnight Commander. Tamb� permet operacions de tallar i enganxar amb el "
 "ratol�, i inclou suport de men�s desplegables a la consola."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr ""
 
-#: ../../services.pm_.c:30
+#: ../../services.pm_.c:29
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -7026,7 +7491,7 @@ msgstr ""
 "L'Apache �s un servidor de World Wide Web. S'utilitza per servir fitxers\n"
 "HTML i CGI."
 
-#: ../../services.pm_.c:32
+#: ../../services.pm_.c:31
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -7041,13 +7506,13 @@ msgstr ""
 "d'iniciar molts serveis, incloent el telnet, l'ftp, l'rsh i l'rlogin. Si\n"
 "s'inhabilita l'inetd s'inhabiliten tots els serveis de qu� �s responsable."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:35
 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_.c:38
+#: ../../services.pm_.c:37
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -7058,23 +7523,23 @@ msgstr ""
 "kbdconfig.\n"
 "Per a la majoria d'ordinadors, s'ha de deixar habilitat."
 
-#: ../../services.pm_.c:41
+#: ../../services.pm_.c:40
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
 msgstr ""
 
-#: ../../services.pm_.c:43
+#: ../../services.pm_.c:42
 msgid "Automatic detection and configuration of hardware at boot."
 msgstr ""
 
-#: ../../services.pm_.c:44
+#: ../../services.pm_.c:43
 msgid ""
 "Linuxconf will sometimes arrange to perform various tasks\n"
 "at boot-time to maintain the system configuration."
 msgstr ""
 
-#: ../../services.pm_.c:46
+#: ../../services.pm_.c:45
 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)."
@@ -7083,13 +7548,13 @@ msgstr ""
 "correctament. B�sicament, es tracta d'un servidor que assigna les\n"
 "tasques d'impressi� a la(es) impressora(es)."
 
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:47
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
 msgstr ""
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:49
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -7097,7 +7562,7 @@ msgstr ""
 "named (BIND) �s un servidor de noms de domini (DNS) que s'utiilitza\n"
 "per convertir noms d'ordinadors centrals en adreces IP."
 
-#: ../../services.pm_.c:52
+#: ../../services.pm_.c:51
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -7105,7 +7570,7 @@ msgstr ""
 "Munta i desmunta tots els punts de muntatge dels sistemes de fitxers\n"
 "de xarxa (NFS), SMB (gestor de xarxes d'�rea local/Windows) i NCP (NetWare)."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -7113,7 +7578,7 @@ msgstr ""
 "Activa/Desactiva totes les interf�cies de xarxa configurades per\n"
 "iniciar-se durant l'arrencada."
 
-#: ../../services.pm_.c:56
+#: ../../services.pm_.c:55
 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"
@@ -7123,7 +7588,7 @@ msgstr ""
 "Aquest servei proporciona la funcionalitat del servidor NFS, que es\n"
 "configura mitjan�ant el fitxer /etc/exports."
 
-#: ../../services.pm_.c:59
+#: ../../services.pm_.c:58
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -7131,17 +7596,17 @@ msgstr ""
 "L'NFS �s un popular protocol de compartici� de fitxers en xarxes TCP/IP\n"
 "Aquest servei proporciona la funcionalitat de blocatge del fitxer NFS."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
 msgstr ""
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
 msgstr ""
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:63
 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 "
@@ -7152,7 +7617,7 @@ msgstr ""
 "i els m�dems en port�tils. No s'iniciar� tret que es configuri, de manera\n"
 "que no hi ha problema per instal�lar-lo en ordinadors que no el necessiten."
 
-#: ../../services.pm_.c:67
+#: ../../services.pm_.c:66
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -7164,7 +7629,7 @@ msgstr ""
 "executant en ordinadors que actuen com a servidors per a protocols que\n"
 "utilitzen el mecanisme RPC."
 
-#: ../../services.pm_.c:70
+#: ../../services.pm_.c:69
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -7172,7 +7637,7 @@ msgstr ""
 "El Postfix �s un agent de transport de correu, que �s el programa que\n"
 "passa el correu d'un ordinador a un altre."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -7180,13 +7645,13 @@ msgstr ""
 "Desa i recupera el generador d'entropia del sistema per a\n"
 "la generaci� de nombres aleatoris d'una m�s alta qualitat."
 
-#: ../../services.pm_.c:74
+#: ../../services.pm_.c:73
 msgid ""
 "Assign raw devices to block devices (such as hard drive\n"
 "partitions), for the use of applications such as Oracle"
 msgstr ""
 
-#: ../../services.pm_.c:76
+#: ../../services.pm_.c:75
 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"
@@ -7197,7 +7662,7 @@ msgstr ""
 "�mpliament en xarxes petites, les xarxes complexes necessiten protocols\n"
 "d'encaminament m�s complexs."
 
-#: ../../services.pm_.c:79
+#: ../../services.pm_.c:78
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -7205,7 +7670,7 @@ msgstr ""
 "El protocol rstat permet que els usuaris d'una xarxa recuperin\n"
 "m�trics de funcionament de qualsevol ordinador de la mateixa."
 
-#: ../../services.pm_.c:81
+#: ../../services.pm_.c:80
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -7213,7 +7678,7 @@ msgstr ""
 "El protocol rusers permet que els usuaris d'una xarxa identifiquin\n"
 "qui est� connectat en altres ordinadors de la mateixa."
 
-#: ../../services.pm_.c:83
+#: ../../services.pm_.c:82
 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)."
@@ -7222,12 +7687,12 @@ msgstr ""
 "de tots els usuaris que est�n connectats a un ordinador que est�\n"
 "executant el proc�s rwho (similar al finger)."
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:84
 #, fuzzy
 msgid "Launch the sound system on your machine"
 msgstr "Executa el sistema X-Window en iniciar"
 
-#: ../../services.pm_.c:86
+#: ../../services.pm_.c:85
 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."
@@ -7236,33 +7701,71 @@ msgstr ""
 "missatges en diversos fitxers de registre del sistema. �s aconsellable\n"
 "executar-lo sempre."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
 msgstr ""
 
-#: ../../services.pm_.c:89
+#: ../../services.pm_.c:88
 #, fuzzy
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
 msgstr "Inicia i atura l'X Font Server en arrencar i apagar l'ordinador."
 
-#: ../../services.pm_.c:118
+#: ../../services.pm_.c:114 ../../services.pm_.c:156
 msgid "Choose which services should be automatically started at boot time"
 msgstr ""
 "Escolliu els serveis que s'han d'iniciar autom�ticament durant l'arrencada"
 
+#: ../../services.pm_.c:126
+#, fuzzy
+msgid "Printing"
+msgstr "Impressora"
+
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "Internet"
+
+#: ../../services.pm_.c:130
+msgid "File sharing"
+msgstr ""
+
+#: ../../services.pm_.c:132
+#, fuzzy
+msgid "System"
+msgstr "Mode de sistema"
+
 #: ../../services.pm_.c:137
+#, fuzzy
+msgid "Remote Administration"
+msgstr "Opcions de la impressora lpd remota"
+
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Servidor, base de dades"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+#, fuzzy
+msgid "Services"
+msgstr "dispositiu"
+
+#: ../../services.pm_.c:198
 msgid "running"
 msgstr "s'est� executant"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 msgid "stopped"
 msgstr "aturat"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr "Serveis i dimonis"
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
@@ -7270,11 +7773,16 @@ msgstr ""
 "Malauradament no hi ha m�s informaci�\n"
 "sobre aquest servei."
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 msgid "On boot"
 msgstr "En arrencar"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "S'est� instal�lant el paquet %s"
+
+#: ../../standalone/diskdrake_.c:63
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
 "I'll try to go on blanking bad partitions"
@@ -7282,15 +7790,66 @@ msgstr ""
 "No puc llegir la vostra taula de particions, est� massa malmesa per a mi :(\n"
 "Intentar� seguir buidant les particions incorrectes"
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+#, fuzzy
+msgid "Error!"
+msgstr "Error"
+
+#: ../../standalone/drakautoinst_.c:45
+#, c-format
+msgid "I can't find needed image file `%s'."
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:47
+#, fuzzy
+msgid "Auto Install Configurator"
+msgstr "Publica la configuraci� de la instal�laci� "
+
+#: ../../standalone/drakautoinst_.c:48
+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"
+"Do you want to continue?"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:70
+#, fuzzy
+msgid "Automatic Steps Configuration"
+msgstr "Configuraci� del tipus d'arrencada"
+
+#: ../../standalone/drakautoinst_.c:71
+msgid ""
+"Please choose for each step whether it will replay like your install, or it "
+"will be manual"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:112 ../../standalone/drakgw_.c:599
+msgid "Congratulations!"
+msgstr "Felicitats!"
+
+#: ../../standalone/drakautoinst_.c:113
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:36 ../../standalone/drakgw_.c:181
 msgid "Internet Connection Sharing"
 msgstr "Connexi� a Internet compartida"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "La connexi� a Internet compartida est� habilitada"
 
-#: ../../standalone/drakgw_.c:119
+#: ../../standalone/drakgw_.c:120
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
@@ -7302,31 +7861,31 @@ msgstr ""
 "\n"
 "Qu� voleu fer?"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "inhabilita"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr "deixa-ho c�rrer"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
 msgstr "torna a configurar"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
 msgstr "S'estan inhabilitant els servidors..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "Ara, la compartici� de la connexi� a Internet est� inhabilitada."
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "La connexi� a Internet compartida est� inhabilitada"
 
-#: ../../standalone/drakgw_.c:144
+#: ../../standalone/drakgw_.c:145
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -7338,27 +7897,19 @@ msgstr ""
 "\n"
 "Qu� voleu fer?"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "habilita"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
 msgstr "S'estan habilitant els servidors..."
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "Ara, la connexi� compartida a Internet est� habilitada."
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "No s'ha pogut interpretar el contingut del fitxer de configuraci�."
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr "Fitxer de configuraci� no reconegut"
-
-#: ../../standalone/drakgw_.c:181
+#: ../../standalone/drakgw_.c:182
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
 "With that feature, other computers on your local network will be able to use "
@@ -7375,21 +7926,21 @@ msgstr ""
 "Nota: per configurar una xarxa d'�rea local (LAN), us cal un adaptador de "
 "xarxa dedicat."
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Interf�cie %s (utilitzant el m�dul %s)"
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:209
 #, c-format
 msgid "Interface %s"
 msgstr "Interf�cie %s"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:217
 msgid "No network adapter on your system!"
 msgstr "No teniu cap adaptador de xarxa al sistema!"
 
-#: ../../standalone/drakgw_.c:217
+#: ../../standalone/drakgw_.c:218
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
@@ -7398,6 +7949,10 @@ msgstr ""
 "executeu l'eina de configuraci� de maquinari."
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "Interf�cie de la xarxa"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7412,7 +7967,7 @@ msgstr ""
 "\n"
 "Ara configurar� la vostra xarxa d'�rea local amb aquest adaptador."
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
@@ -7420,23 +7975,24 @@ msgstr ""
 "Si us plau, escolliu l'adaptador de xarxa que es connectar�\n"
 "a la vostra xarxa d'�rea local."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
 "Compte, l'adaptador de xarxa ja est� configurat. El tornar� a configurar."
 
-#: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
+#: ../../standalone/drakgw_.c:254
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 "S'ha trobat un conflicte potencial d'adre�a LAN en la configuraci� actual de "
-"$_!\n"
+"%s!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "S'ha detectat la configuraci� del sistema de tallafocs!"
 
-#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:263 ../../standalone/drakgw_.c:269
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
@@ -7444,25 +8000,22 @@ msgstr ""
 "Atenci�! S'ha detectat una configuraci� existent del sistema de tallafocs. "
 "Potser us caldr� fer algun ajustament manual despr�s de la instal�laci�."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "S'est� configurant..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 "S'estan configurant les seq��ncies, instal�lant el programari, iniciant els "
 "servidors..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "Hi ha hagut problemes en instal�lar el paquet $_"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "Felicitats!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Hi ha hagut problemes en instal�lar el paquet %s"
 
-#: ../../standalone/drakgw_.c:591
+#: ../../standalone/drakgw_.c:600
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
@@ -7473,23 +8026,23 @@ msgstr ""
 "vostra xarxa d'�rea local utilitzant la configuraci� autom�tica de xarxa "
 "(DHCP)."
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
 msgstr "La configuraci� ja s'ha realitzat, per� ara est� inhabilitada."
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
 msgstr "La configuraci� ja s'ha realitzat i ara est� habilitada."
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "No s'ha configurat mai cap connexi� compartida a Internet."
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
 msgstr "Configuraci� de la compartici� de la connexi� a Internet"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -7504,84 +8057,83 @@ msgstr ""
 "\n"
 "Feu clic a Configura per executar l'auxiliar de configuraci�."
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Configuraci� de xarxa (%d adaptadors)"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:539
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 msgid "Profile: "
 msgstr "Perfil: "
 
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:94
 msgid "Del profile..."
 msgstr "Suprimeix el perfil..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr "Perfil a suprimir:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "Perfil nou..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "Nom del perfil a crear:"
+#: ../../standalone/draknet_.c:134
+msgid ""
+"Name of the profile to create (the new profile is created as a copy of the "
+"current one) :"
+msgstr ""
 
-#: ../../standalone/draknet_.c:140
+#: ../../standalone/draknet_.c:160
 msgid "Hostname: "
 msgstr "Nom de l'ordinador central: "
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "Acc�s a Internet"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
 msgstr "Tipus:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "Passarel�la:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Interface:"
 msgstr "Intef�cie:"
 
-#: ../../standalone/draknet_.c:168
+#: ../../standalone/draknet_.c:192
 msgid "Status:"
 msgstr "Estat:"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:122 ../../standalone/net_monitor_.c:224
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 msgid "Connected"
 msgstr "Connectat"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:83 ../../standalone/net_monitor_.c:122
-#: ../../standalone/net_monitor_.c:224
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 msgid "Not connected"
 msgstr "Sense connexi�"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
 msgstr "Connecta..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Disconnect..."
 msgstr "Desconnecta..."
 
-#: ../../standalone/draknet_.c:191
+#: ../../standalone/draknet_.c:215
 #, fuzzy
 msgid "Starting your connection..."
 msgstr "S'est� comprovant la vostra conexi�..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
 msgstr "S'est� tancant la connexi�..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7593,120 +8145,115 @@ msgstr ""
 "/etc/sysconfig/network-scripts/net_cnx_down\n"
 "a root."
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
 msgstr "Ara, el sistema est� desconnectat."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "Configura l'acc�s a Internet..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "Configuraci� de la LAN"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "Adaptador"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "Programa de control"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "Interf�cie"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+#, fuzzy
+msgid "State"
+msgstr "Estat:"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "Configura la xarxa d'�rea local..."
 
-#: ../../standalone/draknet_.c:283
-msgid "Normal Mode"
-msgstr "Mode normal"
+#: ../../standalone/draknet_.c:279
+msgid "Click here to launch the wizard ->"
+msgstr ""
 
-#: ../../standalone/draknet_.c:288
+#: ../../standalone/draknet_.c:306
 msgid "Apply"
 msgstr "Aplica"
 
-#: ../../standalone/draknet_.c:307
+#: ../../standalone/draknet_.c:325
 msgid "Please Wait... Applying the configuration"
 msgstr "Si us plau, espereu... s'est� aplicant la configuraci�"
 
-#: ../../standalone/draknet_.c:391
+#: ../../standalone/draknet_.c:428
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 
-#: ../../standalone/draknet_.c:415
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
 msgstr "Configuraci� de la LAN"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adaptador %s: %s"
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
 msgstr "Protocol d'arrencada"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
 msgstr "Iniciat en l'arrencada"
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
 msgstr "Client DHCP"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Disable"
-msgstr "Inhabilita"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "activate now"
+msgstr "Actiu"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "Habilita"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "desactivate now"
+msgstr "Actiu"
 
-#: ../../standalone/draknet_.c:504
+#: ../../standalone/draknet_.c:538
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
 msgstr ""
 
-#: ../../standalone/draknet_.c:528
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
 msgstr "Configuraci� de la connexi� a Internet"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "Configuraci� de la connexi� a Internet"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "Tipus de connexi�: "
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "Par�metres"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "DNS 1 del prove�dor (opcional)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "DNS 2 del prove�dor (opcional)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "Targeta Ethernet"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "Client DHCP"
 
@@ -7779,15 +8326,30 @@ msgstr ""
 "totalment tancat.\n"
 "Les caracter�stiques de seguretat estan al m�xim."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "S'est� establint el nivell de seguretat"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "Escolliu les opcions per al servidor"
+
+#: ../../standalone/draksec_.c:68
+msgid ""
+"A library which defends against buffer overflow and format string attacks."
+msgstr ""
+
+#: ../../standalone/draksec_.c:72
 msgid "Setting security level"
 msgstr "S'est� establint el nivell de seguretat"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
 msgstr "Control Center"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "Escolliu l'eina que voleu utilitzar "
 
@@ -7816,83 +8378,14 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "No es pot iniciar l'actualitzaci� en directe !!!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "no s'ha trobat cap serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "Voleu emular el tercer bot�?"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "Si us plau, comproveu el ratol�."
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-msgid "Network Monitoring"
-msgstr "Monitoritzaci� de la xarxa"
-
-#: ../../standalone/net_monitor_.c:56
-msgid "Statistics"
-msgstr "Estad�stiques"
-
-#: ../../standalone/net_monitor_.c:59
-msgid "Sending Speed: "
-msgstr "S'est� enviant la velocitat: "
-
-#: ../../standalone/net_monitor_.c:61
-msgid "Receiving Speed: "
-msgstr "S'est� rebent la velocitat: "
-
-#: ../../standalone/net_monitor_.c:66
-msgid "Close"
-msgstr "Tanca"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Connecting to Internet "
-msgstr "S'est� establint la connexi� a Internet"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Disconnecting from Internet "
-msgstr "S'est� realitzant la desconnexi� d'Internet"
-
-#: ../../standalone/net_monitor_.c:114
-msgid "Disconnection from Internet failed."
-msgstr "No s'ha pogut realitzar la desconnexi� d'Internet"
-
-#: ../../standalone/net_monitor_.c:115
-msgid "Disconnection from Internet complete."
-msgstr "La desconnexi� d'Internet ha finalitzat"
-
-#: ../../standalone/net_monitor_.c:117
-msgid "Connection complete."
-msgstr "La connexi� ha finalitzat."
-
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-"No s'ha pogut establir la connexi�.\n"
-"Comproveu la configuraci� al Centre de control de Mandrake."
-
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr "enviat: "
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr "rebut: "
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Connect"
-msgstr "Connecta"
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Disconnect"
-msgstr "Desconnecta"
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "Configuraci� del sistema de tallafocs"
@@ -7923,11 +8416,79 @@ msgstr ""
 "\n"
 "Feu clic a Configura per configurar un tallafocs est�ndard"
 
-#: ../../tinyfirewall.pm_.c:10
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "Escolliu el vostre idioma"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Tipus d'instal�laci�"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Detecci� del disc dur"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Configura el ratol�"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Escolliu el vostre teclat"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "Seguretat"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Sistemes de fitxers"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Formata les particions"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Paquets a instal�lar"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Instal�la el sistema"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "Afegeix un usuari"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Configura la xarxa"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Configura els serveis"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Crea un disc d'arrencada"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Instal�la el LILO"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Configura l'X"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Surt de la instal�laci�"
+
+#: ../../tinyfirewall.pm_.c:9
 msgid ""
 "tinyfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Linux Mandrake machine.\n"
+"This configures a personal firewall for this Mandrake Linux machine.\n"
 "For a powerful dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -7938,7 +8499,7 @@ msgstr ""
 "Per a una potent soluci� de tallafocs dedicada, consulteu si us plau la "
 "distribuci� especialitzada MandrakeSecurity Firewall."
 
-#: ../../tinyfirewall.pm_.c:15
+#: ../../tinyfirewall.pm_.c:14
 msgid ""
 "We'll now ask you questions about which services you'd like to allow\n"
 "the Internet to connect to.  Please think carefully about these\n"
@@ -7956,7 +8517,7 @@ msgstr ""
 "desactiveu-ne el tallafocs. Podeu canviar aquesta configuraci� sempre que\n"
 "vulgueu tornant a executar aquesta aplicaci�!"
 
-#: ../../tinyfirewall.pm_.c:22
+#: ../../tinyfirewall.pm_.c:21
 msgid ""
 "Are you running a web server on this machine that you need the whole\n"
 "Internet to see? If you are running a webserver that only needs to be\n"
@@ -7969,7 +8530,7 @@ msgstr ""
 "NO.\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:27
+#: ../../tinyfirewall.pm_.c:26
 msgid ""
 "Are you running a name server on this machine? If you didn't set one\n"
 "up to give away IP and zone information to the whole Internet, please\n"
@@ -7981,7 +8542,7 @@ msgstr ""
 "Internet, si us plau responeu NO.\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:32
+#: ../../tinyfirewall.pm_.c:31
 msgid ""
 "Do you want to allow incoming Secure Shell (ssh) connections? This\n"
 "is a telnet-replacement that you might use to login. If you're using\n"
@@ -7995,7 +8556,7 @@ msgstr ""
 "Telnet no est� xifrat, de manera que us poden robar la contrasenya si\n"
 "l'utilitzeu, mentre que l'ssh est� xifrat i no permet cap mena d'intercepci�."
 
-#: ../../tinyfirewall.pm_.c:37
+#: ../../tinyfirewall.pm_.c:36
 msgid ""
 "Do you want to allow incoming telnet connections?\n"
 "This is horribly unsafe, as we explained in the previous screen. We\n"
@@ -8007,7 +8568,7 @@ msgstr ""
 "recomanem vivament que respongueu No aqu� i que utilitzeu l'ssh en comptes\n"
 "del Telnet.\n"
 
-#: ../../tinyfirewall.pm_.c:42
+#: ../../tinyfirewall.pm_.c:41
 msgid ""
 "Are you running an FTP server here that you need accessible to the\n"
 "Internet? If you are, we strongly recommend that you only use it for\n"
@@ -8020,7 +8581,7 @@ msgstr ""
 "pot ser robada, at�s que l'FTP no utilitza xifratge per a la transfer�ncia\n"
 "de contrasenyes.\n"
 
-#: ../../tinyfirewall.pm_.c:47
+#: ../../tinyfirewall.pm_.c:46
 msgid ""
 "Are you running a mail server here? If you're sending you \n"
 "messages through pine, mutt or any other text-based mail client,\n"
@@ -8032,7 +8593,7 @@ msgstr ""
 "text, probablement �s aix�. En cas contrari, desactiveu-ne el tallafocs.\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:52
+#: ../../tinyfirewall.pm_.c:51
 msgid ""
 "Are you running a POP or IMAP server here? This would\n"
 "be used to host non-web-based mail accounts for people via \n"
@@ -8044,7 +8605,7 @@ msgstr ""
 "mitjan�ant aquest ordinador.\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:57
+#: ../../tinyfirewall.pm_.c:56
 msgid ""
 "You appear to be running a 2.2 kernel.  If your network IP\n"
 "is automatically set by a computer in your home or office \n"
@@ -8055,7 +8616,7 @@ msgstr ""
 "casa o de l'oficina estableix autom�ticament la IP de la vostra\n"
 "xarxa (assignaci� din�mica), us cal autoritzar aix�. �s aquest el cas?\n"
 
-#: ../../tinyfirewall.pm_.c:62
+#: ../../tinyfirewall.pm_.c:61
 msgid ""
 "Is your computer getting time syncronized to another computer?\n"
 "Mostly, this is used by medium-large Unix/Linux organizations\n"
@@ -8069,7 +8630,7 @@ msgstr ""
 "d'una oficina gran i no heu sentit parlar d'aix�, probablement no us trobeu\n"
 "en aquest cas."
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
@@ -8081,289 +8642,1561 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
 msgstr "No es pot obrir %s: %s\n"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "No s'ha pogut obrir %s per escriure-hi: %s\n"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clients per a diferents protocols, incloent l'ssh"
+msgid "Web/FTP"
+msgstr "Servidor, Web/FTP"
 
 #: ../../share/compssUsers:999
-msgid "Development"
-msgstr "Desenvolupament"
+msgid "Network Computer (client)"
+msgstr "Ordinador de xarxa (client)"
 
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Estaci� de treball"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Servidor NFS, Servidor SMB, Servidor intermediari, Servidor SSH"
 
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Servidor, Tallafoc/Encaminador"
+msgid "Office"
+msgstr "Oficina"
 
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Gesti� d'informaci� personal"
+msgid "Gnome Workstation"
+msgstr "Estaci� de treball GNOME"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multim�dia - Gr�fics"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Eines per al Palm Pilot o per al Visor"
 
 #: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "Internet"
+msgid "Workstation"
+msgstr "Estaci� de treball"
 
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Ordinador de xarxa (client)"
+msgid "Firewall/Router"
+msgstr "Servidor, Tallafoc/Encaminador"
+
+#: ../../share/compssUsers:999
+msgid "Domain Name and Network Information Server"
+msgstr ""
+
+#: ../../share/compssUsers:999
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programes d'ofim�tica: processadors de textos (kword, abiword), gestors de "
+"fulls de c�lcul (kspread, gnumeric), visualitzadors pdf, etc."
 
 #: ../../share/compssUsers:999
 msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr "Eines d'�udio: reproductors d'mp3 o midi, mescladors, etc."
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Estaci� d'Internet"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Llibres i Com es fa... sobre el Linux i el programari lliure"
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Oficina"
+msgid "KDE Workstation"
+msgstr "Estaci� de treball KDE"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Estaci� multim�dia"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
+msgid "Multimedia - Video"
+msgstr "Multim�dia - V�deo"
+
+#: ../../share/compssUsers:999
+msgid "Set of tools for mail, news, web, file transfer, and chat"
 msgstr ""
-"Conjunt d'eines per llegir i enviar correu i not�cies (pine, mutt, tin...) i "
-"per navegar pel Web"
+"Conjunt d'eines per al correu, not�cies, web, transfer�ncia de fitxers i xat"
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Biblioteques de desenvolupament C i C++, programes i fitxers inclosos"
+msgid "Database"
+msgstr "Servidor, base de dades"
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
+msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programes per gestionar els vostres comptes, com ara el gnucash"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Eines per facilitar la configuraci� de l'ordinador"
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
+msgid "Multimedia - Sound"
+msgstr "Multim�dia - So"
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servidor NFS, Servidor SMB, Servidor intermediari, Servidor SSH"
+msgid "Utilities"
+msgstr "Utilitats"
 
 #: ../../share/compssUsers:999
 msgid "Documentation"
 msgstr "Documentaci�"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Console Tools"
+msgstr "Eines de consola"
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Utilitats"
+msgid "Postfix mail server, Inn news server"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS "
+msgid "Internet station"
+msgstr "Estaci� d'Internet"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Entorn gr�fic"
+msgid "Multimedia station"
+msgstr "Estaci� multim�dia"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multim�dia - So"
+#, fuzzy
+msgid "Configuration"
+msgstr "Configuraci� de la LAN"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programes d'entreteniment: acci�, jocs de taula, estrat�gia, etc."
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "M�s escriptoris gr�fics (Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Reproductors i editors de v�deo"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "Entorn d'escriptori K, l'entorn gr�fic b�sic que inclou diverses eines"
 
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Eines de consola"
+msgid "Graphical Environment"
+msgstr "Entorn gr�fic"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programes de reproducci�/edici� de so i v�deo"
+msgid "Development"
+msgstr "Desenvolupament"
 
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Estaci� cient�fica de treball"
+msgid "Apache, Pro-ftpd"
+msgstr "Apache i Pro-ftpd"
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editors, int�rprets d'ordres, eines de fitxer, terminals"
+msgid "Tools to create and burn CD's"
+msgstr "Eines per crear i gravar CD"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Llibres i Com es fa... sobre el Linux i el programari lliure"
+msgid "Office Workstation"
+msgstr "Estaci� de treball Office"
 
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Entorn gr�fic amb un conjunt d'aplicacions i eines d'escriptori f�cil "
-"d'utilitzar"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc."
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr ""
+msgid "Graphics programs such as The Gimp"
+msgstr "Programes gr�fics com ara el Gimp"
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "Jocs"
+msgid "DNS/NIS "
+msgstr "DNS/NIS "
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multim�dia - V�deo"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Biblioteques de desenvolupament C i C++, programes i fitxers inclosos"
 
 #: ../../share/compssUsers:999
 msgid "Network Computer server"
 msgstr "Servidor d'ordinador de xarxa"
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Programes gr�fics com ara el Gimp"
+msgid "Mail/Groupware/News"
+msgstr "Servidor, Correu/Groupware/Not�cies"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Estaci� de treball Office"
+msgid "Game station"
+msgstr "Estaci� de jocs"
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr "Entorn d'escriptori K, l'entorn gr�fic b�sic que inclou diverses eines"
+msgid "Video players and editors"
+msgstr "Reproductors i editors de v�deo"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "M�s escriptoris gr�fics (Gnome, IceWM)"
+msgid "Multimedia - Graphics"
+msgstr "Multim�dia - Gr�fics"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Eines per crear i gravar CD"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programes d'entreteniment: acci�, jocs de taula, estrat�gia, etc."
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multim�dia - Gravaci� de CD"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Conjunt d'eines per llegir i enviar correu i not�cies (pine, mutt, tin...) i "
+"per navegar pel Web"
 
 #: ../../share/compssUsers:999
 msgid "Archiving, emulators, monitoring"
 msgstr "Arxivament, emuladors, monitoritzaci�"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Servidor, base de dades"
+msgid "Personal Finance"
+msgstr "Comptabilitat personal"
 
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
 msgstr ""
-"Programes d'ofim�tica: processadors de textos (kword, abiword), gestors de "
-"fulls de c�lcul (kspread, gnumeric), visualitzadors pdf, etc."
+"Entorn gr�fic amb un conjunt d'aplicacions i eines d'escriptori f�cil "
+"d'utilitzar"
 
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Servidor, Web/FTP"
+msgid "Clients for different protocols including ssh"
+msgstr "Clients per a diferents protocols, incloent l'ssh"
 
 #: ../../share/compssUsers:999
-msgid "Server"
-msgstr "Servidor"
+#, fuzzy
+msgid "Internet gateway"
+msgstr "Acc�s a Internet"
 
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Comptabilitat personal"
+msgid "Sound and video playing/editing programs"
+msgstr "Programes de reproducci�/edici� de so i v�deo"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configuraci�"
+msgid "Other Graphical Desktops"
+msgstr "Altres escriptoris gr�fics"
 
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Estaci� de treball KDE"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editors, int�rprets d'ordres, eines de fitxer, terminals"
 
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Altres escriptoris gr�fics"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programes per gestionar els vostres comptes, com ara el gnucash"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache i Pro-ftpd"
+msgid "Games"
+msgstr "Jocs"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Servidor, Correu/Groupware/Not�cies"
+msgid "Personal Information Management"
+msgstr "Gesti� d'informaci� personal"
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Estaci� de treball GNOME"
+msgid "Multimedia - CD Burning"
+msgstr "Multim�dia - Gravaci� de CD"
 
 #: ../../share/compssUsers:999
+msgid "Scientific Workstation"
+msgstr "Estaci� cient�fica de treball"
+
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "no es pot obrir /etc/sysconfig/autologin per a lectura: %s"
+
+#~ msgid "Do you want to restart the network"
+#~ msgstr "Voleu reiniciar la xarxa"
+
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "Hi esteu d'acord?"
+
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "Ara reiniciar� el dispositiu de xarxa:\n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "Ara reiniciar� el dispositiu de xarxa %s. Hi esteu d'acord?"
+
 #, fuzzy
-msgid "Internet gateway"
-msgstr "Acc�s a Internet"
+#~ msgid ""
+#~ "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
+#~ "(primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+#~ msgstr ""
+#~ "Tret que sapigueu expressament que s'ha d'indicar una altra cosa, "
+#~ "l'elecci�\n"
+#~ "habitual �s \"/dev/hda\" (el disc IDE mestre primari) o b� \"/dev/sda\"\n"
+#~ "(el primer disc SCSI)."
 
-#: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Eines per al Palm Pilot o per al Visor"
+#, fuzzy
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "Aquestes s�n les cues d'impressi� seg�ents.\n"
+#~ "Podeu afegir-ne algunes m�s o canviar-ne les existents."
 
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Estaci� de jocs"
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "Tipus de connexi�: "
 
-#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc."
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "Escolliu l'usuari per omissi�:"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Eines per facilitar la configuraci� de l'ordinador"
+#, fuzzy
+#~ msgid "Test the mouse here."
+#~ msgstr "Si us plau, comproveu el ratol�."
 
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Conjunt d'eines per al correu, not�cies, web, transfer�ncia de fitxers i xat"
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ msgstr ""
+#~ "Escolliu l'idioma que voleu utilitzar per a la instal�laci� i per a l'�s "
+#~ "del sistema."
+
+#~ msgid ""
+#~ "You need to accept the terms of the above license to continue "
+#~ "installation.\n"
+#~ "\n"
+#~ "\n"
+#~ "Please click on \"Accept\" if you agree with its terms.\n"
+#~ "\n"
+#~ "\n"
+#~ "Please click on \"Refuse\" if you disagree with its terms. Installation "
+#~ "will end without modifying your current\n"
+#~ "configuration."
+#~ msgstr ""
+#~ "Heu d'acceptar els termes de la llic�ncia de m�s amunt per poder "
+#~ "continuar la instal�laci�.\n"
+#~ "\n"
+#~ "\n"
+#~ "Si us plau, feu clic a \"Accepto\" si hi esteu d'acord.\n"
+#~ "\n"
+#~ "\n"
+#~ "Feu clic a \"No accpeto\" si no hi esteu d'acord. La instal�laci� "
+#~ "finalitzar� sense modificar la instal�laci� actual."
+
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr "Escolliu el vostre tipus de teclat de la llista inferior"
+
+#~ msgid ""
+#~ "If you wish other languages (than the one you choose at\n"
+#~ "beginning of installation) will be available after installation, please "
+#~ "chose\n"
+#~ "them in list above. If you want select all, you just need to select \"All"
+#~ "\"."
+#~ msgstr ""
+#~ "Si desitgeu que altres idiomes (a m�s del que vau triar en\n"
+#~ "iniciar la instal�laci�) estiguin disponibles despr�s de la "
+#~ "instal�laci�,\n"
+#~ "escolliu-los de la llista de m�s amunt. Si els voleu seleccionar tots,\n"
+#~ "nom�s cal que seleccioneu \"Tots\"."
+
+#~ msgid ""
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Customized: If you are familiar enough with GNU/Linux, you may then "
+#~ "choose\n"
+#~ "    the primary usage for your machine. See below for details.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
+#~ "    perform a highly customized installation. As for a \"Customized\"\n"
+#~ "    installation class, you will be able to select the usage for your "
+#~ "system.\n"
+#~ "    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
+#~ "DOING!"
+#~ msgstr ""
+#~ "Seleccioneu:\n"
+#~ "\n"
+#~ "  - Personalitzada: Si esteu familiaritzat amb el Linux, podreu\n"
+#~ "triar l'�s del sistema instal�lat entre Normal, Desenvolupament o\n"
+#~ "Servidor. Trieu \"Normal\" per a una instal�laci� per a un �s\n"
+#~ "general del vostre ordinador, \"Desenvolupament\" si utilitzareu\n"
+#~ "l'ordinador principalment per a desenvolupament de programari,\n"
+#~ "o \"Servidor\" si voleu instal�lar un servidor convencional (per\n"
+#~ "a correu, impressions...).\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Per a experts: Si domineu el GNU/Linux i voleu realitzar una\n"
+#~ "instal�laci� totalment personalitzada, aquest �s el vostre\n"
+#~ "tipus d'instal�laci�. Podreu seleccionar l'�s del vostre sistema\n"
+#~ "com a \"Personalitzada\"."
+
+#~ msgid ""
+#~ "You must now define your machine usage. Choices are:\n"
+#~ "\n"
+#~ "* Workstation: this the ideal choice if you intend to use your machine "
+#~ "primarily for everyday use, at office or\n"
+#~ "  at home.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Development: if you intend to use your machine primarily for software "
+#~ "development, it is the good choice. You\n"
+#~ "  will then have a complete collection of software installed in order to "
+#~ "compile, debug and format source code,\n"
+#~ "  or create software packages.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Server: if you intend to use this machine as a server, it is the good "
+#~ "choice. Either a file server (NFS or\n"
+#~ "  SMB), a print server (Unix style or Microsoft Windows style), an "
+#~ "authentication server (NIS), a database\n"
+#~ "  server and so on. As such, do not expect any gimmicks (KDE, GNOME, "
+#~ "etc.) to be installed."
+#~ msgstr ""
+#~ "Ara heu de decidir com utilitzareu l'ordinador. Les opcions s�n:\n"
+#~ "\n"
+#~ "* Estaci� de treball: l'elecci� ideal si penseu utilitzar l'ordinador "
+#~ "b�sicament per a l'�s quotidi�, a la feina o\n"
+#~ "  a casa.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Desenvolupament: si penseu utilitzar l'ordinador b�sicament per a "
+#~ "desenvolupament de programari, aquesta �s l'elecci� ideal.\n"
+#~ "  Tindreu instal�lada una completa col�lecci� de programari per poder "
+#~ "compilar, depurar i formatar codi font,\n"
+#~ "  o crear paquets de programari.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Servidor: si penseu utilitzar l'ordinador com a servidor, aquesta �s "
+#~ "l'elecci� ideal, ja sigui un servidor de fitxers (NFS o\n"
+#~ "  SMB), un servidor d'impressi� (tipus Unix o Microsoft Windows), un "
+#~ "servidor d'autenticaci� (NIS), un servidor\n"
+#~ "  de bases de dades, etc. En canvi, no espereu que se us instal�lin coses "
+#~ "com ara el KDE, el GNOME, etc.)"
+
+#~ msgid ""
+#~ "You may now select the group of packages you wish to\n"
+#~ "install or upgrade.\n"
+#~ "\n"
+#~ "\n"
+#~ "DrakX will then check whether you have enough room to install them all. "
+#~ "If not,\n"
+#~ "it will warn you about it. If you want to go on anyway, it will proceed "
+#~ "onto the\n"
+#~ "installation of all selected groups but will drop some packages of "
+#~ "lesser\n"
+#~ "interest. At the bottom of the list you can select the option \n"
+#~ "\"Individual package selection\"; in this case you will have to browse "
+#~ "through\n"
+#~ "more than 1000 packages..."
+#~ msgstr ""
+#~ "Ara podeu seleccionar el grup de paquets que voleu instal�lar o "
+#~ "actualitzar.\n"
+#~ "\n"
+#~ "\n"
+#~ "El DrakX comprovar� si teniu prou espai per instal�lar-los tots i, si no, "
+#~ "us\n"
+#~ "ho avisar�. Si voleu seguir igualment, continuar� amb la instal�laci� de "
+#~ "tots\n"
+#~ "els grups seleccionats per� no n'instal�lar� alguns de menys inter�s. Al "
+#~ "final\n"
+#~ "de la llista podeu seleccionar l'opci� \"Selecci� individual de paquets"
+#~ "\", i\n"
+#~ "en aquest cas haureu de navegar per m�s de 1.000 paquets..."
+
+#~ msgid ""
+#~ "You can now choose individually all the packages you\n"
+#~ "wish to install.\n"
+#~ "\n"
+#~ "\n"
+#~ "You can expand or collapse the tree by clicking on options in the left "
+#~ "corner of\n"
+#~ "the packages window.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you prefer to see packages sorted in alphabetic order, click on the "
+#~ "icon\n"
+#~ "\"Toggle flat and group sorted\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you want not to be warned on dependencies, click on \"Automatic\n"
+#~ "dependencies\". If you do this, note that unselecting one package may "
+#~ "silently\n"
+#~ "unselect several other packages which depend on it."
+#~ msgstr ""
+#~ "Ara podeu triar individualment tots els paquets que voleu instal�lar.\n"
+#~ "\n"
+#~ "\n"
+#~ "Podeu expandir o reduir l'arbre fent clic a les opcions del rac� esquerre "
+#~ "de la finestra de paquets.\n"
+#~ "\n"
+#~ "\n"
+#~ "Si preferiu veure els paquets ordenats alfab�ticament, feu clic a la "
+#~ "icona\n"
+#~ "\"Commuta entre ordenaci� plana i per grups\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Si no voleu ser avisat pel que fa a les depend�ncies, feu clic a "
+#~ "\"Depend�ncies\n"
+#~ "autom�tiques\". Si ho feu, tingueu en compte que el fet de "
+#~ "desseleccionar\n"
+#~ "un paquet pot causar la desselecci� d'altres paquets que en depenen, i "
+#~ "no\n"
+#~ "us n'assabentareu."
+
+#~ msgid ""
+#~ "If you have all the CDs in the list above, click Ok. If you have\n"
+#~ "none of those CDs, click Cancel. If only some CDs are missing, unselect "
+#~ "them,\n"
+#~ "then click Ok."
+#~ msgstr ""
+#~ "Si teniu tots els CD de la llista superior, feu clic a D'acord.\n"
+#~ "Si no teniu cap d'aquests CD, feu clic a Cancel�la.\n"
+#~ "Si nom�s falten alguns CD, desseleccioneu-los i feu clic a D'acord."
+
+#~ msgid ""
+#~ "If you wish to connect your computer to the Internet or\n"
+#~ "to a local network please choose the correct option. Please turn on your "
+#~ "device\n"
+#~ "before choosing the correct option to let DrakX detect it automatically.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you do not have any connection to the Internet or a local network, "
+#~ "choose\n"
+#~ "\"Disable networking\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you wish to configure the network later after installation or if you "
+#~ "have\n"
+#~ "finished to configure your network connection, choose \"Done\"."
+#~ msgstr ""
+#~ "Si voleu connectar l'ordinador a Internet o a una xarxa local, "
+#~ "seleccioneu\n"
+#~ "l'opci� corresponent, per� abans recordeu engegar el dispositiu per tal "
+#~ "que\n"
+#~ "el DrakX el detecti autom�ticament.\n"
+#~ "\n"
+#~ "\n"
+#~ "Si no teniu connexi� a Internet ni a cap xarxa local, escolliu "
+#~ "\"Inhabilita el servei de xarxa\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Si voleu configurar la xarxa m�s endavant, despr�s de la instal�laci�, o "
+#~ "si\n"
+#~ "heu acabat la configuraci� de la connexi� de xarxa, trieu \"Fet\"."
+
+#~ msgid ""
+#~ "No modem has been detected. Please select the serial port on which it is "
+#~ "plugged.\n"
+#~ "\n"
+#~ "\n"
+#~ "For information, the first serial port (called \"COM1\" under Microsoft\n"
+#~ "Windows) is called \"ttyS0\" under Linux."
+#~ msgstr ""
+#~ "No s'ha detectat cap m�dem. Si us plau, seleccioneu el port s�rie on est� "
+#~ "connectat.\n"
+#~ "\n"
+#~ "\n"
+#~ "Per a la vostra informaci�, el primer port s�rie (anomenat \"COM1\" en "
+#~ "Microsoft Windows) s'anomena \"ttyS0\" en Linux."
+
+#~ msgid ""
+#~ "You may now enter dialup options. If you don't know\n"
+#~ "or are not sure what to enter, the correct informations can be obtained "
+#~ "from\n"
+#~ "your Internet Service Provider. If you do not enter the DNS (name "
+#~ "server)\n"
+#~ "information here, this information will be obtained from your Internet "
+#~ "Service\n"
+#~ "Provider at connection time."
+#~ msgstr ""
+#~ "Ara podeu introduir les opcions de marcatge. Si no sabeu qu� heu "
+#~ "d'introduir,\n"
+#~ "o si no n'esteu segur, podreu aconseguir la informaci� necess�ria del "
+#~ "vostre\n"
+#~ "prove�dor d'Internet. Si no introdu�u aqu� la informaci� del DNS "
+#~ "(servidor de\n"
+#~ "noms), aquesta informaci� s'obtindr� del prove�dor en el moment de "
+#~ "connectar."
+
+#~ msgid ""
+#~ "If your modem is an external modem, please turn on it now to let DrakX "
+#~ "detect it automatically."
+#~ msgstr ""
+#~ "Si el m�dem que teniu �s extern, engegueu-lo per tal que el DrakX el "
+#~ "detecti autom�ticament."
+
+#~ msgid "Please turn on your modem and choose the correct one."
+#~ msgstr "Si us plau, engegueu el m�dem i trieu-ne el correcte."
+
+#~ msgid ""
+#~ "If you are not sure if informations above are\n"
+#~ "correct or if you don't know or are not sure what to enter, the correct\n"
+#~ "informations can be obtained from your Internet Service Provider. If you "
+#~ "do not\n"
+#~ "enter the DNS (name server) information here, this information will be "
+#~ "obtained\n"
+#~ "from your Internet Service Provider at connection time."
+#~ msgstr ""
+#~ "Si no esteu segur de si la informaci� de m�s amunt �s correcta, si no "
+#~ "sabeu\n"
+#~ "qu� introduir o si no n'esteu segur, podreu aconseguir la informaci�\n"
+#~ "necess�ria del vostre prove�dor d'Internet. Si no introdu�u aqu� la\n"
+#~ "informaci� del DNS (servidor de noms), aquesta informaci� s'obtindr� del\n"
+#~ "prove�dor en el moment de connectar."
+
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, the correct informations can "
+#~ "be\n"
+#~ "obtained from your Internet Service Provider."
+#~ msgstr ""
+#~ "Ara podeu introduir el nom del vostre ordinador central. Si no esteu "
+#~ "segur del que hi\n"
+#~ "heu d'introduir, el vostre prove�dor us en donar� la informaci� correcta."
+
+#~ msgid ""
+#~ "You may now configure your network device.\n"
+#~ "\n"
+#~ "   * IP address: if you don't know or are not sure what to enter, ask "
+#~ "your network administrator.\n"
+#~ "     You should not enter an IP address if you select the option "
+#~ "\"Automatic IP\" below.\n"
+#~ "\n"
+#~ "   * Netmask: \"255.255.255.0\" is generally a good choice. If you don't "
+#~ "know or are not sure what to enter,\n"
+#~ "     ask your network administrator.\n"
+#~ "\n"
+#~ "   * Automatic IP: if your network uses BOOTP or DHCP protocol, select "
+#~ "this option. If selected, no value is needed in\n"
+#~ "    \"IP address\". If you don't know or are not sure if you need to "
+#~ "select this option, ask your network administrator."
+#~ msgstr ""
+#~ "Ara podeu configurar el voste dispositiu de xarxa.\n"
+#~ "\n"
+#~ "   * Adre�a IP: si no la sabeu, o no n'esteu segur, pregunteu-la a "
+#~ "l'administrador de la xarxa.\n"
+#~ "     No heu d'introduir cap adre�a IP si m�s avall seleccioneu l'opci� "
+#~ "\"IP autom�tica\".\n"
+#~ "\n"
+#~ "  * M�scara de la xarxa: Normalment, \"255.255.255.0\" �s una bona "
+#~ "elecci�. Si no n'esteu segur, consulteu-ho a l'administrador de la "
+#~ "xarxa.\n"
+#~ "\n"
+#~ "  * IP autom�tica: si la vostra xarxa utilitza els protocols BOOTP o "
+#~ "DHCP,\n"
+#~ "seleccioneu aquesta opci�. Si es selecciona, no cal cap valor per a "
+#~ "\"Adre�a IP\". Si no n'esteu segur, consulteu-ho a l'administrador de la "
+#~ "xarxa."
+
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, ask your network administrator."
+#~ msgstr ""
+#~ "Ara podeu introduir el nom del vostre ordinador central, si cal. Si no "
+#~ "el\n"
+#~ "sabeu, o no esteu segur de qu� heu d'introduir, consulteu a "
+#~ "l'administrador de la xarxa."
+
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, leave blank."
+#~ msgstr ""
+#~ "Ara podeu introduir el nom del vostre ordinador central, si cal. Si no\n"
+#~ "el sabeu, o si esteu segur de qu� introduir, deixeu-ho en blanc."
+
+#~ msgid ""
+#~ "You may now enter dialup options. If you're not sure what to enter, the\n"
+#~ "correct information can be obtained from your ISP."
+#~ msgstr ""
+#~ "Ara podeu introduir les opcions de marcatge. Si no esteu segur del que "
+#~ "hi\n"
+#~ "heu d'introduir, el vostre prove�dor us en donar� la informaci� correcta."
+
+#~ msgid ""
+#~ "If you will use proxies, please configure them now. If you don't know if\n"
+#~ "you should use proxies, ask your network administrator or your ISP."
+#~ msgstr ""
+#~ "Si teniu previst utilitzar proxys, configureu-los ara. Si no sabeu si\n"
+#~ "n'utilitzareu, consulteu-ho a l'administrador de la xarxa o al vostre\n"
+#~ "prove�dor."
+
+#~ msgid ""
+#~ "You can install cryptographic package if your internet connection has "
+#~ "been\n"
+#~ "set up correctly. First choose a mirror where you wish to download "
+#~ "packages and\n"
+#~ "after that select the packages to install.\n"
+#~ "\n"
+#~ "\n"
+#~ "Note you have to select mirror and cryptographic packages according\n"
+#~ "to your legislation."
+#~ msgstr ""
+#~ "Podeu instal�lar el paquet criptogr�fic si la vostra connexi� a Internet\n"
+#~ "s'ha configurat correctament. Escolliu primer una r�pilca des de la qual\n"
+#~ "vulgueu descarregar paquets i despr�s seleccioneu els paquets a "
+#~ "instal�lar.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tingueu en compte que heu de seleccionar la r�plica i els paquets\n"
+#~ "criptogr�fics segons la vostra legislaci�."
+
+#~ msgid "You can now select your timezone according to where you live."
+#~ msgstr "Ara podeu seleccionar la zona hor�ria segons el lloc on viviu."
+
+#~ msgid ""
+#~ "You can configure a local printer (connected to your computer) or remote\n"
+#~ "printer (accessible via a Unix, Netware or Microsoft Windows network)."
+#~ msgstr ""
+#~ "Podeu configurar una impressora local (connectada al vostre ordinador) o\n"
+#~ "remota (accessible mitjan�ant una xarxa Unix, Netware o Microsoft "
+#~ "Windows)."
+
+#~ msgid ""
+#~ "If you wish to be able to print, please choose one printing system "
+#~ "between\n"
+#~ "CUPS and LPR.\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS is a new, powerful and flexible printing system for Unix systems "
+#~ "(CUPS\n"
+#~ "means \"Common Unix Printing System\"). It is the default printing system "
+#~ "in\n"
+#~ "Mandrake Linux.\n"
+#~ "\n"
+#~ "\n"
+#~ "LPR is the old printing system used in previous Mandrake Linux "
+#~ "distributions.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you don't have printer, click on \"None\"."
+#~ msgstr ""
+#~ "Si voleu imprimir, trieu un sistema de impressi� entre CUPS i LPR.\n"
+#~ "\n"
+#~ "\n"
+#~ "El CUPS �s un nou sistema d'impressi�, potent i flexible, per a sistemes "
+#~ "Unix\n"
+#~ "(CUPS significa \"Common Unix Printing System\"). �s el sistema "
+#~ "d'impressi�\n"
+#~ "per defecte en Mandrake Linux.\n"
+#~ "\n"
+#~ "\n"
+#~ "L'LPR �s l'antic sistema d'impressi� utilitzat en distribucions anteriors "
+#~ "de\n"
+#~ "Mandrake Linux distributions.\n"
+#~ "\n"
+#~ "\n"
+#~ "Si no teniu impressora, feu clic a \"Cap\"."
+
+#~ msgid ""
+#~ "GNU/Linux can deal with many types of printer. Each of these types "
+#~ "requires\n"
+#~ "a different setup.\n"
+#~ "\n"
+#~ "\n"
+#~ "If your printer is physically connected to your computer, select \"Local\n"
+#~ "printer\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you want to access a printer located on a remote Unix machine, select\n"
+#~ "\"Remote printer\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you want to access a printer located on a remote Microsoft Windows "
+#~ "machine\n"
+#~ "(or on Unix machine using SMB protocol), select \"SMB/Windows 95/98/NT\"."
+#~ msgstr ""
+#~ "El GNU/Linux pot treballar amb molts tipus d'impressores, per� cada un\n"
+#~ "d'aquests tipus requereix una configuraci� diferent.\n"
+#~ "\n"
+#~ "\n"
+#~ "Si teniu la impressora connectada f�sicament a l'ordinador, seleccioneu\n"
+#~ "\"Impressora local\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Si voleu accedir a una impressora que es troba en un ordinador Unix "
+#~ "remot,\n"
+#~ "seleccioneu \"Impressora remota\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Si voleu accedir a una impressora que es troba en un ordinador Microsoft\n"
+#~ "Windows remot (o en un ordinador Unix que utilitza el protocol SMB),\n"
+#~ "seleccioneu \"SMB/Windows 95/98/NT\"."
+
+#~ msgid ""
+#~ "Please turn on your printer before continuing to let DrakX detect it.\n"
+#~ "\n"
+#~ "You have to enter some informations here.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Name of printer: the print spooler uses \"lp\" as default printer "
+#~ "name. So, you must have a printer named \"lp\".\n"
+#~ "     If you have only one printer, you can use several names for it. You "
+#~ "just need to separate them by a pipe\n"
+#~ "     character (a \"|\"). So, if you prefer a more meaningful name, you "
+#~ "have to put it first, eg: \"My printer|lp\".\n"
+#~ "     The printer having \"lp\" in its name(s) will be the default "
+#~ "printer.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Description: this is optional but can be useful if several printers "
+#~ "are connected to your computer or if you allow\n"
+#~ "     other computers to access to this printer.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Location: if you want to put some information on your\n"
+#~ "     printer location, put it here (you are free to write what\n"
+#~ "     you want, for example \"2nd floor\").\n"
+#~ msgstr ""
+#~ "Si us plau, engegueu la impressora abans de continuar per tal que el "
+#~ "DrakX\n"
+#~ "la pugui detectar.\n"
+#~ "\n"
+#~ "Aqu� heu d'introduir algunes dades.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Nom de la impressora: l'spool d'impressi� utilitza \"lp\" com a nom "
+#~ "per\n"
+#~ "omissi� de la impressora. Per tant, heu de tenir una impressora "
+#~ "anomenada\n"
+#~ "\"lp\".\n"
+#~ "     Si nom�s teniu una impressora, podeu donar-li diversos;\n"
+#~ "noms; nom�s cal que els separeu amb el car�cter \"|\". Per tant,\n"
+#~ "si preferiu un nom m�s expressiu, l'heu d'indicar en primer lloc\n"
+#~ "(per exemple: \"La meva impressora|lp\").\n"
+#~ "     La impressora que contingui \"lp\" al(s) nom(s) ser� la impressora "
+#~ "per omissi�.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Descripci�: �s opcional, per� pot ser �til si teniu diverses\n"
+#~ "impressores connectades a l'ordinador o si permeteu que altres\n"
+#~ "ordinadors accedeixin a aquesta impressora.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Ubicaci�: si voleu incloure informaci� sobre la ubicaci� de la\n"
+#~ "impressora, feu-ho aqu� (podeu escriure el que vulgueu, (per exemple,\n"
+#~ "\"2n pis\").\n"
+
+#~ msgid ""
+#~ "You need to enter some informations here.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Name of queue: the print spooler uses \"lp\" as default printer "
+#~ "name. So, you need have a printer named \"lp\".\n"
+#~ "    If you have only one printer, you can use several names for it. You "
+#~ "just need to separate them by a pipe\n"
+#~ "    character (a \"|\"). So, if you prefer to have a more meaningful "
+#~ "name, you have to put it first, eg: \"My printer|lp\".\n"
+#~ "    The printer having \"lp\" in its name(s) will be the default "
+#~ "printer.\n"
+#~ "\n"
+#~ "  \n"
+#~ "   * Spool directory: it is in this directory that printing jobs are "
+#~ "stored. Keep the default choice\n"
+#~ "     if you don't know what to use\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Printer Connection: If your printer is physically connected to your "
+#~ "computer, select \"Local printer\".\n"
+#~ "     If you want to access a printer located on a remote Unix machine, "
+#~ "select \"Remote lpd printer\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     If you want to access a printer located on a remote Microsoft "
+#~ "Windows machine (or on Unix machine using SMB\n"
+#~ "     protocol), select \"SMB/Windows 95/98/NT\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     If you want to acces a printer located on NetWare network, select "
+#~ "\"NetWare\".\n"
+#~ msgstr ""
+#~ "Aqu� heu d'introduir algunes dades.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Nom de la cua: l'spool d'impressi� utilitza \"lp\" com a nom per\n"
+#~ "omissi� de la impressora. Per tant, heu de tenir una impressora "
+#~ "anomenada\n"
+#~ "\"lp\".\n"
+#~ "     Si nom�s teniu una impressora, podeu donar-li diversos;\n"
+#~ "noms; nom�s cal que els separeu amb el car�cter \"|\". Per tant,\n"
+#~ "si preferiu un nom m�s expressiu, l'heu d'indicar en primer lloc\n"
+#~ "(per exemple: \"La meva impressora|lp\").\n"
+#~ "     La impressora que contingui \"lp\" al(s) nom(s) ser� la impressora "
+#~ "per omissi�.\n"
+#~ "\n"
+#~ "  \n"
+#~ "   * Directori d'spool: les tasques d'impressi� s'emmagatzemen en aquest "
+#~ "directori.Conserveu la opci� predeterminada si no sabeu quina utilitzar\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Printer Connection: If your printer is physically connected to your "
+#~ "computer, select \"Local printer\".\n"
+#~ "     Si voleu accedir a una impressora que es troba en un ordinador Unix\n"
+#~ "remot, seleccioneu \"Impressora lpd remota\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     Si voleu accedir a una impressora que es troba en un ordinador\n"
+#~ "Microsoft Windows remot (o en un ordinador Unix que utilitza el protocol\n"
+#~ "SMB), seleccioneu \"SMB/Windows 95/98/NT\".\n"
+#~ "\n"
+#~ "     Si voleu accedir a una impressora que es troba en una xarxa "
+#~ "NetWare,\n"
+#~ "seleccioneu \"NetWare\".\n"
 
-#~ msgid "GB"
-#~ msgstr "GB"
+#~ msgid ""
+#~ "Your printer has not been detected. Please enter the name of the device "
+#~ "on\n"
+#~ "which it is connected.\n"
+#~ "\n"
+#~ "\n"
+#~ "For information, most printers are connected on the first parallel port. "
+#~ "This\n"
+#~ "one is called \"/dev/lp0\" under GNU/Linux and \"LPT1\" under Microsoft "
+#~ "Windows."
+#~ msgstr ""
+#~ "No s'ha detectat la vostra impressora. Si us plau, introdu�u el nom del\n"
+#~ "dispositiu a qu� est� connectada.\n"
+#~ "\n"
+#~ "\n"
+#~ "Per a la vostra informaci�, la majoria d'impressores estan connectades "
+#~ "al\n"
+#~ "primer port paral�lel, que s'anomena  \"/dev/lp0\" en GNU/Linux i \"LPT1"
+#~ "\"\n"
+#~ "en Microsoft Windows."
+
+#~ msgid "You must now select your printer in the above list."
+#~ msgstr "Ara heu de seleccionar la vostra impressora a la llista superior."
+
+#~ msgid ""
+#~ "Please select the right options according to your printer.\n"
+#~ "Please see its documentation if you don't know what choose here.\n"
+#~ "\n"
+#~ "\n"
+#~ "You will be able to test your configuration in next step and you will be "
+#~ "able to modify it if it doesn't work as you want."
+#~ msgstr ""
+#~ "Si us plau, seleccioneu les opcions correctes segons la vostra "
+#~ "impressora;\n"
+#~ "consulteu-ne la documentaci� si no sabeu qu� heu de seleccionar.\n"
+#~ "\n"
+#~ "\n"
+#~ "Podreu comprovar la configuraci� en el pas seg�ent i modificar-la si no\n"
+#~ "funciona exactament com voleu."
+
+#~ msgid ""
+#~ "You can now enter the root password for your Mandrake Linux system.\n"
+#~ "The password must be entered twice to verify that both password entries "
+#~ "are identical.\n"
+#~ "\n"
+#~ "\n"
+#~ "Root is the system's administrator and is the only user allowed to modify "
+#~ "the\n"
+#~ "system configuration. Therefore, choose this password carefully. \n"
+#~ "Unauthorized use of the root account can be extemely dangerous to the "
+#~ "integrity\n"
+#~ "of the system, its data and other system connected to it.\n"
+#~ "\n"
+#~ "\n"
+#~ "The password should be a mixture of alphanumeric characters and at least "
+#~ "8\n"
+#~ "characters long. It should never be written down.\n"
+#~ "\n"
+#~ "\n"
+#~ "Do not make the password too long or complicated, though: you must be "
+#~ "able to\n"
+#~ "remember it without too much effort."
+#~ msgstr ""
+#~ "Ara podeu introduir la contrasenya de l'usuari 'root' del vostre\n"
+#~ "sistema Mandrake Linux. Ho heu de fer dos cops per verificar que\n"
+#~ "ambdues introduccions s�n id�ntiques.\n"
+#~ "\n"
+#~ "\n"
+#~ "L'usuari 'root' �s l'administrador del sistema, i �s l'�nic\n"
+#~ "autoritzat per modificar la configuraci� del sistema; per tant,\n"
+#~ "trieu amb molta cura aquesta contrasenya. L'�s no autoritzat del\n"
+#~ "compte 'root' pot ser extremadament perill�s per a la integritat\n"
+#~ "del sistema, per a les seves dades, i per a altres sistema que hi\n"
+#~ "estan connectats.\n"
+#~ "\n"
+#~ "\n"
+#~ "La contrasenya s'ha de crear amb diversos car�cters alfanum�rics, ha de\n"
+#~ "tenir una llargada m�nima de 8 car�cters, i mai no s'ha d'anotar enlloc.\n"
+#~ "\n"
+#~ "\n"
+#~ "No obstant aix�, no creeu una contrasenya excessivament llarga o\n"
+#~ "complicada: heu de poder recordar-la sense problemes."
+
+#~ msgid ""
+#~ "You may now create one or more \"regular\" user account(s), as\n"
+#~ "opposed to the \"privileged\" user account, root. You can create\n"
+#~ "one or more account(s) for each person you want to allow to use\n"
+#~ "the computer. Note that each user account will have its own\n"
+#~ "preferences (graphical environment, program settings, etc.)\n"
+#~ "and its own \"home directory\", in which these preferences are\n"
+#~ "stored.\n"
+#~ "\n"
+#~ "\n"
+#~ "First of all, create an account for yourself! Even if you will be the "
+#~ "only user\n"
+#~ "of the machine, you may NOT connect as root for daily use of the system: "
+#~ "it's a\n"
+#~ "very high security risk. Making the system unusable is very often a typo "
+#~ "away.\n"
+#~ "\n"
+#~ "\n"
+#~ "Therefore, you should connect to the system using the user account\n"
+#~ "you will have created here, and login as root only for administration\n"
+#~ "and maintenance purposes."
+#~ msgstr ""
+#~ "Ara podeu crear un o m�s comptes \"normals\" d'usuari, en\n"
+#~ "contraposici� al compte \"privilegiat\", el 'root'. Podeu crear\n"
+#~ "un o m�s comptes per a cada una de les persones a qui permetreu\n"
+#~ "utilitzar l'ordinador. Tingueu en compte que cada compte d'usuari\n"
+#~ "tindr� les seves pr�pies prefer�ncies (entorn gr�fic, par�metres\n"
+#~ "del programa. etc.) i el seu propi \"directori inicial\", on\n"
+#~ "s'emmagatzemen aquestes prefer�ncies.\n"
+#~ "\n"
+#~ "\n"
+#~ "Primer de tot, creeu-vos un compte propi! Encara que sigueu l'�nic\n"
+#~ "usuari de l'ordinador, NO us connecteu com a 'root'\n"
+#~ "per a l'�s quotidi� del sistema: �s un risc de seguretat molt alt.\n"
+#~ "Tot sovint, fer el sistema inutilitzable dep�n d'un simple error\n"
+#~ "tipogr�fic.\n"
+#~ "\n"
+#~ "\n"
+#~ "Per tant, connecteu-vos al sistema amb el compte d'usuari que heu\n"
+#~ "creat, i entreu-hi com a 'root' nom�s per a tasques d'administraci�\n"
+#~ "i manteniment."
+
+#~ msgid ""
+#~ "Creating a boot disk is strongly recommended. If you can't\n"
+#~ "boot your computer, it's the only way to rescue your system without\n"
+#~ "reinstalling it."
+#~ msgstr ""
+#~ "�s molt recomanable crear un disc d'arrencada. Si no podeu arrencar "
+#~ "l'ordinador,\n"
+#~ "�s l'�nica manera de solucionar-ho sense haver de reinstal�lar-ho tot."
+
+#~ msgid ""
+#~ "LILO and grub main options are:\n"
+#~ "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
+#~ "partition) that contains the boot sector. Unless you know specifically\n"
+#~ "otherwise, choose \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Delay before booting default image: Specifies the number in tenths\n"
+#~ "of a second the boot loader should wait before booting the first image.\n"
+#~ "This is useful on systems that immediately boot from the hard disk after\n"
+#~ "enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+#~ "omitted or is set to zero.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Video mode: This specifies the VGA text mode that should be selected\n"
+#~ "when booting. The following values are available: \n"
+#~ "\n"
+#~ "    * normal: select normal 80x25 text mode.\n"
+#~ "\n"
+#~ "    * <number>:  use the corresponding text mode.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Clean \"/tmp\" at each boot: if you want delete all files and "
+#~ "directories\n"
+#~ "stored in \"/tmp\" when you boot your system, select this option.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Precise RAM if needed: unfortunately, there is no standard method to "
+#~ "ask the\n"
+#~ "BIOS about the amount of RAM present in your computer. As consequence, "
+#~ "Linux may\n"
+#~ "fail to detect your amount of RAM correctly. If this is the case, you "
+#~ "can\n"
+#~ "specify the correct amount or RAM here. Please note that a difference of "
+#~ "2 or 4\n"
+#~ "MB between detected memory and memory present in your system is normal."
+#~ msgstr ""
+#~ "Les opcions principals del LILO i del Grub s�n:\n"
+#~ "  - Dispositiu d'arrencada: Defineix el nom del dispositiu (p.\n"
+#~ "ex., una partici� del disc dur) que cont� el sector d'arrencada.\n"
+#~ "Tret que sapigueu expressament que s'ha d'indicar una altra cosa,\n"
+#~ "trieu \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Temps d'espera abans d'arrencar la imatge per defecte: Especifica el\n"
+#~ "temps, en d�cimes de segon, que el carregador d'arrencada ha\n"
+#~ "d'esperar abans de carregar la primera imatge.\n"
+#~ "Aix� �s �til en sistemes que arrenquen immediatament des del disc\n"
+#~ "dur despr�s d'habilitar el teclat. El carregador d'arrencada no\n"
+#~ "esperar� si s'omet el \"temps d'espera\" o si se li d�na el valor zero.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Mode de v�deo: Amb aix� s'especifica el mode de text VGA que\n"
+#~ "cal seleccionar en arrencar. Es poden utilitzar els valors\n"
+#~ "seg�ents:\n"
+#~ "    * normal: selecciona el mode de text 80x25 normal.\n"
+#~ "    * <n�mero>: utilitza el mode de text corresponent.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Neteja de \"/tmp\" en cada arrencada: si voleu suprimir tots els "
+#~ "fitxers i\n"
+#~ "directoris emmagatzemats a \"/tmp\" en arrencar el sistame, seleccioneu\n"
+#~ "aquesta opci�.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Si cal, indicaci� de la mida exacta de la RAM: malauradament, no hi "
+#~ "cap\n"
+#~ "m�tode est�ndard per preguntar al BIOS la quantitat de RAM que teniu a\n"
+#~ "l'ordinador. Per tant, �s possible que el Linux no pugui detectar\n"
+#~ "correctament la quantitat de RAM instal�lada. Si �s aquest el cas, en "
+#~ "podeu\n"
+#~ "indicar aqu� la quantitat correcta, per� penseu que una difer�ncia de 2 o "
+#~ "4\n"
+#~ "MB entre la mem�ria detectada i la mem�ria real �s normal."
+
+#~ msgid ""
+#~ "SILO is a bootloader for SPARC: it is able to boot\n"
+#~ "either GNU/Linux or any other operating system present on your computer.\n"
+#~ "Normally, these other operating systems are correctly detected and\n"
+#~ "installed. If this is not the case, you can add an entry by hand in this\n"
+#~ "screen. Be careful as to choose the correct parameters.\n"
+#~ "\n"
+#~ "\n"
+#~ "You may also want not to give access to these other operating systems to\n"
+#~ "anyone, in which case you can delete the corresponding entries. But\n"
+#~ "in this case, you will need a boot disk in order to boot them!"
+#~ msgstr ""
+#~ "El SILO �s un carregador d'arrencada per a l'SPARC: pot arrencar el\n"
+#~ "GNU/Linux o qualsevol altre sistema operatiu que tingueu a l'ordinador.\n"
+#~ "Normalment, aquests altres sistemes operatius es detecten i instal�len\n"
+#~ "correctament, per� si no �s aix�, podeu afegir-los manualment en aquesta\n"
+#~ "pantalla. Aneu amb compte de triar els par�metres correctes.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tamb� �s possible que no volgueu donar acc�s a tothom a aquests sistemes\n"
+#~ "operatius; en aquest cas podeu suprimir les entrades corresponents, per�\n"
+#~ "aleshores us caldr� un disc d'arrencada per poder-los arrencar!"
+
+#~ msgid ""
+#~ "SILO main options are:\n"
+#~ "  - Bootloader installation: Indicate where you want to place the\n"
+#~ "information required to boot to GNU/Linux. Unless you know exactly\n"
+#~ "what you are doing, choose \"First sector of drive (MBR)\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Delay before booting default image: Specifies the number in tenths\n"
+#~ "of a second the boot loader should wait before booting the first image.\n"
+#~ "This is useful on systems that immediately boot from the hard disk after\n"
+#~ "enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+#~ "omitted or is set to zero."
+#~ msgstr ""
+#~ "Les opcions principals del SILO s�n:\n"
+#~ "  - Instal�laci� del carregador d'arrencada: indica on voleu situar la\n"
+#~ "informaci� necess�ria per arrencar el GNU/Linux. Tret que sapigueu\n"
+#~ "exactament qu� esteu fent, seleccioneu \"Primer sector de la unitat\n"
+#~ "(MBR)\".\n"
+#~ " \n"
+#~ "\n"
+#~ "  - Temps d'espera abans d'arrencar la imatge per defecte: Especifica el\n"
+#~ "temps, en d�cimes de segon, que el carregador d'arrencada ha\n"
+#~ "d'esperar abans de carregar la primera imatge.\n"
+#~ "Aix� �s �til en sistemes que arrenquen immediatament des del disc\n"
+#~ "dur despr�s d'habilitar el teclat. El carregador d'arrencada no\n"
+#~ "esperar� si s'omet el \"temps d'espera\" o si se li d�na el valor zero."
+
+#~ msgid ""
+#~ "Now it's time to configure the X Window System, which is the\n"
+#~ "core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
+#~ "you must configure your video card and monitor. Most of these\n"
+#~ "steps are automated, though, therefore your work may only consist\n"
+#~ "of verifying what has been done and accept the settings :)\n"
+#~ "\n"
+#~ "\n"
+#~ "When the configuration is over, X will be started (unless you\n"
+#~ "ask DrakX not to) so that you can check and see if the\n"
+#~ "settings suit you. If they don't, you can come back and\n"
+#~ "change them, as many times as necessary."
+#~ msgstr ""
+#~ "Ara cal configurar el sistema X Window, que �s el nucli del GUI\n"
+#~ "(Interf�cie gr�fica d'usuari) del GNU/Linux. Per a aix�, heu de\n"
+#~ "configurar la vostra targeta gr�fica i el monitor. No obstant\n"
+#~ "aix�, la majoria d'aquests passos estan automatitzats, aix� que pot\n"
+#~ "ser que la vostra feina es limiti a verificar qu� s'ha fet i a\n"
+#~ "acceptar els par�metres :)\n"
+#~ "\n"
+#~ "\n"
+#~ "Quan la configuraci� hagi acabat s'iniciar� X (tret que demaneu al\n"
+#~ "Drakx que no ho faci), i podreu verificar si els par�metres us\n"
+#~ "convenen. Si no, podreu tornar enrere i canviar-los tantes vegades\n"
+#~ "com calgui."
+
+#~ msgid ""
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
+#~ msgstr ""
+#~ "Si hi ha algun problema a la configuraci� X, utilitzeu aquestes opcions\n"
+#~ "per configurar correctament l'X Window System."
+
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "Si preferiu utilitzar una entrada gr�fica, seleccioneu \"S�\". En cas\n"
+#~ "contrari, seleccioneu \"No\"."
+
+#~ msgid ""
+#~ "You can choose a security level for your system. Please refer to the "
+#~ "manual for complete\n"
+#~ "  information. Basically, if you don't know what to choose, keep the "
+#~ "default option.\n"
+#~ msgstr ""
+#~ "Podeu triar un nivell de seguretat per al vostre sistema. Si us plau,\n"
+#~ "consulteu el manual per obtenir informaci� completa. B�sicament, si no\n"
+#~ "sabeu qu� triar, conserveu l'opci� per defecte.\n"
+
+#~ msgid ""
+#~ "Your system is going to reboot.\n"
+#~ "\n"
+#~ "After rebooting, your new Mandrake Linux system will load automatically.\n"
+#~ "If you want to boot into another existing operating system, please read\n"
+#~ "the additional instructions."
+#~ msgstr ""
+#~ "Ara, el sistema es tornar� a arrencar.\n"
+#~ "\n"
+#~ "Despr�s d'aix�, el sistema Mandrake Linux es carregar�\n"
+#~ "autom�ticament. Si voleu arrencar un altre sistema operatiu existent,\n"
+#~ "llegiu les instruccions addicionals."
+
+#~ msgid "Czech (Programmers)"
+#~ msgstr "Txec (Programadors)"
+
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "Eslovac (Programadors)"
+
+#~ msgid "Name of the profile to create:"
+#~ msgstr "Nom del perfil a crear:"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "Escriu a /etc/fstab"
+
+#~ msgid "Restore from file"
+#~ msgstr "Restaura des del fitxer"
+
+#~ msgid "Save in file"
+#~ msgstr "Desa al fitxer"
+
+#~ msgid "Restore from floppy"
+#~ msgstr "Restaura des del disquet"
+
+#~ msgid "Format all"
+#~ msgstr "Formata-ho tot"
+
+#~ msgid "After formatting all partitions,"
+#~ msgstr "Despr�s de formatar totes les particions,"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "totes les dades d'aquestes particions s'hauran perdut"
+
+#~ msgid "Reload"
+#~ msgstr "Torna a carregar"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr ""
+#~ "Voleu generar un disquet d'instal�laci� autom�tica per fer c�pies del "
+#~ "Linux?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "Configuraci� de l'ADSL"
+
+#~ msgid ""
+#~ "With a remote CUPS server, you do not have to configure\n"
+#~ "any printer here; printers will be automatically detected\n"
+#~ "unless you have a server on a different network; in the\n"
+#~ "latter case, you have to give the CUPS server IP address\n"
+#~ "and optionally the port number."
+#~ msgstr ""
+#~ "Amb un servidor CUPS remot, aqu� no us cal configurar cap\n"
+#~ "impressora; les impressores es detectaran autom�ticament,\n"
+#~ "tret que tingueu un servidor en una altra xarxa; en aquest\n"
+#~ "cas, heu d'indicar l'adre�a IP, i opcionalment el n�mero de\n"
+#~ "port, al servidor CUPS."
+
+#~ msgid "Remote queue"
+#~ msgstr "Cua remota"
+
+#, fuzzy
+#~ msgid "Remote queue name missing!"
+#~ msgstr "Cua remota"
+
+#, fuzzy
+#~ msgid "Command line"
+#~ msgstr "Nom de domini"
+
+#, fuzzy
+#~ msgid "Modify printer"
+#~ msgstr "Cap impressora"
+
+#, fuzzy
+#~ msgid "start it"
+#~ msgstr "limita"
+
+#~ msgid "Network Monitoring"
+#~ msgstr "Monitoritzaci� de la xarxa"
+
+#~ msgid "Profile "
+#~ msgstr "Perfil "
+
+#~ msgid "Statistics"
+#~ msgstr "Estad�stiques"
+
+#~ msgid "Sending Speed:"
+#~ msgstr "S'est� enviant la velocitat: "
 
-#~ msgid "KB"
-#~ msgstr "kB"
+#~ msgid "Receiving Speed:"
+#~ msgstr "S'est� rebent la velocitat: "
 
-#~ msgid "TB"
-#~ msgstr "TB"
+#, fuzzy
+#~ msgid "Connection Time: "
+#~ msgstr "Tipus de connexi�: "
+
+#~ msgid "Connecting to Internet "
+#~ msgstr "S'est� establint la connexi� a Internet"
+
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "S'est� realitzant la desconnexi� d'Internet"
+
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "No s'ha pogut realitzar la desconnexi� d'Internet"
 
-#~ msgid "%d minutes"
-#~ msgstr "%d minuts"
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "La desconnexi� d'Internet ha finalitzat"
+
+#~ msgid "Connection complete."
+#~ msgstr "La connexi� ha finalitzat."
+
+#~ msgid ""
+#~ "Connection failed.\n"
+#~ "Verify your configuration in the Mandrake Control Center."
+#~ msgstr ""
+#~ "No s'ha pogut establir la connexi�.\n"
+#~ "Comproveu la configuraci� al Centre de control de Mandrake."
+
+#, fuzzy
+#~ msgid "Color configuration"
+#~ msgstr "Configuraci�"
+
+#~ msgid "sent: "
+#~ msgstr "enviat: "
+
+#~ msgid "received: "
+#~ msgstr "rebut: "
+
+#, fuzzy
+#~ msgid "average"
+#~ msgstr "escombraries"
 
-#~ msgid "1 minute"
-#~ msgstr "1 minute"
+#~ msgid "Connect"
+#~ msgstr "Connecta"
+
+#~ msgid "Disconnect"
+#~ msgstr "Desconnecta"
+
+#~ msgid "/File/_New"
+#~ msgstr "/Fitxer/_Nou"
+
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Fitxer/_Obre"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>O"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/Fitxer/_Desa"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Fitxer/_Anomena i desa"
+
+#~ msgid "/File/-"
+#~ msgstr "/Fitxer/-"
+
+#~ msgid "/_Options"
+#~ msgstr "/_Opcions"
+
+#~ msgid "/Options/Test"
+#~ msgstr "/Opcions/Prova"
+
+#~ msgid "/_Help"
+#~ msgstr "/_Ajuda"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/Ajuda/_Quant a..."
+
+#, fuzzy
+#~ msgid "Default Runlevel"
+#~ msgstr "Predeterminat"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#~ msgid "Remove queue"
+#~ msgstr "Elimina la cua"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "No s'ha pogut interpretar el contingut del fitxer de configuraci�."
+
+#~ msgid "Unrecognized config file"
+#~ msgstr "Fitxer de configuraci� no reconegut"
+
+#~ msgid "Adapter"
+#~ msgstr "Adaptador"
+
+#~ msgid "Disable network"
+#~ msgstr "Inhabilita el sistema de xarxa"
+
+#, fuzzy
+#~ msgid "Enable network"
+#~ msgstr "Inhabilita el sistema de xarxa"
+
+#~ msgid ""
+#~ "You can now test your mouse. Use buttons and wheel to verify\n"
+#~ "if settings are good. If not, you can click on \"Cancel\" to choose "
+#~ "another\n"
+#~ "driver."
+#~ msgstr ""
+#~ "Ara podeu provar el ratol�. Utilitzeu els botons i la bola per comprovar "
+#~ "que\n"
+#~ "els par�metres s�n correctes; si no ho s�n, feu clic a \"Cancel�la\" per\n"
+#~ "seleccionar un altre controlador."
 
-#~ msgid "%d seconds"
-#~ msgstr "%d segons"
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "Connexi� per DSL (o ADSL)"
+
+#, fuzzy
+#~ msgid "Choose"
+#~ msgstr "Tanca"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr ""
+#~ "Podeu indicar directament l'URI per accedir a la impressora amb CUPS."
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "S�, imprimeix una p�gina ASCII de prova"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "S�, imprimeix una p�gina PostScript de prova"
+
+#~ msgid "Paper Size"
+#~ msgstr "Mida del paper"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "Voleu expulsar la p�gina despr�s de la tasca?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "Opcions del programa de control Uniprint"
+
+#~ msgid "Color depth options"
+#~ msgstr "Opcions de profunditat del color"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "Voleu imprimir el text com a PostScript?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Voleu ajustar el text 'stair-stepping'?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "Nombre de p�gines per p�gines de sortida"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "Marges dret/esquerra en punts (1/72 de polzada)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "Marges superior/inferior en punts (1/72 de polzada)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "opcions addicionals del GhostScript"
+
+#~ msgid "Extra Text options"
+#~ msgstr "Opcions addicionals per al text"
+
+#~ msgid "Reverse page order"
+#~ msgstr "Inverteix l'ordre de les p�gines"
+
+#~ msgid "CUPS starting"
+#~ msgstr "S'est� iniciant el CUPS"
+
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Seleccioneu la connexi� de la impressora remota"
+
+#~ msgid ""
+#~ "Every printer need a name (for example lp).\n"
+#~ "Other parameters such as the description of the printer or its location\n"
+#~ "can be defined. What name should be used for this printer and\n"
+#~ "how is the printer connected?"
+#~ msgstr ""
+#~ "Cada impressora necessita un nom (p.ex. lp).\n"
+#~ "Es poden definir altres par�metres, com ara la descripci� de la "
+#~ "impressora\n"
+#~ "o la seva ubicaci�. Quin nom cal utilitzar per a aquesta impressora, i "
+#~ "com\n"
+#~ "est� connectada?"
+
+#~ msgid ""
+#~ "Every print queue (which print jobs are directed to) needs a\n"
+#~ "name (often lp) and a spool directory associated with it. What\n"
+#~ "name and directory should be used for this queue and how is the printer "
+#~ "connected?"
+#~ msgstr ""
+#~ "Cada cua d'impressi� (a qu� s'adrecen les tasques d'impressi�) necessita\n"
+#~ "un nom (sovint lp) i un directori d'spool associada amb ell. Quin nom i\n"
+#~ "directori cal utilitzar per a aquesta cua, i com est� connectada la "
+#~ "impressora?"
+
+#~ msgid "Name of queue"
+#~ msgstr "Nom de la cua"
+
+#~ msgid "Spool directory"
+#~ msgstr "Directori d'spool"
+
+#~ msgid "Disable"
+#~ msgstr "Inhabilita"
+
+#~ msgid "Enable"
+#~ msgstr "Habilita"
+
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "Per habilitar un sistema m�s segur, seleccioneu \"Utilitza el\n"
+#~ "fitxer d'ombra\" i \"Utilitza les contrasenyes MD5\"."
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "Si la vostra xarxa utilitza NIS, seleccioneu \"Utilitza NIS\". Si no ho\n"
+#~ "sabeu, consulteu a l'administrador de la xarxa."
+
+#~ msgid "yellow pages"
+#~ msgstr "p�gines grogues"
+
+#, fuzzy
+#~ msgid "Light configuration"
+#~ msgstr "Configuraci� de la LAN"
+
+#~ msgid "Provider dns 1"
+#~ msgstr "DNS 1 del prove�dor"
+
+#~ msgid "Provider dns 2"
+#~ msgstr "DNS 2 del prove�dor"
+
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "Com us voleu connectar a Internet?"
 
 #~ msgid "cannot fork: "
 #~ msgstr "no es pot bifurcar: "
@@ -8381,9 +10214,6 @@ msgstr ""
 #~ msgid "Opening your connection..."
 #~ msgstr "S'est� obrint la connexi�..."
 
-#~ msgid "Standard tools"
-#~ msgstr "Eines est�ndard"
-
 #~ msgid "This startup script try to load your modules for your usb mouse."
 #~ msgstr "Aquest script d'inici intenta carregar els m�duls del ratol� USB."
 
@@ -8539,9 +10369,6 @@ msgstr ""
 #~ msgid "Internet/Network access"
 #~ msgstr "Acc�s a Internet/xarxa"
 
-#~ msgid "Mail information"
-#~ msgstr "Informaci� del correu"
-
 #~ msgid "Miscellaneous"
 #~ msgstr "Miscel�l�nia"
 
@@ -8623,15 +10450,9 @@ msgstr ""
 #~ "\n"
 #~ "Si continueu, tancar� l'entorn %s"
 
-#~ msgid "eth$_"
-#~ msgstr "eth$_"
-
 #~ msgid "loopback"
 #~ msgstr "loopback"
 
-#~ msgid "None"
-#~ msgstr "Cap"
-
 #~ msgid "Which bootloader(s) do you want to use?"
 #~ msgstr "Quin(s) carregador(s) d'arrencada voleu utilitzar?"
 
@@ -8653,9 +10474,6 @@ msgstr ""
 #~ msgid "Configure local network"
 #~ msgstr "Configura la xarxa local"
 
-#~ msgid "Disable networking"
-#~ msgstr "Inhabilita el sistema de xarxa"
-
 #~ msgid "Configure the Internet connection / Configure local Network"
 #~ msgstr "Configura la connexi� a Internet / Configura la xarxa local"
 
@@ -8703,9 +10521,6 @@ msgstr ""
 #~ msgid "Configure timezone"
 #~ msgstr "Zona hor�ria"
 
-#~ msgid "Configure printer"
-#~ msgstr "Configura la impressora"
-
 #~ msgid "(may cause data corruption)"
 #~ msgstr "(pot malmetre les dades)"
 
@@ -8801,9 +10616,6 @@ msgstr ""
 #~ msgid "Update location"
 #~ msgstr "Actualitza la ubicaci�"
 
-#~ msgid "Remove"
-#~ msgstr "Elimina"
-
 #~ msgid "Find Package"
 #~ msgstr "Cerca el paquet"
 
@@ -8813,9 +10625,6 @@ msgstr ""
 #~ msgid "Toggle between Installed and Available"
 #~ msgstr "Commuta entre Instal�lats i Disponibles"
 
-#~ msgid "Uninstall"
-#~ msgstr "Desinstal�la"
-
 #~ msgid "Choose package to install"
 #~ msgstr "Escolliu el paquet a instal�lar"
 
@@ -8974,13 +10783,13 @@ msgstr ""
 #~ msgid ""
 #~ " Introduction\n"
 #~ "\n"
-#~ "The operating system and the different components available in the Linux-"
-#~ "Mandrake distribution \n"
+#~ "The operating system and the different components available in the "
+#~ "Mandrake Linux 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 Linux-Mandrake distribution.\n"
+#~ "system and the different components of the Mandrake Linux distribution.\n"
 #~ "\n"
 #~ "\n"
 #~ "1. License Agreement\n"
@@ -9058,7 +10867,7 @@ msgstr ""
 #~ "Products, as a whole or in \n"
 #~ "parts,\n"
 #~ "by all means and for all purposes.\n"
-#~ "\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of "
+#~ "\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
 #~ "MandrakeSoft S.A.  All rights \n"
 #~ "are \n"
 #~ "reserved. The duplication is forbidden without prior written consent by "
@@ -9107,7 +10916,7 @@ msgstr ""
 #~ "and \n"
 #~ "use of software components or arising out of  downloading software "
 #~ "components from one of \n"
-#~ "Linux-Mandrake \n"
+#~ "Mandrake Linux \n"
 #~ "sites  which are prohibited or restricted in some countries by local "
 #~ "laws. This limited liability \n"
 #~ "applies to, but is not restricted to, the strong cryptography components "
@@ -9136,13 +10945,13 @@ msgstr ""
 #~ "\n"
 #~ "D'ara endavant, el sistema operatiu i els diferents components que "
 #~ "s'inclouen\n"
-#~ "a la distribuci� Linux-Mandrake s'anomenaran els \"Productes de programari"
+#~ "a la distribuci� Mandrake Linux s'anomenaran els \"Productes de programari"
 #~ "\".\n"
 #~ "Els Productes de programari inclouen, per� no es limiten a, el conjunt "
 #~ "de\n"
 #~ "programes, m�todes, regles i documentaci� relativa al sistema operatiu i "
 #~ "als\n"
-#~ "diferents components de la distribuci� Linux-Mandrake.\n"
+#~ "diferents components de la distribuci� Mandrake Linux.\n"
 #~ "\n"
 #~ "\n"
 #~ "1. Acord de Llic�ncia\n"
@@ -9228,7 +11037,7 @@ msgstr ""
 #~ "o\n"
 #~ "totalment, per tots els mitjans i per a totes les finalitats. \"Mandrake"
 #~ "\",\n"
-#~ "\"Linux-Mandrake\" i els logotips associats son marques registrades de\n"
+#~ "\"Mandrake Linux\" i els logotips associats son marques registrades de\n"
 #~ "MandrakeSoft S.A.  Tots els drets reservats. Es prohibeix la duplicaci� "
 #~ "sense\n"
 #~ "consentiment previ per escrit de MandrakeSoft S.A.\n"
@@ -9277,7 +11086,7 @@ msgstr ""
 #~ "resultin de\n"
 #~ "la possessi� i �s de components de programari o de la desc�rrega de "
 #~ "components\n"
-#~ "de programari d'algun dels llocs web de Linux-Mandrake que estiguin "
+#~ "de programari d'algun dels llocs web de Mandrake Linux que estiguin "
 #~ "prohibits o\n"
 #~ "restringits en alguns pa�sos per lleis locals. Aquesta responsabilitat "
 #~ "limitada\n"
@@ -9355,7 +11164,7 @@ msgstr ""
 #~ "Choose \"Install\" if there are no previous versions of GNU/Linux\n"
 #~ "installed, or if you wish to use multiple distributions or versions.\n"
 #~ "\n"
-#~ "Choose \"Rescue\" if you wish to rescue a version of Linux-Mandrake "
+#~ "Choose \"Rescue\" if you wish to rescue a version of Mandrake Linux "
 #~ "already installed.\n"
 #~ "\n"
 #~ "\n"
@@ -9402,7 +11211,7 @@ msgstr ""
 
 #~ msgid ""
 #~ "At this point, you may choose what partition(s) to use to install\n"
-#~ "your Linux-Mandrake system if they have been already defined (from a\n"
+#~ "your Mandrake Linux system if they have been already defined (from a\n"
 #~ "previous install of GNU/Linux or from another partitioning tool). In "
 #~ "other\n"
 #~ "cases, hard drive partitions must be defined. This operation consists of\n"
@@ -9443,7 +11252,7 @@ msgstr ""
 #~ "- Ctrl-m  to set the mount point\n"
 #~ msgstr ""
 #~ "En aquest moment podeu decidir quina(es) partici�(ns) voleu utilitzar\n"
-#~ "per instal�lar el sistema Linux-Mandrake, si �s que ja es va(n)\n"
+#~ "per instal�lar el sistema Mandrake Linux, si �s que ja es va(n)\n"
 #~ "definir (en una instal�laci� anterior del GNU/Linux o mitjan�ant una\n"
 #~ "altra eina de partici�). En altres casos, s'han de definir les\n"
 #~ "particions del disc dur: aquesta operaci� consisteix en dividir el\n"
@@ -9551,7 +11360,7 @@ msgstr ""
 #~ "hardware.\n"
 #~ "\n"
 #~ "\n"
-#~ "If you install a Linux-Mandrake system on a machine which is part\n"
+#~ "If you install a Mandrake Linux system on a machine which is part\n"
 #~ "of an already existing network, the network administrator will\n"
 #~ "have given you all necessary information (IP address, network\n"
 #~ "submask or netmask for short, and hostname). If you're setting\n"
@@ -9581,7 +11390,7 @@ msgstr ""
 #~ "d'anar a buscar a la documentaci� del vostre maquinari.\n"
 #~ "\n"
 #~ "\n"
-#~ "Si instal�leu un sistema Linux-Mandrake en un ordinador que forma\n"
+#~ "Si instal�leu un sistema Mandrake Linux en un ordinador que forma\n"
 #~ "part d'una xarxa existent, l'administrador de la xarxa us haur� de\n"
 #~ "facilitar la informaci� necess�ria (l'adre�a IP, la subm�scara de\n"
 #~ "xarxa i el nom de l'ordinador central). Si esteu configurant una\n"
@@ -9786,9 +11595,6 @@ msgstr ""
 #~ msgid "nfs mount failed"
 #~ msgstr "ha fallat el muntatge de l'nfs"
 
-#~ msgid "CHAP"
-#~ msgstr "CHAP"
-
 #~ msgid "Socket"
 #~ msgstr "S�col"
 
@@ -9888,18 +11694,18 @@ msgstr ""
 #~ msgid "Network:"
 #~ msgstr "Xarxa:"
 
-#~ msgid "Internet Connection Sharing - setup of $device"
-#~ msgstr "Connexi� a Internet compartida: configuraci� de $device"
+#~ msgid "Internet Connection Sharing - setup of %s"
+#~ msgstr "Connexi� a Internet compartida: configuraci� de %s"
 
 #~ msgid ""
 #~ "The following interface is about to be configured:\n"
 #~ "\n"
-#~ "$interface\n"
+#~ "%s\n"
 #~ "\n"
 #~ msgstr ""
 #~ "Ara es configurar� la interf�cie seg�ent:\n"
 #~ "\n"
-#~ "$interface\n"
+#~ "%s\n"
 #~ "\n"
 
 #~ msgid "Everything configured!"
@@ -9914,9 +11720,6 @@ msgstr ""
 #~ msgid "Try to find %s devices?"
 #~ msgstr "Voleu que intenti trobar els dispositius %s?"
 
-#~ msgid "Modem Configuration"
-#~ msgstr "Configuraci� del m�dem"
-
 #~ msgid ""
 #~ "Do you want to configure a dialup connection with modem for your system?"
 #~ msgstr ""
@@ -9932,9 +11735,6 @@ msgstr ""
 #~ msgstr ""
 #~ "%s: Aquesta partici� no �s arrel; si us plau, seleccioneu-ne una altra."
 
-#~ msgid "No root partition found"
-#~ msgstr "No s'ha trobat cap partici� arrel"
-
 #~ msgid "Please choose a partition to use as your root partition."
 #~ msgstr "Si us plau, seleccioneu una partici� per utilitzar-la com a arrel."
 
@@ -10069,9 +11869,6 @@ msgstr ""
 #~ msgid "useless"
 #~ msgstr "in�til"
 
-#~ msgid "garbage"
-#~ msgstr "escombraries"
-
 #~ msgid ""
 #~ "Choose \"Install\" if there are no previous versions of Linux\n"
 #~ "installed, or if you wish to use multiple distributions or versions.\n"
diff --git a/perl-install/share/po/el.po b/perl-install/share/po/el.po
index 060e3ec77..f26576caf 100644
--- a/perl-install/share/po/el.po
+++ b/perl-install/share/po/el.po
@@ -1,69 +1,72 @@
-# SOME DESCRIPTIVE TITLE.
+# Greek Translation of DrakX.
 # Copyright (c) 1999 MandrakeSoft
-# FIRST AUTHOR Theodore J. Soldatos <theodore@eexi.gr>, 1999.
+# FIRST AUTHOR Theodore J. Soldatos <theodore@eexi.gr>, 1999-2000.
+# Thanos Kyritsis <djart@hellug.gr>, 2001
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-02 17:16+0200\n"
-"PO-Revision-Date: 2000-1-4 16:27+0100\n"
-"Last-Translator: unmantained\n"
-"Language-Team: GREEK <nls@tux.hellug.gr>\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
+"PO-Revision-Date: 2001-08-23 23:59+0300\n"
+"Last-Translator: Thanos Kyritsis <djart@hellug.gr>\n"
+"Language-Team: Greek <nls@tux.hellug.gr>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-7\n"
+"Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 0.8\n"
 
-#: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
-msgstr ""
+#: ../../Xconfigurator.pm_.c:231
+msgid "Configure all heads independently"
+msgstr "������� ���� ��� ������� ����������"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
-msgstr ""
+msgstr "����� ��������� Xinerama"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
-msgstr ""
+msgstr "������� ���� ��� ������ \"%s\" (%s)"
 
-#: ../../Xconfigurator.pm_.c:239
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
-msgstr "�������� ���������"
+msgstr "������� ������ �������"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:239
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
+"�� ������� ��� ����������� ������� ��������� �������.\n"
+"�� ������ �� ������;"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "����� ��������"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "�������� ����� ��������"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "�������� X server (������ ������ ��������)"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "X server"
 msgstr "������������ X Window"
 
-#: ../../Xconfigurator.pm_.c:309 ../../Xconfigurator.pm_.c:316
-#: ../../Xconfigurator.pm_.c:366
+#: ../../Xconfigurator.pm_.c:307 ../../Xconfigurator.pm_.c:313
+#: ../../Xconfigurator.pm_.c:363 ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s"
 msgstr "XFree %s"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:310
 msgid "Which configuration of XFree do you want to have?"
 msgstr "�� ����� XFree ������ �� �����;"
 
-#: ../../Xconfigurator.pm_.c:324
+#: ../../Xconfigurator.pm_.c:321
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -74,19 +77,20 @@ msgstr ""
 "������ \n"
 "�������� ���������� ��� ����������� �������."
 
-#: ../../Xconfigurator.pm_.c:326 ../../Xconfigurator.pm_.c:359
+#: ../../Xconfigurator.pm_.c:323 ../../Xconfigurator.pm_.c:356
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with XFree %s."
 msgstr ""
 "� ����� �������� ��� ����������� ���������� ������������� �������� ��� XFree "
 "%s."
 
-#: ../../Xconfigurator.pm_.c:328 ../../Xconfigurator.pm_.c:361
+#: ../../Xconfigurator.pm_.c:325 ../../Xconfigurator.pm_.c:358
+#: ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s with 3D hardware acceleration"
 msgstr "XFree %s �� ���������� ������������� ��������"
 
-#: ../../Xconfigurator.pm_.c:336 ../../Xconfigurator.pm_.c:350
+#: ../../Xconfigurator.pm_.c:333 ../../Xconfigurator.pm_.c:347
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -96,12 +100,12 @@ msgstr ""
 "%s,\n"
 "�������: ����������� ���������� - ������ �� ������� ��� ���������� ���!"
 
-#: ../../Xconfigurator.pm_.c:338 ../../Xconfigurator.pm_.c:352
+#: ../../Xconfigurator.pm_.c:335 ../../Xconfigurator.pm_.c:349
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "XFree %s �� ����������� ���������� ������������� ��������"
 
-#: ../../Xconfigurator.pm_.c:347
+#: ../../Xconfigurator.pm_.c:344
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -115,27 +119,31 @@ msgstr ""
 "����������\n"
 "��� ����������� �������."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr "Xpmac (������ �������� ������������)"
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "��������� XFree"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "������� ������ ������ ��������"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "��������� X server"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "�������� �����"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Monitor"
 msgstr "�����"
 
-#: ../../Xconfigurator.pm_.c:483
+#: ../../Xconfigurator.pm_.c:519
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -159,39 +167,39 @@ msgstr ""
 "�����������\n"
 "��� ������ ���. �� ��� ����� ��������, ����� ��� ����������� �������."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "��������� ���������� ���������"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "��������� ����������� ���������"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "� ����� ��� ���� ��������� �����"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "� ����� �������� ��� ���� ��������� �����"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "��� ����� �������� ��������� �����"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "������ �� ���������� ��� ���������;"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "�������: � ������ ����� ���������� �� ���� ��� ����� ��������"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "������ ���������"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -199,153 +207,156 @@ msgstr ""
 "\n"
 "��������� �� �������� ������� �����������"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "���������� ������:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "������ �� %d ������������"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "����� ���� � ����� �������;"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "���������� ������, ��������� �� �������� ������� �����������"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "�������"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "�������� ������� ��� ����� ��������"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "����� ��������: %s"
 
-#: ../../Xconfigurator.pm_.c:734
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 server: %s"
 
-#: ../../Xconfigurator.pm_.c:750 ../../standalone/draknet_.c:280
-#: ../../standalone/draknet_.c:283
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:829 ../../printerdrake.pm_.c:1885
+#: ../../standalone/draknet_.c:298 ../../standalone/draknet_.c:301
 msgid "Expert Mode"
-msgstr "��� ��������..."
+msgstr "��������� ������������"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "�������� ����"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "���������"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "���������� �������������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "����� ���������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "������� ���������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1333
+#: ../../Xconfigurator.pm_.c:1440
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "�����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1334
+#: ../../Xconfigurator.pm_.c:1441
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "��������� ���������� ���������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "��������� ����������� ���������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "����� ��������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "����� ��������: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "����� ������ ��������: %s kb\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "����� ��������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "�������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1342
+#: ../../Xconfigurator.pm_.c:1450
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 server: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1343
+#: ../../Xconfigurator.pm_.c:1451
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "������ XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "������������ ��������� �������� ������������� (X-Window)"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "�� ������ �� ������;"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "������ ������"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "������ ������ ��������"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "������ ��������� X server"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "������ ��������"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "������� �����������"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "��������� �������"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "������"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -358,20 +369,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "�������� ��������������� �� %s ��� ������������ ��� �������"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "�������� ������������� ��� ���� ������� Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "������� ���������� (X) ���� ��������"
 
-#: ../../Xconfigurator.pm_.c:1447
+#: ../../Xconfigurator.pm_.c:1556
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -425,219 +436,224 @@ msgid "8 MB"
 msgstr "8 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
-msgstr "16 MB � �����������"
+msgid "16 MB"
+msgstr "16 MB"
+
+#: ../../Xconfigurator_consts.pm_.c:113
+msgid "32 MB"
+msgstr "32 MB"
+
+#: ../../Xconfigurator_consts.pm_.c:114
+msgid "64 MB or more"
+msgstr "64 MB � �����������"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standard VGA, 640x480 ��� 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 ��� 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 Compatible, 1024x768 ��� 87 Hz interlaced (no 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Super VGA, 1024x768 ��� 87 Hz interlaced, 800x600 ��� 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "Extended Super VGA, 800x600 ��� 60 Hz, 640x480 ��� 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "Non-Interlaced SVGA, 1024x768 ��� 60 Hz, 800x600 ��� 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "High Frequency SVGA, 1024x768 ��� 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:127
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Multi-frequency ��� ������ �� ����������� ������� 1280x1024 ��� 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:128
+#: ../../Xconfigurator_consts.pm_.c:130
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Multi-frequency ��� ������ �� ����������� ������� 1280x1024 ��� 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:129
+#: ../../Xconfigurator_consts.pm_.c:131
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Multi-frequency ��� ������ �� ����������� ������� 1280x1024 ��� 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "����� ��� ������ �� ����������� ������� 1600x1200 ��� 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "����� ��� ������ �� ����������� ������� 1600x1200 ��� 76 Hz"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124
+#: ../../any.pm_.c:96 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "������ ������ ��� ���������� ���������"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124 ../../any.pm_.c:197
+#: ../../any.pm_.c:96 ../../any.pm_.c:121 ../../any.pm_.c:194
 msgid "First sector of drive (MBR)"
 msgstr "������ ������ ��� ������ (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "����������� SILO"
 
-#: ../../any.pm_.c:104 ../../any.pm_.c:117
+#: ../../any.pm_.c:101 ../../any.pm_.c:114
 msgid "Where do you want to install the bootloader?"
 msgstr "��� ������ �� ������������� �� ��������� ���������;"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "����������� LILO/grub"
 
-#: ../../any.pm_.c:128 ../../any.pm_.c:142
+#: ../../any.pm_.c:125 ../../any.pm_.c:139
 msgid "SILO"
-msgstr ""
+msgstr "SILO"
 
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:127
 msgid "LILO with text menu"
-msgstr ""
+msgstr "LILO �� ����� ��������"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
-msgstr ""
+msgstr "LILO �� ������� �����"
 
-#: ../../any.pm_.c:134
+#: ../../any.pm_.c:131
 msgid "Grub"
-msgstr ""
+msgstr "Grub"
 
-#: ../../any.pm_.c:138
+#: ../../any.pm_.c:135
 msgid "Boot from DOS/Windows (loadlin)"
-msgstr ""
+msgstr "�������� ��� �� DOS/Windows (loadlin)"
 
-#: ../../any.pm_.c:140 ../../any.pm_.c:142
-#, fuzzy
+#: ../../any.pm_.c:137 ../../any.pm_.c:139
 msgid "Yaboot"
-msgstr "Root"
+msgstr "Yaboot"
 
-#: ../../any.pm_.c:148 ../../any.pm_.c:180
+#: ../../any.pm_.c:145 ../../any.pm_.c:177
 msgid "Bootloader main options"
 msgstr "������� �������� ������������ ���������"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
-#, fuzzy
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
-msgstr "������� �������� ������������ ���������"
+msgstr "Bootloader ��� �����"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "����������� ������������ ���������"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "������� ���������"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (��� ���������� �� ���������� BIOS)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "��������"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "��������"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "������� ������"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "����������� ���� ��� ��������"
 
-#: ../../any.pm_.c:160 ../../any.pm_.c:741
-#: ../../install_steps_interactive.pm_.c:904 ../../netconnect.pm_.c:629
-#: ../../printerdrake.pm_.c:98 ../../printerdrake.pm_.c:132
-#: ../../standalone/draknet_.c:569
+#: ../../any.pm_.c:157 ../../any.pm_.c:730
+#: ../../install_steps_interactive.pm_.c:938 ../../network/modem.pm_.c:46
+#: ../../printerdrake.pm_.c:402 ../../printerdrake.pm_.c:481
+#: ../../standalone/draknet_.c:603
 msgid "Password"
 msgstr "�����������"
 
-#: ../../any.pm_.c:161 ../../any.pm_.c:742
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../any.pm_.c:158 ../../any.pm_.c:731
+#: ../../install_steps_interactive.pm_.c:939
 msgid "Password (again)"
 msgstr "����������� (����)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "���������� �������� ������� �������"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "����������"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "���������� /tmp �� ���� ��������"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "������� ��������� ������ �� ���������� (��� ��������� %d MB)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "������������ ��������� profiles"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "�������� ������� ������ �� Mb"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "� ������� ``���������� �������� ������� �������'' ����� ������� ����� "
 "�����������"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "Please try again"
 msgstr "�������� ����������� ����"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "The passwords do not match"
 msgstr "�� ����������� ����� �������"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
-msgstr ""
+msgstr "������ Init"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
-msgstr ""
+msgstr "������� ������������ Firmware"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
-msgstr ""
+msgstr "����� ������ ��������� ������"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
-msgstr ""
+msgstr "������������ ��������� ��� CD;"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
-msgstr ""
+msgstr "������������ OF ���������;"
 
-#: ../../any.pm_.c:188
-#, fuzzy
+#: ../../any.pm_.c:185
 msgid "Default OS?"
-msgstr "������� ��' �������"
+msgstr "��' ������� ����������� �������;"
 
-#: ../../any.pm_.c:210
+#: ../../any.pm_.c:207
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -645,148 +661,144 @@ msgstr ""
 "�������� �� ��������� ��������.\n"
 "�������� �� ���������� �� ����� � �� �������� ��� ����������."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "��������"
 
-#: ../../any.pm_.c:220 ../../any.pm_.c:729 ../../diskdrake.pm_.c:46
-#: ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217 ../../any.pm_.c:718 ../../diskdrake.pm_.c:161
+#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:1846
+#: ../../printerdrake.pm_.c:1847 ../../printerdrake.pm_.c:1904
+#: ../../printerdrake.pm_.c:1948
 msgid "Done"
 msgstr "������������"
 
-#: ../../any.pm_.c:220
-#, fuzzy
+#: ../../any.pm_.c:217
 msgid "Modify"
-msgstr "����������� RAID"
+msgstr "�����������"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "�� ����� ������� ������ �� ����������"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Other OS (SunOS...)"
 msgstr "���� ����������� (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "���� ����������� (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "���� ����������� (windows...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "Image"
 
-#: ../../any.pm_.c:253 ../../any.pm_.c:264
+#: ../../any.pm_.c:247 ../../any.pm_.c:258
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:254 ../../any.pm_.c:283
+#: ../../any.pm_.c:248 ../../any.pm_.c:277
 msgid "Append"
 msgstr "Append"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "Read-write"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "�������"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "���������"
 
-#: ../../any.pm_.c:274 ../../any.pm_.c:279 ../../any.pm_.c:282
+#: ../../any.pm_.c:268 ../../any.pm_.c:273 ../../any.pm_.c:276
 msgid "Label"
 msgstr "��������"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "������� ��' �������"
 
-#: ../../any.pm_.c:284
-#, fuzzy
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
-msgstr "Initrd"
+msgstr "Initrd-�������"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
-msgstr ""
+msgstr "�����Video"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "�������� ��������"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "��� ����������� ����� ��������"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "���� � �������� ��������������� ���"
 
-#: ../../any.pm_.c:317
-#, fuzzy
-msgid "What type of partitioning?"
-msgstr "�� ����� �������� �����;"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "����� %s %s ������������"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "����� �����;"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "����� ������� ����������� %s;"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
-#: ../../printerdrake.pm_.c:237
+#: ../../any.pm_.c:601 ../../any.pm_.c:760 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "No"
 msgstr "���"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
+#: ../../any.pm_.c:601 ../../any.pm_.c:759 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "Yes"
 msgstr "���"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "������� ����������� ������"
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:648
+#: ../../any.pm_.c:637
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "����������� ������ ��� %s ����� %s"
 
-#: ../../any.pm_.c:649
+#: ../../any.pm_.c:638
 #, c-format
 msgid "(module %s)"
 msgstr "(module %s)"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:660
+#: ../../any.pm_.c:649
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "����� %s ����� �� ��������;"
 
-#: ../../any.pm_.c:668
+#: ../../any.pm_.c:657
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -803,20 +815,20 @@ msgstr ""
 "�� ����� ��� ��� ��� ����������� ��� ����������; � ������� ���� ����\n"
 "���������� ������� ��� ����������, ���� ��� �� ���������� �����."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "�������� �������"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "������������� ����������"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "�������� ���� �� ������ ����������� ��� ��� ����� %s"
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -827,11 +839,11 @@ msgstr ""
 "�� ���������� ����� ��� ����� ``�����=���� �����2=����2 ...''.\n"
 "��� ����������, ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "���������� ������"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -840,34 +852,34 @@ msgstr ""
 "� ������� ��� ������ %s �������.\n"
 "������ �� ���������� ���� �� ������������ �����������;"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(�� %s ���� ��� ���������)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "�� ����������� ����� ���� ����"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "�������� �������� ������ �����"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "�� ������ ����� ������ �� �������� ���� ���� ��������, ��������, `-' ��� `_'"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "���� �� ������ ����� ������� ���"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "�������� ������"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -876,55 +888,70 @@ msgstr ""
 "�������� ������\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "������� ������"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "���������� �����"
 
-#: ../../any.pm_.c:740 ../../printerdrake.pm_.c:97
-#: ../../printerdrake.pm_.c:131
+#: ../../any.pm_.c:729 ../../printerdrake.pm_.c:401
+#: ../../printerdrake.pm_.c:480
 msgid "User name"
 msgstr "������ �����"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "������ (shell)"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "���������"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:756
 msgid "Autologin"
 msgstr "�������� ������� (Autologin)"
 
-#: ../../any.pm_.c:767
+#: ../../any.pm_.c:757
+#, fuzzy
 msgid ""
 "I can set up your computer to automatically log on one user.\n"
-"If you don't want to use this feature, click on the cancel button."
+"Do you want to use this feature?"
 msgstr ""
 "����� �� ������� �� ������� ��� ���� ���� �� ��������� �������� ����\n"
 "��� �������� �� ���� ������������ ������.\n"
 "��� ��� ������ �� ��������� ����, ������� ��� ������ ��������."
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "�������� ��� ��' ������� ������:"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "�������� ��� ����������� ��������� ��� ������ �� ���������������"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "�������� �������� ��� ������."
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr ""
+"�������� �� ��������� ��� ����� ������� ��� �� ����� ���������� ���� �� "
+"����� ��� ������������"
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "���"
+
 # NOTE: this message will be displayed at boot time; that is
 # only the ascii charset will be available on most machines
 # so use only 7bit for this message (and do transliteration or
 # leave it in English, as it is the best for your language)
-# 
+#
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:262 ../../bootloader.pm_.c:608
+#: ../../bootloader.pm_.c:259
 #, c-format
 msgid ""
 "Welcome to %s the operating system chooser!\n"
@@ -948,579 +975,767 @@ msgstr ""
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:809
+#: ../../bootloader.pm_.c:835
 msgid "Welcome to GRUB the operating system chooser!"
 msgstr "Welcome to GRUB the operating system chooser!"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:812
+#: ../../bootloader.pm_.c:838
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
 msgstr "Use the %c and %c keys for selecting which entry is highlighted."
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:815
+#: ../../bootloader.pm_.c:841
 msgid "Press enter to boot the selected OS, 'e' to edit the"
 msgstr "Press enter to boot the selected OS, 'e' to edit the"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:818
+#: ../../bootloader.pm_.c:844
 msgid "commands before booting, or 'c' for a command-line."
 msgstr "commands before booting, or 'c' for a command-line."
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:821
+#: ../../bootloader.pm_.c:847
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr "The highlighted entry will be booted automatically in %d seconds."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
 msgstr "��� ������� ������� ����� ��� /boot"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
 #. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:918
+#: ../../bootloader.pm_.c:951
 msgid "Desktop"
 msgstr "Desktop"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:920
+#: ../../bootloader.pm_.c:953
 msgid "Start Menu"
 msgstr "Start Menu"
 
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "��� ������ �� ������������� �� ��������� ���������;"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
-msgstr ""
+msgstr "��� ������� ������� ��������� �����.\n"
 
 #: ../../bootlook.pm_.c:62
-#, fuzzy
 msgid "Boot Style Configuration"
-msgstr "��������� ���� ��� �����������"
+msgstr "Boot ����� �������"
 
 #: ../../bootlook.pm_.c:79
-#, fuzzy
 msgid "/_File"
-msgstr "������:\n"
-
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr ""
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr ""
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr ""
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr ""
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr ""
+msgstr "/_������"
 
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr ""
+#: ../../bootlook.pm_.c:80
+msgid "/File/_Quit"
+msgstr "/������/�_�����"
 
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr ""
+#: ../../bootlook.pm_.c:80
+msgid "<control>Q"
+msgstr "<control>Q"
 
 #: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr ""
+msgid "NewStyle Categorizing Monitor"
+msgstr "NewStyle Categorizing �����"
+
+#: ../../bootlook.pm_.c:92
+msgid "NewStyle Monitor"
+msgstr "NewStyle �����"
 
 #: ../../bootlook.pm_.c:93
-msgid "/File/_Quit"
-msgstr ""
+msgid "Traditional Monitor"
+msgstr "����������� �����"
 
 #: ../../bootlook.pm_.c:94
-msgid "<control>Q"
-msgstr ""
-
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr ""
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr ""
-
-#: ../../bootlook.pm_.c:99
-#, fuzzy
-msgid "/_Help"
-msgstr "�������"
+msgid "Traditional Gtk+ Monitor"
+msgstr "����������� Gtk+ �����"
 
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr ""
+#: ../../bootlook.pm_.c:95
+msgid "Launch Aurora at boot time"
+msgstr "�������� ��� Aurora ���� ��� �������� ��� ����������"
 
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-#, fuzzy
-msgid "Configure"
-msgstr "������� �"
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "���������� Lilo/grub"
 
-#: ../../bootlook.pm_.c:114
-#, fuzzy, c-format
+#: ../../bootlook.pm_.c:102
+#, c-format
 msgid ""
 "You are currently using %s as Boot Manager.\n"
 "Click on Configure to launch the setup wizard."
-msgstr "����������� �������� Internet"
-
-#: ../../bootlook.pm_.c:121
-#, fuzzy
-msgid "Lilo/grub mode"
-msgstr "������ ������"
-
-#: ../../bootlook.pm_.c:131
-msgid "NewStyle Categorizing Monitor"
-msgstr ""
-
-#: ../../bootlook.pm_.c:134
-#, fuzzy
-msgid "NewStyle Monitor"
-msgstr "�����"
-
-#: ../../bootlook.pm_.c:137
-#, fuzzy
-msgid "Traditional Monitor"
-msgstr "������ ������"
-
-#: ../../bootlook.pm_.c:140
-msgid "Traditional Gtk+ Monitor"
 msgstr ""
+"�������������� ��� %s �� Boot Manager.\n"
+"����� ���� ��� ������� ��� �� ���������� ��� ����� ������������."
 
-#: ../../bootlook.pm_.c:144
-msgid "Launch Aurora at boot time"
-msgstr ""
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "�������"
 
-#: ../../bootlook.pm_.c:169
-#, fuzzy
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
-msgstr "������� ���������"
+msgstr "���������� ���������"
+
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "��������� ����������"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
-msgstr ""
+msgstr "������� ��� X-Window ���� ��� �������� ��� ����������"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
-msgstr ""
+msgstr "���, ��� ������� �������� login"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
-msgstr ""
-
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr ""
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "������� ��' �������"
+msgstr "���, ������� �������� login �� ���� (user, desktop)"
 
-#: ../../bootlook.pm_.c:236 ../../standalone/draknet_.c:88
-#: ../../standalone/draknet_.c:120 ../../standalone/draknet_.c:184
-#: ../../standalone/draknet_.c:302 ../../standalone/draknet_.c:396
-#: ../../standalone/draknet_.c:473 ../../standalone/draknet_.c:509
-#: ../../standalone/draknet_.c:617
+#: ../../bootlook.pm_.c:155 ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:140 ../../standalone/draknet_.c:208
+#: ../../standalone/draknet_.c:320 ../../standalone/draknet_.c:433
+#: ../../standalone/draknet_.c:507 ../../standalone/draknet_.c:543
+#: ../../standalone/draknet_.c:644
 msgid "OK"
-msgstr ""
-
-#: ../../bootlook.pm_.c:238 ../../install_steps_gtk.pm_.c:576
-#: ../../interactive.pm_.c:114 ../../interactive.pm_.c:269
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:357
-#: ../../my_gtk.pm_.c:360 ../../my_gtk.pm_.c:617
-#: ../../standalone/drakgw_.c:639 ../../standalone/draknet_.c:95
-#: ../../standalone/draknet_.c:127 ../../standalone/draknet_.c:295
-#: ../../standalone/draknet_.c:485 ../../standalone/draknet_.c:631
-#: ../../standalone/tinyfirewall_.c:63
+msgstr "OK"
+
+#: ../../bootlook.pm_.c:156 ../../install_steps_gtk.pm_.c:516
+#: ../../interactive.pm_.c:122 ../../interactive.pm_.c:286
+#: ../../interactive.pm_.c:308 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:416 ../../my_gtk.pm_.c:419 ../../my_gtk.pm_.c:716
+#: ../../printerdrake.pm_.c:1158 ../../standalone/drakgw_.c:648
+#: ../../standalone/draknet_.c:115 ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:313 ../../standalone/draknet_.c:519
+#: ../../standalone/draknet_.c:658 ../../standalone/tinyfirewall_.c:63
 msgid "Cancel"
 msgstr "�������"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr ""
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr ""
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "�������� ���������� ��� /etc/inittab ��� ��������: %s"
 
-#: ../../bootlook.pm_.c:435 ../../standalone/drakboot_.c:47
+#: ../../bootlook.pm_.c:336 ../../standalone/drakboot_.c:47
 msgid "Installation of LILO failed. The following error occured:"
 msgstr "� ����������� ��� LILO �������. ���������� �� �������� ������:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "����������"
-
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "����������"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "��������"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "KB"
 
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "�����������"
+#: ../../common.pm_.c:93 ../../install_steps_graphical.pm_.c:287
+#: ../../install_steps_graphical.pm_.c:334
+msgid "MB"
+msgstr "MB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:653
-msgid "Resize"
-msgstr "������ ��������"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr "TB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "�����"
+#: ../../common.pm_.c:109
+#, c-format
+msgid "%d minutes"
+msgstr "%d �����"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "������ ��������"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 �����"
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "���������� /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d ������������"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "���������� �� ����������� ����� �����������"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "�������� ����� ����� ��� ��������� ��������� ��� ��������� ���"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "���������� �� �������� ����� �����������"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "�������� ����������!"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "��������� ��� ������"
+#: ../../diskdrake.pm_.c:103
+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"
+"���� ���� ��� ������"
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "���������� �� ������"
+#: ../../diskdrake.pm_.c:122 ../../diskdrake_interactive.pm_.c:313
+#: ../../diskdrake_interactive.pm_.c:328 ../../install_steps.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:37
+#: ../../install_steps_interactive.pm_.c:310 ../../interactive_http.pm_.c:119
+#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:62
+msgid "Error"
+msgstr "������"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "�����"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "��������� ��� ��������"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "���"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "���������� �� ��������"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+#, fuzzy
+msgid "Remote"
+msgstr "����� ���������������� �����"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "���������� ����"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "������ ��������"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "����������� ����"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "��������"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "�������� ��������"
+#: ../../diskdrake.pm_.c:211 ../../diskdrake.pm_.c:417
+#: ../../diskdrake.pm_.c:534 ../../diskdrake_interactive.pm_.c:353
+#: ../../diskdrake_interactive.pm_.c:488
+msgid "Type"
+msgstr "�����"
 
-#: ../../diskdrake.pm_.c:59
-msgid "All primary partitions are used"
-msgstr "���� �� ����������� ����������� ����� �� �����"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "����������"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "��� ����� �� �������� �����������"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "�������"
+
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "�������� �����"
 
-#: ../../diskdrake.pm_.c:59
+#: ../../diskdrake.pm_.c:235
 msgid ""
-"To have more partitions, please delete one to be able to create an extended "
-"partition"
+"You have one big FAT partition\n"
+"(generally used by MicroSoft Dos/Windows).\n"
+"I suggest you first resize that partition\n"
+"(click on it, then click on \"Resize\")"
 msgstr ""
-"��� �� ���������� �����������, �������� ��������� ��� ���� ������ ����� "
-"������ � �������� ����������� ����������"
+"����� ��� ������ FAT ���������\n"
+"(������� ���������������� ��� Dos � Windows).\n"
+"������� �� �������� �� ������� ��� �����\n"
+"(�������� ���, ���� �������� \"������ ��������\")"
+
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "�������� ����� ���� �� ��� ���������"
 
-#: ../../diskdrake.pm_.c:61
+#: ../../diskdrake.pm_.c:240
 #, fuzzy
-msgid "Not enough space for auto-allocating"
-msgstr "��� ������� ������� ��������� ����� ��� ���������� ���� �����������"
+msgid "Please click on a media"
+msgstr "�������� ����� ���� �� ��� ���������"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "������� ���������� ������"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "�������� ����� ���� �� ��� ���������"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "���������� ������ �����������"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-#, fuzzy
-msgid "More"
-msgstr "����������"
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "������������"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
+#, fuzzy
+msgid "Journalised FS"
+msgstr "������� �������"
+
+#: ../../diskdrake.pm_.c:395
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Swap"
 msgstr "Swap"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:396 ../../diskdrake_interactive.pm_.c:952
 msgid "Empty"
 msgstr "�����"
 
-#: ../../diskdrake.pm_.c:117 ../../install_steps_gtk.pm_.c:407
-#: ../../mouse.pm_.c:145
+#: ../../diskdrake.pm_.c:396 ../../install_steps_gtk.pm_.c:373
+#: ../../install_steps_gtk.pm_.c:433 ../../mouse.pm_.c:161
+#: ../../services.pm_.c:161
 msgid "Other"
 msgstr "����"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "����� ���������� �������:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "������������"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "����������"
+
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "�������������� ``%s'' ��� ���� ���"
+
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "��������"
 
-#: ../../diskdrake.pm_.c:147
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "����� ����� ``����������''"
+
+#: ../../diskdrake.pm_.c:424 ../../diskdrake_interactive.pm_.c:480
+#, c-format
 msgid ""
-"You have one big FAT partition\n"
-"(generally used by MicroSoft Dos/Windows).\n"
-"I suggest you first resize that partition\n"
-"(click on it, then click on \"Resize\")"
+"After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
-"����� ��� ������ FAT ���������\n"
-"(������� ���������������� ��� Dos � Windows).\n"
-"������� �� �������� �� ������� ��� �����\n"
-"(�������� ���, ���� �������� \"������ ��������\")"
+"���� ��� ������ ����� ���� ��������� %s, ��� �� �������� �� ����� ��� "
+"��������� �� ������"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "�������� ����� ����� ��� ��������� ��������� ��� ��������� ���"
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "��� ������ �� ��������� ��� ������� %s;"
 
-#: ../../diskdrake.pm_.c:152 ../../diskdrake.pm_.c:170
-#: ../../diskdrake.pm_.c:179 ../../diskdrake.pm_.c:570
-#: ../../diskdrake.pm_.c:592
-msgid "Read carefully!"
-msgstr "�������� ����������!"
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Mount options"
+msgstr "���������� ������"
 
-#: ../../diskdrake.pm_.c:155
-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"
+#: ../../diskdrake.pm_.c:507
+msgid "Various"
 msgstr ""
-"��� ��������� �� ��������������� �� aboot, �������� �� ������� �������� ���� "
-"2048 ������ ����� �������)\n"
-"���� ���� ��� ������"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "�������: ���� � ���������� ����� ����������."
+#: ../../diskdrake.pm_.c:525
+#, fuzzy
+msgid "Removable media"
+msgstr "�������� ������� ����������� ������� �����������"
 
-#: ../../diskdrake.pm_.c:214 ../../install_steps.pm_.c:72
-#: ../../install_steps_interactive.pm_.c:37
-#: ../../install_steps_interactive.pm_.c:322 ../../standalone/diskdrake_.c:66
-msgid "Error"
-msgstr "������"
+#: ../../diskdrake.pm_.c:532
+#, fuzzy
+msgid "Change type"
+msgstr "������ ����� ����������"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "������ ��������: "
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "���� ������ ������� ���������;"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "�������: "
+#: ../../diskdrake.pm_.c:564
+msgid "Scanning available nfs shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:569
 #, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "������ DOS ������ ������: %s \n"
+msgid "Scanning available nfs shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:244 ../../diskdrake.pm_.c:251
-#: ../../diskdrake.pm_.c:301
-msgid "Type: "
-msgstr "�����: "
+#: ../../diskdrake.pm_.c:578 ../../diskdrake.pm_.c:648
+msgid "If the list above doesn't contain the wanted entry, enter it here:"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:248
-msgid "Name: "
-msgstr "�����: "
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "������������"
 
-#: ../../diskdrake.pm_.c:253
-#, c-format
-msgid "Start: sector %s\n"
-msgstr "����: ������ %s\n"
+#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
+msgid "Shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Size: %s"
-msgstr "�������: %s"
+#: ../../diskdrake.pm_.c:615
+msgid "Scanning available samba shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:256
+#: ../../diskdrake.pm_.c:626 ../../diskdrake.pm_.c:639
 #, c-format
-msgid ", %s sectors"
-msgstr ", %s ������"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:258
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "��������� %d ��� ��������� %d\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose a partition"
+msgstr "�������� �����"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "��������������\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose another partition"
+msgstr "���������� ���� ����������"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "�������������\n"
+#: ../../diskdrake_interactive.pm_.c:188
+#, fuzzy
+msgid "Exit"
+msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "������������\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "���������� �� ����������� ����� �����������"
 
-#: ../../diskdrake.pm_.c:262
-#, c-format
-msgid "RAID md%s\n"
-msgstr "RAID md%s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to normal mode"
+msgstr "���������� �� �������� ����� �����������"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "������ loopback: %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "������� ���������� ������"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"��������� ��������� �� �������\n"
-"    (��� MS-DOS, ��� ��� lilo)\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "�� ��������;"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "������� %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "������ ����� ����������"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "������� chunk %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "������ ����� ���������� ��� ������ �����������;"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "������ RAID %s\n"
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "������ �� ���������� ��� ���������;"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "����� ������� loopback: %s"
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "�������� ��������"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "���������� ����"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "����"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:250
+#, fuzzy
+msgid "Hard drive information"
+msgstr "���������� ������� ������"
+
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "Not enough space for auto-allocating"
+msgstr ""
+"��� ������� ������� ��������� ����� ��� �������� ���������� ���� �����������"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "���� �� ����������� ����������� ����� �� �����"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "��� ����� �� �������� �����������"
+
+#: ../../diskdrake_interactive.pm_.c:275
 msgid ""
-"\n"
-"Chances are, this partition is\n"
-"a Driver partition, you should\n"
-"probably leave it alone.\n"
+"To have more partitions, please delete one to be able to create an extended "
+"partition"
 msgstr ""
+"��� �� ���������� �����������, �������� ��������� ��� ���� ������ ����� "
+"������ � �������� ����������� ����������"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "���������� ������ �����������"
+
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "������� ����������� ��������"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "������� ����������� ��������"
+
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "������� ����������� ��������"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "�������� ������� ����������� ������� �����������"
+
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "�������� ������"
+
+#: ../../diskdrake_interactive.pm_.c:308
 msgid ""
-"\n"
-"This special Bootstrap\n"
-"partition is for\n"
-"dual-booting your system.\n"
+"The backup partition table has not the same size\n"
+"Still continue?"
 msgstr ""
+"� ��������� ������� ����������� ���� ����������� �������\n"
+"�� ��������;"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "�������� ����� ���� �� ��� ���������"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "�������������"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "�������: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"�������� ��� �������� ���� ����� ���������\n"
+"��� �� �������� �� ���� �� �������� �� ������"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "���������: %s ���������, %s �������, %s ������\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "���������� �������� ������ �����������"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "������ LVM %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+#, fuzzy
+msgid "Detailed information"
+msgstr "������� �����������"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "����� ������ �����������: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "������ ��������"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "��� bus %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "����������"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "�������"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "�����������"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "������"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "�������� ��� RAID"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "�������� ��� �� RAID"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "����������� RAID"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "�������� ��� LVM"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "�������� ��� �� RAID"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "�������� ��� �� LVM"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "����������� RAID"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "����� ��� loopback"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "�������� �����"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "���������� ���� ����������"
+
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "���� ���� �����: "
+
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "������� �� MB"
+
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "����� ���������� �������: "
+
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "������ ��������: "
+
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "���������: "
+
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "����������� ������� loopback %s"
+
+#: ../../diskdrake_interactive.pm_.c:486
+msgid "Change partition type"
+msgstr "������ ����� ����������"
+
+#: ../../diskdrake_interactive.pm_.c:491
+msgid "Switching from ext2 to ext3"
+msgstr "������ ��� ext2 �� ext3"
+
+#: ../../diskdrake_interactive.pm_.c:521
+#, c-format
+msgid "Where do you want to mount loopback file %s?"
+msgstr "��� ������ �� ��������� �� ������ loopback %s;"
+
+#: ../../diskdrake_interactive.pm_.c:528
+msgid ""
+"Can't unset mount point as this partition is used for loop back.\n"
+"Remove the loopback first"
+msgstr ""
+"��� ����� �� �������� �� ������ �������� ����� ���� � ��������� "
+"���������������\n"
+"��� loopback. ��������� ����� �� loopback"
+
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "����������� fat filesystem bounds"
+
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "�������� ��������"
+
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "����� � ����� ���������� ��� ������ �' ������� �������."
+
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr ""
+"������ �� ����� ��������� ��������� ���� ��� ��������� �� ���� ��� ���������"
+
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr ""
+"���� ��� ������ �������� ���� ��������� %s, ��� �� �������� �� ����� ��� "
+"��������� �� ������"
+
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "�������� �� ��� �������"
+
+#: ../../diskdrake_interactive.pm_.c:591
+#, fuzzy
+msgid "New size in MB: "
+msgstr "������� �� MB"
+
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Which disk do you want to move it to?"
+msgstr "�� ����� ����� ������ �� �������������;"
+
+#: ../../diskdrake_interactive.pm_.c:632
+msgid "Sector"
+msgstr "������"
+
+#: ../../diskdrake_interactive.pm_.c:633
+msgid "Which sector do you want to move it to?"
+msgstr "�� ����� ����� ������ �� �������������;"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving"
+msgstr "���������� �� �������"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving partition..."
+msgstr "���������� ���������� �� �������..."
+
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "�������� ��� ������� RAID ��� ����� �� ����� � ��������"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "���"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "�������� ��� ������� LVM ��� ����� �� ����� � ��������"
 
-#: ../../diskdrake.pm_.c:435
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "����� LVM;"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "���� � ��������� ��� ������ �� �������������� ��� loopback"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Loopback"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "����� ������� loopback: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "���������� �����"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "�� ������ ���������������� ���, �������� ��� ����"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "�� ������ ������� ���. �� �� �������������;"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "�������"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "�������"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "������� chunk"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "�������: ���� � ���������� ����� ����������."
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "�� ����� partitioning;"
+
+#: ../../diskdrake_interactive.pm_.c:834
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -1532,7 +1747,7 @@ msgstr ""
 "���� �������������� LILO ��� ��� �� ��������, ���� ��� ��������������LILO "
 "��� ��� ���������� �� /boot"
 
-#: ../../diskdrake.pm_.c:439
+#: ../../diskdrake_interactive.pm_.c:838
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -1543,7 +1758,7 @@ msgstr ""
 "��� ����� ��������� /boot.\n"
 "�� ��������� �� ��������������� LILO, ��������� ��� ��������� /boot."
 
-#: ../../diskdrake.pm_.c:445
+#: ../../diskdrake_interactive.pm_.c:844
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
 "No bootloader is able to handle this without a /boot partition.\n"
@@ -1554,337 +1769,296 @@ msgstr ""
 "��������� /boot.\n"
 "��������� ������ �� ���������� ��� ��������� /boot."
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "�������������� ``%s'' ��� ���� ���"
-
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "����� ����� ``����������''"
-
-#: ../../diskdrake.pm_.c:469 ../../diskdrake.pm_.c:513
-#, c-format
-msgid ""
-"After changing type of partition %s, all data on this partition will be lost"
-msgstr ""
-"���� ��� ������ ����� ���� ��������� %s, ��� �� �������� �� ����� ��� "
-"��������� �� ������"
-
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "�� ��������;"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "������ ����� ����������"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "������ ����� ���������� ��� ������ �����������;"
-
-#: ../../diskdrake.pm_.c:516
-msgid "Change partition type"
-msgstr "������ ����� ����������"
-
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "���� ������ ������� ���������;"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr ""
-"��� �������� �� ��������������� �� ReiserFS ��� ����������� ���������� ��� "
-"32MB"
-
-#: ../../diskdrake.pm_.c:537
-#, c-format
-msgid "Where do you want to mount loopback file %s?"
-msgstr "��� ������ �� ��������� �� ������ loopback %s;"
-
-#: ../../diskdrake.pm_.c:538
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "��� ������ �� ��������� ��� ������� %s;"
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "� ������� ����������� ��� ������ %s �� ����������� ���� �����!"
 
-#: ../../diskdrake.pm_.c:542
-msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
-"Remove the loopback first"
-msgstr ""
-"��� ����� �� �������� �� ������ �������� ����� ���� � ��������� "
-"���������������\n"
-"��� loopback. ��������� ����� �� loopback"
+#: ../../diskdrake_interactive.pm_.c:868
+msgid "You'll need to reboot before the modification can take place"
+msgstr "���������� ������������ ��� �� ����������� �� �������"
 
-#: ../../diskdrake.pm_.c:561
+#: ../../diskdrake_interactive.pm_.c:879
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 "���� ��� ����������� ��� ���������� %s, ��� �� �������� �� ����� ��� "
 "��������� �� ������"
 
-#: ../../diskdrake.pm_.c:563
+#: ../../diskdrake_interactive.pm_.c:881
 msgid "Formatting"
 msgstr "�����������"
 
-#: ../../diskdrake.pm_.c:564
+#: ../../diskdrake_interactive.pm_.c:882
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "����������� ������� loopback %s"
 
-#: ../../diskdrake.pm_.c:565 ../../install_steps_interactive.pm_.c:430
+#: ../../diskdrake_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:419
 #, c-format
 msgid "Formatting partition %s"
 msgstr "����������� ���������� %s"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "���� ��� ����������� ���� ��� �����������,"
-
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "��� �� �������� �� ����� ��� ����������� �� ������"
-
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "����������"
-
-#: ../../diskdrake.pm_.c:577
-msgid "Which disk do you want to move it to?"
-msgstr "�� ����� ����� ������ �� �������������;"
-
-#: ../../diskdrake.pm_.c:578
-msgid "Sector"
-msgstr "������"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "�������� mkraid"
 
-#: ../../diskdrake.pm_.c:579
-msgid "Which sector do you want to move it to?"
-msgstr "�� ����� ����� ������ �� �������������;"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "��� ������� ������� ��������� ����� ��� ���������� ���� �����������"
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving"
-msgstr "���������� �� �������"
+#: ../../diskdrake_interactive.pm_.c:895
+#, c-format
+msgid ""
+"Directory %s already contain some data\n"
+"(%s)"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving partition..."
-msgstr "���������� ���������� �� �������..."
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "��� ������� ������� ��������� ����� ��� ���������� ���� �����������"
 
-#: ../../diskdrake.pm_.c:592
+#: ../../diskdrake_interactive.pm_.c:910
 #, c-format
-msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "� ������� ����������� ��� ������ %s �� ����������� ���� �����!"
+msgid "Copying %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:594
-msgid "You'll need to reboot before the modification can take place"
-msgstr "���������� ������������ ��� �� ����������� �� �������"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "�������: %s\n"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "����������� fat filesystem bounds"
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "�������: "
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "�������� ��������"
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "������ DOS ������ ������: %s \n"
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "����� � ����� ���������� ��� ������ �' ������� �������."
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "�����: "
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr ""
-"������ �� ����� ��������� ��������� ���� ��� ��������� �� ���� ��� ���������"
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "�����: "
 
-#: ../../diskdrake.pm_.c:650
+#: ../../diskdrake_interactive.pm_.c:954
 #, c-format
-msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr ""
-"���� ��� ������ �������� ���� ��������� %s, ��� �� �������� �� ����� ��� "
-"��������� �� ������"
+msgid "Start: sector %s\n"
+msgstr "����: ������ %s\n"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "�������� �� ��� �������"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "�������: %s"
 
-#: ../../diskdrake.pm_.c:660 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
-msgid "MB"
-msgstr "MB"
+#: ../../diskdrake_interactive.pm_.c:957
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s ������"
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "���������� ���� ����������"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "��������� %d ��� ��������� %d\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "���� ���� �����: "
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "��������������\n"
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "������� �� MB"
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "�������������\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "����� ���������� �������: "
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "������������\n"
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "���������: "
+#: ../../diskdrake_interactive.pm_.c:963
+#, c-format
+msgid "RAID md%s\n"
+msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:798
-msgid "This partition can't be used for loopback"
-msgstr "���� � ��������� ��� ������ �� �������������� ��� loopback"
+#: ../../diskdrake_interactive.pm_.c:965
+#, fuzzy, c-format
+msgid ""
+"Loopback file(s):\n"
+"   %s\n"
+msgstr "������ loopback: %s\n"
 
-#: ../../diskdrake.pm_.c:808
-msgid "Loopback"
-msgstr "Loopback"
+#: ../../diskdrake_interactive.pm_.c:966
+msgid ""
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
+msgstr ""
+"��������� ��������� �� �������\n"
+"    (��� MS-DOS, ��� ��� lilo)\n"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "����� ������� loopback: "
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "������� %s\n"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "�� ������ ���������������� ���, �������� ��� ����"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "������� chunk %s\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "�� ������ ������� ���. �� �� �������������;"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "������ RAID %s\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "�������� ������"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "����� ������� loopback: %s"
 
-#: ../../diskdrake.pm_.c:876
+#: ../../diskdrake_interactive.pm_.c:975
 msgid ""
-"The backup partition table has not the same size\n"
-"Still continue?"
+"\n"
+"Chances are, this partition is\n"
+"a Driver partition, you should\n"
+"probably leave it alone.\n"
 msgstr ""
-"� ��������� ������� ����������� ���� ����������� �������\n"
-"�� ��������;"
-
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "�������������"
+"\n"
+"�� ����������� �����, ���� � ��������� �� �����\n"
+"��� ��������� ������, �� ������ ����������\n"
+"�� ��� ������� �����.\n"
 
-#: ../../diskdrake.pm_.c:885
+#: ../../diskdrake_interactive.pm_.c:978
 msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
 msgstr ""
-"�������� ��� �������� ���� ����� ���������\n"
-"��� �� �������� �� ���� �� �������� �� ������"
-
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "���������� �������� ������ �����������"
-
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "�������"
-
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "�������"
-
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "������� chunk"
+"\n"
+"���� ����� ������ Bootstrap\n"
+"��������� ���\n"
+"dual-booting �� ������� ���.\n"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "�������� ��� ������� RAID ��� ����� �� ����� � ��������"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "�������: %s\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "���"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "���������: %s ���������, %s �������, %s ������\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "�������� ��� ������� LVM ��� ����� �� ����� � ��������"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "�����������: "
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr ""
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "������ LVM %s\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "�������� ������� ����������� ������� �����������"
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "����� ������ �����������: %s\n"
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "������� ����������� ��������"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "��� bus %d id %d\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "������������"
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "��������: %s"
 
-#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
-#: ../../fs.pm_.c:113
+#: ../../fs.pm_.c:447 ../../fs.pm_.c:457 ../../fs.pm_.c:461 ../../fs.pm_.c:465
+#: ../../fs.pm_.c:469 ../../fs.pm_.c:473
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s ����������� ��� %s �������"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "��� ���� ��� �� ����������� �� %s �� ���� %s"
 
-#: ../../fs.pm_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "������� �������"
+
+#: ../../fs.pm_.c:588
+#, c-format
+msgid "fsck failed with exit code %d or signal %d"
+msgstr "�� fsck ������� �� ������ ������ %d � ���� %d"
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
 msgid "mount failed: "
 msgstr "������� �������: "
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "������ ���� ��� ���������� ��� %s: %s"
 
 #: ../../fsedit.pm_.c:21
-#, fuzzy
 msgid "simple"
-msgstr "������"
+msgstr "����"
 
 #: ../../fsedit.pm_.c:30
 msgid "server"
 msgstr "������������"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr ""
+"��� �������� �� ��������������� �� JFS ��� ����������� ���������� ��� 16MB"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr ""
+"��� �������� �� ��������������� �� ReiserFS ��� ����������� ���������� ��� "
+"32MB"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "�� ������ �������� ������ �� �������� �� /"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "������� ��� ��������� �� ������ �������� %s\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "�������� ��������� %s\n"
-
-#: ../../fsedit.pm_.c:285
+#: ../../fsedit.pm_.c:476
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
-msgstr ""
+msgstr "��� �������� �� ��������������� ��� ��������� LVM ��� ���������� %s"
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
 msgstr ""
 "����� � ��������� ������ �� ���������� ��� ������ ������� ������� (root)"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "���������� ��� ���������� ������� ������� (ext2, reiserfs) ��� ���� �� "
 "������ ��������\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "������ ���� �� ������� ��� %s ��� �������: %s"
 
-#: ../../fsedit.pm_.c:453
+#: ../../fsedit.pm_.c:681
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
@@ -1893,328 +2067,404 @@ msgstr ""
 "���������� ���� ���������� �������. �������� ������� �� ����� ��� ������ "
 "����� ����� ��� �����������"
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "��� ������� ����� ���������!"
 
-#: ../../help.pm_.c:9
+#: ../../help.pm_.c:13
 msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr "�������� �������� ������ ��� ����������� ��� �����."
-
-#: ../../help.pm_.c:12
-msgid ""
-"You need to accept the terms of the above license to continue installation.\n"
-"\n"
+"GNU/Linux is a multiuser system, and this means that each user can have his\n"
+"own preferences, his own files and so on. You can read the ``User Guide''\n"
+"to learn more. But unlike \"root\", which is the administrator, the users\n"
+"you will add here will not be entitled to change anything except their own\n"
+"files and their own configuration. You will have to create at least one\n"
+"regular user for yourself. That account is where you should log in for\n"
+"routine use. Although it is very practical to log in as \"root\" everyday,\n"
+"it may also be very dangerous! The slightest mistake could mean that your\n"
+"system would not work any more. If you make a serious mistake as a regular\n"
+"user, you may only lose some information, but not the entire system.\n"
 "\n"
-"Please click on \"Accept\" if you agree with its terms.\n"
+"First, you have to enter your real name. This is not mandatory, of course -\n"
+"as you can actually enter whatever you want. DrakX will then take the first\n"
+"word you have entered in the box and will bring it over to the \"User\n"
+"name\". This is the name this particular user will use to log into the\n"
+"system. You can change it. You then have to enter a password here. A\n"
+"non-privileged (regular) user's password is not as crucial as that of\n"
+"\"root\" from a security point of view, but that is no reason to neglect it\n"
+"- after all, your files are at risk.\n"
 "\n"
+"If you click on \"Accept user\", you can then add as many as you want. Add\n"
+"a user for each one of your friends: your father or your sister, for\n"
+"example. When you finish adding all the users you want, select \"Done\".\n"
 "\n"
-"Please click on \"Refuse\" if you disagree with its terms. Installation will "
-"end without modifying your current\n"
-"configuration."
+"Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
+"for that user (bash by default)."
 msgstr ""
-"������ �� ����������� ���� ����� ��� ������ ������ ���� ���������� ��� "
-"�����������.\n"
-"\n"
-"\n"
-"�������� �������� \"�������\" ��� ���������� �� ���� �����.\n"
-"\n"
-"\n"
-"�������� �������� \"������\" ��� ��� ����������. � ����������� �� ���������� "
-"����� ��\n"
-"��������� ������."
 
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr ""
-"�������� ��� ���������� ��� ����������� ��� ������������ ������ ��� �������� "
-"�����"
-
-#: ../../help.pm_.c:25
-msgid ""
-"If you wish other languages (than the one you choose at\n"
-"beginning of installation) will be available after installation, please "
-"chose\n"
-"them in list above. If you want select all, you just need to select \"All\"."
-msgstr ""
-"��� ������ ��� ����� ������� (����� ��� ���� ��� ��������� ���� ����)\n"
-"�������� �������� ��� ��� ��� �������� ��������."
-
-#: ../../help.pm_.c:30
+#: ../../help.pm_.c:41
+#, fuzzy
 msgid ""
-"Please choose \"Install\" if there are no previous version of Linux-"
-"Mandrake\n"
-"installed or if you wish to use several operating systems.\n"
+"Listed above are the existing Linux partitions detected on your hard drive.\n"
+"You can keep the choices made by the wizard, they are good for most common\n"
+"installs. If you make any changes, you must at least define a root\n"
+"partition (\"/\"). Do not choose too small a partition or you will not be\n"
+"able to install enough software. If you want to store your data on a\n"
+"separate partition, you will also need to create a partition for \"/home\"\n"
+"(only possible if you have more than one Linux partition available).\n"
 "\n"
+"Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\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"
-"Depend of your knowledge in GNU/Linux, you can choose one of the following "
-"levels to install or update your\n"
-"Linux-Mandrake operating system:\n"
+"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard drives:\n"
 "\n"
-"\t* Recommended: if you have never installed a GNU/Linux operating system "
-"choose this. Installation will be\n"
-"\t  be very easy and you will be asked only on few questions.\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"
-"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
-"the primary usage (workstation, server,\n"
-"\t  development) of your system. You will need to answer to more questions "
-"than in \"Recommended\" installation\n"
-"\t  class, so you need to know how GNU/Linux works to choose this "
-"installation class.\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"
-"\t* Expert: if you have a good knowledge in GNU/Linux, you can choose this "
-"installation class. As in \"Customized\"\n"
-"\t  installation class, you will be able to choose the primary usage "
-"(workstation, server, development). Be very\n"
-"\t  careful before choose this installation class. You will be able to "
-"perform a higly customized installation.\n"
-"\t  Answer to some questions can be very difficult if you haven't a good "
-"knowledge in GNU/Linux. So, don't choose\n"
-"\t  this installation class unless you know what you are doing."
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc."
 msgstr ""
-"�������� �������� \"�����������\" ��� ��� ������� ������������� ���������� "
-"������ ��� Linux-Mandrake\n"
-"� ��� ������ �� ��������������� ����������� ��� ���� ����������� ���������.\n"
-"\n"
+"�������� ������� ���� �������� �� ��� ����������� Linux ��� ������������ "
+"���� \n"
+"����� ���. �������� �� ��������� ��� ��������� ��������, ����� ����� ��� \n"
+"����������� �����. ��� �������� ����� ��� ��������, ������ �� ����� "
+"�����������\n"
+"��� ������ ��������� (root, \"/\"). ��� ��������� ��� ���� ����� ��������� "
+"�����\n"
+"��� �� ����� ���� ��� ����������� ����������. ��� ������ �� ����������� �� "
+"��������\n"
+"��� �� ��������� ���������, ������ �� ��������� ��� ��������� ��� \"/home"
+"\" (�������\n"
+"���� �� ����� �������� ��� ��� Linux ��������� ���������).\n"
 "\n"
-"�������� \"����������\" ��� ������ �� ������������ ��� ������������ "
-"����������� ��� Linux-Mandrake\n"
 "\n"
+"������������, ���� ��������� ���������� ��: \"�����\", \"������������\".\n"
 "\n"
-"������� �� ��� ������� ��� ��� GNU/Linux, �������� �� ��������� ��� ��� �� "
-"�������� ������� ������������\n"
-"� ����������� ��� Linux-Mandrake:\n"
 "\n"
-"\t* �����������: ��� ��� ����� ���������������� ���� ��� GNU/Linux �������. "
-"� ����������� �� ����� \n"
-"\t  ���� ������ ��� �� ��� ������� �� ���������� ����� ���������.\n"
+"�� ����� �������� �� ����: ����� ������, ������� ������, ������� "
+"���������� \n"
+"��� ����������, \"hda1\").\n"
 "\n"
 "\n"
-"\t* �������������: ��� ����� ������������� �� �� GNU/Linux, �������� �� "
-"��������� ��� ������ �����\n"
-"\t  (������������, ������� ��������) ��� ���������� ���. �� ��������� �� "
-"���������� �� ������������\n"
-"\t  ���������, ����� �� ������ �� ����� ������� ������� ������� ������� �� "
-"��� ���������� ��� GNU/Linux.\n"
+"� ����� ����� \"hd\" ��� ��������� ��� ����� IDE ��� \"sd\" ��� SCSI �����.\n"
 "\n"
 "\n"
-"\t* �������: ��� ����� �������� �� �� GNU/Linux. ���� ��� ��������, �������� "
-"�� ��������� ��� ������\n"
-"\t  ����� ��� ����������. �� ��������� ������ �� ������������ �� ������� "
-"���� ������� ��� ����������,\n"
-"\t  ���� �� ��������� �� ���������� �� �������������� ��������� ��� "
-"������������ �������������� �������.\n"
-"\t  ����������� ��� ������ �� ������ ������ ��������� ����� ��� �����������."
-
-#: ../../help.pm_.c:56
-msgid ""
-"Select:\n"
+"� ������� ������ ����� ����� ��� ������ ���� �� \"hd\" � \"sd\". ��� ���� "
+"IDE \n"
+"�������: \n"
 "\n"
-"  - Customized: If you are familiar enough with GNU/Linux, you may then "
-"choose\n"
-"    the primary usage for your machine. See below for details.\n"
+"   * \"a\" ����� � master ������ ���� ����� ������� IDE,\n"
 "\n"
+"   * \"b\" ����� � slave ������ ���� ����� ������� IDE,\n"
 "\n"
-"  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
-"    perform a highly customized installation. As for a \"Customized\"\n"
-"    installation class, you will be able to select the usage for your "
-"system.\n"
-"    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
-"DOING!"
-msgstr ""
-"��������:\n"
+"   * \"c\" ����� � master ������ ���� ������� ������� IDE,\n"
 "\n"
-"  - �������������: ��� ����� ������������� �� �� Linux, �� ��������� �� \n"
-"��������� ������ ���������� ������� ������, ���������� ��������� � "
-"�����������\n"
-"�������.\n"
+"   * \"d\" ����� � slave ������ ���� ������� ������� IDE.\n"
 "\n"
 "\n"
-"  - �������������: ��� ����� ���� ������������� �� ��������� GNU/Linux ���\n"
-"������ �� ���������������� ��� ���������� ������������� �����������, ����\n"
-"���� � ������� ����� ��� ���. �� ��������� �� ��������� ���� ������������\n"
-"���� ��� ���� �������� (\"�������������\") �������."
+"��� ������� SCSI, \"a\" ����� � ������ ������, \"b\" ����� � �������� ������ "
+"���..."
 
-#: ../../help.pm_.c:68
+#: ../../help.pm_.c:72
 msgid ""
-"You must now define your machine usage. Choices are:\n"
+"The Mandrake Linux installation is spread out over several CDROMs. DrakX\n"
+"knows if a selected package is located on another CDROM and will eject the\n"
+"current CD and ask you to insert a different one as required."
+msgstr ""
+
+#: ../../help.pm_.c:77
+msgid ""
+"It is now time to specify which programs you wish to install on your\n"
+"system. There are thousands of packages available for Mandrake Linux, and\n"
+"you are not supposed to know them all by heart.\n"
+"\n"
+"If you are performing a standard installation from CDROM, you will first be\n"
+"asked to specify the CDs you currently have (in Expert mode only). Check\n"
+"the CD labels and highlight the boxes corresponding to the CDs you have\n"
+"available for installation. Click \"OK\" when you are ready to continue.\n"
 "\n"
-"\t* Workstation: this the ideal choice if you intend to use your machine "
-"primarily for everyday use, at office or\n"
-"\t  at home.\n"
+"Packages are sorted in groups corresponding to a particular use of your\n"
+"machine. The groups themselves are sorted into four sections:\n"
 "\n"
+" * \"Workstation\": if you plan to use your machine as a workstation, "
+"select\n"
+"one or more of the corresponding groups.\n"
+"\n"
+" * \"Development\": if the machine is to be used for programming, choose "
+"the\n"
+"desired group(s).\n"
 "\n"
-"\t* Development: if you intend to use your machine primarily for software "
-"development, it is the good choice. You\n"
-"\t  will then have a complete collection of software installed in order to "
-"compile, debug and format source code,\n"
-"\t  or create software packages.\n"
+" * \"Server\": finally, if the machine is intended to be a server, you will\n"
+"be able to select which of the most common services you wish to see\n"
+"installed on the machine.\n"
 "\n"
+" * \"Graphical Environment\": this is where you will choose your preferred\n"
+"graphical environment. At least one must be selected if you want to have a\n"
+"graphical workstation!\n"
 "\n"
-"\t* Server: if you intend to use this machine as a server, it is the good "
-"choice. Either a file server (NFS or\n"
-"\t  SMB), a print server (Unix style or Microsoft Windows style), an "
-"authentication server (NIS), a database\n"
-"\t  server and so on. As such, do not expect any gimmicks (KDE, GNOME, etc.) "
-"to be installed."
+"Moving the mouse cursor over a group name will display a short explanatory\n"
+"text about that group.\n"
+"\n"
+"You can check the \"Individual package selection\" box, which is useful if\n"
+"you are familiar with the packages being offered or if you want to have\n"
+"total control over what will be installed.\n"
+"\n"
+"If you started the installation in \"Update\" mode, you can unselect all\n"
+"groups to avoid installing any new package. This is useful for repairing or\n"
+"updating an existing system."
 msgstr ""
-"�� �������� ��� ����� ������� �� ��� ����� ��� ���������� ��� \n"
-"����� �� ���������:\n"
+
+#: ../../help.pm_.c:115
+msgid ""
+"Finally, depending on your choice of whether or not to select individual\n"
+"packages, you will be presented a tree containing all packages classified\n"
+"by groups and subgroups. While browsing the tree, you can select entire\n"
+"groups, subgroups, or individual packages.\n"
+"\n"
+"Whenever you select a package on the tree, a description appears on the\n"
+"right. When your selection is finished, click the \"Install\" button which\n"
+"will then launch the installation process. Depending on the speed of your\n"
+"hardware and the number of packages that need to be installed, it may take\n"
+"a while to complete the process. A time to complete estimate is displayed\n"
+"on the screen to help you gauge if there is sufficient time to enjoy a cup\n"
+"of coffee.\n"
 "\n"
-"\t* ������� ��������: �������� ����� ��� ��������� �� ��������������� �� "
-"�������\n"
-"\t  ��� ������ ��� ���������� �����, ��� ����� � ��� �������. \n"
+"!! If a server package has been selected either intentionally or because it\n"
+"was part of a whole group, you will be asked to confirm that you really\n"
+"want those servers to be installed. Under Mandrake Linux, any installed\n"
+"servers are started by default at boot time. Even if they are safe and have\n"
+"no known issues at the time the distribution was shipped, it may happen\n"
+"that security holes are discovered after this version of Mandrake Linux was\n"
+"finalized. If you do not know what a particular service is supposed to do\n"
+"or why it is being installed, then click \"No\". Clicking \"Yes\" will\n"
+"install the listed services and they will be started automatically by\n"
+"default. !!\n"
 "\n"
-"\t* ��������: �������� ���� ��� ��������� �� ��������������� �� ������� ���\n"
-"\t  ������ ��� �������� ����������. �� ������������ ��� ������ ������� "
-"���������\n"
-"\t  ��� �����������, ������������� ��� ����������� ������� ������, ����� "
-"���\n"
-"\t  ���������� ������� ����������.\n"
+"The \"Automatic dependencies\" option simply disables the warning dialog\n"
+"which appears whenever the installer automatically selects a package. This\n"
+"occurs because it has determined that it needs to satisfy a dependency with\n"
+"another package in order to successfully complete the installation.\n"
 "\n"
-"\t* ������������: �������� ���� ��� ��������� �� ��������������� �� ������� "
-"���\n"
-"\t  �� �����������, ���� ������� (NFS � SMB), ���� ���������� (lp � SMB), "
-"����\n"
-"\t  ������������ (NIS), ����� ��������� ���. �� ����� ��� ���������, ��� ��\n"
-"\t  ������������� �������� ���� �� KDE, �� Gnome ���."
+"The tiny floppy disc icon at the bottom of the list allows to load the\n"
+"packages list chosen during a previous installation. Clicking on this icon\n"
+"will ask you to insert a floppy disk previously created at the end of\n"
+"another installation. See the second tip of last step on how to create such\n"
+"a floppy."
+msgstr ""
 
-#: ../../help.pm_.c:84
+#: ../../help.pm_.c:151
 msgid ""
-"DrakX will attempt to look for PCI SCSI adapter(s). If DrakX\n"
-"finds an SCSI adapter and knows which driver to use, it will be "
-"automatically\n"
-"installed.\n"
+"If you wish to connect your computer to the Internet or to a local network,\n"
+"please choose the correct option. Please turn on your device before\n"
+"choosing the correct option to let DrakX detect it automatically.\n"
 "\n"
+"Mandrake Linux proposes the configuration of an Internet connection at\n"
+"installation time. Available connections are: traditional modem, ISDN\n"
+"modem, ADSL connection, cable modem, and finally a simple LAN connection\n"
+"(Ethernet).\n"
 "\n"
-"If you have no SCSI adapter, an ISA SCSI adapter or a PCI SCSI adapter that\n"
-"DrakX doesn't recognize, you will be asked if a SCSI adapter is present in "
-"your\n"
-"system. If there is no adapter present, you can click on \"No\". If you "
-"click on\n"
-"\"Yes\", a list of drivers will be presented from which you can select your\n"
-"specific adapter.\n"
+"Here, we will not detail each configuration. Simply make sure that you have\n"
+"all the parameters from your Internet Service Provider or system\n"
+"administrator.\n"
 "\n"
+"You can consult the manual chapter about Internet connections for details\n"
+"about the configuration, or simply wait until your system is installed and\n"
+"use the program described there to configure your connection.\n"
 "\n"
-"If you have to manually specify your adapter, DrakX will ask if you want to\n"
-"specify options for it. You should allow DrakX to probe the hardware for "
-"the\n"
-"options. This usually works well.\n"
+"If you wish to configure the network later after installation or if you\n"
+"have finished configuring your network connection, click \"Cancel\"."
+msgstr ""
+
+#: ../../help.pm_.c:172
+#, fuzzy
+msgid ""
+"You may now choose which services you wish to start at boot time.\n"
 "\n"
+"Here are presented all the services available with the current\n"
+"installation. Review them carefully and uncheck those which are not always\n"
+"needed at boot time.\n"
 "\n"
-"If not, you will need to provide options to the driver. Please review the "
-"User\n"
-"Guide (chapter 3, section \"Collective informations on your hardware) for "
-"hints\n"
-"on retrieving this information from hardware documentation, from the\n"
-"manufacturer's Web site (if you have Internet access) or from Microsoft "
-"Windows\n"
-"(if you have it on your system)."
+"You can get a short explanatory text about a service by selecting a\n"
+"specific service. However, if you are not sure whether a service is useful\n"
+"or not, it is safer to leave the default behavior.\n"
+"\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."
 msgstr ""
-"�� DrakX �� ����������� �� ��������� ������������ SCSI ����� PCI.\n"
-"��� �� DrakX ��������� ���� ����������� ��� ����� ��� �� ��� "
-"��������������,\n"
-"�� ������������ �������� ��� ��������� �����\n"
+"�������� ���� �� ��������� ����� ��������� ������ �� �������� ���� ��� \n"
+"��������.\n"
 "\n"
 "\n"
-"��� ����� ����������� SCSI ����� ISA, ������� �� ������������ PCI "
-"����������� \n"
-"� ��� ����� ������� ����������� SCSI, �� DrakX �� ��� ������� ��� ����� "
-"������� \n"
-"����������� SCSI ��� ������� ���. ��� ��� �����, ������� ����� '���'. ��� "
-"��������\n"
-"'���', �� ��� ������� �� ��������� ��� ���� ��� ��� ���� ��������.\n"
+"��� ������������ ��� ������ ��� ��������� ���� �� ��� ��� �����, \n"
+"�� ���������� ��� ��������� �������� ��� �� ������ ��� ���� ���.\n"
 "\n"
 "\n"
-"��� ��������� �����������, �� DrakX �� ��� ������� ��� ������ �� ������� "
-"��������.\n"
-"�������, ��������� �� DrakX �� �������� �������� ��� �����������, ��� �� "
-"����� ��������.\n"
+"�������� ���� �� ���� ��� ��������� �� ��������������� ��� ������� ��� \n"
+"�����������. ��� �� ������ �� ���������� ��������� ��� ��� ����������, \n"
+"����� ��������� ��������� ����������� ��������� ��������� ��� �������� \n"
+"�� �����������.\n"
+"������, �������� ���� ��� ��������� ��� ���������� ����������."
+
+#: ../../help.pm_.c:188
+msgid ""
+"GNU/Linux manages time in GMT (Greenwich Manage Time) and translates it in\n"
+"local time according to the time zone you selected."
+msgstr ""
+"�� GNU/Linux ���������� ��� ��� �� GMT (\"Greenwich Mean Time\" � \n"
+"\"���������� ��� ����������\") ��� ��� ���������� �� ������ ���\n"
+"����� ��� ����� ���� ��� �� ���������."
+
+#: ../../help.pm_.c:192
+msgid ""
+"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
+"on which all the graphics environments (KDE, Gnome, AfterStep,\n"
+"WindowMaker...) bundled with Mandrake Linux rely. In this section, DrakX\n"
+"will try to configure X automatically.\n"
 "\n"
+"It is extremely rare for it to fail, unless the hardware is very old (or\n"
+"very new). If it succeeds, it will start X automatically with the best\n"
+"resolution possible depending on the size of the monitor. A window will\n"
+"then appear and ask you if you can see it.\n"
 "\n"
-"�� �������� ���������, �� ������ �� ������ �������� ��� ��� �����. \n"
-"�������������� ��� ����� ������������ ��� �� ��� �� ������ ����� ��� \n"
-"����������� ��� ��� ����������� ��� Windows (�� �������), ��� ��� "
-"����������\n"
-"��� ������ � ��� ��� ���������� ��� ������������ (�� ����� �������� ��� "
-"Internet)."
+"If you are doing an \"Expert\" install, you will enter the X configuration\n"
+"wizard. See the corresponding section of the manual for more information\n"
+"about this wizard.\n"
+"\n"
+"If you can see the message and answer \"Yes\", then DrakX will proceed to\n"
+"the next step. If you cannot see the message, it simply means that the\n"
+"configuration was wrong and the test will automatically end after 10\n"
+"seconds, restoring the screen."
+msgstr ""
 
-#: ../../help.pm_.c:108
+#: ../../help.pm_.c:212
 msgid ""
-"At this point, you need to choose where to install your\n"
-"Linux-Mandrake operating system on your hard drive. If it is empty or if an\n"
-"existing operating system uses all the space available on it, you need to\n"
-"partition it. Basically, partitioning a hard drive consists of logically\n"
-"dividing it to create space to install your new Linux-Mandrake system.\n"
+"The first time you try the X configuration, you may not be very satisfied\n"
+"with its display (screen is too small, shifted left or right...). Hence,\n"
+"even if X starts up correctly, DrakX then asks you if the configuration\n"
+"suits you. It will also propose to change it by displaying a list of valid\n"
+"modes it could find, asking you to select one.\n"
 "\n"
+"As a last resort, if you still cannot get X to work, choose \"Change\n"
+"graphics card\", select \"Unlisted card\", and when prompted on which\n"
+"server you want, choose \"FBDev\". This is a failsafe option which works\n"
+"with any modern graphics card. Then choose \"Test again\" to be sure."
+msgstr ""
+
+#: ../../help.pm_.c:224
+msgid ""
+"Finally, you will be asked whether you want to see the graphical interface\n"
+"at boot. Note this question will be asked even if you chose not to test the\n"
+"configuration. Obviously, you want to answer \"No\" if your machine is to\n"
+"act as a server, or if you were not successful in getting the display\n"
+"configured."
+msgstr ""
+
+#: ../../help.pm_.c:231
+msgid ""
+"The Mandrake Linux CDROM has a built-in rescue mode. You can access it by\n"
+"booting from the CDROM, press the >>F1<< key at boot and type >>rescue<< at\n"
+"the prompt. But in case your computer cannot boot from the CDROM, you\n"
+"should come back to this step for help in at least two situations:\n"
 "\n"
-"Because the effects of the partitioning process are usually irreversible,\n"
-"partitioning can be intimidating and stressful if you are an inexperienced "
-"user.\n"
-"This wizard simplifies this process. Before beginning, please consult the "
-"manual\n"
-"and take your time.\n"
+" * when installing the boot loader, DrakX will rewrite the boot sector "
+"(MBR)\n"
+"of your main disk (unless you are using another boot manager) so that you\n"
+"can start up with either Windows or GNU/Linux (assuming you have Windows in\n"
+"your system). If you need to reinstall Windows, the Microsoft install\n"
+"process will rewrite the boot sector, and then you will not be able to\n"
+"start GNU/Linux!\n"
 "\n"
+" * if a problem arises and you cannot start up GNU/Linux from the hard "
+"disk,\n"
+"this floppy disk will be the only means of starting up GNU/Linux. It\n"
+"contains a fair number of system tools for restoring a system, which has\n"
+"crashed due to a power failure, an unfortunate typing error, a typo in a\n"
+"password, or any other reason.\n"
 "\n"
-"You need at least two partitions. One is for the operating system itself and "
-"the\n"
-"other is for the virtual memory (also called Swap).\n"
+"When you click on this step, you will be asked to enter a disk inside the\n"
+"drive. The floppy disk you will insert must be empty or contain data which\n"
+"you do not need. You will not have to format it since DrakX will rewrite\n"
+"the whole disk."
+msgstr ""
+
+#: ../../help.pm_.c:255
+#, fuzzy
+msgid ""
+"At this point you need to choose where on your hard drive to install your\n"
+"Mandrake Linux operating system. If your hard drive is empty or if an\n"
+"existing operating system is using all the space available, you will need\n"
+"to partition it. Basically, partitioning a hard drive consists of logically\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
+"Because the effects of the partitioning process are usually irreversible,\n"
+"partitioning can be intimidating and stressful if you are an inexperienced\n"
+"user. Fortunately, there is a wizard which simplifies this process. Before\n"
+"beginning, please consult the manual and take your time.\n"
 "\n"
-"If partitions have been already defined (from a previous installation or "
-"from\n"
-"another partitioning tool), you just need choose those to use to install "
-"your\n"
-"Linux system.\n"
+"If you are running the install in Expert mode, you will enter DiskDrake,\n"
+"the Mandrake Linux partitioning tool, which allows you to fine-tune your\n"
+"partitions. See the DiskDrake chapter of the manual. From the installation\n"
+"interface, you can use the wizards as described here by clicking the\n"
+"\"Wizard\" button of the dialog.\n"
 "\n"
+"If partitions have already been defined, either from a previous\n"
+"installation or from another partitioning tool, simply select those to\n"
+"install your Linux system.\n"
 "\n"
-"If partitions haven't been already defined, you need to create them. \n"
-"To do that, use the wizard available above. Depending of your hard drive\n"
-"configuration, several solutions can be available:\n"
+"If partitions are not defined, you will need to create them using the\n"
+"wizard. Depending on your hard drive configuration, several options are\n"
+"available:\n"
 "\n"
-"\t* Use existing partition: the wizard has detected one or more existing "
-"Linux partitions on your hard drive. If\n"
-"\t  you want to keep them, choose this option. \n"
+" * \"Use free space\": this option will simply lead to an automatic\n"
+"partitioning of your blank drive(s). You will not be prompted further.\n"
 "\n"
+" * \"Use existing partition\": the wizard has detected one or more existing\n"
+"Linux partitions on your hard drive. If you want to use them, choose this\n"
+"option.\n"
 "\n"
-"\t* Erase entire disk: if you want delete all data and all partitions "
-"present on your hard drive and replace them by\n"
-"\t  your new Linux-Mandrake system, you can choose this option. Be careful "
-"with this solution, you will not be\n"
-"\t  able to revert your choice after confirmation.\n"
+" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+"installed on your hard drive and takes all the space available on it, you\n"
+"have to create free space for Linux data. To do that, you can delete your\n"
+"Microsoft Windows partition and data (see \"Erase entire disk\" or \"Expert\n"
+"mode\" solutions) or resize your Microsoft Windows partition. Resizing can\n"
+"be performed without the loss of any data. This solution is recommended if\n"
+"you want to use both Mandrake Linux and Microsoft Windows on same computer.\n"
 "\n"
+"   Before choosing this option, please understand that after this "
+"procedure,\n"
+"the size of your Microsoft Windows partition will be smaller than at the\n"
+"present time. You will have less free space under Microsoft Windows to\n"
+"store your data or to install new software.\n"
 "\n"
-"\t* Use the free space on the Windows partition: if Microsoft Windows is "
-"installed on your hard drive and takes\n"
-"\t  all space available on it, you have to create free space for Linux data. "
-"To do that you can delete your\n"
-"\t  Microsoft Windows partition and data (see \"Erase entire disk\" or "
-"\"Expert mode\" solutions) or resize your\n"
-"\t  Microsoft Windows partition. Resizing can be performed without loss of "
-"any data. This solution is\n"
-"\t  recommended if you want use both Linux-Mandrake and Microsoft Windows on "
-"same computer.\n"
+" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
+"present on your hard drive and replace them with your new Mandrake Linux\n"
+"system, choose this option. Be careful with this solution because you will\n"
+"not be able to revert your choice after confirmation.\n"
 "\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"\t  Before choosing this solution, please understand that the size of your "
-"Microsoft\n"
-"\t  Windows partition will be smaller than at present time. It means that "
-"you will have less free space under\n"
-"\t  Microsoft Windows to store your data or install new software.\n"
+" * \"Remove Windows\": this will simply erase everything on the drive and\n"
+"begin fresh, partitioning everything from scratch. All data on your disk\n"
+"will be lost.\n"
 "\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"\t* Expert mode: if you want to partition manually your hard drive, you can "
-"choose this option. Be careful before\n"
-"\t  choosing this solution. It is powerful but it is very dangerous. You can "
-"lose all your data very easily. So,\n"
-"\t  don't choose this solution unless you know what you are doing."
+" * \"Expert mode\": choose this option if you want to manually partition\n"
+"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"can very easily lose all your data. Hence, do not choose this unless you\n"
+"know what you are doing."
 msgstr ""
 "�� ���� �� ������, ������ �� ����������� ��� �� ������������� �� GNU/Linux\n"
 "���� ������ ��� �����. ��� ����� ������ � ��� ��� ���� ����������� "
@@ -2222,7 +2472,7 @@ msgstr ""
 "���� ��� ����, �� ��������� �� ��� �����������, ������ �� ������ ���� ������ "
 "����������\n"
 "��� ������ �� ������������, ���� �� ������������� ���� ��� ��� ����������� "
-"��� Linux-Mandrake.\n"
+"��� Mandrake Linux.\n"
 "\n"
 "\n"
 "������ � ��������� ����� ������� ��� �� ����������� �������, ������ �� ����� "
@@ -2247,133 +2497,244 @@ msgstr ""
 "��������. ������� �� \n"
 "��� ��������� ��� ������ ���, �������� �������� ������:\n"
 "\n"
-"\t* ����� ���������� �����������: �������� ��� � ������������ ����������� "
+"* ����� ���������� �����������: �������� ��� � ������������ ����������� "
 "Linux ��� ������� ���.\n"
-"\t  ��� ������ �� ��� ���������, �������� ����� ��� �������.\n"
+"  ��� ������ �� ��� ���������, �������� ����� ��� �������.\n"
 "\n"
 "\n"
-"\t* �������� ��������� ��� ������: ��� ������ �� ���������� ��� �� �������� "
+"* �������� ��������� ��� ������: ��� ������ �� ���������� ��� �� �������� "
 "��� ���� ��� ����������\n"
-"\t  ����������� ��� �� �� �������������� �� �� ��� ��� Linux-Mandrake "
-"�������, �������� ����� ��� \n"
-"\t  �������. �������: ��� ������� ������ �� ������������ ��� ����������\n"
-"\t  �� �������� ����� ��������! ��� �� �������� �� ������������!\n"
+"  ����������� ��� �� �� �������������� �� �� ��� ��� Mandrake Linux �������, "
+"�������� ����� ��� \n"
+"  �������. �������: ��� ������� ������ �� ������������ ��� ����������\n"
+"  �� �������� ����� ��������! ��� �� �������� �� ������������!\n"
 "\n"
 "\n"
-"\t* ����� ��������� ����� ���� ��������� ��� Windows: ��� ����� "
-"������������� �� Microsoft Windows\n"
-"\t  ��� ������������� ��� ��� ���� ��� ������, ������ �� �������������� "
+"* ����� ��������� ����� ���� ��������� ��� Windows: ��� ����� ������������� "
+"�� Microsoft Windows\n"
+"  ��� ������������� ��� ��� ���� ��� ������, ������ �� �������������� "
 "�������� ���� ��� �� Linux.\n"
-"\t  ��� �� ����� ����, �������� ���� �� ���������� ��� ��������� ��� Windows "
+"  ��� �� ����� ����, �������� ���� �� ���������� ��� ��������� ��� Windows "
 "��� ��� �� �������� ����\n"
-"\t  (��� \"�������� ��������� ��� ������\" � \"�������\") � �� ������������ "
+"  (��� \"�������� ��������� ��� ������\" � \"�������\") � �� ������������ "
 "��� ��������� ��� Windows.\n"
-"\t  � ���������� ������ �� ����� ����� ������� ���������. ���� � ���� "
+"  � ���������� ������ �� ����� ����� ������� ���������. ���� � ���� "
 "���������� ��� ������ �� ��������������\n"
-"\t  Microsoft Windows ��� Linux-Mandrake ���� ���� ����������.\n"
+"  Microsoft Windows ��� Mandrake Linux ���� ���� ����������.\n"
 "\n"
 "\n"
-"\t  ���� ����������� �� ������������ ��� �����, ������ �� ���������� ��� "
-"���� ��� ����� ��� ����������\n"
-"\t  �� ����� �������� ���� ��������� ��� �� Windows ��� ���������� ��������� "
-"� ����������� ���������.\n"
+"  ���� ����������� �� ������������ ��� �����, ������ �� ���������� ��� ���� "
+"��� ����� ��� ����������\n"
+"  �� ����� �������� ���� ��������� ��� �� Windows ��� ���������� ��������� � "
+"����������� ���������.\n"
 "\n"
 "\n"
-"\t* �������: ��� ������ �� ����������� ����� ��� ����� ���, ����� ��������� "
+"* �������: ��� ������ �� ����������� ����� ��� ����� ���, ����� ��������� "
 "���������. ����� ��� \n"
-"\t  ������� �� ������ ����������� ���� ����������, ��� ��� �������� �� "
-"������ ��� �� �������� ���\n"
-"\t  ��� ������ ������ �����. ����������� ��� ������ �� ������ ������ "
+"  ������� �� ������ ����������� ���� ����������, ��� ��� �������� �� ������ "
+"��� �� �������� ���\n"
+"  ��� ������ ������ �����. ����������� ��� ������ �� ������ ������ "
 "�����������."
 
-#: ../../help.pm_.c:160
+#: ../../help.pm_.c:319
+msgid ""
+"There you are. Installation is now complete and your GNU/Linux system is\n"
+"ready to use. Just click \"OK\" to reboot the system. You can start\n"
+"GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
+"soon as the computer has booted up again.\n"
+"\n"
+"The \"Advanced\" button (in Expert mode only) shows two more buttons to:\n"
+"\n"
+" * \"generate auto-install floppy\": to create an installation floppy disk\n"
+"which will automatically perform a whole installation without the help of\n"
+"an operator, similar to the installation you just configured.\n"
+"\n"
+"   Note that two different options are available after clicking the button:\n"
+"\n"
+"    * \"Replay\". This is a partially automated install as the partitioning\n"
+"step (and only this one) remains interactive.\n"
+"\n"
+"    * \"Automated\". Fully automated install: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
+"\n"
+"   This feature is very handy when installing a great number of similar\n"
+"machines. See the Auto install section at our web site.\n"
+"\n"
+" * \"Save packages selection\"(*): saves the packages selection as made\n"
+"previously. Then, when doing another installation, insert the floppy inside\n"
+"the driver and run the installation going to the help screen by pressing on\n"
+"the [F1] key, and by issuing >>linux defcfg=\"floppy\"<<.\n"
+"\n"
+"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
+"\"mformat a:\")"
+msgstr ""
+
+#: ../../help.pm_.c:350
 #, fuzzy
 msgid ""
-"At this point, you need to choose what\n"
-"partition(s) to use to install your new Linux-Mandrake system. If "
-"partitions\n"
-"have been already defined (from a previous installation of GNU/Linux or "
-"from\n"
-"another partitioning tool), you can use existing partitions. In other "
-"cases,\n"
-"hard drive partitions must be defined.\n"
+"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"
-"To create partitions, you must first select a hard drive. You can select "
-"the\n"
-"disk for partitioning by clicking on \"hda\" for the first IDE drive, \"hdb"
-"\" for\n"
-"the second or \"sda\" for the first SCSI drive and so on.\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"
+"any of them.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
-"   * Clear all: this option deletes all partitions available on the selected "
-"hard drive.\n"
+"Click on \"Cancel\" if you want to choose another partition for your new\n"
+"Mandrake Linux operating system installation.\n"
 "\n"
+"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
+"for bad blocks on the disc."
+msgstr ""
+"�� ���� ����������� ������ �� ������������ (������ �� ������������ ��� "
+"�������\n"
+"�������) ������ ���������������.\n"
 "\n"
-"   * Auto allocate: this option allows you to automatically create Ext2 and "
-"swap partitions in free space of your\n"
-"     hard drive.\n"
 "\n"
+"�������� ������ �� ��������� ������� ������������� ����������� ��� �� "
+"���������� \n"
+"�� �������� ����. ��� ������ ���� ������, �������� �������� ��� ����������� "
+"��� \n"
+"������ �� ���������.\n"
 "\n"
-"   * Rescue partition table: if your partition table is damaged, you can try "
-"to recover it using this option. Please\n"
-"     be careful and remember that it can fail.\n"
 "\n"
+"��������� ��� ��� ����� ���������� �� ��������� ���� ��� ������������� "
+"�����������.\n"
+"������ �� ��������� ��� ����������� ��� ��������� �� ����������� ������� "
+"(���� �� \n"
+"\"/\", \"/usr\" ��� \"/var\"), ���� ��� ���������� �� ��������� ����������� "
+"��� ��������� \n"
+"�������� ��� ������ �� ��������� (������� � \"/home\").\n"
 "\n"
-"   * Undo: you can use this option to cancel your changes.\n"
 "\n"
+"�������� �� ����� ����������� ����� ���� ��� ����� ��� ���������� ��� �� "
+"�������� \n"
+"���� ����������� ����� �� ������ ����������.\n"
 "\n"
-"   * Reload: you can use this option if you wish to undo all changes and "
-"load your initial partitions table\n"
 "\n"
+"������� \"OK\" ���� ����� ������� �� ���������� ��� ����������.\n"
 "\n"
-"   * Wizard: If you wish to use a wizard to partition your hard drive, you "
-"can use this option. It is recommended if\n"
-"     you do not have a good knowledge in partitioning.\n"
 "\n"
+"������� \"�������\" ��� ������ �� �������� ��� �������� ��� ��� �� "
+"��������������� \n"
+"����� ����������� ��� ��� ����������� ��� Mandrake Linux."
+
+#: ../../help.pm_.c:376
+#, fuzzy
+msgid ""
+"Your new Mandrake Linux operating system is currently being installed.\n"
+"Depending on the number of packages you will be installing and the speed of\n"
+"your computer, this operation could take from a few minutes to a\n"
+"significant amount of time.\n"
 "\n"
-"   * Restore from floppy: if you have saved your partition table on a floppy "
-"during a previous installation, you can\n"
-"     recover it using this option.\n"
+"Please be patient."
+msgstr ""
+"�� ��� ��� ����������� ������� Mandrake Linux ������������.\n"
+"���� � ���������� �� ����� ������ ���, ������� �� �� ������� \n"
+"��� ����������� ��� ��������� ��� ��� �������� ��� ���������� ���.\n"
+"\n"
+"\n"
+"�������� ���������� �����������."
+
+#: ../../help.pm_.c:384
+msgid ""
+"Before continuing you should read carefully the terms of the license. It\n"
+"covers the whole Mandrake Linux distribution, and if you do not agree with\n"
+"all the terms in it, click on the \"Refuse\" button which will immediately\n"
+"terminate the installation. To continue with the installation, click the\n"
+"\"Accept\" button."
+msgstr ""
+
+#: ../../help.pm_.c:391
+msgid ""
+"At this point, it is time to choose the security level desired for the\n"
+"machine. As a rule of thumb, the more exposed the machine is, and the more\n"
+"the data stored in it is crucial, the higher the security level should be.\n"
+"However, a higher security level is generally obtained at the expenses of\n"
+"easiness of use. Refer to the MSEC chapter of the ``Reference Manual'' to\n"
+"get more information about the meaning of these levels.\n"
+"\n"
+"If you do not know what to choose, keep the default option."
+msgstr ""
+
+#: ../../help.pm_.c:401
+#, fuzzy
+msgid ""
+"At this point, you need to choose what partition(s) will be used for the\n"
+"installation of your Mandrake Linux system. If partitions have been already\n"
+"defined, either from a previous installation of GNU/Linux or from 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"
+" * \"Clear all\": this option deletes all partitions on the selected hard\n"
+"drive.\n"
 "\n"
-"   * Save on floppy: if you wish to save your partition table on a floppy to "
-"be able to recover it, you can use this\n"
-"     option. It is strongly recommended to use this option\n"
+" * \"Auto allocate\": this option allows you to automatically create Ext2\n"
+"and swap partitions in free space of your hard drive.\n"
 "\n"
+" * \"Rescue partition table\": if your partition table is damaged, you can\n"
+"try to recover it using this option. Please be careful and remember that it\n"
+"can fail.\n"
+"\n"
+" * \"Undo\": use this option to cancel your changes.\n"
+"\n"
+" * \"Reload\": you can use this option if you wish to undo all changes and\n"
+"load your initial partitions table.\n"
+"\n"
+" * \"Wizard\": 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 knowledge of\n"
+"partitioning.\n"
 "\n"
-"   * Done: when you have finished partitioning your hard drive, use this "
-"option to save your changes.\n"
+" * \"Restore from floppy\": this option will allow you to restore a\n"
+"previously saved partition table from floppy disk.\n"
 "\n"
+" * \"Save to floppy\": saves the partition table to a floppy. Useful for\n"
+"later partition-table recovery if necessary. It is strongly recommended to\n"
+"perform this step.\n"
 "\n"
-"For information, you can reach any option using the keyboard: navigate "
-"trough the partitions using Tab and Up/Down arrows.\n"
+" * \"Done\": when you have finished partitioning your hard drive, this will\n"
+"save your changes back to disc.\n"
 "\n"
+"Note: you can reach any option using the keyboard. Navigate through the\n"
+"partitions using [Tab] and [Up/Down] arrows.\n"
 "\n"
 "When a partition is selected, you can use:\n"
 "\n"
-"           * Ctrl-c to create a new partition (when a empty partition is "
-"selected)\n"
+" * Ctrl-c to create a new partition (when an empty partition is selected);\n"
 "\n"
-"           * Ctrl-d to delete a partition\n"
+" * Ctrl-d to delete a partition;\n"
 "\n"
-"           * Ctrl-m to set the mount point\n"
-"           \n"
+" * Ctrl-m to set the mount point.\n"
 "\n"
-"           \n"
-"If you are installing on a PPC Machine, you will want to create a small HFS "
-"'bootstrap' partition of at least 1MB for use\n"
-"by the yaboot bootloader. If you opt to make the partition a bit larger, say "
-"50MB, you may find it a useful place to store \n"
-"a spare kernel and ramdisk image for emergency boot situations."
+"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"
+"boot loader. 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"
-"�� Linux-Mandrake. ��� ����������� �����������, ��� ���������� ����������� � "
+"�� Mandrake Linux. ��� ����������� �����������, ��� ���������� ����������� � "
 "��� \n"
-"���� ��������, �������� �� ��� ���������������. ������, �� ������ �� �� "
+"���� ��������, �������� �� ��� ���������������. ������, �� ������ �� "
 "������� \n"
 "���� �����������.\n"
 "\n"
@@ -2442,169 +2803,51 @@ msgstr ""
 "\n"
 "           * Ctrl-d ��� �������� ����������\n"
 "\n"
-"           * Ctrl-m ��� ������ ������� ��������"
-
-#: ../../help.pm_.c:224
-msgid ""
-"Above are listed the existing Linux partitions detected on\n"
-"your hard drive. You can keep choices make by the wizard, they are good for "
-"a\n"
-"common usage. If you change these choices, you must at least define a root\n"
-"partition (\"/\"). Don't choose a too little partition or you will not be "
-"able\n"
-"to install enough software. If you want store your data on a separate "
-"partition,\n"
-"you need also to choose a \"/home\" (only possible if you have more than "
-"one\n"
-"Linux partition available).\n"
-"\n"
+"           * Ctrl-m ��� ������ ������� ��������           \n"
 "\n"
-"For information, each partition is listed as follows: \"Name\", \"Capacity"
-"\".\n"
-"\n"
-"\n"
-"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
-"\n"
-"\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and "
-"\"sd\"\n"
-"if it is an SCSI hard drive.\n"
-"\n"
-"\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE "
-"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"
-"\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc..."
-msgstr ""
-"�������� ������� ���� �������� �� ��� ����������� Linux ��� ������������ "
-"���� \n"
-"����� ���. �������� �� ��������� ��� ��������� ��������, ����� ����� ��� \n"
-"����������� �����. ��� �������� ����� ��� ��������, ������ �� ����� "
-"�����������\n"
-"��� ������ ��������� (root, \"/\"). ��� ��������� ��� ���� ����� ��������� "
-"�����\n"
-"��� �� ����� ���� ��� ����������� ����������. ��� ������ �� ����������� �� "
-"��������\n"
-"��� �� ��������� ���������, ������ �� ��������� ��� ��������� ��� \"/home"
-"\" (�������\n"
-"���� �� ����� �������� ��� ��� Linux ��������� ���������).\n"
-"\n"
-"\n"
-"������������, ���� ��������� ���������� ��: \"�����\", \"������������\".\n"
-"\n"
-"\n"
-"�� ����� �������� �� ����: ����� ������, ������� ������, ������� "
-"���������� \n"
-"��� ����������, \"hda1\").\n"
-"\n"
-"\n"
-"� ����� ����� \"hd\" ��� ��������� ��� ����� IDE ��� \"sd\" ��� SCSI �����.\n"
-"\n"
-"\n"
-"� ������� ������ ����� ����� ��� ������ ���� �� \"hd\" � \"sd\". ��� ���� "
-"IDE \n"
-"�������: \n"
-"\n"
-"   * \"a\" ����� � master ������ ���� ����� ������� IDE,\n"
-"\n"
-"   * \"b\" ����� � slave ������ ���� ����� ������� IDE,\n"
-"\n"
-"   * \"c\" ����� � master ������ ���� ������� ������� IDE,\n"
-"\n"
-"   * \"d\" ����� � slave ������ ���� ������� ������� IDE.\n"
-"\n"
-"\n"
-"��� ������� SCSI, \"a\" ����� � ������ ������, \"b\" ����� � �������� ������ "
-"���..."
-
-#: ../../help.pm_.c:258
-msgid ""
-"Choose the hard drive you want to erase to install your\n"
-"new Linux-Mandrake partition. Be careful, all data present on it will be "
-"lost\n"
-"and will not be recoverable."
-msgstr ""
-"�������� ��� ����� ��� ������ �� ���������� ��� �� ������������� \n"
-"��� ��� ��������� Linux-Mandrake. �������: ��� �� �������� �� ����������\n"
-"��� �� ����� ������� � ��������� ����."
-
-#: ../../help.pm_.c:263
-msgid ""
-"Click on \"OK\" if you want to delete all data and\n"
-"partitions present on this hard drive. Be careful, after clicking on \"OK\", "
-"you\n"
-"will not be able to recover any data and partitions present on this hard "
-"drive,\n"
-"including any Windows data.\n"
-"\n"
-"\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
-"partitions present on this hard drive."
-msgstr ""
-"������� \"OK\" ��� ������ �� ���������� ��� �� �������� ��� ��� \n"
-"����������� �� ����� ��� �����. �������, ���� ��� ���� ��� �� �������� \n"
-"�� ����������� ����������� �������� ��� ���������� ���� �� ������ ���� \n"
-"�����, ������������������� ��� ������������ ��������� ��� �� Windows.\n"
-"\n"
-"\n"
-"������� \"�������\" ��� �� ��������� ����� ��� ���������� ����� �� ������ \n"
-"�������� ��� ����������� ��� ���������� ���� �����."
+"           \n"
+"��� ������ ����������� �� ��� PPC ��������, �� ������ �� ������������� ��� "
+"����� HFS 'bootstrap' ��������� ����������� 1�� ��� �����\n"
+"��� ��� yaboot bootloader. ��� ��������� �� ������ ��� ��������� ����������, "
+"�.�. 50��, ���� ��� ������ ������� ��� ���������� \n"
+"���� ������ ��� ramdisk image ��� ��������� �����������."
 
-#: ../../help.pm_.c:273
+#: ../../help.pm_.c:460
+#, fuzzy
 msgid ""
-"More than one Microsoft Windows partition have been\n"
-"detected on your hard drive. Please choose the one you want resize to "
-"install\n"
-"your new Linux-Mandrake operating system.\n"
-"\n"
+"More than one Microsoft Windows partition has been detected on your hard\n"
+"drive. Please choose the one you want resize in order to install your new\n"
+"Mandrake Linux operating system.\n"
 "\n"
-"For information, each partition is listed as follow; \"Linux name\", "
-"\"Windows\n"
-"name\" \"Capacity\".\n"
+"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
+"\"Capacity\".\n"
 "\n"
-"\"Linux name\" is coded as follow: \"hard drive type\", \"hard drive number"
-"\",\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 type\" is \"hd\" if your hard dive is an IDE hard drive and \"sd"
-"\"\n"
-"if it is an SCSI hard drive.\n"
-"\n"
-"\n"
-"\"Hard drive number\" is always a letter putted after \"hd\" or \"sd\". With "
-"IDE hard drives:\n"
-"\n"
-"   * \"a\" means \"master hard drive on the primary IDE controller\",\n"
+"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard drives:\n"
 "\n"
-"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
+" * \"a\" means \"master hard drive on the primary IDE controller\",\n"
 "\n"
-"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
+" * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
-"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc.\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 "
-"disk\n"
-"or partition is called \"C:\")."
+"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"disk or partition is called \"C:\")."
 msgstr ""
 "������������ ��� ��� ����������� Windows �������� ���� ����� ���. �������� \n"
-"�������� ���� ������ �� ������������ ��� �� ������������� �� Linux-"
-"Mandrake.\n"
+"�������� ���� ������ �� ������������ ��� �� ������������� �� Mandrake "
+"Linux.\n"
 "\n"
 "\n"
 "������������, ���� ��������� ���������� ��: \"����� Linux\", \"����� Windows"
@@ -2640,743 +2883,228 @@ msgstr ""
 "Windows\n"
 "(� ������ ������ � ��������� ������� \"C:\")."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:491
 msgid "Please be patient. This operation can take several minutes."
 msgstr "�������� ����������. ���� � ���������� ������ �� ����� ������ �����."
 
-#: ../../help.pm_.c:309
+#: ../../help.pm_.c:494
+#, fuzzy
 msgid ""
-"Any partitions that have been newly defined must be\n"
-"formatted for use (formatting meaning creating a filesystem).\n"
+"DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
+"installation or if you want to have greater control (\"Expert\"). You also\n"
+"have the choice of performing a new install or an upgrade of an existing\n"
+"Mandrake Linux system. Clicking \"Install\" will completely wipe out the\n"
+"old system. Select \"Upgrade\" if you are upgrading or repairing an\n"
+"existing system.\n"
 "\n"
+"Please choose \"Install\" if there are no previous version of Mandrake\n"
+"Linux installed or if you wish to boot between various operating systems.\n"
 "\n"
-"At this time, you may wish to reformat some already existing partitions to "
-"erase\n"
-"the data they contain. If you wish do that, please also select the "
-"partitions\n"
-"you want to format.\n"
+"Please choose \"Update\" if you wish to update or repair an already\n"
+"installed version of Mandrake Linux.\n"
 "\n"
+"Depending on your knowledge of GNU/Linux, please choose one of the\n"
+"following to install or update your Mandrake Linux operating system:\n"
 "\n"
-"Please note that it is not necessary to reformat all pre-existing "
-"partitions.\n"
-"You must reformat the partitions containing the operating system (such as \"/"
-"\",\n"
-"\"/usr\" or \"/var\") but do you no have to reformat partitions containing "
-"data\n"
-"that you wish to keep (typically /home).\n"
+" * Recommended: choose this if you have never installed a GNU/Linux\n"
+"operating system. The installation will be very easy and you will only be\n"
+"asked a few questions.\n"
 "\n"
-"\n"
-"Please be careful selecting partitions, after formatting, all data will be\n"
-"deleted and you will not be able to recover any of them.\n"
-"\n"
-"\n"
-"Click on \"OK\" when you are ready to format partitions.\n"
-"\n"
-"\n"
-"Click on \"Cancel\" if you want to choose other partitions to install your "
-"new\n"
-"Linux-Mandrake operating system."
+" * Expert: if you have a good knowledge of GNU/Linux, you can choose this\n"
+"installation class. The expert installation will allow you to perform a\n"
+"highly customized installation. Answering some of the questions can be\n"
+"difficult if you do not have a good knowledge of GNU/Linux so do not choose\n"
+"this unless you know what you are doing."
 msgstr ""
-"�� ���� ����������� ������ �� ������������ (������ �� ������������ ��� "
-"�������\n"
-"�������) ������ ���������������.\n"
+"�������� �������� \"�����������\" ��� ��� ������� ������������� ���������� "
+"������ ��� Mandrake Linux\n"
+"� ��� ������ �� ��������������� ����������� ��� ���� ����������� ���������.\n"
 "\n"
 "\n"
-"�������� ������ �� ��������� ������� ������������� ����������� ��� �� "
-"���������� \n"
-"�� �������� ����. ��� ������ ���� ������, �������� �������� ��� ����������� "
-"��� \n"
-"������ �� ���������.\n"
-"\n"
+"�������� \"����������\" ��� ������ �� ������������ ��� ������������ "
+"����������� ��� Mandrake Linux\n"
 "\n"
-"��������� ��� ��� ����� ���������� �� ��������� ���� ��� ������������� "
-"�����������.\n"
-"������ �� ��������� ��� ����������� ��� ��������� �� ����������� ������� "
-"(���� �� \n"
-"\"/\", \"/usr\" ��� \"/var\"), ���� ��� ���������� �� ��������� ����������� "
-"��� ��������� \n"
-"�������� ��� ������ �� ��������� (������� � \"/home\").\n"
 "\n"
+"������� �� ��� ������� ��� ��� GNU/Linux, �������� �� ��������� ��� ��� �� "
+"�������� ������� ������������\n"
+"� ����������� ��� Mandrake Linux:\n"
 "\n"
-"�������� �� ����� ����������� ����� ���� ��� ����� ��� ���������� ��� �� "
-"�������� \n"
-"���� ����������� ����� �� ������ ����������.\n"
+"* �����������: ��� ��� ����� ���������������� ���� ��� GNU/Linux �������. � "
+"����������� �� ����� \n"
+"  ���� ������ ��� �� ��� ������� �� ���������� ����� ���������.\n"
 "\n"
 "\n"
-"������� \"OK\" ���� ����� ������� �� ���������� ��� ����������.\n"
+"* �������������: ��� ����� ������������� �� �� GNU/Linux, �������� �� "
+"��������� ��� ������ �����\n"
+"  (������������, ������� ��������) ��� ���������� ���. �� ��������� �� "
+"���������� �� ������������\n"
+"  ���������, ����� �� ������ �� ����� ������� ������� ������� ������� �� ��� "
+"���������� ��� GNU/Linux.\n"
 "\n"
 "\n"
-"������� \"�������\" ��� ������ �� �������� ��� �������� ��� ��� �� "
-"��������������� \n"
-"����� ����������� ��� ��� ����������� ��� Linux-Mandrake."
+"* �������: ��� ����� �������� �� �� GNU/Linux. ���� ��� ��������, �������� "
+"�� ��������� ��� ������\n"
+"  ����� ��� ����������. �� ��������� ������ �� ������������ �� ������� ���� "
+"������� ��� ����������,\n"
+"  ���� �� ��������� �� ���������� �� �������������� ��������� ��� "
+"������������ �������������� �������.\n"
+"  ����������� ��� ������ �� ������ ������ ��������� ����� ��� �����������."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:521
 msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
+"Normally, DrakX selects the right keyboard for you (depending on the\n"
+"language you have chosen) and you will not even see this step. However, you\n"
+"might not have a keyboard that corresponds exactly to your language: for\n"
+"example, if you are an English speaking Swiss person, you may still want\n"
+"your keyboard to be a Swiss keyboard. Or if you speak English but are\n"
+"located in Quebec, you may find yourself in the same situation. In both\n"
+"cases, you will have to go back to this installation step and select an\n"
+"appropriate keyboard from the list.\n"
 "\n"
-"\n"
-"DrakX will then check whether you have enough room to install them all. If "
-"not,\n"
-"it will warn you about it. If you want to go on anyway, it will proceed onto "
-"the\n"
-"installation of all selected groups but will drop some packages of lesser\n"
-"interest. At the bottom of the list you can select the option \n"
-"\"Individual package selection\"; in this case you will have to browse "
-"through\n"
-"more than 1000 packages..."
+"Click on the \"More\" button to be presented with the complete list of\n"
+"supported keyboards."
 msgstr ""
-"�������� ���� �� ��������� ��� ������ ������� ��� ���������� �� "
-"������������� � �� ������������.\n"
-"\n"
-"\n"
-"�� DrakX �� ������������ ��� ����� ������ ���� ���� ����� ���.\n"
-"��� ���, �� ������ ��� �������������. ��� ������ �� ����������, �� "
-"�������������\n"
-"���� �� ����������� ������, ���� �� ���������� ������ ������ ��������� "
-"�������������.\n"
-"��� ���� ����� ��� ������ �������� �� ��������� \"������� ����������� �������"
-"\". �� ����\n"
-"�� ��������� �� ������ �� ��������� ������� �� �������� ��� 1000 ������."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:534
 msgid ""
-"You can now choose individually all the packages you\n"
-"wish to install.\n"
-"\n"
-"\n"
-"You can expand or collapse the tree by clicking on options in the left "
-"corner of\n"
-"the packages window.\n"
-"\n"
-"\n"
-"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
-"\"Toggle flat and group sorted\".\n"
+"Please choose your preferred language for installation and system usage.\n"
 "\n"
+"Clicking on the \"Advanced\" button will allow you to select other\n"
+"languages to be installed on your workstation. Selecting other languages\n"
+"will install the language-specific files for system documentation and\n"
+"applications. For example, if you will host users from Spain on your\n"
+"machine, select English as the main language in the tree view and in the\n"
+"Advanced section click on the grey star corresponding to \"Spanish|Spain\".\n"
 "\n"
-"If you want not to be warned on dependencies, click on \"Automatic\n"
-"dependencies\". If you do this, note that unselecting one package may "
-"silently\n"
-"unselect several other packages which depend on it."
+"Note that multiple languages may be installed. Once you have selected any\n"
+"additional locales click the \"OK\" button to continue."
 msgstr ""
-"�������� ���� �� ��������� ���������� ��� �� ������ ��� ���������� \n"
-"�� �������������.\n"
-"\n"
-"\n"
-"�������� �� ���������� � �� ���������� �� ������ ����������� ��� ��������\n"
-"���� �������� ����� ��� ��������� ��� �������.\n"
-"\n"
-"\n"
-"��� ��������� �� �� ������� �� ������ ������������ ����������, �������\n"
-"\"�������� ������������\".\n"
-"\n"
-"\n"
-"��� ��� ������ �� ��������� ��������������� ��� ����������, �������\n"
-"\"��������� ����������\". ��������� ��� �� ����� ��� ���������, � \n"
-"���������� ���� ������� ������ �� ���������� ��� ������� ���������� \n"
-"��� ����� ������� ��� ���������� ��� ����."
 
-#: ../../help.pm_.c:364
+#: ../../help.pm_.c:547
 msgid ""
-"If you have all the CDs in the list above, click Ok. If you have\n"
-"none of those CDs, click Cancel. If only some CDs are missing, unselect "
-"them,\n"
-"then click Ok."
-msgstr ""
-"��� ����� ��� �� �������� CDs, ������� Ok.\n"
-"��� ��� ����� ������ ��� �� �������� CDs, ������� �������.\n"
-"��� ��� ����� ������ ��� ����, ����������� �� ��� ������� Ok."
-
-#: ../../help.pm_.c:369
-msgid ""
-"Your new Linux-Mandrake operating system is currently being\n"
-"installed. This operation should take a few minutes (it depends on size you\n"
-"choose to install and the speed of your computer).\n"
+"By default, DrakX assumes you have a two-button mouse and will set it up\n"
+"for third-button emulation. DrakX will automatically know whether it is a\n"
+"PS/2, serial or USB mouse.\n"
 "\n"
+"If you wish to specify a different type of mouse select the appropriate\n"
+"type from the list provided.\n"
 "\n"
-"Please be patient."
+"If you choose a mouse other than the default you will be presented with a\n"
+"mouse test screen. Use the buttons and wheel to verify that the settings\n"
+"are good. If the mouse is not working correctly press the space bar or\n"
+"RETURN to \"Cancel\" and choose again."
 msgstr ""
-"�� ��� ��� ����������� ������� Linux-Mandrake ������������.\n"
-"���� � ���������� �� ����� ������ ���, ������� �� �� ������� \n"
-"��� ����������� ��� ��������� ��� ��� �������� ��� ���������� ���.\n"
-"\n"
-"\n"
-"�������� ���������� �����������."
 
-#: ../../help.pm_.c:377
-msgid ""
-"You can now test your mouse. Use buttons and wheel to verify\n"
-"if settings are good. If not, you can click on \"Cancel\" to choose another\n"
-"driver."
-msgstr ""
-"�������� ���� �� ���������� �� ������� ���. ��������� �� ������� ��� ��\n"
-"������ ��� ����������� ��� ��� ����������� ���� ������. �� ���, ��������\n"
-"\"�������\" ��� �������� ����� �����."
-
-#: ../../help.pm_.c:382
+#: ../../help.pm_.c:560
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1\n"
-"port under MS Windows is named ttyS0 under GNU/Linux."
+"Please select the correct port. For example, the COM1 port under MS Windows\n"
+"is named ttyS0 under GNU/Linux."
 msgstr ""
 "�������� �������� ��� ��������� ����. ��� ����������,\n"
 "� COM1 ��� Windows ���������� ttyS0 ��� GNU/Linux."
 
-#: ../../help.pm_.c:386
-msgid ""
-"If you wish to connect your computer to the Internet or\n"
-"to a local network please choose the correct option. Please turn on your "
-"device\n"
-"before choosing the correct option to let DrakX detect it automatically.\n"
-"\n"
-"\n"
-"If you do not have any connection to the Internet or a local network, "
-"choose\n"
-"\"Disable networking\".\n"
-"\n"
-"\n"
-"If you wish to configure the network later after installation or if you "
-"have\n"
-"finished to configure your network connection, choose \"Done\"."
-msgstr ""
-"��� ������ �� ��������� ��� ���������� ��� ��� ��������� � �� ��� ������ \n"
-"������, �������� ����� ��� ��������� �������, ���� �������� ��� �������� "
-"��� \n"
-"������� ���� �� DrakX �� ��� ��������� ��������.\n"
-"\n"
-"\n"
-"��� ��� ����� ����� �������� �������, �������� \"�������������� �������\".\n"
-"\n"
-"\n"
-"��� ������ �� ��������� �� ������ ��������, � �� ���������� �� ��� \n"
-"��������� �������, �������� \"�����\"."
-
-#: ../../help.pm_.c:399
-msgid ""
-"No modem has been detected. Please select the serial port on which it is "
-"plugged.\n"
+#: ../../help.pm_.c:564
+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 one authorized to make updates, add users,\n"
+"change the overall system configuration, and so on. In short, \"root\" can\n"
+"do everything! That is why you must choose a password that is difficult to\n"
+"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
+"choose not to enter a password, but we strongly advise you against this if\n"
+"only for one reason: do not think that because you booted GNU/Linux that\n"
+"your other operating systems are safe from mistakes. Since \"root\" can\n"
+"overcome all limitations and unintentionally erase all data on partitions\n"
+"by carelessly accessing the partitions themselves, it is important for it\n"
+"to be difficult to become \"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 too\n"
+"easy to compromise a system.\n"
 "\n"
-"For information, the first serial port (called \"COM1\" under Microsoft\n"
-"Windows) is called \"ttyS0\" under Linux."
-msgstr ""
-"��� ����������� modem. �������� �������� ��� �������� ���� ���� �����\n"
-"����� �����������.\n"
+"However, please do not make the password too long or complicated because\n"
+"you must be able to remember it without too much effort.\n"
 "\n"
+"The password will not be displayed on screen as you type it in. Hence, you\n"
+"will have to type the password twice to reduce the chance of a typing\n"
+"error. If you do happen to make the same typing error twice, this\n"
+"\"incorrect\" password will have to be used the first time you connect.\n"
 "\n"
-"������������, � ����� ���� (��� ���������� \"COM1\" ��� Microsoft Windows),\n"
-"��� Linux ���������� \"ttyS0\"."
-
-#: ../../help.pm_.c:406
-msgid ""
-"You may now enter dialup options. If you don't know\n"
-"or are not sure what to enter, the correct informations can be obtained "
-"from\n"
-"your Internet Service Provider. If you do not enter the DNS (name server)\n"
-"information here, this information will be obtained from your Internet "
-"Service\n"
-"Provider at connection time."
-msgstr ""
-"�������� ���� �� ��������� ��� ��������� dial-up. ��� ��� ������ � ��� "
-"�����\n"
-"�������� ��� ����� ��� ���������, �������� �� ��� �������������� ��� ��� \n"
-"������� ���. ��� ��� ������� ����������� �������� (DNS), �� ������� "
-"�������� \n"
-"���� ��� �������."
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-"��� �� modem ��� ����� ���������, �������� ������� �� ���� �� DrakX �� "
-"�������� �� �� ��������� ��������."
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "�������� ������� �� modem ��� ��� �������� �� �����."
-
-#: ../../help.pm_.c:419
-msgid ""
-"If you are not sure if informations above are\n"
-"correct or if you don't know or are not sure what to enter, the correct\n"
-"informations can be obtained from your Internet Service Provider. If you do "
-"not\n"
-"enter the DNS (name server) information here, this information will be "
-"obtained\n"
-"from your Internet Service Provider at connection time."
-msgstr ""
-"�������� ���� �� ��������� ��� ��������� dial-up. ��� ��� ������ � ��� "
-"�����\n"
-"�������� ��� ����� ��� ���������, �������� �� ��� �������������� ��� ��� \n"
-"������� ���. ��� ��� ������� ����������� �������� (DNS), �� ������� "
-"�������� \n"
-"���� ��� �������."
-
-#: ../../help.pm_.c:426
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, the correct informations can be\n"
-"obtained from your Internet Service Provider."
-msgstr ""
-"�������� ���� �� �������� �� �������� ����� (��� ����������). ��� ��� ����� "
-"��������,\n"
-"�������� �� �������� ����������� ��� ��� ������� ���."
-
-#: ../../help.pm_.c:431
-msgid ""
-"You may now configure your network device.\n"
+"In expert mode, you will be asked if you will be connecting to an\n"
+"authentication server, like NIS or LDAP.\n"
 "\n"
-"   * IP address: if you don't know or are not sure what to enter, ask your "
+"If your network uses LDAP (or NIS) protocol for authentication, select\n"
+"\"LDAP\" (or \"NIS\") as authentication. If you do not know, ask your\n"
 "network administrator.\n"
-"     You should not enter an IP address if you select the option \"Automatic "
-"IP\" below.\n"
-"\n"
-"   * Netmask: \"255.255.255.0\" is generally a good choice. If you don't "
-"know or are not sure what to enter,\n"
-"     ask your network administrator.\n"
-"\n"
-"   * Automatic IP: if your network uses BOOTP or DHCP protocol, select this "
-"option. If selected, no value is needed in\n"
-"    \"IP address\". If you don't know or are not sure if you need to select "
-"this option, ask your network administrator."
-msgstr ""
-"�������� ���� �� ��������� ��� ������� �������.\n"
-"\n"
-"  - ��������� IP: ��� ��� ��� ������, ������� ��� �������� ������� �\n"
-"��� ������� ���.\n"
-"��� ������ �� �������� ��������� IP ��� ��������� \"�������� ������� IP\"\n"
-"��������.\n"
-"\n"
-"\n"
-"  - ����� �������: \"255.255.255.0\" ����� ������� ���� �������. ��� ���\n"
-"����� ��������, ������� ��� �������� ������� � ��� ������� ���.\n"
-"\n"
-"\n"
-"  - �������� ������� IP: ��� �� ������ ��� ������������ ��� ��� �� "
-"����������\n"
-"BOOTP � DHCP, �������� ����. �� ���� ��� ���������, ��� ���������� �� "
-"������\n"
-"��������� IP. ��� ��� ����� ��������, ������� ��� �������� ������� �\n"
-"��� ������� ���."
-
-#: ../../help.pm_.c:443
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, ask your network administrator."
-msgstr ""
-"�������� ���� �� �������� �� �������� ��� �����. ��� ���\n"
-"����� ��������, �������������� ��� �������� �������."
-
-#: ../../help.pm_.c:447
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, leave blank."
-msgstr ""
-"�������� ���� �� �������� �� �������� ��� �����. ��� ���\n"
-"����� ��������, ������ �� ����."
-
-#: ../../help.pm_.c:451
-msgid ""
-"You may now enter dialup options. If you're not sure what to enter, the\n"
-"correct information can be obtained from your ISP."
-msgstr ""
-"�������� ���� �� �������� ��� �������� ��� dialup. ��� ��� ����� ��������,\n"
-"�������� �� �������� ����������� ��� ��� ������� ���."
-
-#: ../../help.pm_.c:455
-msgid ""
-"If you will use proxies, please configure them now. If you don't know if\n"
-"you should use proxies, ask your network administrator or your ISP."
-msgstr ""
-"��� ��������������� proxies, �������� �������� ���� ����. ��� ��� ������,\n"
-"������� ��� ������� ��� � ��� �������� �������."
-
-#: ../../help.pm_.c:459
-msgid ""
-"You can install cryptographic package if your internet connection has been\n"
-"set up correctly. First choose a mirror where you wish to download packages "
-"and\n"
-"after that select the packages to install.\n"
-"\n"
-"\n"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
-msgstr ""
-"�� � ������� ��� �� �� ��������� ����� ����� ����������, �������� ��\n"
-"������������� ������ �������������. ����� �������� ���� ���� ��'\n"
-"���� �� ���������� �� ������ ��� ���� �������� ���� ������ ��\n"
-"�������������.\n"
-"\n"
-"��������� ��� ������ �� ��������� ���� ��� ������ ������� �� ���\n"
-"��������� ���."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "�������� ���� �� ��������� ���� ���� ������� �� ��� ��������� ���."
-
-#: ../../help.pm_.c:471
-msgid ""
-"GNU/Linux manages time in GMT (Greenwich Manage\n"
-"Time) and translates it in local time according to the time zone you have\n"
-"selected.\n"
-"\n"
-"\n"
-"If you use Microsoft Windows on this computer, choose \"No\"."
-msgstr ""
-"�� GNU/Linux ���������� ��� ��� �� GMT (\"Greenwich Mean Time\" � \n"
-"\"���������� ��� ����������\") ��� ��� ���������� �� ������ ���\n"
-"����� ��� ����� ���� ��� �� ���������.\n"
-"\n"
-"��� ��� ���� ������� ����� ��������� ��� Microsoft Windows, �������� \"���\"."
-
-#: ../../help.pm_.c:479
-msgid ""
-"You may now choose which services you want to start at boot time.\n"
-"\n"
-"\n"
-"When your mouse comes over an item, a small balloon help will popup which\n"
-"describes the role of the service.\n"
-"\n"
-"\n"
-"Be very careful in this step if you intend to use your machine as a server: "
-"you\n"
-"will probably want not to start any services that you don't need. Please\n"
-"remember that several services can be dangerous if they are enable on a "
-"server.\n"
-"In general, select only the services that you really need."
-msgstr ""
-"�������� ���� �� ��������� ����� ��������� ������ �� �������� ���� ��� \n"
-"��������.\n"
-"\n"
-"\n"
-"��� ������������ ��� ������ ��� ��������� ���� �� ��� ��� �����, \n"
-"�� ���������� ��� ��������� �������� ��� �� ������ ��� ���� ���.\n"
-"\n"
-"\n"
-"�������� ���� �� ���� ��� ��������� �� ��������������� ��� ������� ��� \n"
-"�����������. ��� �� ������ �� ���������� ��������� ��� ��� ����������, \n"
-"����� ��������� ��������� ����������� ��������� ��������� ��� �������� \n"
-"�� �����������.\n"
-"������, �������� ���� ��� ��������� ��� ���������� ����������."
-
-#: ../../help.pm_.c:492
-msgid ""
-"You can configure a local printer (connected to your computer) or remote\n"
-"printer (accessible via a Unix, Netware or Microsoft Windows network)."
-msgstr ""
-"�������� �� ������� ���� ������ �������� (����������� ���� ���������� ���) \n"
-"� ���� ��������������� (���������� ���� UNIX �������, Netware � ������� \n"
-"Microsoft Windows)."
-
-#: ../../help.pm_.c:496
-msgid ""
-"If you wish to be able to print, please choose one printing system between\n"
-"CUPS and LPR.\n"
-"\n"
-"\n"
-"CUPS is a new, powerful and flexible printing system for Unix systems (CUPS\n"
-"means \"Common Unix Printing System\"). It is the default printing system "
-"in\n"
-"Linux-Mandrake.\n"
-"\n"
 "\n"
-"LPR is the old printing system used in previous Linux-Mandrake "
-"distributions.\n"
-"\n"
-"\n"
-"If you don't have printer, click on \"None\"."
-msgstr ""
-"��� ������ �� ����������, �������� ��� ��� �� ��� ��������� ��������� \n"
-"(CUPS ��� LPR.\n"
-"\n"
-"\n"
-"�� CUPS ����� ��� ���, ������ ��� �������� ������� ��������� ��� UNIX \n"
-"���������. ���� ����� � ������ ������� ��� �� Linux-Mandrake.\n"
-"\n"
-"\n"
-"�� LPR ����� �� ����� �������� ������� ���������.\n"
-"\n"
-"��� ��� ����� ��������, �������� \"������\"."
-
-#: ../../help.pm_.c:511
-msgid ""
-"GNU/Linux can deal with many types of printer. Each of these types requires\n"
-"a different setup.\n"
-"\n"
-"\n"
-"If your printer is physically connected to your computer, select \"Local\n"
-"printer\".\n"
-"\n"
-"\n"
-"If you want to access a printer located on a remote Unix machine, select\n"
-"\"Remote printer\".\n"
-"\n"
-"\n"
-"If you want to access a printer located on a remote Microsoft Windows "
-"machine\n"
-"(or on Unix machine using SMB protocol), select \"SMB/Windows 95/98/NT\"."
-msgstr ""
-"�� GNU/Linux ������ �� ����������� �� ��������� ������ ���������. � ������� "
-"���\n"
-"������ ���������� ������������ ���������.\n"
-"\n"
-"��� � ��������� ��� ����� ������������ ��� ������� ���, �������� \"�������\n"
-"���������\".\n"
-"\n"
-"��� ������ �� ���������� �� ���� �������� ������������ �� ��������������� "
-"UNIX\n"
-"�������, �������� \"���������������� ���������\".\n"
-"\n"
-"\n"
-"��� ������ �� ���������� �� ���� �������� ������������ �� ��������������� "
-"Windows\n"
-"������� (� UNIX �� SMB ����������), �������� \"SMB/Windows 95/98/NT\"."
-
-#: ../../help.pm_.c:527
-msgid ""
-"Please turn on your printer before continuing to let DrakX detect it.\n"
-"\n"
-"You have to enter some informations here.\n"
-"\n"
-"\n"
-"   * Name of printer: the print spooler uses \"lp\" as default printer name. "
-"So, you must have a printer named \"lp\".\n"
-"     If you have only one printer, you can use several names for it. You "
-"just need to separate them by a pipe\n"
-"     character (a \"|\"). So, if you prefer a more meaningful name, you have "
-"to put it first, eg: \"My printer|lp\".\n"
-"     The printer having \"lp\" in its name(s) will be the default printer.\n"
-"\n"
-"\n"
-"   * Description: this is optional but can be useful if several printers are "
-"connected to your computer or if you allow\n"
-"     other computers to access to this printer.\n"
-"\n"
-"\n"
-"   * Location: if you want to put some information on your\n"
-"     printer location, put it here (you are free to write what\n"
-"     you want, for example \"2nd floor\").\n"
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
 
-#: ../../help.pm_.c:548
+#: ../../help.pm_.c:600
 msgid ""
-"You need to enter some informations here.\n"
-"\n"
-"\n"
-"   * Name of queue: the print spooler uses \"lp\" as default printer name. "
-"So, you need have a printer named \"lp\".\n"
-"    If you have only one printer, you can use several names for it. You just "
-"need to separate them by a pipe\n"
-"    character (a \"|\"). So, if you prefer to have a more meaningful name, "
-"you have to put it first, eg: \"My printer|lp\".\n"
-"    The printer having \"lp\" in its name(s) will be the default printer.\n"
-"\n"
-"  \n"
-"   * Spool directory: it is in this directory that printing jobs are stored. "
-"Keep the default choice\n"
-"     if you don't know what to use\n"
-"\n"
-"\n"
-"   * Printer Connection: If your printer is physically connected to your "
-"computer, select \"Local printer\".\n"
-"     If you want to access a printer located on a remote Unix machine, "
-"select \"Remote lpd printer\".\n"
-"\n"
-"\n"
-"     If you want to access a printer located on a remote Microsoft Windows "
-"machine (or on Unix machine using SMB\n"
-"     protocol), select \"SMB/Windows 95/98/NT\".\n"
-"\n"
-"\n"
-"     If you want to acces a printer located on NetWare network, select "
-"\"NetWare\".\n"
-msgstr ""
-
-#: ../../help.pm_.c:573
-msgid ""
-"Your printer has not been detected. Please enter the name of the device on\n"
-"which it is connected.\n"
-"\n"
-"\n"
-"For information, most printers are connected on the first parallel port. "
-"This\n"
-"one is called \"/dev/lp0\" under GNU/Linux and \"LPT1\" under Microsoft "
-"Windows."
-msgstr ""
-"��� ����������� ���������. �������� �������� �� ����� ��� �������� ����\n"
-" ����� ����� ������������.\n"
-"\n"
-"\n"
-"�� ������������ ��������� ���������� ���� ����� ��������� ����. ���� "
-"����������\n"
-"\"/dev/lp0\" ��� GNU/Linux ��� \"LPT1\" ��� Microsoft Windows."
-
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "�������� ��� �������� ��� ���� �������� ��������"
-
-#: ../../help.pm_.c:584
-msgid ""
-"Please select the right options according to your printer.\n"
-"Please see its documentation if you don't know what choose here.\n"
-"\n"
-"\n"
-"You will be able to test your configuration in next step and you will be "
-"able to modify it if it doesn't work as you want."
-msgstr ""
-"�������� �������� ��� ���������� ��������� ��� ��� �������� ���.\n"
-"�������� ��� ���������� ��� �������� ��� ��� ������ �� �� ���������.\n"
-"\n"
-"\n"
-"����� ��� ���������� �� �������� ��� �������� ��� ��� ������� ���� ��� ����� "
-"������������� �� ��� ����������� ���� �� ������."
-
-#: ../../help.pm_.c:591
-msgid ""
-"You can now enter the root password for your Linux-Mandrake system.\n"
-"The password must be entered twice to verify that both password entries are "
-"identical.\n"
-"\n"
-"\n"
-"Root is the system's administrator and is the only user allowed to modify "
-"the\n"
-"system configuration. Therefore, choose this password carefully. \n"
-"Unauthorized use of the root account can be extemely dangerous to the "
-"integrity\n"
-"of the system, its data and other system connected to it.\n"
-"\n"
-"\n"
-"The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. It should never be written down.\n"
+"LILO and GRUB are boot loaders for GNU/Linux. This stage, normally, is\n"
+"totally automated. In fact, DrakX analyzes the disk boot sector and acts\n"
+"accordingly, depending on what it finds here:\n"
 "\n"
+" * if Windows boot sector is found, it will replace it with a GRUB/LILO "
+"boot\n"
+"sector. Hence, you will be able to load either GNU/Linux or another OS;\n"
 "\n"
-"Do not make the password too long or complicated, though: you must be able "
-"to\n"
-"remember it without too much effort."
-msgstr ""
-"�������� ���� �� ������� �� ����-������ ��� ��� ������ \"root\".\n"
-"� ���� ������ �� �������� ��� ������� ��� �����������.\n"
+" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
+"one;\n"
 "\n"
+"If in doubt, DrakX will display a dialog with various options.\n"
 "\n"
-"� root ����� � ������������ ��� ���������� ��� � ����� ��� ���� \n"
-"�� �������� �� ������� ��� ��������� ��� ����������. �� ����, \n"
-"�������� ���������� ���� �� ���� ������! �� ��������������� \n"
-"�������� ��� root ������ �� ��������������� ���������� ��� \n"
-"��� ����������� ��� ���������� ��� ��� ��������� ���, ����� \n"
-"��� ��� ���� ��������� ����������� �� ����. \n"
+" * \"Boot loader to use\": you have three choices:\n"
 "\n"
+"    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
+"interface.\n"
 "\n"
-"� ���� ������ ������ �� ����� ��� ���� �������������� ���������� \n"
-"��� �� ����� ����������� ���� (8) ����������. ��� ������ *����* \n"
-"�� �� ������� �� �����."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"��� ���������� ��������, ������ �� ��������� \"����� ������� shadow\" ���\n"
-"\"����� ������������ MD5\"."
-
-#: ../../help.pm_.c:613
-msgid ""
-"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
-"network administrator."
-msgstr ""
-"��� �� ������ ��� ������������ NIS, �������� \"����� NIS\". ��� ���\n"
-"����� ��������, �������������� ��� �������� �������."
-
-#: ../../help.pm_.c:617
-msgid ""
-"You may now create one or more \"regular\" user account(s), as\n"
-"opposed to the \"privileged\" user account, root. You can create\n"
-"one or more account(s) for each person you want to allow to use\n"
-"the computer. Note that each user account will have its own\n"
-"preferences (graphical environment, program settings, etc.)\n"
-"and its own \"home directory\", in which these preferences are\n"
-"stored.\n"
-"\n"
+"    * \"GRUB\": if you prefer GRUB (text menu).\n"
 "\n"
-"First of all, create an account for yourself! Even if you will be the only "
-"user\n"
-"of the machine, you may NOT connect as root for daily use of the system: "
-"it's a\n"
-"very high security risk. Making the system unusable is very often a typo "
-"away.\n"
+"    * \"LILO with text menu\": if you prefer LILO with its text menu "
+"interface.\n"
 "\n"
+" * \"Boot device\": in most cases, you will not change the default\n"
+"(\"/dev/hda\"), but if you prefer, the boot loader can be installed on the\n"
+"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\").\n"
 "\n"
-"Therefore, you should connect to the system using the user account\n"
-"you will have created here, and login as root only for administration\n"
-"and maintenance purposes."
-msgstr ""
-"�������� ���� �� ������������� ���� � ������������� \"������\" �������,\n"
-"(�� �������� �� ��� \"���������������\" ������, root). �������� �� \n"
-"������������� ���� � ������������� ������� ��� ���� ������� ��� ������\n"
-"�� ���� �������� ��� ������� ���. ��������� ��� ���� ������� ���� ���\n"
-"����� ��� ��������� (������� ����������, ��������� ��������� ���),\n"
-"����� ��� �� ���� ��� \"home directory\", ��� ����� �������������\n"
-"����� �� ���������.\n"
+" * \"Delay before booting the default image\": when rebooting the computer,\n"
+"this is the delay granted to the user to choose - in the boot loader menu,\n"
+"another boot entry than the default one.\n"
 "\n"
+"!! Beware that if you choose not to install a boot loader (by selecting\n"
+"\"Cancel\" here), you must ensure that you have a way to boot your Mandrake\n"
+"Linux system! Also be sure you know what you do before changing any of the\n"
+"options. !!\n"
 "\n"
-"���' �����, ������������ ���� ������ ��� ��� ����� ���! ����� ��� ���\n"
-"����� � ��������� ������� ��� ����������, ��� ������ �� ��������������\n"
-"�� root ��� ��� ���������� ����� ��� ����������, ����� ���� �� \n"
-"������������ ���������. ��� ���� ����� �������������� ����� ������\n"
-"��� �� ����������� ��� ����������� ��� ���� ��������� �� root.\n"
+"Clicking the \"Advanced\" button in this dialog will offer many advanced\n"
+"options, which are reserved to the expert user.\n"
 "\n"
+"Mandrake Linux installs its own boot loader, which will let you boot either\n"
+"GNU/Linux or any other operating systems which you have on your system.\n"
 "\n"
-"�� ����, �� ������ �� ��������� ��� ������� ��� ��������������� ����\n"
-"������ ����� ������ ��� �� ��������� �� root ���� ��� �������� ���������\n"
-"��� ���������� ��� ����������."
-
-#: ../../help.pm_.c:636
-msgid ""
-"Creating a boot disk is strongly recommended. If you can't\n"
-"boot your computer, it's the only way to rescue your system without\n"
-"reinstalling it."
+"If there is another operating system installed on your machine, it will be\n"
+"automatically added to the boot menu. Here, you can choose to fine-tune the\n"
+"existing options. Double-clicking on an existing entry allows you to change\n"
+"its parameters or remove it; \"Add\" creates a new entry; and \"Done\" goes\n"
+"on to the next installation step."
 msgstr ""
-"���������� �� ������������� ���� ����� ���������. ��� ��� \n"
-"�������� �� ���������� ��� ���������� ���, ����� � ����� ������ \n"
-"�� ��������� �� ������� ��� ����� ���������������."
 
-#: ../../help.pm_.c:641
-msgid ""
-"You need to indicate where you wish\n"
-"to place the information required to boot to GNU/Linux.\n"
-"\n"
-"\n"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"������ �� ������������� ��� ������ �� ������������� �� \n"
-"����������� ��� ����� ����������� ��� ��� �������� ��� \n"
-"GNU/Linux.\n"
-"\n"
-"\n"
-"����� ��� �� ������ ���� ���� �� ������, �������� \"������ ������\n"
-"��� ������ (MBR)\"."
-
-#: ../../help.pm_.c:649
-msgid ""
-"Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
-" (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
-msgstr ""
-"����� ��� �� ����� �������� ��� ��� ����� ����, � ����������� �������\n"
-"����� \"/dev/hda\" (� ������ ������ ��� ����� ������), � \"/dev/sda\n"
-"(� ������ SCSI ������)."
-
-#: ../../help.pm_.c:653
+#: ../../help.pm_.c:647
+#, fuzzy
 msgid ""
-"LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
+"LILO (the LInux LOader) and GRUB are boot loaders: they are able to boot\n"
 "either GNU/Linux or any other operating system present on your computer.\n"
 "Normally, these other operating systems are correctly detected and\n"
 "installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
+"screen. Be careful to choose the correct parameters.\n"
 "\n"
-"\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
+"You may also not want to give access to these other operating systems to\n"
+"anyone. In which case, you can delete the corresponding entries. But then,\n"
+"you will need a boot disk in order to boot those other operating systems!"
 msgstr ""
 "�� LILO ��� �� Grub ����� ����������� ���������: ������� �� ���������� \n"
 "�� GNU/Linux � ����������� ���� ����������� ������� ��� ������� ���. "
@@ -3392,116 +3120,160 @@ msgstr ""
 "�������� ���������\n"
 "��� �� �� ���������������!"
 
-#: ../../help.pm_.c:665
+#: ../../help.pm_.c:658
 #, fuzzy
 msgid ""
-"LILO and grub main options are:\n"
-"  - Boot device: Sets the name of the device (e.g. a hard disk\n"
-"partition) that contains the boot sector. Unless you know specifically\n"
-"otherwise, choose \"/dev/hda\".\n"
-"\n"
-"\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero.\n"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\n"
 "\n"
-"\n"
-"  - Video mode: This specifies the VGA text mode that should be selected\n"
-"when booting. The following values are available: \n"
-"\n"
-"    * normal: select normal 80x25 text mode.\n"
-"\n"
-"    * <number>:  use the corresponding text mode.\n"
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
+msgstr ""
+"������ �� ������������� ��� ������ �� ������������� �� \n"
+"����������� ��� ����� ����������� ��� ��� �������� ��� \n"
+"GNU/Linux.\n"
 "\n"
 "\n"
-"  - Clean \"/tmp\" at each boot: if you want delete all files and "
-"directories\n"
-"stored in \"/tmp\" when you boot your system, select this option.\n"
+"����� ��� �� ������ ���� ���� �� ������, �������� \"������ ������\n"
+"��� ������ (MBR)\"."
+
+#: ../../help.pm_.c:665
+msgid ""
+"Here we select a printing system for your computer to use. Other OSes may\n"
+"offer you one, but Mandrake offers three.\n"
 "\n"
+" * \"pdq\" - which means ``print, don't queue'', is the choice if you have "
+"a\n"
+"direct connection to your printer and you want to be able to panic out of\n"
+"printer jams, and you do not have any networked printers. It will handle\n"
+"only very simple network cases and is somewhat slow for networks. Pick\n"
+"\"pdq\" if this is your maiden voyage to GNU/Linux. You can change your\n"
+"choices after install by running PrinterDrake from the Mandrake Control\n"
+"Center and clicking the expert button.\n"
+"\n"
+" * \"CUPS\" - ``Common Unix Printing System'' is excellent at printing to\n"
+"your local printer and also halfway round the planet. It is simple and can\n"
+"act like a server or a client for the ancient \"lpd\" printing system, so\n"
+"it is compatible with the systems that went before. It can do many tricks,\n"
+"but the basic setup is almost as easy as \"pdq\". If you need this to\n"
+"emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
+"graphical front-ends for printing or choosing printer options.\n"
+"\n"
+" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
+"approximately the same things the others can do, but it will print to\n"
+"printers mounted on a Novell Network, because it supports IPX protocol, and\n"
+"it can print directly to shell commands. If you have need of Novell or\n"
+"printing to commands without using a separate pipe construct, use lprNG.\n"
+"Otherwise, CUPS is preferable as it is simpler and better at working over\n"
+"networks."
+msgstr ""
+
+#: ../../help.pm_.c:693
+#, fuzzy
+msgid ""
+"DrakX is now detecting any IDE devices present in your computer. It will\n"
+"also scan for one or more PCI SCSI card(s) on your system. If a SCSI card\n"
+"is found DrakX will automatically install the appropriate driver.\n"
+"\n"
+"Because hardware detection will sometimes not detect a piece of hardware\n"
+"DrakX will ask you to confirm if a PCI SCSI card is present. Click \"Yes\"\n"
+"if you know that there is a SCSI card installed in your machine. You will\n"
+"be presented a list of SCSI cards to choose from. Click \"No\" if you have\n"
+"no SCSI hardware. If you are unsure you can check the list of hardware\n"
+"detected in your machine by selecting \"See hardware info\" and clicking\n"
+"\"OK\". Examine the list of hardware and then click on the \"OK\" button to\n"
+"return to the SCSI interface question.\n"
 "\n"
-"  - Precise RAM if needed: unfortunately, there is no standard method to ask "
-"the\n"
-"BIOS about the amount of RAM present in your computer. As consequence, Linux "
-"may\n"
-"fail to detect your amount of RAM correctly. If this is the case, you can\n"
-"specify the correct amount or RAM here. Please note that a difference of 2 "
-"or 4\n"
-"MB between detected memory and memory present in your system is normal."
+"If you have to manually specify your adapter, DrakX will ask if you want to\n"
+"specify options for it. You should allow DrakX to probe the hardware for\n"
+"the card-specific options that the hardware needs to initialize. This\n"
+"usually works well.\n"
+"\n"
+"If DrakX is not able to probe for the options that need to be passed, you\n"
+"will need to manually provide options to the driver. Please review the\n"
+"``User Guide'' (chapter 3, section \"Collecting information on your\n"
+"hardware\") for hints on retrieving the parameters required from hardware\n"
+"documentation, from the manufacturer's web site (if you have Internet\n"
+"access) or from Microsoft Windows (if you used this hardware with Windows\n"
+"on your system)."
 msgstr ""
-"�� ������ �������� ��� LILO ��� ��� grub �����:\n"
-"  - ������� ���������: ������ �� ����� ��� �������� (�.�. ��� \n"
-"���������) ��� �������� ��� ����� ���������. ����� ��� �� �����\n"
-"�������� ��� ����� ������, �������� \"/dev/hda\".\n"
+"�� DrakX �� ����������� �� ��������� ������������ SCSI ����� PCI.\n"
+"��� �� DrakX ��������� ���� ����������� ��� ����� ��� �� ��� "
+"��������������,\n"
+"�� ������������ �������� ��� ��������� �����\n"
 "\n"
 "\n"
-"  - ����������� ���� ��� ��������: ������ �� ������ ��� �������������\n"
-"��� �� ������� �� ��������� ���� ��������� �� ����� �����������.\n"
-"���� ����� ������� ������� �� ��������� ��� �������� ��� ��� �����\n"
-"������ ���� ��� ������������ ��� �������������. ��� ������� �����������\n"
-"��� � ������� ����������� � ����� �����.\n"
+"��� ����� ����������� SCSI ����� ISA, ������� �� ������������ PCI "
+"����������� \n"
+"� ��� ����� ������� ����������� SCSI, �� DrakX �� ��� ������� ��� ����� "
+"������� \n"
+"����������� SCSI ��� ������� ���. ��� ��� �����, ������� ����� '���'. ��� "
+"��������\n"
+"'���', �� ��� ������� �� ��������� ��� ���� ��� ��� ���� ��������.\n"
 "\n"
 "\n"
-"  - ������� ������: ���� ������ ��� VGA ������� �������� ��� �� ��������\n"
-"���� ��� ��������. �������� �� �������� ��������: \n"
+"��� ��������� �����������, �� DrakX �� ��� ������� ��� ������ �� ������� "
+"��������.\n"
+"�������, ��������� �� DrakX �� �������� �������� ��� �����������, ��� �� "
+"����� ��������.\n"
 "\n"
-"    * normal: �������� ������� �������� 80�25.\n"
 "\n"
-"    * <�������>: ����� ��� ����������� �������� ��������."
+"�� �������� ���������, �� ������ �� ������ �������� ��� ��� �����. \n"
+"�������������� ��� ����� ������������ ��� �� ��� �� ������ ����� ��� \n"
+"����������� ��� ��� ����������� ��� Windows (�� �������), ��� ��� "
+"����������\n"
+"��� ������ � ��� ��� ���������� ��� ������������ (�� ����� �������� ��� "
+"Internet)."
 
-#: ../../help.pm_.c:697
+#: ../../help.pm_.c:720
+#, fuzzy
 msgid ""
-"Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able\n"
-"to boot either GNU/Linux, MacOS, or MacOSX, if present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
+"You can add additional entries for yaboot, either for other operating\n"
+"systems, alternate kernels, or for an emergency boot image.\n"
 "\n"
+"For other OS's, the entry consists only of a label and the root partition.\n"
 "\n"
-"Yaboot main options are:\n"
+"For Linux, there are a few possible options:\n"
 "\n"
+" * Label: this is simply the name you will have to type at the yaboot "
+"prompt\n"
+"to select this boot option.\n"
 "\n"
-"  - Init Message: A simple text message that is displayed before the boot\n"
-"prompt.\n"
+" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
+"or a variation of vmlinux with an extension.\n"
 "\n"
+" * Root: the \"root\" device or \"/\" for your Linux installation.\n"
 "\n"
-"  - Boot Device: Indicate where you want to place the information required "
-"to \n"
-"boot to GNU/Linux. Generally, you will have setup a bootstrap partition "
-"earlier \n"
-"to hold this information.\n"
+" * Append: on Apple hardware, the kernel append option is used quite often\n"
+"to assist in initializing video hardware, or to enable keyboard mouse\n"
+"button emulation for the often lacking 2nd and 3rd mouse buttons on a stock\n"
+"Apple mouse. The following are some examples:\n"
 "\n"
+"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"hda=autotune\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"
-"\n"
-"  - Kernel Boot Timeout: This timeout is similar to the LILO boot delay.  "
-"After \n"
-"selecting Linux, you will have this delay in 0.1 seconds before your "
-"default\n"
-"kernel description is selected.\n"
-"\n"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-"  - Enable CD Boot?: Checking this option will allow you to choose 'C' for "
-"CD at\n"
-"the first boot prompt.\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 4,096 bytes. If you\n"
+"need to allocate a large ramdisk, this option can be used.\n"
 "\n"
-"  - Enable OF Boot?: Checking this option will allow you to choose 'N' for "
-"Open\n"
-"Firmware at the first boot prompt.\n"
+" * Read-write: normally the \"root\" partition is initially brought up in\n"
+"read-only, to allow a file system check before the system becomes \"live\".\n"
+"Here, you can override 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 OS: You can select which OS will boot by default when the Open "
-"Firmware \n"
-"Delay expires."
+" * Default: selects this entry as being the default Linux selection,\n"
+"selectable by just pressing ENTER at the yaboot prompt. This entry will\n"
+"also be highlighted with a \"*\", if you press [Tab] to see the boot\n"
+"selections."
 msgstr ""
-
-#: ../../help.pm_.c:738
-msgid ""
 "You can add additional entries for yaboot, either for other operating "
 "systems,\n"
 "alternate kernels, or for an emergency boot image.\n"
@@ -3536,10 +3308,10 @@ msgid ""
 "are some examples:\n"
 "\n"
 "\n"
-"\t\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
 "hda=autotune\n"
 "\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
+"\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
 "\n"
 "\n"
 " \n"
@@ -3571,208 +3343,161 @@ msgid ""
 "pressing ENTER at the yaboot prompt.  This entry will also be highlighted "
 "with a '*', if you\n"
 "press TAB to see the boot selections."
-msgstr ""
 
-#: ../../help.pm_.c:793
+#: ../../help.pm_.c:765
+#, fuzzy
 msgid ""
-"SILO is a bootloader for SPARC: it is able to boot\n"
-"either GNU/Linux or any other operating system present on your computer.\n"
+"Yaboot is a boot loader for NewWorld MacIntosh hardware. It is able to boot\n"
+"either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
+"these other operating systems are correctly detected and installed. If this\n"
+"is not the case, you can add an entry by hand in this screen. Be careful as\n"
+"to choose the correct parameters.\n"
+"\n"
+"Yaboot's main options are:\n"
+"\n"
+" * Init Message: a simple text message that is displayed before the boot\n"
+"prompt.\n"
+"\n"
+" * Boot Device: indicate where you want to place the information required "
+"to\n"
+"boot to GNU/Linux. Generally, you setup a bootstrap partition earlier to\n"
+"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 before your\n"
+"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 "
+"Open\n"
+"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 is a bootloader for NewWorld MacIntosh hardware. It is able\n"
+"to boot either GNU/Linux, MacOS, or MacOSX, if present on your computer.\n"
 "Normally, these other operating systems are correctly detected and\n"
 "installed. If this is not the case, you can add an entry by hand in this\n"
 "screen. Be careful as to choose the correct parameters.\n"
 "\n"
 "\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
-msgstr ""
-"�� SILO ����� ��������� ��������� ��� SPARC: ������ �� ��������� \n"
-"�� GNU/Linux � ����������� ���� ����������� ������� ��� ������� ���. "
-"��������, \n"
-"�� �������� ����������� ��������������� ��� ����������� �����. ��� ���� "
-"��� \n"
-"������, �������� �� ���������� �������� �������� �� ����� ��� �����. \n"
-"�������� �� ��������� ��� ������ �����������.\n"
+"Yaboot main options are:\n"
 "\n"
-"�������� ������ �� ����������� ��� �������� �� ���� ����������� ��������� "
-"����������\n"
-"��� ����������� ��������. �� ����� ���� ��� ���������, �� ����������� "
-"�������� ���������\n"
-"��� �� �� ���������������!"
-
-#: ../../help.pm_.c:805
-msgid ""
-"SILO main options are:\n"
-"  - Bootloader installation: Indicate where you want to place the\n"
-"information required to boot to GNU/Linux. Unless you know exactly\n"
-"what you are doing, choose \"First sector of drive (MBR)\".\n"
 "\n"
+"  - Init Message: A simple text message that is displayed before the boot\n"
+"prompt.\n"
 "\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero."
-msgstr ""
-"�� ������ �������� ��� SILO �����:\n"
-"  - ����������� bootloader: ������ �� ��� ������ �� ������������� �� "
-"�����������\n"
-"��� ��� �������� ��� GNU/Linux �����������. ����� �� �� ������ �� ������� "
-"������,\n"
-"�������� \"������ ������ ��� ������ (MBR)\".\n"
 "\n"
+"  - Boot Device: Indicate where you want to place the information required "
+"to \n"
+"boot to GNU/Linux. Generally, you will have setup a bootstrap partition "
+"earlier \n"
+"to hold this information.\n"
 "\n"
-"  - ����������� ���� ��� ��������: ������ �� ������ ��� �������������\n"
-"��� �� ������� �� ��������� ���� ��������� �� ����� �����������.\n"
-"���� ����� ������� ������� �� ��������� ��� �������� ��� ��� �����\n"
-"������ ���� ��� ������������ ��� �������������. ��� ������� �����������\n"
-"��� � ������� ����������� � ����� �����."
-
-#: ../../help.pm_.c:818
-msgid ""
-"Now it's time to configure the X Window System, which is the\n"
-"core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
-"you must configure your video card and monitor. Most of these\n"
-"steps are automated, though, therefore your work may only consist\n"
-"of verifying what has been done and accept the settings :)\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"
-"When the configuration is over, X will be started (unless you\n"
-"ask DrakX not to) so that you can check and see if the\n"
-"settings suit you. If they don't, you can come back and\n"
-"change them, as many times as necessary."
-msgstr ""
-"���� ������ �� ��������� �� X Window System, �� ����� ����� � \n"
-"������� ��� �������� ������������� (GUI) ��� GNU/Linux. ������ ��\n"
-"��������� ��� ����� �������� ��� ��� ����� ���. �� ����������\n"
-"����� ��� ����������� ����� ����������������, ����� � �������\n"
-"��� ���������� ���� ����������� ��� ������� ��� ��������� \n"
-"��������� :)\n"
 "\n"
+"  - Kernel Boot Timeout: This timeout is similar to the LILO boot delay.  "
+"After \n"
+"selecting Linux, you will have this delay in 0.1 seconds before your "
+"default\n"
+"kernel description is selected.\n"
 "\n"
-"���� ����������� � ���������� ��������, �� ��������� ��\n"
-"X Window ������� (����� ��� ����� ����������� ������), ���\n"
-"�� �������� ��� �� ��������� ��� �����������. ��� ���, \n"
-"�������� �� ����������� ��� ��� �� ����������� ��� ���������\n"
-"���� ����� ���������."
-
-#: ../../help.pm_.c:831
-msgid ""
-"If something is wrong in X configuration, use these options to correctly\n"
-"configure the X Window System."
-msgstr ""
-"��� ���� ��� ���� ���� �� ��� ��������� ��� �, ��������������� ����� ���\n"
-"�������� ��� �� ��������� ����� �� ������� ���������� (X Window System)."
+"\n"
+"  - Enable CD Boot?: Checking this option will allow you to choose 'C' for "
+"CD at\n"
+"the first boot prompt.\n"
+"\n"
+"\n"
+"  - Enable OF Boot?: Checking this option will allow you to choose 'N' for "
+"Open\n"
+"Firmware at the first boot prompt.\n"
+"\n"
+"\n"
+"  - Default OS: You can select which OS will boot by default when the Open "
+"Firmware \n"
+"Delay expires."
 
-#: ../../help.pm_.c:835
+#: ../../help.pm_.c:798
 msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
+"Here are presented various parameters concerning your machine. Depending on\n"
+"your installed hardware, you may - or not, see the following entries:\n"
+"\n"
+" * \"Mouse\": mouse check the current mouse configuration and click on the\n"
+"button to change it if necessary.\n"
+"\n"
+" * \"Keyboard\": keyboard check the current keyboard map configuration and\n"
+"click on the button to change that if necessary.\n"
+"\n"
+" * \"Timezone\": time zoneDrakX, by default, guesses your time zone from "
+"the\n"
+"language you have chosen. But here again, as for the choice of a keyboard,\n"
+"you may not be in the country for which the chosen language should\n"
+"correspond. Hence, you may need to click on the \"Timezone\" button in\n"
+"order to configure the clock according to the time zone you are in.\n"
+"\n"
+" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
+"configuration wizard.\n"
+"\n"
+" * \"Sound card\": if a sound card is detected on your system, it is\n"
+"displayed here. No modification possible at installation time.\n"
+"\n"
+" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
+"here. No modification possible at installation time.\n"
+"\n"
+" * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
+"displayed here. You can click on the button to change the parameters\n"
+"associated to it."
 msgstr ""
-"��� ��������� �������� �� ������� ���������� �������� \"���\". ������, \n"
-"�������� \"���\"."
 
-#: ../../help.pm_.c:839
+#: ../../help.pm_.c:827
+#, fuzzy
 msgid ""
-"You can choose a security level for your system. Please refer to the manual "
-"for complete\n"
-"  information. Basically, if you don't know what to choose, keep the default "
-"option.\n"
+"Choose the hard drive you want to erase to install your new Mandrake Linux\n"
+"partition. Be careful, all data present on it will be lost and will not be\n"
+"recoverable!"
 msgstr ""
+"�������� ��� ����� ��� ������ �� ���������� ��� �� ������������� \n"
+"��� ��� ��������� Mandrake Linux. �������: ��� �� �������� �� ����������\n"
+"��� �� ����� ������� � ��������� ����."
 
-#: ../../help.pm_.c:844
+#: ../../help.pm_.c:832
+#, fuzzy
 msgid ""
-"Your system is going to reboot.\n"
+"Click on \"OK\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
 "\n"
-"After rebooting, your new Linux Mandrake system will load automatically.\n"
-"If you want to boot into another existing operating system, please read\n"
-"the additional instructions."
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
-"�� ������� ��� �� �������������.\n"
+"������� \"OK\" ��� ������ �� ���������� ��� �� �������� ��� ��� \n"
+"����������� �� ����� ��� �����. �������, ���� ��� ���� ��� �� �������� \n"
+"�� ����������� ����������� �������� ��� ���������� ���� �� ������ ���� \n"
+"�����, ������������������� ��� ������������ ��������� ��� �� Windows.\n"
 "\n"
-"���� ��� ������������, �� ��� ��� Linux Mandrake ������� �� ���������\n"
-"��������. ��� ������ �� ���������� ��� ���� ������� �����������, ��������\n"
-"�������� ��� �������� �������."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "�������� ������"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "�������� �����������"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "���������� ������� ������"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "������� ���������"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "�������� ������������"
-
-#: ../../install2.pm_.c:42
-#, fuzzy
-msgid "Security"
-msgstr "�������"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "�����. ���. ���."
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "������. ��������."
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "������� �������"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "����������� ����������"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "����������� root"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "�������� ������"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "������� �������"
+"\n"
+"������� \"�������\" ��� �� ��������� ����� ��� ���������� ����� �� ������ \n"
+"�������� ��� ����������� ��� ���������� ���� �����."
 
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
+#: ../../install2.pm_.c:114
+#, c-format
+msgid ""
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
 
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "������� ���������"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "������� ���������"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "���. ��. ���������"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "������� �"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "������"
-
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3786,50 +3511,53 @@ msgid ""
 "\n"
 "Do you really want to install these servers?\n"
 msgstr ""
+"����� �������� ���� �������� ������������: %s\n"
+"\n"
+"\n"
+"����� �� ������������ ��������������� ��' �������. ��� ����� ������ ������ "
+"����������\n"
+"���������, ���� ������ �� ������� ������ ���������. �� ����� ��� ���������, "
+"������ �� ������������\n"
+"�� ����������� �������.\n"
+"\n"
+"\n"
+"������ �� ������������� ������ ���� ������������;\n"
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
 msgstr "��� ����� �� ������������� broadcast ����� NIS domain"
 
-#: ../../install_any.pm_.c:676
-#, fuzzy, c-format
+#: ../../install_any.pm_.c:793
+#, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
-msgstr "�������� �������� ���� ����� %s"
+msgstr "�������� ��� FAT ������������� �������� ���� ����� %s"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
-msgstr ""
+msgstr "���� � �������� ��� ����� ������������� FAT"
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 msgstr ""
+"��� �� ��������������� ����� ��� ������������ ������� �������, ��������� ��� "
+"����������� �� ``linux defcfg=floppy''"
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "������ ���� ��� �������� ��� ������� $f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "������ ���� ��� �������� ��� ������� %s"
 
-#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:310
-#: ../../interactive.pm_.c:99 ../../interactive.pm_.c:114
-#: ../../interactive.pm_.c:269 ../../interactive_newt.pm_.c:166
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:356
-#: ../../my_gtk.pm_.c:617 ../../my_gtk.pm_.c:640
+#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:325
+#: ../../interactive.pm_.c:107 ../../interactive.pm_.c:122
+#: ../../interactive.pm_.c:286 ../../interactive.pm_.c:308
+#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:170
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:415
+#: ../../my_gtk.pm_.c:716 ../../my_gtk.pm_.c:738
 msgid "Ok"
 msgstr "��"
 
-#: ../../install_gtk.pm_.c:423
-msgid "Please test the mouse"
-msgstr "�������� ��������� �� �������"
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "��� ������������ ���������"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "������� �� ������!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -3840,7 +3568,7 @@ msgstr ""
 "������������.\n"
 "�������� �� ������ �������� ����������� ���: %s"
 
-#: ../../install_interactive.pm_.c:41
+#: ../../install_interactive.pm_.c:44
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -3850,11 +3578,11 @@ msgstr ""
 "����o������� � �������� ��� ���������.\n"
 "���� ������ �� ������ �������� �� `/'"
 
-#: ../../install_interactive.pm_.c:46 ../../install_steps_graphical.pm_.c:259
+#: ../../install_interactive.pm_.c:49 ../../install_steps_graphical.pm_.c:259
 msgid "You must have a swap partition"
 msgstr "������ �� ����� ��� ��������� swap"
 
-#: ../../install_interactive.pm_.c:47 ../../install_steps_graphical.pm_.c:261
+#: ../../install_interactive.pm_.c:50 ../../install_steps_graphical.pm_.c:261
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -3864,55 +3592,59 @@ msgstr ""
 "\n"
 "�� ��������;"
 
-#: ../../install_interactive.pm_.c:68
+#: ../../install_interactive.pm_.c:53 ../../install_steps.pm_.c:165
+msgid "You must have a FAT partition mounted in /boot/efi"
+msgstr "������ �� ����� ��� ��������� FAT mounted ��� /boot/efi"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "����� ��������� �����"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "��� ������� ������� ��������� ����� ��� ���������� ���� �����������"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "����� ���������� �����������"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "��� �������� ����������� ���� �����"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "����� ���������� Windows ��� loopback"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "���� ��������� ������ �� ��������������� ��� �� Linux4Win;"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "�������� �� ������"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "������� ������� ���������� ���������� �� MB:"
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "������� ���������� swap �� MB"
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "����� ��� ��������� ����� ���� ��������� ��� Windows"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "�� �� ���� ���������� ������ �� �������� �������;"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "����������� ����� ���������� ������� Windows"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -3921,13 +3653,13 @@ msgstr ""
 "��� ����� �� ������ ������� ���� ��������� FAT, \n"
 "���������� �� �������� �����: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "� ��������� ��� Windows ����� ���� ����������������, �������� ������ ����� "
 "�� ``defrag'' "
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -3946,21 +3678,21 @@ msgstr ""
 "���� �� ������ �� ��������� ��������� ��������� ��� ��������� ���.\n"
 "��� ����� ��������, ������� Ok."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "�� ���� ������ �� ��������� ��� �� windows ���"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "��������� %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "������ �������� FAT �������: %s"
 
-#: ../../install_interactive.pm_.c:145
+#: ../../install_interactive.pm_.c:154
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
@@ -3968,36 +3700,35 @@ msgstr ""
 "��� �������� FAT ����������� ��� ������ �������� � ��� ����� �� loopback (� "
 "��� ������� ������� �����)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "�������� ��������� ��� ������"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "�������� Windows(TM)"
 
-#: ../../install_interactive.pm_.c:154
+#: ../../install_interactive.pm_.c:163
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr ""
 "����� ������������� ��� ���� �������, �� ����� ������ �� ������������� �� "
 "Linux;"
 
-#: ../../install_interactive.pm_.c:157
+#: ../../install_interactive.pm_.c:166
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr ""
 "���� �� ���������� ����������� ��� �� �������� ���� ���� ����� %s �� ������"
 
-#: ../../install_interactive.pm_.c:165
-#, fuzzy
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
-msgstr "����� ���������� �����������"
+msgstr "�������������� ����������� ������"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "����� fdisk"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -4006,28 +3737,28 @@ msgstr ""
 "�������� ���� �� ����������� ��� ����� %s\n"
 "���� ����������, ��� �������� �� ������������ �������� `w'"
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
 msgstr "��� ����� ������ �������� ���� ���� ��������� ��� Windows"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
 msgstr "��� ����� �� ��� ������ ���� ��� �����������"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "�� DrakX ����� ��� �������� ������:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "� ��������� �������: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "�������� �������"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "������� ����������� �������."
 
@@ -4040,12 +3771,12 @@ msgstr ""
 "��� ������ � ��� ��� ���������� ��� ������������ (�� ����� �������� ��� "
 "Internet).��������� �� ����� ��� ������."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "����� ������ �������� %s"
 
-#: ../../install_steps.pm_.c:385
+#: ../../install_steps.pm_.c:384
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
@@ -4057,16 +3788,16 @@ msgstr ""
 "������� �� CD-ROM �� ��� ���� ������� ��������������� ��� ������ \"rpm -qpl "
 "Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "����� ������ ��� %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "��� ������� ���������� ������ ���������"
 
-#: ../../install_steps_auto_install.pm_.c:51
+#: ../../install_steps_auto_install.pm_.c:77
 #: ../../install_steps_stdio.pm_.c:23
 #, c-format
 msgid "Entering step `%s'\n"
@@ -4080,32 +3811,32 @@ msgstr "�������� �� ������� ��� ������ �� �������������"
 msgid "Total size: "
 msgstr "�������� �������: "
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:437
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:387
 #, c-format
 msgid "Version: %s\n"
 msgstr "������: %s\n"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:438
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:388
 #, c-format
 msgid "Size: %d KB\n"
 msgstr "�������: %d KB\n"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:337
-#: ../../install_steps_interactive.pm_.c:520
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:509
 msgid "Choose the packages you want to install"
 msgstr "�������� �� ������ ��� ������ �� �������������"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:340
+#: ../../install_steps_graphical.pm_.c:465 ../../interactive_gtk.pm_.c:571
 msgid "Info"
 msgstr "�����������"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:345
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:457
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Install"
 msgstr "�����������"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:558
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:497
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Installing"
 msgstr "�����������"
 
@@ -4113,7 +3844,7 @@ msgstr "�����������"
 msgid "Please wait, "
 msgstr "�������� ����������, "
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:570
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:510
 msgid "Time remaining "
 msgstr "���������� ������ "
 
@@ -4122,21 +3853,21 @@ msgid "Total time "
 msgstr "��������� ������ "
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "������������ ������������"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:618
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:558
 #, c-format
 msgid "Installing package %s"
 msgstr "����������� ������� %s"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
+#: ../../install_steps_gtk.pm_.c:646
 msgid "Go on anyway?"
 msgstr "�� ��������;"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
 msgid "There was an error ordering packages:"
 msgstr "���������� ������ ���� ��� ���������� ��� �������:"
 
@@ -4144,30 +3875,34 @@ msgstr "���������� ������ ���� ��� ���������� ��� �������:"
 msgid "Use existing configuration for X11?"
 msgstr "�� ������������� ��� ���������� ��������� ��� �� �11;"
 
-#: ../../install_steps_gtk.pm_.c:142
+#: ../../install_steps_gtk.pm_.c:148
 msgid ""
 "Your system is low on resource. You may have some problem installing\n"
-"Linux-Mandrake. If that occurs, you can try a text install instead. For "
+"Mandrake Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "�� ������� ��� ��� ���� �������� ������. ������ �� �������������� "
 "����������\n"
-"���� ����������� ��� Linux-Mandrake. ��� ������ ����, �������� �� ���������� "
+"���� ����������� ��� Mandrake Linux. ��� ������ ����, �������� �� ���������� "
 "����������� ��������.\n"
 "������� F1 ���� ��� �������� ��� CDROM, ���� ������ `text'."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "����� ������������"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "�������� �������� ��� �������� �����������"
 
-#: ../../install_steps_gtk.pm_.c:222
+#: ../../install_steps_gtk.pm_.c:228
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr "�� �������� ������� ��� ������ ��� ��������� ����� ������� %d MB.\n"
 
-#: ../../install_steps_gtk.pm_.c:224
+#: ../../install_steps_gtk.pm_.c:230
 #, c-format
 msgid ""
 "If you wish to install less than this size,\n"
@@ -4182,7 +3917,7 @@ msgstr ""
 "��� ������ ������� �� ������������ ���� �� ��� ��������� ������.\n"
 "��� ������� 100% �� ������������ ��� �� ���������� ������."
 
-#: ../../install_steps_gtk.pm_.c:229
+#: ../../install_steps_gtk.pm_.c:235
 #, c-format
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
@@ -4199,84 +3934,68 @@ msgstr ""
 "��� ������ ������� �� ������������ ���� �� ��� ��������� ������.\n"
 "��� ������� %d%% �� ������������ ��� ����������� �������."
 
-#: ../../install_steps_gtk.pm_.c:235
+#: ../../install_steps_gtk.pm_.c:241
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "�� ��������� �� ������ �������������� ������� ��� ������� ����."
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "������� ������� ���� �����������"
 
-#: ../../install_steps_gtk.pm_.c:285 ../../install_steps_interactive.pm_.c:599
+#: ../../install_steps_gtk.pm_.c:291 ../../install_steps_interactive.pm_.c:619
 msgid "Package Group Selection"
 msgstr "������� ������ �������"
 
-#: ../../install_steps_gtk.pm_.c:305 ../../install_steps_interactive.pm_.c:614
+#: ../../install_steps_gtk.pm_.c:320 ../../install_steps_interactive.pm_.c:634
 msgid "Individual package selection"
 msgstr "������� ���������� �������"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "�������� �������"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "�������� �������"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "�������� ������ �������� ��� �������� �����������"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "�������� �������: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "����� ������"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "�����: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "�������: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "�������� �������: %d / %d MB"
-
-#: ../../install_steps_gtk.pm_.c:467
+#: ../../install_steps_gtk.pm_.c:411
 msgid ""
 "You can't select this package as there is not enough space left to install it"
 msgstr ""
 "��� �������� �� ��������� ���� �� ������ ����� ��� ������� ������� �����"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "�� ������������� �� �������� ������"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "�� ���������� �� �������� ������ "
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "��� �������� �� ���������/������������ ���� �� ������"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "���� ����� ����������� ������, ��� ������ �� �����������"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
 msgstr "��� �������� �� ������������ ���� �� ������. ����� ��� �������������"
 
-#: ../../install_steps_gtk.pm_.c:507
+#: ../../install_steps_gtk.pm_.c:447
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -4284,25 +4003,40 @@ msgstr ""
 "���� �� ������ ������ �� ������������\n"
 "����� �������� ��� ������ �� �� ������������;"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "��� �������� �� ������������ ���� �� ������. ������ �� ������������"
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr "�������� ������� ����������� �������"
+
+#: ../../install_steps_gtk.pm_.c:460
+msgid "Load/Save on floppy"
+msgstr "�������/���������� �� ��������"
+
+#: ../../install_steps_gtk.pm_.c:461
+msgid "Updating package selection"
+msgstr "�������� ����������� �������"
+
+#: ../../install_steps_gtk.pm_.c:466
+msgid "Minimal install"
+msgstr "�������� �����������"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "��������"
 
-#: ../../install_steps_gtk.pm_.c:582
-#, fuzzy
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
-msgstr "������������ ������������"
+msgstr "�������� ����������, ������������ ������������"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d ������"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -4333,16 +4067,45 @@ msgid ""
 "respective authors and are protected by intellectual property and \n"
 "copyright laws applicable to software programs.\n"
 msgstr ""
+"\n"
+"�������������\n"
+"\n"
+"�������� �������� ���������� ���� ����� ��������. ��� ���������� �� \n"
+"����������� �������, ��� ��� ����������� �� ������������� �� ������� ���� "
+"CD. ������� \n"
+"'�������' ��� �� ���������� ��� ����������� ����� ���� �� ����.\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"
 
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Accept"
 msgstr "�������"
 
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Refuse"
 msgstr "������"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4356,7 +4119,7 @@ msgstr ""
 "�������� �������� �� Cd-Rom �� ����� \"%s\" ���� ����� ��� ��� ������� ��.\n"
 "��� ��� �� �����, ������� ������� ��� ������� ������������ ��� ���� �� CdRom."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "���������� ������ ���� ��� ����������� ��� �������:"
 
@@ -4364,36 +4127,21 @@ msgstr "���������� ������ ���� ��� ����������� ��� �������:"
 msgid "An error occurred"
 msgstr "���������� ������"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "�������� �������� ��� ������."
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr ""
-"�������� �� ��������� ��� ����� ������� ��� �� ����� ���������� ���� �� "
-"����� ��� ������������"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "���"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "����� ������"
 
-#: ../../install_steps_interactive.pm_.c:87
+#: ../../install_steps_interactive.pm_.c:72
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Linux-"
-"Mandrake distribution \n"
+"The operating system and the different components available in the Mandrake "
+"Linux 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 Linux-Mandrake distribution.\n"
+"system and the different components of the Mandrake Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4447,7 +4195,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 Linux-Mandrake sites  which are prohibited or restricted in some "
+"from one of Mandrake Linux 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"
@@ -4484,7 +4232,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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
 "MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -4503,105 +4251,218 @@ msgid ""
 "Paris - France.\n"
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 msgstr ""
+"��������\n"
+"\n"
+"The operating system and the different components available in the Mandrake "
+"Linux 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"
+"\n"
+"\n"
+"1. License Agreement\n"
+"\n"
+"Please read carefully this document. 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 "
+"occurance 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 Mandrake Linux 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\", \"Mandrake Linux\" 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"
 
-#: ../../install_steps_interactive.pm_.c:182
-#: ../../install_steps_interactive.pm_.c:822
+#: ../../install_steps_interactive.pm_.c:168
+#: ../../install_steps_interactive.pm_.c:871
 #: ../../standalone/keyboarddrake_.c:28
 msgid "Keyboard"
 msgstr "������������"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "�������� �������� ���������� �������������."
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
-msgstr ""
+msgstr "���� ����� � ������ ����� ��� ���������� �������������"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "����� ������������"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "�� ���� ������������ ���������;"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
 msgstr "�����������/����������"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
 msgstr "��������� ��� ����������� � ��� ����������;"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "�����������"
 
-#: ../../install_steps_interactive.pm_.c:215
-#: ../../install_steps_interactive.pm_.c:218
+#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:204
 msgid "Expert"
 msgstr "��� ��������"
 
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Update"
 msgstr "����������"
 
-#: ../../install_steps_interactive.pm_.c:238 ../../standalone/mousedrake_.c:41
+#: ../../install_steps_interactive.pm_.c:224 ../../standalone/mousedrake_.c:48
 msgid "Please, choose the type of your mouse."
 msgstr "�������� �������� ���� ���������."
 
-#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:57
+#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
 msgid "Mouse Port"
 msgstr "���� ���������"
 
-#: ../../install_steps_interactive.pm_.c:245 ../../standalone/mousedrake_.c:58
+#: ../../install_steps_interactive.pm_.c:231 ../../standalone/mousedrake_.c:65
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr ""
 "�������� �������� �������� ���� ���� ����� ����� ����������� �� ������� ���."
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
-msgstr ""
+msgstr "����������� ��������"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
-msgstr ""
+msgstr "����������� 2 ��������"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
-msgstr ""
+msgstr "����������� 3 ��������"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "������� ������ PCMCIA "
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "Configuring IDE"
 msgstr "������� IDE"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:295
+#: ../../install_steps_interactive.pm_.c:281
 msgid "no available partitions"
 msgstr "��� �������� ���������� �����������"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
 msgstr "������� ����������� ��� ������������ ������� ��������."
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "�������� ������ ��������"
 
-#: ../../install_steps_interactive.pm_.c:323
+#: ../../install_steps_interactive.pm_.c:311
 #, c-format
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
@@ -4618,7 +4479,7 @@ msgstr ""
 "\n"
 "���������� �� ���������� ���� �� �����������;\n"
 
-#: ../../install_steps_interactive.pm_.c:336
+#: ../../install_steps_interactive.pm_.c:324
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
@@ -4626,52 +4487,65 @@ msgstr ""
 "�� DiskDrake ������� �� �������� ����� ��� ������ �����������.\n"
 "��������� �� ���� ��� ������!"
 
-#: ../../install_steps_interactive.pm_.c:361
+#: ../../install_steps_interactive.pm_.c:340
+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 ""
+"��� ������� ��������� ����� ��� 1MB bootstrap! � ����������� �� ����������, "
+"���� ��� �� ���������� �� ������� ���, �� ��������� �� ������������� ��� "
+"��������� bootstrap �� �� DiskDrake"
+
+#: ../../install_steps_interactive.pm_.c:349
+msgid "No root partition found to perform an upgrade"
+msgstr "��� ������� ��������� root ��� ��� �������������� ��� �����������"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "Root Partition (������ ��������� ����������)"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
 msgstr "���� ����� � ������ ��������� (/) ��� ���������� ���;"
 
-#: ../../install_steps_interactive.pm_.c:376
+#: ../../install_steps_interactive.pm_.c:365
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 "���������� ������������ ��� �� �������������� �� ������� ���� ������ "
 "�����������"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "�������� ����������� ���� �����������"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "������� ��� ��������� blocks;"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "����������� �����������"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "���������� ��� ����������� ������� %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 "��� ������� ������ swap ��� ��� ���������� ��� ������������, �������� "
 "���������"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "����� ��� ��������� ������"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "������������� ������� ���� ����������"
 
-#: ../../install_steps_interactive.pm_.c:461
+#: ../../install_steps_interactive.pm_.c:450
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
@@ -4679,30 +4553,59 @@ msgstr ""
 "�� ������� ��� ��� ���� ������ ��������� ���� ��� ����������� � ���������� (%"
 "d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "������ (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "�������� (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "����������� (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "�������������"
 
-#: ../../install_steps_interactive.pm_.c:585
-msgid "Selected size is larger than available space"
+#: ../../install_steps_interactive.pm_.c:522
+msgid ""
+"Please choose load or save package selection on floppy.\n"
+"The format is the same as auto_install generated floppies."
 msgstr ""
+"�������� �������� �� ������� � ���������� ��� �������� ������� ��� "
+"��������.\n"
+"� ����������� ����� � ���� �� ��� ��������� ��������� ������������."
+
+#: ../../install_steps_interactive.pm_.c:525
+msgid "Load from floppy"
+msgstr "������� ��� ��������"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Loading from floppy"
+msgstr "������� ��� ��������"
 
-#: ../../install_steps_interactive.pm_.c:650
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Package selection"
+msgstr "������� �������"
+
+#: ../../install_steps_interactive.pm_.c:532
+msgid "Insert a floppy containing package selection"
+msgstr "�������� �������� ��� �������� ��� ������� �������"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "���������� �� ��������"
+
+#: ../../install_steps_interactive.pm_.c:605
+msgid "Selected size is larger than available space"
+msgstr "�� ���������� ������� ����� ���������� ��� �� ��������� ����"
+
+#: ../../install_steps_interactive.pm_.c:670
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -4712,12 +4615,12 @@ msgstr ""
 "��� ��� ����� ������ ��� �� �������� CDs, ������� �������.\n"
 "��� ��� ����� ������ ��� ����, ����������� �� ��� ������� Ok."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom ������� \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -4726,11 +4629,21 @@ msgstr ""
 "����������� ������� %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "��������� ���� ��� �����������"
 
-#: ../../install_steps_interactive.pm_.c:718
+#: ../../install_steps_interactive.pm_.c:719
+#, c-format
+msgid "Please insert the Boot floppy used in drive %s"
+msgstr "�������� �������� �� �������� ��������� ���� ����� %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "�������� �������� �� �������� ��������� ���������� ���� ����� %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -4795,99 +4708,135 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:750
+#: ../../install_steps_interactive.pm_.c:782
 msgid "Choose a mirror from which to get the packages"
 msgstr "�������� ���� ��� ��� ����� �� ����� � ���� �������"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "������� ��� ���� �������"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "�������� �������� �� ������ ��� ������ �� �������������"
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "���� ����� � ���� ����;"
 
-#: ../../install_steps_interactive.pm_.c:778
-msgid "Is your hardware clock set to GMT?"
-msgstr "�� ����� ��� ���������� ��� ����� ���������� �� GMT (��� ����������);"
+#: ../../install_steps_interactive.pm_.c:813
+msgid "Hardware clock set to GMT"
+msgstr "�� ����� ��� ���������� ��� ����� ���������� �� GMT (��� ����������)"
 
-#: ../../install_steps_interactive.pm_.c:806 ../../printer.pm_.c:22
-#: ../../printerdrake.pm_.c:415
+#: ../../install_steps_interactive.pm_.c:814
+msgid "Automatic time synchronization (using NTP)"
+msgstr "��������� ������������ ���� (����� NTP)"
+
+#: ../../install_steps_interactive.pm_.c:821
+msgid "NTP Server"
+msgstr "������������ NTP"
+
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
 msgstr "���������������� ������������ CUPS"
 
-#: ../../install_steps_interactive.pm_.c:807
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
-msgstr "����� ��������"
+msgstr "������� ���������"
 
-#: ../../install_steps_interactive.pm_.c:821
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "��������"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
-msgstr "USB Mouse"
+msgstr "�������"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
-msgstr ""
+msgstr "���������� ����"
 
-#: ../../install_steps_interactive.pm_.c:824 ../../printerdrake.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:873 ../../printerdrake.pm_.c:1773
+#: ../../printerdrake.pm_.c:1844
 msgid "Printer"
 msgstr "���������"
 
-#: ../../install_steps_interactive.pm_.c:826
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:875
 msgid "ISDN card"
-msgstr "��������� ����� ISDN"
+msgstr "K���� ISDN"
 
-#: ../../install_steps_interactive.pm_.c:829
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
-msgstr "������"
+msgstr "����� ����"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "���� ������� ��������� ������ �� ���������������;"
+msgstr "����� TV"
+
+#: ../../install_steps_interactive.pm_.c:917
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:945
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../../install_steps_interactive.pm_.c:918
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:954
+msgid "NIS"
+msgstr "NIS"
+
+#: ../../install_steps_interactive.pm_.c:919
+#: ../../install_steps_interactive.pm_.c:941
+msgid "Local files"
+msgstr "������ ������"
+
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "����������� root"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "����� �����������"
 
-#: ../../install_steps_interactive.pm_.c:901
+#: ../../install_steps_interactive.pm_.c:935
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr ""
 "���� �� ����������� ����� ���� ���� (������ �� ����� ����������� %d "
 "���������� �����)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "����� NIS"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "����������� ����������"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "yellow pages"
+#: ../../install_steps_interactive.pm_.c:949
+msgid "Authentication LDAP"
+msgstr "����������� LDAP"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
-msgstr "����������� NIS"
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr "LDAP Base dn"
+
+#: ../../install_steps_interactive.pm_.c:951
+msgid "LDAP Server"
+msgstr "������������ LDAP"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:957
+msgid "Authentication NIS"
+msgstr "���������� NIS"
+
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "������� (domain) NIS"
 
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:959
 msgid "NIS Server"
 msgstr "������������ NIS"
 
-#: ../../install_steps_interactive.pm_.c:951
+#: ../../install_steps_interactive.pm_.c:994
 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 "
@@ -4914,19 +4863,19 @@ msgstr ""
 "�������� ���������� ��� ��������� ��� ���������� ���� ��� ������ �����.\n"
 "������ �� ������������� �������� ���������;"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "������ ������ ��������"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "�������� ������ ��������"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "���������"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:1017
 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 "
@@ -4950,32 +4899,44 @@ msgstr ""
 "�������� ���������� ��� ��������� ��� ���������� ���� ��� ������ �����.\n"
 "������ �� ������������� �������� ���������;"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "�������, ��� ������� ���������� ������ ���������"
 
-#: ../../install_steps_interactive.pm_.c:987
+#: ../../install_steps_interactive.pm_.c:1030
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "�������� ����� ��������� ��� ���������� ��������� ���������"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "�������� �������� ���� ����� %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "���������� ������ ���������"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "������������ ������������ ���������"
 
-#: ../../install_steps_interactive.pm_.c:1010
+#: ../../install_steps_interactive.pm_.c:1055
+msgid ""
+"You appear to have an OldWorld or Unknown\n"
+" machine, the yaboot bootloader will not work for you.\n"
+"The install will continue, but you'll\n"
+" need to use BootX to boot your machine"
+msgstr ""
+"�������� ��� ����� ��� ������ � �������\n"
+" ��������, � yaboot bootloader ��� �� �������� ��� ���.\n"
+"� ����������� �� ����������, ����\n"
+"�� ��������� �� ��������������� �� BootX ��� �� ���������� �� �������� ���"
+
+#: ../../install_steps_interactive.pm_.c:1060
 msgid "Do you want to use aboot?"
 msgstr "������ �� ��������������� �� aboot;"
 
-#: ../../install_steps_interactive.pm_.c:1013
+#: ../../install_steps_interactive.pm_.c:1063
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -4984,55 +4945,62 @@ msgstr ""
 "���������� ����������� ������������, ����� ��� �� ���� ���� ��� ���������� "
 "��� ���������� ��� ������ ����������;"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "���. ��. ���������"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 "� ����������� ��� ������������ ��������� �������. ���������� �� �������� "
 "������:"
 
-#: ../../install_steps_interactive.pm_.c:1030
+#: ../../install_steps_interactive.pm_.c:1084
+#, fuzzy, 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 $of_boot,\\\\:tbxi\n"
+" setenv boot-device %s,\\\\:tbxi\n"
 " Then type: shut-down\n"
 "At your next boot you should see the bootloader prompt."
 msgstr ""
+"������ �� ��������� �� �������� ��� Open Firmware boot-������� ���� ��\n"
+" �������������� ��� bootloader.  �� ��� reboot ��� ����� ��� �������� ���\n"
+" bootloader, ������� �� Command-Option-O-F ���� �� reboot ��� ��������:\n"
+" setenv boot-device $of_boot,\\\\:tbxi\n"
+" ���� �������: shut-down\n"
+"���� ������� �������� �� ������ �� ����� ��� �������� ��� bootloader."
 
-#: ../../install_steps_interactive.pm_.c:1038 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1092 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "������"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "�����"
 
-#: ../../install_steps_interactive.pm_.c:1044 ../../standalone/draksec_.c:49
+#: ../../install_steps_interactive.pm_.c:1098 ../../standalone/draksec_.c:62
 msgid "Choose security level"
 msgstr "�������� ������� ���������"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr ""
-"������ �� ������������� ��� �������� ��������� ������������ ��� ����������� "
-"����� ��� ������������;"
-
-#: ../../install_steps_interactive.pm_.c:1082
+#: ../../install_steps_interactive.pm_.c:1134
+#: ../../standalone/drakautoinst_.c:80
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "�������� ����� �������� ���� ����� %s"
 
-#: ../../install_steps_interactive.pm_.c:1096
-#: ../../install_steps_interactive.pm_.c:1128
+#: ../../install_steps_interactive.pm_.c:1138
+#: ../../standalone/drakautoinst_.c:82
 msgid "Creating auto install floppy"
 msgstr "������������ �������� ��������� ������������"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5042,35 +5010,34 @@ msgstr ""
 "\n"
 "������ ������� �� ������������� ����;"
 
-#: ../../install_steps_interactive.pm_.c:1167
+#: ../../install_steps_interactive.pm_.c:1160
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
-"For information on fixes which are available for this release of Linux-"
-"Mandrake,\n"
-"consult the Errata available from http://www.linux-mandrake.com/.\n"
+"For information on fixes which are available for this release of Mandrake "
+"Linux,\n"
+"consult the Errata available from http://www.mandrakelinux.com/.\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Linux-Mandrake User's Guide."
+"install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
 "������������, � ����������� ������������.\n"
 "��������� ��� �������� � �� CD ��������� ��� ������� return ��� "
 "������������.\n"
 "\n"
 "��� ����������� ������� �� ���������� ����� ��� ������� ��� Mandrake Linux,\n"
-"�������������� ��� ������ http://www.linux-mandrake.com/.\n"
+"�������������� ��� ������ http://www.mandrakelinux.com/.\n"
 "\n"
 "����������� ������� �� ��� ��������� ��� ���������� ��� �������� ��� "
 "�������\n"
-"�������� ��� �������� ������ ������ ��� Linux-Mandrake."
+"�������� ��� �������� ������ ������ ��� Mandrake Linux."
 
-#: ../../install_steps_interactive.pm_.c:1179
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
-msgstr "������������ �������� ��������� ������������"
+msgstr "������������ ��������� ��������� ������������"
 
-#: ../../install_steps_interactive.pm_.c:1181
+#: ../../install_steps_interactive.pm_.c:1174
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -5078,45 +5045,64 @@ msgid ""
 "\n"
 "You may prefer to replay the installation.\n"
 msgstr ""
+"� �������� ����������� ������ �� ����� ������ ��������,\n"
+"�� ����� ��� ��������� �� �������� �� ������ �����!!\n"
+"(���� ���������� ��� ����������� ������������ �� ���� ����������).\n"
+"\n"
+"������ �� ��������� �� ����������� ��� �����������.\n"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "��������"
 
-#: ../../install_steps_interactive.pm_.c:1186
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
 msgstr "������������"
 
-#: ../../install_steps_interactive.pm_.c:1189
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
-msgstr "������� ���������� �������"
+msgstr "���������� �������� �������"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "����������� Linux-Mandrake %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "����������� Mandrake Linux %s"
 
-#: ../../install_steps_newt.pm_.c:33
+#: ../../install_steps_newt.pm_.c:34
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> ������ ������     | <Space> ������� | <F12> ������� ��. "
 
-#: ../../interactive.pm_.c:65
-#, fuzzy
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
-msgstr "�����"
+msgstr "�� kdesu ������"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "�������� �����"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
-msgstr ""
+msgstr " ��� �������������"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "�������� ����������"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "�������� �������"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "�������� �������"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "�������� ������ �������� ��� �������� �����������"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -5142,271 +5128,290 @@ msgstr "� ������� ���; (��' ������� %s)"
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "� ������� ���; (��' ������� %s �������� `none' ��� ������) "
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "������� (QWERTZ)"
 
-#: ../../keyboard.pm_.c:125 ../../keyboard.pm_.c:138 ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:141 ../../keyboard.pm_.c:155 ../../keyboard.pm_.c:180
 msgid "German"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:142
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:127 ../../keyboard.pm_.c:164
+#: ../../keyboard.pm_.c:143 ../../keyboard.pm_.c:186
 msgid "Spanish"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "����������"
 
-#: ../../keyboard.pm_.c:129 ../../keyboard.pm_.c:139 ../../keyboard.pm_.c:166
+#: ../../keyboard.pm_.c:145 ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:188
 msgid "French"
 msgstr "�������"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "��������"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "������ ��������� (UK)"
 
-#: ../../keyboard.pm_.c:134 ../../keyboard.pm_.c:137 ../../keyboard.pm_.c:204
+#: ../../keyboard.pm_.c:152 ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:237
 msgid "US keyboard"
 msgstr "�.�.�. (US)"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+msgid "Albanian"
+msgstr "��������"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "�������� (�����)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "�������� (�����������)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "�������� (��������)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "������������ (��������)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "������������ (���������)"
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "�������"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "����������"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "������������"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "�����������"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "�������� (��������� ����������)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "�������� (������� ����������)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "������� (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr "������� (���������������)"
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "��������� (����� ����� �������)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:183
 msgid "Dvorak (US)"
 msgstr "Dvorak (���)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:184
 msgid "Dvorak (Norwegian)"
 msgstr "Dvorak (���������)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "������� (\"������\" ����������)"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "������� (\"��������\" ����������)"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "������ (��������)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "�������"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "�������"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "�������� 106 ��������"
 
-#: ../../keyboard.pm_.c:178
-#, fuzzy
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
-msgstr "������ ��������� (UK)"
+msgstr "��������� ������������"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "��������� ��������"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr ""
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "���������"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "���������� AZERTY (�����)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "���������� AZERTY (���)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "���������� \"number row\" QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "���������� \"��������\" QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "���������"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "����������"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "���������"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "�������� (���������� qwerty)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "�������� (���������� qwertz)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "������������"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "�������� (������)"
 
-#: ../../keyboard.pm_.c:193
+#: ../../keyboard.pm_.c:217
+msgid "Romanian (qwertz)"
+msgstr "��������� (qwertz)"
+
+#: ../../keyboard.pm_.c:218
+msgid "Romanian (qwerty)"
+msgstr "��������� (qwerty)"
+
+#: ../../keyboard.pm_.c:220
 msgid "Russian (Yawerty)"
 msgstr "������ (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "��������"
-
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "��������� (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "��������� (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr "��������� (���������������)"
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "������������ (���������)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Thai"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "Thai"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "�������� (����������� \"F\" �������)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "�������� (�������� \"Q\" �������)"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "���������"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "US �������"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "������� \"numeric row\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
+#: ../../keyboard.pm_.c:240
 #, fuzzy
-msgid "Yugoslavian (latin/cyrillic)"
-msgstr "�������������� (�������� ����������)"
+msgid "Yugoslavian (latin)"
+msgstr "�������������� (��������/���������)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "�������� ��������� %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
-msgstr ""
+msgstr "��������� �� logical volumes �����\n"
 
 #: ../../mouse.pm_.c:25
 msgid "Sun - Mouse"
@@ -5441,9 +5446,8 @@ msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
 #: ../../mouse.pm_.c:43 ../../mouse.pm_.c:67
-#, fuzzy
 msgid "1 button"
-msgstr "��� ��������"
+msgstr "1 ��������"
 
 #: ../../mouse.pm_.c:44
 msgid "Generic"
@@ -5517,171 +5521,229 @@ msgstr "������"
 msgid "No mouse"
 msgstr "����� �������"
 
-#: ../../my_gtk.pm_.c:356
-#, fuzzy
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "�������� ��������� �� �������"
+
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "��� ������������ ���������"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "������� �� ������!"
+
+#: ../../my_gtk.pm_.c:380
+msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+
+#: ../../my_gtk.pm_.c:415
 msgid "Finish"
-msgstr "����������"
+msgstr "�����"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "������� -�"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
-msgstr ""
+msgstr "<- �����������"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "�����;"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "��������� ���������� (Internet)"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "������� ��� ���������"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "������ �� ���������� �� ���������� ��� ��������� ����;"
+#: ../../network/adsl.pm_.c:20
+msgid ""
+"The most common way to connect with adsl is pppoe.\n"
+"Some connections use pptp, a few ones use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"� ��� ������ ������ �������� adsl ����� pppoe.\n"
+"��������� ��������� ������������� pptp, ������� ����� dhcp.\n"
+"��� ��� ������, �������� '����� pppoe'"
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "������ ��������... "
+#: ../../network/adsl.pm_.c:22
+msgid "Alcatel speedtouch usb"
+msgstr ""
 
-#: ../../netconnect.pm_.c:154 ../../standalone/draknet_.c:196
-msgid "The system is now connected to Internet."
-msgstr "�� ������� ��� ����� ����������� ��� ���������."
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "����� dhcp"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr ""
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "����� pppoe"
 
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "����� pptp"
+
+#: ../../network/ethernet.pm_.c:37
 msgid ""
-"The system doesn't seem to be connected to internet.\n"
-"Try to reconfigure your connection."
+"Which dhcp client do you want to use?\n"
+"Default is dhcpcd"
 msgstr ""
-"�� ������� ��� ��� �������� �� ����� ����������� ��� ���������.\n"
-"��������� �� �������������� ��� ������� ���."
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "��������� �������"
-
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
-msgid "ISDN Configuration"
-msgstr "��������� ISDN"
+"����� ������ dhcp ������ �� ���������������;\n"
+"� ���������� ����� dhcpcd"
 
-#: ../../netconnect.pm_.c:222
+#: ../../network/ethernet.pm_.c:88
 msgid ""
-"Select your provider.\n"
-" If it's not in the list, choose Unlisted"
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
-"�������� ��� ������� ���\n"
-" ��� ��� ����� ���� ��������, �������� Unlisted"
+"��� ������� ������������ ������� Ethernet ��� ������� ���.\n"
+"��� ����� �� ������� ����� ��� ����� ��� �������."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "��������� ���������"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "�������� ������� �������"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "�������� ������� � ����������� �� �������� �����"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+"�������� �������� ���� ������� ������� ������ �� ��������������� ��� ��� "
+"������� ��� ���������"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "IRQ ������"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "��� ������� ������������ �������"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "DMA ������"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "������� �������"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "IO ������"
+#: ../../network/ethernet.pm_.c:203
+msgid ""
+"Please enter your host name if you know it.\n"
+"Some DHCP servers require the hostname to work.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''."
+msgstr ""
+"�������� �������� �� ����� ��� ���������� ��� �� ������.\n"
+"��������� ������������ DHCP ��� ����������� ����� ����.\n"
+"�� ����� ���� ������ �� ����� ��� ������ ����� ����������,\n"
+"���� �.�. ``mybox.mylab.myco.com''."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "IO_0 ������"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "����� ����������"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "IO_1 ������"
+#: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
+#: ../../network/netconnect.pm_.c:91 ../../network/netconnect.pm_.c:105
+#: ../../network/netconnect.pm_.c:154 ../../network/netconnect.pm_.c:164
+#: ../../network/netconnect.pm_.c:190 ../../network/netconnect.pm_.c:213
+#: ../../network/netconnect.pm_.c:221
+msgid "Network Configuration Wizard"
+msgstr "������ �������� �������"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "���������� ������� ���������"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "��������� ISDN modem"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "����� ������� (�.�. provider.net)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "��������� ����� ISDN"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "������� ��������� �������"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "�� ������ ����� � ISDN ������� ���;"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "DNS 1"
+#: ../../network/isdn.pm_.c:45
+msgid ""
+"Which ISDN configuration do you prefer?\n"
+"\n"
+"* The Old configuration uses isdn4net. It contains powerfull\n"
+"  tools, but is tricky to configure, and not standard.\n"
+"\n"
+"* The New configuration is easier to understand, more\n"
+"  standard, but with less tools.\n"
+"\n"
+"We recommand the light configuration.\n"
+msgstr ""
+"���� ISDN ������� ���������;\n"
+"\n"
+"* � ����� ������� ������������ �� isdn4net. �������� ������� ��������,\n"
+"  ���� ����� ���� ������� ��� ���� ������� �� ��������� ��� ��� ����������.\n"
+"\n"
+"* � ��� ������� ����� ���������� ���� ���������, ����������� ����������,\n"
+"  ���� �� �������� ��������.\n"
+"\n"
+"����������� ��� ������� �������.\n"
+"\n"
 
-#: ../../netconnect.pm_.c:248
-msgid "Provider dns 2"
-msgstr "DNS 2"
+#: ../../network/isdn.pm_.c:54
+msgid "New configuration (isdn-light)"
+msgstr "��� ������� (isdn-light)"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "������ ������"
+#: ../../network/isdn.pm_.c:54
+msgid "Old configuration (isdn4net)"
+msgstr "����� ������� (isdn4net)"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "'����� ���������� (user name)"
+#: ../../network/isdn.pm_.c:169 ../../network/isdn.pm_.c:187
+#: ../../network/isdn.pm_.c:197 ../../network/isdn.pm_.c:204
+#: ../../network/isdn.pm_.c:214
+msgid "ISDN Configuration"
+msgstr "��������� ISDN"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "����������� �����������"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"�������� ��� ������� ���\n"
+" ��� ��� ����� ���� ��������, �������� Unlisted"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "������"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "���������� ���������"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol (EDSS1)"
 msgstr "������ (EDSS1)"
 
-#: ../../netconnect.pm_.c:263
-msgid "Rest of the world"
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
+msgid "Protocol for the rest of the world"
 msgstr "��������� ������"
 
-#: ../../netconnect.pm_.c:263
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
 msgid ""
-"Rest of the world \n"
+"Protocol for the rest of the world \n"
 " no D-Channel (leased lines)"
 msgstr ""
 "��������� ������ \n"
 " ����� D-Channel (���������� �������)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "���� ���������� ������ �� ���������������;"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "�� ����� �����;"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "��� ����"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../netconnect.pm_.c:284
+#: ../../network/isdn.pm_.c:205
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -5693,19 +5755,19 @@ msgstr ""
 "\n"
 "��� ����� PCMCIA �����, ������ �� ������ �� irq ��� �� io ��� ������ ���.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "�������"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "��������"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "���� ����� � ISDN ����� ���;"
 
-#: ../../netconnect.pm_.c:314
+#: ../../network/isdn.pm_.c:234
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
@@ -5713,110 +5775,59 @@ msgstr ""
 "�������� ��� ISDN �����, ���� ��� ���� ��� ���� ���. �������� �������� ��� "
 "����� PCI ��� ��� �������� �����."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "��� ������� ����� ISDN. �������� �������� ��� ��� ��� �������� �����."
 
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"��� ������� ������������ ������� Ethernet ��� ������� ���.\n"
-"��� ����� �� ������� ����� ��� ����� ��� �������."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "�������� ������� �������"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr ""
-"�������� �������� ���� ������� ������� ������ �� ��������������� ��� ��� "
-"������� ��� ���������"
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "������� �������"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"����������;"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "�� ������������ ��� �������� ������� �������:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "��������� ADSL"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "������ �� ��������� ���� ��� ��������;"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "�� ���� �������� ����� ����� ����������� �� modem ���;"
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "�������� dialup"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "����� ��������"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "������� ���������"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "Login ID"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "����������� ����������"
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
+msgid "CHAP"
+msgstr ""
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Script-based"
 msgstr "����� script"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "����� ����������"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "����� �������"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
-#, fuzzy
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
-msgstr "������ ������������ DNS"
+msgstr "������ ������������ DNS (�����������)"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
-#, fuzzy
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 msgid "Second DNS Server (optional)"
-msgstr "�������� ������������ DNS"
-
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr "�� ������������ ��� ������� ������� $netc->{NET_DEVICE}. ����������;"
+msgstr "�������� ������������ DNS (�����������)"
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -5824,7 +5835,7 @@ msgstr ""
 "\n"
 "�������� �� ������������� � �� �������������� ��� ������� ���."
 
-#: ../../netconnect.pm_.c:745 ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:33 ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can reconfigure your connection."
@@ -5832,11 +5843,11 @@ msgstr ""
 "\n"
 "�������� �� �������������� ��� ������� ���."
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "���� �� ������ ����� ������������ ��� ���������."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -5844,216 +5855,194 @@ msgstr ""
 "\n"
 "�������� �� ���������� ��� ��������� � �� �������������� ��� ������� ���."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "���� �� ������ ��� ����� ������������ ��� ���������."
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "������� ��� ��������� (internet)"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "���������� ��� �� ��������� (internet)"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "������� �������� ��� ������ (������ � ���������)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "������� ��� ������� ���������� (internet)"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-#, fuzzy
-msgid "Network Configuration Wizard"
-msgstr "��������� �������"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "��������� ISDN modem"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "��������� ����� ISDN"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "�� ������ ����� � ISDN ������� ���;"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "������� ��� ���������"
-
-#: ../../netconnect.pm_.c:834
-#, fuzzy
-msgid ""
-"The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few ones use dhcp.\n"
-"If you don't know, choose 'use pppoe'"
-msgstr ""
-"� ��� ������ ������ �������� adsl ����� dhcp + pppoe.\n"
-"��������� ��������� ������������� pptp, ������� (�����) dhcp.\n"
-"��� ��� ������, �������� '����� pppoe'"
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "����� dhcp"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "����� pppoe"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "����� pptp"
-
-#: ../../netconnect.pm_.c:846
+#: ../../network/netconnect.pm_.c:96
 #, c-format
-msgid "I'm about to restart the network device %s. Do you agree?"
-msgstr "�� ������������ ��� ������� ������� %s. ����������;"
+msgid "We are now going to configure the %s connection."
+msgstr "���� �� ���������� ��� %s �������."
 
-#: ../../netconnect.pm_.c:883
+#: ../../network/netconnect.pm_.c:105
+#, c-format
 msgid ""
-"Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
+"\n"
+"\n"
+"\n"
+"We are now going to configure the %s connection.\n"
+"\n"
+"\n"
+"Press OK to continue."
 msgstr ""
-"����� ������ dhcp ������ �� ���������������;\n"
-"� ���������� ����� dhcpcd"
+"\n"
+"\n"
+"\n"
+"���� �� ���������� ��� %s �������.\n"
+"\n"
+"\n"
+"������� �� OK ��� �� ����������"
 
-#: ../../netconnect.pm_.c:900
-msgid "Network configuration"
+#: ../../network/netconnect.pm_.c:129 ../../network/netconnect.pm_.c:243
+#: ../../network/netconnect.pm_.c:255 ../../network/tools.pm_.c:56
+msgid "Network Configuration"
 msgstr "��������� �������"
 
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "������ �� �������������� �� ������;"
-
-#: ../../netconnect.pm_.c:904
-#, fuzzy, c-format
-msgid ""
-"A problem occured while restarting the network: \n"
-"\n"
-"%s"
-msgstr "������ �� �������������� �� ������;"
-
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:130
 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 ""
+"������ ������ ��� �������� �����������, �� ������ ����� ��� ����������.\n"
+"����� ���� ��� �� ��� �� ����������� ��� ��������� ���, � ����� ��� �� "
+"������������� �� ������� ��� Internet.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 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"
+"������� ������� �� ���������� �� ������� ��� ��� internet/������.\n"
+"�� ��� ������ �� ��������������� ��� �������� ���������, ����������� �� "
+"checkbox.\n"
 
-#: ../../netconnect.pm_.c:964
-#, fuzzy
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
-msgstr "�������� ��� ��' ������� ������:"
+msgstr "�������� �� ������ ��� �������"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
-msgstr ""
+msgstr "����� ��������� ����������"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "���������� ��������..."
 
-#: ../../netconnect.pm_.c:978
-#, fuzzy
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
-msgstr "������� ����� �������� �� modem"
+msgstr "���� ������� �� modem"
 
-#: ../../netconnect.pm_.c:978
-#, fuzzy, c-format
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
+#, c-format
 msgid "detected on port %s"
-msgstr "����� ������ �������� %s"
+msgstr "����������� ���� ����� %s"
 
-#: ../../netconnect.pm_.c:979
-#, fuzzy
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
-msgstr "������� �������� ISDN"
+msgstr "������� ISDN"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
-msgstr ""
+msgstr "����������� �� %s"
 
-#: ../../netconnect.pm_.c:980
-#, fuzzy
-msgid "DSL (or ADSL) connection"
-msgstr "������� �������� DSL (� ADSL)"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+msgid "ADSL connection"
+msgstr "������� ADSL"
 
-#: ../../netconnect.pm_.c:980
-#, fuzzy, c-format
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+#, c-format
 msgid "detected on interface %s"
-msgstr "������� �������"
+msgstr "����������� ���� ����������� %s"
 
-#: ../../netconnect.pm_.c:981
-#, fuzzy
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
-msgstr "������� ���������� ��������"
+msgstr "��������� �������"
 
-#: ../../netconnect.pm_.c:982
-#, fuzzy
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+msgid "cable connection detected"
+msgstr "����������� ��������� �������"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
-msgstr "��������� ADSL"
+msgstr "������� LAN"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
-msgstr ""
+msgstr "�����(��) ethernet ������������"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "��� ������ �� ���������� ��� ���������;"
+#: ../../network/netconnect.pm_.c:190
+msgid "Choose the connection you want to configure"
+msgstr "�������� �� ������� ��� ������ �� ���������"
 
-#: ../../netconnect.pm_.c:1004
+#: ../../network/netconnect.pm_.c:214
 msgid ""
-"Congratulation, The network and internet configuration is finished.\n"
+"You have configured multiple ways to connect to the Internet.\n"
+"Choose the one you want to use.\n"
 "\n"
-"The configuration will now be applied to your system."
 msgstr ""
+"����� �������� ������� ������� ��� �� ��������� ��� Internet.\n"
+"�������� ����� ��� ������ �� ���������������.\n"
+"\n"
 
-#: ../../netconnect.pm_.c:1007
-msgid ""
-"After that is done, we recommend you to restart your X\n"
-"environnement to avoid hostname changing problem."
-msgstr ""
+#: ../../network/netconnect.pm_.c:215
+msgid "Internet connection"
+msgstr "������� Internet"
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "��� ������� ������������ �������"
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "������ �� ��������� ���� ��� ��������;"
 
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "������� �������"
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "��������� �������"
 
-#: ../../network.pm_.c:278
+#: ../../network/netconnect.pm_.c:240
+msgid "The network needs to be restarted"
+msgstr ""
+
+#: ../../network/netconnect.pm_.c:243
+#, c-format
 msgid ""
-"Please enter your host name if you know it.\n"
-"Some DHCP servers require the hostname to work.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''."
+"A problem occured while restarting the network: \n"
+"\n"
+"%s"
 msgstr ""
-"�������� �������� �� ����� ��� ���������� ��� �� ������.\n"
-"��������� ������������ DHCP ��� ����������� ����� ����.\n"
-"�� ����� ���� ������ �� ����� ��� ������ ����� ����������,\n"
-"���� �.�. ``mybox.mylab.myco.com''."
+"��� �������� ����������� ���� ��� ������������ ��� �������: \n"
+"\n"
+"%s"
 
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "����� ����������"
+#: ../../network/netconnect.pm_.c:247
+msgid ""
+"Congratulations, the network and internet configuration is finished.\n"
+"\n"
+"The configuration will now be applied to your system.\n"
+msgstr ""
+"������������, � ������� ������� ��� internet ��������.\n"
+"\n"
+"�� ��������� �� ����������� ���� ��� ������� ���.\n"
 
-#: ../../network.pm_.c:319
-#, fuzzy
+#: ../../network/netconnect.pm_.c:250
+msgid ""
+"After that is done, we recommend you to restart your X\n"
+"environnement to avoid hostname changing problem."
+msgstr ""
+"���� ����� ����, ����������� �� �������������� �� �\n"
+"���������� ��� �� ��������� �� ���������� ������� hostname."
+
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -6065,7 +6054,7 @@ msgstr ""
 "���� ������� OK ��� �� ��������� ��� ���������� ���������.\n"
 "���������� �� �������� ����� �� �������� ��� ��������� �������."
 
-#: ../../network.pm_.c:324
+#: ../../network/network.pm_.c:288
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
@@ -6075,38 +6064,38 @@ msgstr ""
 "���� �������� ������ �� �������� �� IP ��������� �� ��������\n"
 "����� (����������: 1.2.3.4)."
 
-#: ../../network.pm_.c:333 ../../network.pm_.c:334
+#: ../../network/network.pm_.c:297 ../../network/network.pm_.c:298
 #, c-format
 msgid "Configuring network device %s"
 msgstr "������� �������� ������� %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr ""
+#: ../../network/network.pm_.c:298
+#, c-format
+msgid " (driver %s)"
+msgstr " (driver %s)"
 
-#: ../../network.pm_.c:336 ../../standalone/draknet_.c:231
-#: ../../standalone/draknet_.c:427
+#: ../../network/network.pm_.c:300 ../../standalone/draknet_.c:255
+#: ../../standalone/draknet_.c:461
 msgid "IP address"
 msgstr "��������� IP"
 
-#: ../../network.pm_.c:337 ../../standalone/draknet_.c:428
+#: ../../network/network.pm_.c:301 ../../standalone/draknet_.c:462
 msgid "Netmask"
 msgstr "����� �������"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "(bootp/dhcp)"
 msgstr "(bootp/dhcp)"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "Automatic IP"
 msgstr "�������� IP"
 
-#: ../../network.pm_.c:359 ../../printerdrake.pm_.c:102
-#: ../../printerdrake.pm_.c:425
+#: ../../network/network.pm_.c:323 ../../printerdrake.pm_.c:406
 msgid "IP address should be in format 1.2.3.4"
 msgstr "� IP ��������� ������ �� ����� �� ����� 1.2.3.4"
 
-#: ../../network.pm_.c:388
+#: ../../network/network.pm_.c:351
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -6118,43 +6107,149 @@ msgstr ""
 "���� �.�. ``mybox.mylab.myco.com''.\n"
 "�������� ������ �� �������� ��� ��� ��������� IP ��� ����� �������"
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "������������ DNS"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
 msgstr "���� �������"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "������� �����"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "��������� proxies"
 
-#: ../../network.pm_.c:408
+#: ../../network/network.pm_.c:372
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
-#: ../../network.pm_.c:409
+#: ../../network/network.pm_.c:373
 msgid "FTP proxy"
 msgstr "FTP proxy"
 
-#: ../../network.pm_.c:412
+#: ../../network/network.pm_.c:374
+msgid "Track network card id (usefull for laptops)"
+msgstr ""
+
+#: ../../network/network.pm_.c:377
 msgid "Proxy should be http://..."
 msgstr "� proxy ������ �� ����� http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "� proxy ������ �� ����� ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "��������� ���������� (Internet)"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "������ �� ���������� �� ���������� ��� ��������� ����;"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "������ ��������... "
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "�� ������� ��� ����� ����������� ��� ���������."
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr "��� ���� ���������, �� ������������� ����."
+
+#: ../../network/tools.pm_.c:51 ../../standalone/draknet_.c:220
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr ""
+"�� ������� ��� ��� �������� �� ����� ����������� ��� ���������.\n"
+"��������� �� �������������� ��� ������� ���."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "��������� ���������"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "�������� ������� � ����������� �� �������� �����"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "IRQ ������"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "DMA ������"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "IO ������"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "IO_0 ������"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "IO_1 ������"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "���������� ������� ���������"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "����� ������� (�.�. provider.net)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "������� ��������� �������"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "Provider dns 1 (�����������)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "Provider dns 2 (�����������)"
+
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "�������� ������������"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "������ ������"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+msgid "Connection speed"
+msgstr "�������� ��������"
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "������ ��������: "
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "'����� ���������� (user name)"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "����������� �����������"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
 msgstr "� ���������� ��������� ��� ������������� �� ����� ��� ���� ����������"
 
-#: ../../partition_table.pm_.c:581
+#: ../../partition_table.pm_.c:640
 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 "
@@ -6164,31 +6259,30 @@ msgstr ""
 "� �������� ���� ����� �� ������������ ��� ����������� ����������� ��� ���� "
 "���� �� ���� �� ������ ����� ���� ���������� ���������"
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "������ ���� ��� �������� ��� ������� %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "� ��������� ��� �� ������ %s �������: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "������������ �������� ������"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "������ �������� ��� ������ %s"
 
-#: ../../partition_table_raw.pm_.c:161
+#: ../../partition_table_raw.pm_.c:154
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
 "It means writing anything on the disk will end up with random trash"
 msgstr ""
+"���� ���� ��������� ��� ����� ���. \n"
+"��� ���� ������� ��� ������������ ��� ��������� �������. \n"
+"���� �������� ��� � ����������� ������� ��� ����� �� ��������� ��� ������ "
+"���������"
 
 #: ../../pkgs.pm_.c:24
 msgid "must have"
@@ -6210,49 +6304,213 @@ msgstr "����"
 msgid "maybe"
 msgstr "����"
 
-#: ../../printer.pm_.c:20
+#: ../../printer.pm_.c:23
+msgid "CUPS - Common Unix Printing System"
+msgstr "CUPS - Common Unix Printing System"
+
+#: ../../printer.pm_.c:24
+msgid "LPRng - LPR New Generation"
+msgstr "LPRng - LPR New Generation"
+
+#: ../../printer.pm_.c:25
+msgid "LPD - Line Printer Daemon"
+msgstr "LPD - Line Printer Daemon"
+
+#: ../../printer.pm_.c:26
+msgid "PDQ - Print, Don't Queue"
+msgstr "PDQ - Print, Don't Queue"
+
+#: ../../printer.pm_.c:32
+msgid "CUPS"
+msgstr ""
+
+#: ../../printer.pm_.c:33
+msgid "LPRng"
+msgstr ""
+
+#: ../../printer.pm_.c:34
+msgid "LPD"
+msgstr ""
+
+#: ../../printer.pm_.c:35
+msgid "PDQ"
+msgstr ""
+
+#: ../../printer.pm_.c:40
 msgid "Local printer"
 msgstr "������� ���������"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "���������������� ���������"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
+#: ../../printer.pm_.c:42
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "���������������� ������������ CUPS"
+
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "���������������� ������������ lpd"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "��������� ������� (socket)"
 
-#: ../../printer.pm_.c:25
-msgid "SMB/Windows 95/98/NT"
+#: ../../printer.pm_.c:45
+#, fuzzy
+msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:26
-msgid "NetWare"
-msgstr "NetWare"
+#: ../../printer.pm_.c:46
+#, fuzzy
+msgid "Printer on NetWare server"
+msgstr "������������ ����������"
 
-#: ../../printer.pm_.c:27 ../../printerdrake.pm_.c:158
-#: ../../printerdrake.pm_.c:160
-msgid "Printer Device URI"
+#: ../../printer.pm_.c:47
+#, fuzzy
+msgid "Enter a printer device URI"
 msgstr "������� �������� URI"
 
-#: ../../printerdrake.pm_.c:19
+#: ../../printer.pm_.c:48
+#, fuzzy
+msgid "Pipe job into a command"
+msgstr "����������� ���� ������"
+
+#: ../../printer.pm_.c:418 ../../printer.pm_.c:839
+#: ../../printerdrake.pm_.c:1227 ../../printerdrake.pm_.c:2023
+msgid "Unknown model"
+msgstr ""
+
+#: ../../printer.pm_.c:546 ../../printerdrake.pm_.c:790
+msgid "Raw printer (No driver)"
+msgstr ""
+
+#: ../../printer.pm_.c:693
+#, fuzzy, c-format
+msgid "(on %s)"
+msgstr "(module %s)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "������ �������� ��������"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "��� ����� ������������ � ��������� ���;"
+
+#: ../../printerdrake.pm_.c:25
+#, fuzzy
+msgid ""
+"\n"
+"Printers on remote CUPS servers you do not have to configure\n"
+"here; these printers will be automatically detected. Please\n"
+"select \"Printer on remote CUPS server\" in this case."
+msgstr ""
+"�� ��� ����� ����������� CUPS, ��� ���������� �� ��������� ��������� \n"
+"���. �� ��������� �� ������������� ��������, ����� �� ����� �����������\n"
+"�� ����������� ������. �� ����� ��� ���������, �� ������ �� �������� ���\n"
+"IP ��������� ��� ����������� CUPS ��� ���� ��� ��� ������ �����."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+#, fuzzy
+msgid "None"
+msgstr "������������"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "�������� ��� ��' ������� ������:"
+
+#: ../../printerdrake.pm_.c:105
+msgid ""
+"With remote CUPS servers, you do not have to configure any \n"
+"printer here; CUPS servers inform your machine automatically\n"
+"about their printers. All printers known to your machine\n"
+"currently are listed in the \"Default printer\" field. Choose\n"
+"the default printer for your machine there and click the\n"
+"\"Apply/Re-read printers\" button. Click the same button to\n"
+"refresh the list (it can take up to 30 seconds after the start\n"
+"of CUPS until all remote printers are visible).\n"
+"When your CUPS server is in a different network, you have to \n"
+"give the CUPS server IP address and optionally the port number\n"
+"to get the printer information from the server, otherwise leave\n"
+"these fields blank."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:117
+msgid ""
+"\n"
+"Normally, CUPS is automatically configured according to your\n"
+"network environment, so that you can access the printers on the\n"
+"CUPS servers in your local network. If this does not work \n"
+"correctly, turn off \"Automatic CUPS configuration\" and edit\n"
+"your file /etc/cups/cupsd.conf manually. Do not forget to restart\n"
+"CUPS afterwards (command: \"service cups restart\")."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:124 ../../printerdrake.pm_.c:1290
+#: ../../printerdrake.pm_.c:1294 ../../printerdrake.pm_.c:1295
+#: ../../printerdrake.pm_.c:1296 ../../printerdrake.pm_.c:2011
+msgid "Close"
+msgstr "��������"
+
+#: ../../printerdrake.pm_.c:125
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "���������������� ���������"
+
+#: ../../printerdrake.pm_.c:129
+msgid "The IP address should look like 192.168.1.20"
+msgstr "� IP ��������� ������ �� ����� �� ����� 192.168.1.20"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+msgid "The port number should be an integer!"
+msgstr "� ������� ����� ������ �� ����� �������� �������!"
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+#, fuzzy
+msgid "Default printer"
+msgstr "������� ���������"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "IP ��������� ����������� CUPS:"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "����"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "Boot ����� �������"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "���������� ��������..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "������ �����"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "���� ��������� ����� \"%s\" ����������� ��� "
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "������� ������� ��������"
 
-#: ../../printerdrake.pm_.c:53
+#: ../../printerdrake.pm_.c:256
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -6260,38 +6518,60 @@ msgstr ""
 "�� ���� ������� ����� ������������ � ��������� ���;\n"
 "(��������: �� /dev/lp0 ����������� ��� LPT1:)\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "������� ��������"
 
-#: ../../printerdrake.pm_.c:74
+#: ../../printerdrake.pm_.c:261
+msgid "Device/file name missing!"
+msgstr "�� ������ �������� ������!"
+
+#: ../../printerdrake.pm_.c:274 ../../printerdrake.pm_.c:698
+#: ../../printerdrake.pm_.c:786
+#, fuzzy
+msgid "Reading printer database ..."
+msgstr "�������� ����� ������ CUPS"
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "�������� ���������������� lpd ��������"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:313
+#, fuzzy
 msgid ""
-"To use a remote lpd print queue, you need to supply\n"
-"the hostname of the printer server and the queue name\n"
-"on that server which jobs should be placed in."
+"To use a remote lpd printer, you need to supply\n"
+"the hostname of the printer server and the printer name\n"
+"on that server."
 msgstr ""
 "��� �� ��������������� ��� ��������������� ���� ���������\n"
 "lpd, ������ �� ������ �� �������� ����� ��� ����������� \n"
 "����������, ����� ��� �� ����� ��� ����� ��� ����� �� \n"
 "��������������� �� ����� ��� �����������."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
 msgstr "��������������� �������� �����:"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "����� ���������������� �����"
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "���������������� ���������"
+
+#: ../../printerdrake.pm_.c:320
+msgid "Remote host name missing!"
+msgstr "��������������� �������� ����� ������!"
+
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "��������������� �������� ����� ������!"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "�������� �������� SMB (Windows 9x/NT)"
 
-#: ../../printerdrake.pm_.c:89
+#: ../../printerdrake.pm_.c:393
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -6306,29 +6586,37 @@ msgstr ""
 "��������, ����� ��� ����������� ���������� ���������� ���� ������� \n"
 "������, ����� ������ ��� ����� � ������ ��������."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "�������� ����� SMB �����������:"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "IP ��������� SMB �����������:"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "����� �����:"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "����� ��������:"
 
-#: ../../printerdrake.pm_.c:124
+#: ../../printerdrake.pm_.c:410
+msgid "Either the server name or the server's IP must be given!"
+msgstr "���� �� ����� ��� ����������� � � IP ��� ������ �� ������!"
+
+#: ../../printerdrake.pm_.c:414
+msgid "Samba share name missing!"
+msgstr "�� ����� ��� ��� Samba ������!"
+
+#: ../../printerdrake.pm_.c:473
 msgid "NetWare Printer Options"
 msgstr "�������� �������� NetWare"
 
-#: ../../printerdrake.pm_.c:125
+#: ../../printerdrake.pm_.c:474
 msgid ""
-"To print to a NetWare printer, you need to provide the\n"
+"To print on a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
 "TCP/IP hostname!) as well as the print queue name for the printer you\n"
 "wish to access and any applicable user name and password."
@@ -6339,60 +6627,231 @@ msgstr ""
 "�� ����� ��� �������� ���� ����� ���������� ��������, ����� ���\n"
 "����������� ���������� ���������� ���� ������� ������ ��� ����� ������."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "������������ ����������"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "����� ����� ��������"
 
-#: ../../printerdrake.pm_.c:142
+#: ../../printerdrake.pm_.c:484
+msgid "NCP server name missing!"
+msgstr "�� ����� ��� ����������� NCP ������!"
+
+#: ../../printerdrake.pm_.c:488
+msgid "NCP queue name missing!"
+msgstr "�� ����� ��� NCP ����� ������!"
+
+#: ../../printerdrake.pm_.c:527
 msgid "Socket Printer Options"
 msgstr "�������� �������� socket"
 
-#: ../../printerdrake.pm_.c:143
+#: ../../printerdrake.pm_.c:528
+#, fuzzy
 msgid ""
 "To print to a socket printer, you need to provide the\n"
-"hostname of the printer and optionally the port number."
+"host name of the printer and optionally the port number.\n"
+"On HP JetDirect servers the port number is usually 9100,\n"
+"on other servers it can vary. See the manual of your\n"
+"hardware."
 msgstr ""
 "��� �� ���������� �� ���� �������� socket, ������ �� ������ �� \n"
 "�������� ����� ��� �������� ��� ����������� ��� ������ �����."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
 msgstr "����� ��������"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "����"
+#: ../../printerdrake.pm_.c:537
+msgid "Printer host name missing!"
+msgstr "����� �������� ������!"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "������� �������� URI"
+
+#: ../../printerdrake.pm_.c:567
+#, fuzzy
+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 ""
-"�������� �� ������ ���������� �� URI ��� �������� ���� �������� ���� CUPS."
+"�������� �� ������� ���������� �� URI ��� ��� �������� ���� ��������. �� URI "
+"������ �� ����� ���� ��� CUPS ���� ��� Foomatic ������������. ��� ��� ��� "
+"�������������� ���� �� URI ����� ��� ��� �� spoolers."
+
+#: ../../printerdrake.pm_.c:582
+msgid "A valid URI must be entered!"
+msgstr "��� ����� URI ������ �� ��������!"
+
+#: ../../printerdrake.pm_.c:682
+msgid ""
+"Every printer needs a name (for example lp).\n"
+"The Description and Location fields do not need \n"
+"to be filled in. They are comments for the users."
+msgstr ""
+"���� �������� ���������� ��� ����� (�.�. lp).\n"
+"�� ����� ��������� ��� ��������� ��� ���������� �� \n"
+"������������. ����� ���� ������ ��� ���� �������."
+
+#: ../../printerdrake.pm_.c:685
+msgid "Name of printer"
+msgstr "����� ��������"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "���������"
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "���������"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "�������� ����� ������ CUPS"
+
+#: ../../printerdrake.pm_.c:793
+msgid "Printer model selection"
+msgstr "������� �������� ��������"
+
+#: ../../printerdrake.pm_.c:794
+msgid "Which printer model do you have?"
 msgstr "�� ����� �������� �����;"
 
-#: ../../printerdrake.pm_.c:204 ../../printerdrake.pm_.c:305
-msgid "Do you want to test printing?"
-msgstr "������ �� ���������� ��� ��������;"
+#: ../../printerdrake.pm_.c:866
+#, fuzzy
+msgid "OKI winprinter configuration"
+msgstr "��������� ���������� (Internet)"
+
+#: ../../printerdrake.pm_.c:867
+msgid ""
+"You are configuring an OKI laser winprinter. These printers\n"
+"use a very special communication protocol and therefore they\n"
+"work only when connected to the first parallel port. When\n"
+"your printer is connected to another port or to a print\n"
+"server box please connect the printer to the first parallel\n"
+"port before you print a test page. Otherwise the printer\n"
+"will not work. Your connection type setting will be ignored\n"
+"by the driver."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:916 ../../printerdrake.pm_.c:946
+#, fuzzy
+msgid "Lexmark inkjet configuration"
+msgstr "��������� ���������� (Internet)"
+
+#: ../../printerdrake.pm_.c:917
+msgid ""
+"The inkjet printer drivers provided by Lexmark only support\n"
+"local printers, no printers on remote machines or print server\n"
+"boxes. Please connect your printer to a local port or\n"
+"configure it on the machine where it is connected to."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:947
+msgid ""
+"To be able to print with your Lexmark inkjet and this\n"
+"configuration, you need the inkjet printer drivers\n"
+"provided by Lexmark (http://www.lexmark.com/). Go to\n"
+"the US site and click on the \"Drivers\" button. Then\n"
+"choose your model and afterwards \"Linux\" as\n"
+"operating system. The drivers come as RPM packages\n"
+"or shell scripts with interactive graphical installation.\n"
+"You do not need to do this configuration by the\n"
+"graphical frontends. Cancel directly after the license\n"
+"agreement. Then print printhead alignment pages with\n"
+"\"lexmarkmaintain\" and adjust the head alignment\n"
+"settings with this program."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1079
+msgid ""
+"Printer default settings\n"
+"You should make sure that the page size and the\n"
+"ink type (if available) are set correctly. Note\n"
+"that with a very high printout quality printing\n"
+"can get substantially slower."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1090
+#, c-format
+msgid "Option %s must be an integer number!"
+msgstr "������� %s ������ �� ����� �������� �������!"
+
+#: ../../printerdrake.pm_.c:1094
+#, c-format
+msgid "Option %s must be a number!"
+msgstr "������� %s ������ �� ����� �������!"
+
+#: ../../printerdrake.pm_.c:1099
+#, c-format
+msgid "Option %s out of range!"
+msgstr "������� %s ����� �����!"
+
+#: ../../printerdrake.pm_.c:1136
+#, fuzzy, c-format
+msgid ""
+"Do you want to set this printer (\"%s\")\n"
+"as the default printer?"
+msgstr "������ �� ���������� ��� ����������� ������;"
+
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "������ �����"
+
+#: ../../printerdrake.pm_.c:1153
+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\n"
+"and on laser printers with too low memory it can even not come out.\n"
+"In most cases it is enough to print the standard test page."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1158
+msgid "No test pages"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1159
+#, fuzzy
+msgid "Print"
+msgstr "���������"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "������"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "�������� ������������ �������..."
+
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "�������� ������������ �������..."
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "�������� ������������ �������..."
 
-#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:324
-#, c-format
+#: ../../printerdrake.pm_.c:1200
+#, fuzzy, c-format
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
+"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"
-"Does it work properly?"
 msgstr ""
 "��� � ������������ ������������ ������� ��������� ���� ��������.\n"
 "������ �� ������� ������� ������ ����� � �������� �� ���������.\n"
@@ -6401,235 +6860,600 @@ msgstr ""
 "\n"
 "����� ����� � ��������"
 
-#: ../../printerdrake.pm_.c:218 ../../printerdrake.pm_.c:328
+#: ../../printerdrake.pm_.c:1204
+#, fuzzy
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Does it work properly?"
+"Test page(s) have been sent to the printer.\n"
+"It may take some time before the printer starts.\n"
 msgstr ""
 "��� � ������������ ������������ ������� ��������� ���� ��������.\n"
 "������ �� ������� ������� ������ ����� � �������� �� ���������.\n"
 "����� ����� � ��������;"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "���, ������ ����������� ������ ASCII"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "���, ������ ����������� ������ PostScrip"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "������� ���������"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "���, ������ ��� ��� ��� ������������ �������"
+#: ../../printerdrake.pm_.c:1237
+#, 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 "
+"\"qtcups <file>\". The graphical tools allow you to choose the printer and "
+"to modify the option settings easily.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:243
-msgid "Configure Printer"
-msgstr "������� ��������"
+#: ../../printerdrake.pm_.c:1239
+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 ""
 
-#: ../../printerdrake.pm_.c:273
-msgid "Printer options"
+#: ../../printerdrake.pm_.c:1242 ../../printerdrake.pm_.c:1254
+#: ../../printerdrake.pm_.c:1266
+#, 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 ""
+
+#: ../../printerdrake.pm_.c:1244 ../../printerdrake.pm_.c:1284
+msgid ""
+"To get a list of the options available for the current printer read either "
+"the list shown below or click on the \"Print option list\" button.\n"
+"\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1249 ../../printerdrake.pm_.c:1261
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\".\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1251 ../../printerdrake.pm_.c:1263
+#: ../../printerdrake.pm_.c:1275
+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 ""
+
+#: ../../printerdrake.pm_.c:1256 ../../printerdrake.pm_.c:1268
+msgid ""
+"To get a list of the options available for the current printer click on the "
+"\"Print option list\" button.\n"
+"\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1273
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\" or \"%s <file>\".\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1277
+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 ""
+
+#: ../../printerdrake.pm_.c:1281
+#, 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 ""
+
+#: ../../printerdrake.pm_.c:1292
+#, fuzzy, c-format
+msgid "Printing on the printer \"%s\""
+msgstr "������� ����������� �������."
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
 msgstr "�������� ��������"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "������� �������"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+msgid "Reading printer data ..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "������� ������� �� �� ����� ��� ���������;"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "��������� ���������� (Internet)"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "�������� ������ Uniprint"
+#: ../../printerdrake.pm_.c:1339
+#, c-format
+msgid ""
+"You can copy the printer configuration which you have done \n"
+"for the spooler %s to %s, your current spooler. All the\n"
+"configuration data (printer name, description, location, \n"
+"connection type, and default option settings) is overtaken,\n"
+"but jobs will not be transferred.\n"
+"Not all queues can be transferred due to the following \n"
+"reasons:\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:281
-msgid "Color depth options"
-msgstr "�������� ������ ��������"
+#: ../../printerdrake.pm_.c:1347
+msgid ""
+"CUPS does not support printers on Novell servers or printers\n"
+"sending the data into a free-formed command.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:283
-msgid "Print text as PostScript?"
-msgstr "�������� �������� ��� PostScript;"
+#: ../../printerdrake.pm_.c:1350
+msgid ""
+"PDQ only supports local printers, remote LPD printers, and\n"
+"Socket/TCP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:285
-msgid "Fix stair-stepping text?"
-msgstr "�������� ��������-������;"
+#: ../../printerdrake.pm_.c:1353
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:287
-msgid "Number of pages per output pages"
-msgstr "������� ������� ��� ������� ������"
+#: ../../printerdrake.pm_.c:1355
+msgid ""
+"In addition, queues not created with this program or\n"
+"\"foomatic-configure\" cannot be transferred."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:288
-msgid "Right/Left margins in points (1/72 of inch)"
-msgstr "��������/����� ��������� �� ������� (1/72 ��� ������)"
+#: ../../printerdrake.pm_.c:1357
+msgid ""
+"\n"
+"Also printers configured with the PPD files provided by\n"
+"their manufacturers or with native CUPS drivers can not be\n"
+"transferred."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:289
-msgid "Top/Bottom margins in points (1/72 of inch)"
-msgstr "����/���� ��������� �� ������� (1/72 ��� ������)"
+#: ../../printerdrake.pm_.c:1360
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:291
-msgid "Extra GhostScript options"
-msgstr "�������� �������� GhostScript"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "�������� �������� ��������"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "���������� ����� �������;"
+#: ../../printerdrake.pm_.c:1377
+#, 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 ""
 
-#: ../../printerdrake.pm_.c:345
-msgid "Would you like to configure a printer?"
-msgstr "�� ������ �� ��������� ���� ��������;"
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr ""
+"�� ����� ��� �������� ������ �� �������� ���� ��������, �������� ��� ��� "
+"��������� underscore"
 
-#: ../../printerdrake.pm_.c:351
+#: ../../printerdrake.pm_.c:1390
+#, c-format
 msgid ""
-"Here are the following print queues.\n"
-"You can add some more or change the existing ones."
+"The printer \"%s\" already exists,\n"
+"do you really want to overwrite its configuration?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1398
+#, fuzzy
+msgid "New printer name"
+msgstr "������� ���������"
+
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
 msgstr ""
-"�������� �� ��������� ����� ���������.\n"
-"�������� �� ���������� �� ����� � �� �������� ��� ����������."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "�������� CUPS"
+#: ../../printerdrake.pm_.c:1412
+#, c-format
+msgid ""
+"You have transferred your former default printer (\"%s\"),\n"
+"Should it be also the default printer under the\n"
+"new printing system %s?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:370
-msgid "Reading CUPS drivers database..."
+#: ../../printerdrake.pm_.c:1423
+#, fuzzy
+msgid "Refreshing printer data ..."
 msgstr "�������� ����� ������ CUPS"
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "������ �������� ��������"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+msgid "Configuration of a remote printer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "��� ����� ������������ � ��������� ���;"
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "�������� ��������..."
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "������ �������� ���������������� ��������"
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "������� �������"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "� ����� ��� ���� ��������� �����"
+
+#: ../../printerdrake.pm_.c:1456
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected.\n"
-"In case of doubt, select \"Remote CUPS server\"."
+"You are going to configure a remote printer. This needs working\n"
+"network access, but your network is not configured yet. If you\n"
+"go on without network configuration, you will not be able to use\n"
+"the printer which you are configuring now. How do you want \n"
+"to proceed?"
 msgstr ""
-"�� ��� ����� ����������� CUPS, ��� ���������� �� ��������� ��������� \n"
-"���. �� ��������� �� ������������� ��������. �� ����� ���������, ��������\n"
-"\"����������� CUPS\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "������� �������"
+
+#: ../../printerdrake.pm_.c:1496
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected\n"
-"unless you have a server on a different network; in the\n"
-"latter case, you have to give the CUPS server IP address\n"
-"and optionally the port number."
+"The network configuration done during the installation \n"
+"cannot be started now. Please check whether the network\n"
+"gets accessable after booting your system and correct the\n"
+"configuration using the Mandrake Control Center, section\n"
+"\"Network & Internet\"/\"Connection\", and afterwards set\n"
+"up the printer, also using the Mandrake Control Center,\n"
+"section \"Hardware\"/\"Printer\""
 msgstr ""
-"�� ��� ����� ����������� CUPS, ��� ���������� �� ��������� ��������� \n"
-"���. �� ��������� �� ������������� ��������, ����� �� ����� �����������\n"
-"�� ����������� ������. �� ����� ��� ���������, �� ������ �� �������� ���\n"
-"IP ��������� ��� ����������� CUPS ��� ���� ��� ��� ������ �����."
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "IP ��������� ����������� CUPS:"
+#: ../../printerdrake.pm_.c:1503
+msgid ""
+"The network access was not running and could not be \n"
+"started. Please check your configuration and your \n"
+"hardware. Then try to configure your remote printer\n"
+"again."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:429
-msgid "Port number should be numeric"
-msgstr "� ������� ����� ������ �� ����� �����������"
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
+msgstr "���� ������� ��������� ������ �� ���������������;"
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "�����"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "�������� �����"
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "���������"
 
-#: ../../printerdrake.pm_.c:454
+#: ../../printerdrake.pm_.c:1549
+#, c-format
+msgid "Installing a printing system in the %s security level"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1550
+#, c-format
 msgid ""
-"Name of printer should contains only letters, numbers and the underscore"
+"You are about to install the printing system %s on\n"
+"a system running in the %s security level.\n"
+"\n"
+"This printing system runs a daemon (background process)\n"
+"which waits for print jobs and handles them. This daemon\n"
+"is also accessable by remote machines through the network\n"
+"and so it is a possible point for attacks. Therefore only\n"
+"a few selected daemons are started by default in this\n"
+"security level.\n"
+"\n"
+"Do you really want to configure printing on this\n"
+"machine?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:461
+#: ../../printerdrake.pm_.c:1584
+#, fuzzy
+msgid "Starting the printing system at boot time"
+msgstr "���� ������� ��������� ������ �� ���������������;"
+
+#: ../../printerdrake.pm_.c:1585
+#, c-format
 msgid ""
-"Every printer need a name (for example lp).\n"
-"Other parameters such as the description of the printer or its location\n"
-"can be defined. What name should be used for this printer and\n"
-"how is the printer connected?"
+"The printing system (%s) will not be started automatically\n"
+"when the machine is booted.\n"
+"\n"
+"It is possible that the automatic starting was turned off \n"
+"by changing to a higher security level, because the printing\n"
+"system is a potential point for attacks.\n"
+"\n"
+"Do you want to have the automatic starting of the printing\n"
+"system turned on again?"
 msgstr ""
-"���� ���������  ���������� ��� ����� (��� ���������� lp). ������� ������ "
-"�� \n"
-"�������� ����� ���������� ���� ��������� � � ���������. �� ����� �� \n"
-"����� �� ����� ��� �������� ��� ��� ����� ������������ � ���������;"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "����� ��������"
+#: ../../printerdrake.pm_.c:1612 ../../printerdrake.pm_.c:1644
+#: ../../printerdrake.pm_.c:1671 ../../printerdrake.pm_.c:1701
+#: ../../printerdrake.pm_.c:1778
+msgid "Checking installed software..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:466
-msgid "Description"
-msgstr "���������"
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "���������"
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1727
+msgid "Select Printer Spooler"
+msgstr "������� Spooler E�������"
+
+#: ../../printerdrake.pm_.c:1728
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "���� ������� ��������� ������ �� ���������������;"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "������� ��������"
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "�������� ��������"
+
+#: ../../printerdrake.pm_.c:1815
+msgid "Preparing PrinterDrake ..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1845
+msgid "Would you like to configure printing?"
+msgstr "�� ������ �� ��������� ���� ��������;"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1879
 msgid ""
-"Every print queue (which print jobs are directed to) needs a\n"
-"name (often lp) and a spool directory associated with it. What\n"
-"name and directory should be used for this queue and how is the printer "
-"connected?"
+"The following printers are configured.\n"
+"Click on one of them to modify it or\n"
+"to get information about it or on \n"
+"\"Add Printer\" to add a new printer."
 msgstr ""
-"���� ���� �������� (���� ����� ���������� �� ����������) ����������\n"
-"��� ����� (����� lp) ��� ���� ��������. �� ����� ��� �������� �� \n"
-"����� �� ����� ��� ���� �������� ��� ��� ����� ������������ � ���������;"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "����� �����"
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "�������� ���������"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "���������"
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (������� ��' �������)"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
-msgstr "������ �������� ��������"
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "���������������� ������������ CUPS"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "���������������� ������������ CUPS"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+msgid "Add printer"
+msgstr "�������� ��������"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "������ �� ���������� ��� ���������;"
 
-#: ../../raid.pm_.c:33
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "��������� ���������� (Internet)"
+
+#: ../../printerdrake.pm_.c:2004
+#, c-format
+msgid ""
+"Printer %s: %s %s\n"
+"What do you want to modify on this printer?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2012
+msgid "Do it!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+#, fuzzy
+msgid "Printer connection type"
+msgstr "������� Internet"
+
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
+msgstr "������� �������� ��������"
+
+#: ../../printerdrake.pm_.c:2018 ../../printerdrake.pm_.c:2081
+msgid "Printer manufacturer, model, driver"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2019 ../../printerdrake.pm_.c:2082
+msgid "Printer manufacturer, model"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2028 ../../printerdrake.pm_.c:2092
+msgid "Set this printer as the default"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2029 ../../printerdrake.pm_.c:2097
+#, fuzzy
+msgid "Print test pages"
+msgstr "�������� ������������ �������..."
+
+#: ../../printerdrake.pm_.c:2030 ../../printerdrake.pm_.c:2099
+msgid "Know how to print with this printer"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2031 ../../printerdrake.pm_.c:2101
+#, fuzzy
+msgid "Remove printer"
+msgstr "���������������� ���������"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "���������������� ���������"
+
+#: ../../printerdrake.pm_.c:2096
+#, c-format
+msgid "The printer \"%s\" is set as the default printer now."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2103
+#, fuzzy, c-format
+msgid "Do you really want to remove the printer \"%s\"?"
+msgstr "������ �� �������������� �� ������;"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "���������������� ���������"
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+msgid "Proxy configuration"
+msgstr "������� proxy"
+
+#: ../../proxy.pm_.c:30
+msgid ""
+"Welcome to the proxy configuration utility.\n"
+"\n"
+"Here, you'll be able to set up your http and ftp proxies\n"
+"with or without login and password\n"
+msgstr ""
+"����� ������ ��� �������� �������� ��� proxy.\n"
+"\n"
+"���, �� ��������� �� ��������� ���� http ��� ftp proxies\n"
+"�� � ����� login ��� ������ ���������\n"
+
+#: ../../proxy.pm_.c:38
+msgid ""
+"Please fill in the http proxy informations\n"
+"Leave it blank if you don't want an http proxy"
+msgstr ""
+"�������� ����������� ��� ����������� ��� �� http proxy\n"
+"������ �� ���� �� ��� ���������� http proxy"
+
+#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
+msgid "URL"
+msgstr "URL"
+
+#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
+msgid "port"
+msgstr "�����"
+
+#: ../../proxy.pm_.c:44
+msgid "Url should begin with 'http:'"
+msgstr "�� URL ������ �� ������ �� 'http:'"
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+msgid "The port part should be numeric"
+msgstr "� ������� ����� ������ �� ����� �����������"
+
+#: ../../proxy.pm_.c:59
+msgid ""
+"Please fill in the ftp proxy informations\n"
+"Leave it blank if you don't want an ftp proxy"
+msgstr ""
+"�������� ����������� ��� ����������� ��� �� ftp proxy\n"
+"������ �� ���� �� ��� ���������� ftp proxy"
+
+#: ../../proxy.pm_.c:65
+msgid "Url should begin with 'ftp:'"
+msgstr "�� Url ������ �� ������ ��'ftp:'"
+
+#: ../../proxy.pm_.c:79
+msgid ""
+"Please enter proxy login and password, if any.\n"
+"Leave it blank if you don't want login/passwd"
+msgstr ""
+"�������� �������� proxy login ��� ������ ���������.\n"
+"������ �� ���� ��� ��� ���������� login/passwd"
+
+#: ../../proxy.pm_.c:80
+msgid "login"
+msgstr "login"
+
+#: ../../proxy.pm_.c:82
+msgid "password"
+msgstr "������� ���������"
+
+#: ../../proxy.pm_.c:84
+msgid "re-type password"
+msgstr "������������������ ��� ������ ���������"
+
+#: ../../proxy.pm_.c:88
+msgid "The passwords don't match. Try again!"
+msgstr "�� ������� ��������� ����� ��������. ����������� ����!"
+
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "��� ����� �� �������� ��������� ��� _�������������_ RAID md%d"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "��� ����� �� ���������� �� ������ $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "��� ����� �� ���������� �� ������ %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "�������� mkraid"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "�������� mkraid (����� ����������� �� raidtools;)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "��� �������� ������� ����������� ��� RAID �������� %d\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
-msgstr ""
+msgstr "�������� ��� ALSA (Advanced Linux Sound Architecture) ���������� ����"
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron, ��� ��������� ���������� ��������� �������."
 
-#: ../../services.pm_.c:18
+#: ../../services.pm_.c:17
 msgid ""
 "apmd is used for monitoring batery status and logging it via syslog.\n"
 "It can also be used for shutting down the machine when the battery is low."
@@ -6638,7 +7462,7 @@ msgstr ""
 "������ ������ �� �������������� ��� �� �������� �������� ��� ���������� �� \n"
 "��������� ������� �������� ��� ���������."
 
-#: ../../services.pm_.c:20
+#: ../../services.pm_.c:19
 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."
@@ -6646,7 +7470,7 @@ msgstr ""
 "������� ������� ����������������� ��� ��� ������ at ��� ������ �������\n"
 "���� � ������ ��� ���������� ����� ������ �������."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:21
 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 "
@@ -6659,7 +7483,7 @@ msgstr ""
 "�������� ����������� ��� ������������� �������� �������� ��� ��� ������� "
 "���������."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:24
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -6670,13 +7494,15 @@ msgstr ""
 "�������� ��� ��������� ����������� �������� ��� ����������� �� ����� \n"
 "mouse ���� �������, ����� ��� ���������� ����������� menu."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr ""
+"�� HardDrake ������ ��� ��������� ������ ��� ����������� ��������\n"
+"�� ���/��������� �����."
 
-#: ../../services.pm_.c:30
+#: ../../services.pm_.c:29
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -6684,7 +7510,7 @@ msgstr ""
 "� Apache ����� ���� ������������ WWW. ������ �� ������������ ������\n"
 "HTML ��� CGI."
 
-#: ../../services.pm_.c:32
+#: ../../services.pm_.c:31
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -6700,13 +7526,15 @@ msgstr ""
 "����� ��� ��������� ������������� ������ ��� ��� ��������� ��� ��� ������\n"
 "����� ��������."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:35
 msgid ""
 "Launch packet filtering for Linux kernel 2.2 series, to set\n"
 "up a firewall to protect your machine from network attacks."
 msgstr ""
+"�������� ������� filtering ��� Linux ������ ��� ������ 2.2, ��� �������\n"
+"���� firewall ��� �� ����������� �� �������� ��� ��� ��������� ���������."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:37
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -6716,23 +7544,28 @@ msgstr ""
 "�������� ��� /etc/sysconfig/keyboard. ���� ������ �� ��������� �� ��� \n"
 "����� ��� ��������� kbdconfig. ������ ������ ����� �� ����� ��������������."
 
-#: ../../services.pm_.c:41
+#: ../../services.pm_.c:40
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
 msgstr ""
+"�������� �������� ��� ������������ ��� ������ ��� /boot ��� ��\n"
+"/usr/include/linux/{autoconf,version}.h"
 
-#: ../../services.pm_.c:43
+#: ../../services.pm_.c:42
 msgid "Automatic detection and configuration of hardware at boot."
 msgstr ""
+"�������� ��������� ��� ������� �������� ���� ��� �������� ��� ����������."
 
-#: ../../services.pm_.c:44
+#: ../../services.pm_.c:43
 msgid ""
 "Linuxconf will sometimes arrange to perform various tasks\n"
 "at boot-time to maintain the system configuration."
 msgstr ""
+"�� Linuxconf ����� ���� ����� �������� ��������\n"
+"���� ��� �������� ��� ���������� ��� �� ���������� �� ������� ��� ����������."
 
-#: ../../services.pm_.c:46
+#: ../../services.pm_.c:45
 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)."
@@ -6741,13 +7574,15 @@ msgstr ""
 "� ������ lpd. ����� ������ ���� ������������ ��� ������� �� ������ \n"
 "����� ���������."
 
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:47
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
 msgstr ""
+"Linux Virtual ������������, ��������������� ��� �� ������������ ���� ������\n"
+"�������� ��� �������������� �����������."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:49
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -6755,7 +7590,7 @@ msgstr ""
 "� named (BIND) ����� ���� Domain Name Server (DNS) ��� ���������������\n"
 "��� �� ���������� ������� �� ����������� IP."
 
-#: ../../services.pm_.c:52
+#: ../../services.pm_.c:51
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -6763,7 +7598,7 @@ msgstr ""
 "������� ��� ���������� ��� �� �������� ��������� ������� (NFS, \n"
 "SMB ��� NCP (Netware))."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -6771,7 +7606,7 @@ msgstr ""
 "�����������/������������� ��� �� ������������ ������� ��� ����� \n"
 "��������� �� �������� ���� ��� ��������."
 
-#: ../../services.pm_.c:56
+#: ../../services.pm_.c:55
 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"
@@ -6781,7 +7616,7 @@ msgstr ""
 "������ TCP/IP. ���� � �������� ��������� ����������� �����������, � \n"
 "������ ���������� ��� �� ������ /etc/exports."
 
-#: ../../services.pm_.c:59
+#: ../../services.pm_.c:58
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -6789,17 +7624,19 @@ msgstr ""
 "�� NFS ����� ��� ��������� ��������� ��� ��� ����������� ������� �� \n"
 "������ TCP/IP. ���� � �������� ��������� ����������� ����������� �������."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
 msgstr ""
+"�������� ������������ ��� numlock �������� ���� �������\n"
+"��� �� XFree ���� ��� �������� ��� ����������."
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
-msgstr ""
+msgstr "���������� ��� OKI 4w ��� �������� winprinters."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:63
 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 "
@@ -6812,7 +7649,7 @@ msgstr ""
 "������, ����� ����� ������� �� ������������ �� ��������� ��� ��� �� "
 "�����������."
 
-#: ../../services.pm_.c:67
+#: ../../services.pm_.c:66
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -6823,7 +7660,7 @@ msgstr ""
 "��� ��������� ���� �� NFS ��� �� NIS. ������ �� ����� �������������� �� \n"
 "��������� ��� ����� �� ������������ ������� ����������."
 
-#: ../../services.pm_.c:70
+#: ../../services.pm_.c:69
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -6832,7 +7669,7 @@ msgstr ""
 "��������� ��� ��������� ��� ��� �������� ������������� ��� �� \n"
 "��� ������� ��� ����."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -6840,13 +7677,15 @@ msgstr ""
 "���������� ��� ���������� ��� ���� ��������� ��� ���������� ��� \n"
 "��� ���������� ��������� ��������� ������� �������."
 
-#: ../../services.pm_.c:74
+#: ../../services.pm_.c:73
 msgid ""
 "Assign raw devices to block devices (such as hard drive\n"
 "partitions), for the use of applications such as Oracle"
 msgstr ""
+"������� raw �������� �� block �������� (���� ����������� �������\n"
+"������), ��� �� ����� ���� ��� ��������� ���� � Oracle"
 
-#: ../../services.pm_.c:76
+#: ../../services.pm_.c:75
 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"
@@ -6857,7 +7696,7 @@ msgstr ""
 "�� \n"
 "����� ������, ���������� ������ �������� ������������� ���������."
 
-#: ../../services.pm_.c:79
+#: ../../services.pm_.c:78
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -6866,7 +7705,7 @@ msgstr ""
 "������� ��������� ��������� ��� ����������� ������� �� ���� \n"
 "�� ������."
 
-#: ../../services.pm_.c:81
+#: ../../services.pm_.c:80
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -6874,7 +7713,7 @@ msgstr ""
 "�� ��������� rusers ��������� ����� ������� ���� ������� �� \n"
 "������������� ���� ������������� ������� ����� ����������."
 
-#: ../../services.pm_.c:83
+#: ../../services.pm_.c:82
 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)."
@@ -6882,11 +7721,11 @@ msgstr ""
 "�� ��������� rwho ��������� �� ����������������� ������� �� ���� ���� \n"
 "�������� ��� ������� ��� ���������� (�������� �� �� finger)."
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:84
 msgid "Launch the sound system on your machine"
-msgstr ""
+msgstr "�������� ��� ���������� ���� ��� �������� ���"
 
-#: ../../services.pm_.c:86
+#: ../../services.pm_.c:85
 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."
@@ -6895,45 +7734,89 @@ msgstr ""
 "��� �� ������ �������� ��� ������ �������������� ���������� (log files)\n"
 "���������� � ������� ���������� ����� ��� ���������."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
-msgstr ""
+msgstr "������� ��� ������ ��� ��� usb �������� ���."
 
-#: ../../services.pm_.c:89
-#, fuzzy
+#: ../../services.pm_.c:88
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "�������� ��� ��������� ��� �������� ����������� ��������������."
+msgstr ""
+"�������� ��� �������� ����������� �������������� X Font Server (���� ����� "
+"���������� ��� �� ������� �� XFree)."
 
-#: ../../services.pm_.c:118
+#: ../../services.pm_.c:114 ../../services.pm_.c:156
 msgid "Choose which services should be automatically started at boot time"
-msgstr "�������� ����� ��������� �� �������� �������� ���� ��� ��������"
+msgstr ""
+
+#: ../../services.pm_.c:126
+#, fuzzy
+msgid "Printing"
+msgstr "���������"
+
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "��������"
+
+#: ../../services.pm_.c:130
+msgid "File sharing"
+msgstr ""
+
+#: ../../services.pm_.c:132
+#, fuzzy
+msgid "System"
+msgstr "��������� ����������"
 
 #: ../../services.pm_.c:137
 #, fuzzy
+msgid "Remote Administration"
+msgstr "�������� ���������������� lpd ��������"
+
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "���� ���������"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+#, fuzzy
+msgid "Services"
+msgstr "������������"
+
+#: ../../services.pm_.c:198
+#, fuzzy
 msgid "running"
 msgstr "�������������"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 #, fuzzy
 msgid "stopped"
 msgstr "Append"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr ""
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
 msgstr ""
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 #, fuzzy
 msgid "On boot"
-msgstr "Root"
+msgstr "Yaboot"
+
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "����������� ������� %s"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone/diskdrake_.c:63
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
 "I'll try to go on blanking bad partitions"
@@ -6941,15 +7824,65 @@ msgstr ""
 "��� ����� �� ������� ��� ������ �����������, ����� ���� ������������� :(\n"
 "�� ���������� �� �������� ���������� ��� ����������� �����������"
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+msgid "Error!"
+msgstr "������!"
+
+#: ../../standalone/drakautoinst_.c:45
+#, c-format
+msgid "I can't find needed image file `%s'."
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:47
+#, fuzzy
+msgid "Auto Install Configurator"
+msgstr "��������� ���� ��� �����������"
+
+#: ../../standalone/drakautoinst_.c:48
+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"
+"Do you want to continue?"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:70
+#, fuzzy
+msgid "Automatic Steps Configuration"
+msgstr "Boot ����� �������"
+
+#: ../../standalone/drakautoinst_.c:71
+msgid ""
+"Please choose for each step whether it will replay like your install, or it "
+"will be manual"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:112 ../../standalone/drakgw_.c:599
+msgid "Congratulations!"
+msgstr "������������!"
+
+#: ../../standalone/drakautoinst_.c:113
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:36 ../../standalone/drakgw_.c:181
 msgid "Internet Connection Sharing"
 msgstr "����������� �������� Internet"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "����������� �������� Internet ���������������"
 
-#: ../../standalone/drakgw_.c:119
+#: ../../standalone/drakgw_.c:120
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
@@ -6961,33 +7894,31 @@ msgstr ""
 "\n"
 "�� ������ �� ������;"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "��������������"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr "�����"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
 msgstr "������������"
 
-#: ../../standalone/drakgw_.c:126
-#, fuzzy
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
-msgstr "���������� ��������..."
+msgstr "�������������� ������������..."
 
-#: ../../standalone/drakgw_.c:134
-#, fuzzy
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "����������� �������� Internet �����������������"
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "����������� �������� Internet �����������������"
 
-#: ../../standalone/drakgw_.c:144
+#: ../../standalone/drakgw_.c:145
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -6999,29 +7930,19 @@ msgstr ""
 "\n"
 "�� ������ �� ������;"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "������������"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
-msgstr ""
+msgstr "������������ ������������..."
 
-#: ../../standalone/drakgw_.c:160
-#, fuzzy
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "����������� �������� Internet ���������������"
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "�� ����������� ��� ������� ��������� ��� ������� �� ������������"
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr ""
-
-#: ../../standalone/drakgw_.c:181
-#, fuzzy
+#: ../../standalone/drakgw_.c:182
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
 "With that feature, other computers on your local network will be able to use "
@@ -7034,25 +7955,23 @@ msgstr ""
 "��� ������� �� �� ��������� �� ������ �����������.\n"
 "\n"
 "��������: ���������� ���� ����������� ������� ���� ���� �� ������������� ��� "
-"������ ������ (LAN).\n"
-"\n"
-"������ �� ��������� ��� ����� ����� ��� �������� Internet;"
+"������ ������ (LAN)."
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
-msgstr ""
+msgstr "����������� %s (����� ���������� %s)"
 
-#: ../../standalone/drakgw_.c:208
-#, fuzzy, c-format
+#: ../../standalone/drakgw_.c:209
+#, c-format
 msgid "Interface %s"
-msgstr "��������"
+msgstr "����������� %s"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:217
 msgid "No network adapter on your system!"
 msgstr "��� ������� ������������ ������� ��� ������� ���!"
 
-#: ../../standalone/drakgw_.c:217
+#: ../../standalone/drakgw_.c:218
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
@@ -7061,7 +7980,11 @@ msgstr ""
 "��������������� �� ��������� �������� ������."
 
 #: ../../standalone/drakgw_.c:224
-#, fuzzy, c-format
+msgid "Network interface"
+msgstr "������� �������"
+
+#: ../../standalone/drakgw_.c:225
+#, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
 "\n"
@@ -7071,12 +7994,11 @@ msgid ""
 msgstr ""
 "������� ���� ���� ����������� ������������ ������� ��� ������� ���:\n"
 "\n"
-"$interface\n"
+"%s\n"
 "\n"
-"������ �� ��������� �� ������ ��� ������ ��������������� ����� ��� "
-"�����������;"
+"�� ��������� �� ������ ��� ������ �� ����� ��� �����������."
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
@@ -7084,24 +8006,23 @@ msgstr ""
 "�������� �������� �� ������������ ������� �� ��������\n"
 "��� ������ ��� ������."
 
-#: ../../standalone/drakgw_.c:242
-#, fuzzy
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
-"�������, � ������������ ������� ����� ��� �����������. ������ \n"
-"�� ��� ��������������;"
+"�������, � ������������ ������� ����� ��� �����������. �� ��� ������������."
 
-#: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
+#: ../../standalone/drakgw_.c:254
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
-"������ ������������������ ��� ���������� LAN ���� �������� ������� ��� $_!\n"
+"������ ������������������ ��� ���������� LAN ���� �������� ������� ��� %s!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "����������� ������� firewall!"
 
-#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:263 ../../standalone/drakgw_.c:269
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
@@ -7109,23 +8030,20 @@ msgstr ""
 "�������! ����������� ��������� ������� firewall. ���� ���������� ���������"
 "\"������������\" ��������� ���� ��� �����������."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "�������..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "�������, ����������� ����������, �������� ������������..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "�������� ���� ��� ����������� ��� ������� $_"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "������������!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "�������� ���� ��� ����������� ��� ������� %s"
 
-#: ../../standalone/drakgw_.c:591
+#: ../../standalone/drakgw_.c:600
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
@@ -7136,268 +8054,237 @@ msgstr ""
 "����������� ��� ������ ��� ������, �� ��� ����� ��������� �������� ������� "
 "(DHCP)."
 
-#: ../../standalone/drakgw_.c:608
-#, fuzzy
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
-msgstr ""
-"� ������� ��� ����������� �������� Internet ���� ��� �����.\n"
-"���� �� ������ ����� ���������.\n"
-"\n"
-"�� ������ �� ������;"
+msgstr "� ������� ���� ��� �����, ���� ���� �� ������ ����� ����������������."
 
-#: ../../standalone/drakgw_.c:609
-#, fuzzy
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
-msgstr ""
-"� ������� ��� ����������� �������� Internet ���� ��� �����.\n"
-"���� �� ������ ����� ������.\n"
-"\n"
-"�� ������ �� ������;"
+msgstr "� ������� ���� ��� �����, ��� ���� �� ������ ����� ��������������."
 
-#: ../../standalone/drakgw_.c:610
-#, fuzzy
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
-msgstr "����������� �������� Internet ���������������"
+msgstr "� ����������� �������� Internet ��� ���� ��������� ����."
 
-#: ../../standalone/drakgw_.c:615
-#, fuzzy
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
-msgstr "������� ��� ������� ���������� (internet)"
+msgstr "������� ����������� �������� ���������� (internet)"
 
-#: ../../standalone/drakgw_.c:622
-#, fuzzy, c-format
+#: ../../standalone/drakgw_.c:631
+#, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
 "\n"
 "%s\n"
 "\n"
 "Click on Configure to launch the setup wizard."
-msgstr "����������� �������� Internet"
+msgstr ""
+"����� ������ ��� �������� �������� ��� ����������� �������� Internet!\n"
+"\n"
+"%s\n"
+"\n"
+"����� ���� ��� ������� ��� �� ���������� ��� ����� ������������."
 
-#: ../../standalone/draknet_.c:59
-#, fuzzy, c-format
+#: ../../standalone/draknet_.c:79
+#, c-format
 msgid "Network configuration (%d adapters)"
-msgstr "��������� �������"
+msgstr "������� ������� (%d adapters)"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:539
-#, fuzzy
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 msgid "Profile: "
-msgstr "������� �������: "
+msgstr "������: "
 
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:94
 msgid "Del profile..."
-msgstr ""
+msgstr "�������� ������..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
-msgstr ""
+msgstr "������ ��� ��������:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
-msgstr ""
+msgstr "��� ������..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
+#: ../../standalone/draknet_.c:134
+msgid ""
+"Name of the profile to create (the new profile is created as a copy of the "
+"current one) :"
 msgstr ""
 
-#: ../../standalone/draknet_.c:140
-#, fuzzy
+#: ../../standalone/draknet_.c:160
 msgid "Hostname: "
-msgstr "����� ����������:"
+msgstr "����� ����������: "
 
-#: ../../standalone/draknet_.c:147
-#, fuzzy
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
-msgstr "��������"
+msgstr "�������� ��� Internet"
 
-#: ../../standalone/draknet_.c:160
-#, fuzzy
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
-msgstr "�����: "
+msgstr "�����:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "���� �������:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
-#, fuzzy
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Interface:"
-msgstr "��������"
+msgstr "�����������:"
 
-#: ../../standalone/draknet_.c:168
+#: ../../standalone/draknet_.c:192
 msgid "Status:"
-msgstr ""
+msgstr "���������:"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:122 ../../standalone/net_monitor_.c:224
-#, fuzzy
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 msgid "Connected"
-msgstr "����� ��������"
+msgstr "���������"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:83 ../../standalone/net_monitor_.c:122
-#: ../../standalone/net_monitor_.c:224
-#, fuzzy
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 msgid "Not connected"
-msgstr "��������� ADSL"
+msgstr "�� ���������"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
-msgstr ""
+msgstr "�������..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Disconnect..."
-msgstr ""
+msgstr "����������..."
 
-#: ../../standalone/draknet_.c:191
-#, fuzzy
+#: ../../standalone/draknet_.c:215
 msgid "Starting your connection..."
-msgstr "������ ��������... "
+msgstr "�������� ��������..."
 
-#: ../../standalone/draknet_.c:199
-#, fuzzy
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
-msgstr "������ ��������... "
+msgstr "�������� ��������..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
 "/etc/sysconfig/network-scripts/net_cnx_down\n"
 "in root."
 msgstr ""
+"� ������� ��� �������.\n"
+"����������� �� �� ������ ����� ��� ���������\n"
+"/etc/sysconfig/network-scripts/net_cnx_down\n"
+"�� root."
 
-#: ../../standalone/draknet_.c:207
-#, fuzzy
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
 msgstr "�� ������� ��� ����� ����������� ��� ���������."
 
-#: ../../standalone/draknet_.c:219
-#, fuzzy
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
-msgstr "������� ���������"
+msgstr "������� ��������� ��� Internet..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
-#, fuzzy
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
-msgstr "��������� ADSL"
+msgstr "������� LAN"
 
-#: ../../standalone/draknet_.c:231
-#, fuzzy
-msgid "Adapter"
-msgstr "����������"
-
-#: ../../standalone/draknet_.c:231
-#, fuzzy
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
-msgstr "������������ �������"
+msgstr "������"
 
-#: ../../standalone/draknet_.c:231
-#, fuzzy
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
-msgstr "��������"
+msgstr "�����������"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
-msgstr ""
+msgstr "����������"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
 #, fuzzy
+msgid "State"
+msgstr "���������:"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
-msgstr "������� ������� �������"
+msgstr "������� ������� �������..."
 
-#: ../../standalone/draknet_.c:283
-#, fuzzy
-msgid "Normal Mode"
-msgstr "��������"
+#: ../../standalone/draknet_.c:279
+msgid "Click here to launch the wizard ->"
+msgstr ""
 
-#: ../../standalone/draknet_.c:288
+#: ../../standalone/draknet_.c:306
 msgid "Apply"
-msgstr ""
+msgstr "������������"
 
-#: ../../standalone/draknet_.c:307
-#, fuzzy
+#: ../../standalone/draknet_.c:325
 msgid "Please Wait... Applying the configuration"
-msgstr "������ ���������"
+msgstr "�������� ����������... �������� ���������"
 
-#: ../../standalone/draknet_.c:391
+#: ../../standalone/draknet_.c:428
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
+"��� ����� ������ ��������� �����������.\n"
+"�������� ��� �������� ���� ��� '�������'"
 
-#: ../../standalone/draknet_.c:415
-#, fuzzy
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
-msgstr "��������� ADSL"
+msgstr "������� L��"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
-msgstr ""
+msgstr "������������ %s: %s"
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
-msgstr ""
+msgstr "���������� ���������"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
-msgstr ""
+msgstr "��������� ���� �������� ����������"
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
-msgstr ""
+msgstr "������� DHCP"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Disable"
-msgstr "��������������"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+msgid "activate now"
+msgstr ""
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "������������"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+msgid "desactivate now"
+msgstr ""
 
-#: ../../standalone/draknet_.c:504
+#: ../../standalone/draknet_.c:538
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
 msgstr ""
+"��� ����� ������� �� �� internet.\n"
+"������������ ��� �������� ���� ��� '�������'"
 
-#: ../../standalone/draknet_.c:528
-#, fuzzy
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
-msgstr "������� ��� ������� ���������� (internet)"
+msgstr "������� �������� ���������� (internet)"
 
-#: ../../standalone/draknet_.c:532
-#, fuzzy
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
-msgstr "������� ��� ������� ���������� (internet)"
+msgstr "������� �������� ���������� (internet)"
 
-#: ../../standalone/draknet_.c:541
-#, fuzzy
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
-msgstr "����� ��������"
+msgstr "����� ��������: "
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
-msgstr ""
+msgstr "����������"
 
-#: ../../standalone/draknet_.c:560
-#, fuzzy
-msgid "Provider dns 1 (optional)"
-msgstr "DNS 1"
-
-#: ../../standalone/draknet_.c:561
-#, fuzzy
-msgid "Provider dns 2 (optional)"
-msgstr "DNS 2"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
-msgstr ""
+msgstr "����� Ethernet"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
-msgstr ""
+msgstr "������� DHCP"
 
 #: ../../standalone/draksec_.c:21
 msgid "Welcome To Crackers"
@@ -7465,16 +8352,30 @@ msgstr ""
 "�������� �������� 4, �� �� ������� ������� �������. �������� \n"
 "��� ������� ������."
 
-#: ../../standalone/draksec_.c:52
-msgid "Setting security level"
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
 msgstr "������� �������� ���������"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/draksec_.c:67
 #, fuzzy
+msgid "Use libsafe for servers"
+msgstr "��������� X server"
+
+#: ../../standalone/draksec_.c:68
+msgid ""
+"A library which defends against buffer overflow and format string attacks."
+msgstr ""
+
+#: ../../standalone/draksec_.c:72
+msgid "Setting security level"
+msgstr "������� �������� ���������"
+
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
-msgstr "������� ��� ��������� (internet)"
+msgstr "������ �������"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "�������� �� �������� ��� ������ �� ���������������"
 
@@ -7502,125 +8403,128 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "��� ����� �� �������� �� live upgrade!!!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "��� ������� serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "��������� ������ ��������;"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "�������� ��������� �� �������"
+#: ../../standalone/tinyfirewall_.c:29
+msgid "Firewalling Configuration"
+msgstr "������� Firewalling"
 
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-#, fuzzy
-msgid "Network Monitoring"
-msgstr "��������� �������"
+#: ../../standalone/tinyfirewall_.c:42
+msgid "Firewalling configuration"
+msgstr "������� firewalling"
 
-#: ../../standalone/net_monitor_.c:56
-msgid "Statistics"
+#: ../../standalone/tinyfirewall_.c:77
+msgid ""
+"Firewalling\n"
+"\n"
+"You already have set up a firewall.\n"
+"Click on Configure to change or remove the firewall"
 msgstr ""
+"Firewalling\n"
+"\n"
+"����� ��� �������� ��� firewall.\n"
+"����� ���� ��� ������� ��� �� �������� � �� ���������� �� firewall"
 
-#: ../../standalone/net_monitor_.c:59
-msgid "Sending Speed: "
+#: ../../standalone/tinyfirewall_.c:81
+msgid ""
+"Firewalling\n"
+"\n"
+"Click on Configure to set up a standard firewall"
 msgstr ""
+"Firewalling\n"
+"\n"
+"����� ���� ��� ������� ��� �� ������� ��� ������ firewall"
 
-#: ../../standalone/net_monitor_.c:61
-msgid "Receiving Speed: "
-msgstr ""
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "�������� ������"
 
-#: ../../standalone/net_monitor_.c:66
-#, fuzzy
-msgid "Close"
-msgstr "USB Mouse"
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "�������� �����������"
 
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Connecting to Internet "
-msgstr "������� ��� ��������� (internet)"
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "���������� ������� ������"
 
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Disconnecting from Internet "
-msgstr "���������� ��� �� ��������� (internet)"
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "������� ���������"
 
-#: ../../standalone/net_monitor_.c:114
-#, fuzzy
-msgid "Disconnection from Internet failed."
-msgstr "���������� ��� �� ��������� (internet)"
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "�������� ������������"
 
-#: ../../standalone/net_monitor_.c:115
-#, fuzzy
-msgid "Disconnection from Internet complete."
-msgstr "���������� ��� �� ��������� (internet)"
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "��������"
 
-#: ../../standalone/net_monitor_.c:117
-#, fuzzy
-msgid "Connection complete."
-msgstr "����� ��������"
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "�����. ���. ���."
 
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "������. ��������."
 
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr ""
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "������� �������"
 
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr ""
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "����������� ����������"
 
-#: ../../standalone/net_monitor_.c:222
-#, fuzzy
-msgid "Connect"
-msgstr "����� ��������"
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "�������� ������"
 
-#: ../../standalone/net_monitor_.c:222
-#, fuzzy
-msgid "Disconnect"
-msgstr "������� �������� ISDN"
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "������� �������"
 
-#: ../../standalone/tinyfirewall_.c:29
-#, fuzzy
-msgid "Firewalling Configuration"
-msgstr "����������� ������� firewall!"
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "������� ���������"
 
-#: ../../standalone/tinyfirewall_.c:42
-#, fuzzy
-msgid "Firewalling configuration"
-msgstr "����������� ������� firewall!"
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "������� ���������"
 
-#: ../../standalone/tinyfirewall_.c:77
-msgid ""
-"Firewalling\n"
-"\n"
-"You already have set up a firewall.\n"
-"Click on Configure to change or remove the firewall"
-msgstr ""
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "���. ��. ���������"
 
-#: ../../standalone/tinyfirewall_.c:81
-msgid ""
-"Firewalling\n"
-"\n"
-"Click on Configure to set up a standard firewall"
-msgstr ""
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "������� �"
 
-#: ../../tinyfirewall.pm_.c:10
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "������"
+
+#: ../../tinyfirewall.pm_.c:9
 msgid ""
 "tinyfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Linux Mandrake machine.\n"
+"This configures a personal firewall for this Mandrake Linux machine.\n"
 "For a powerful dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
+"������� tinyfirewall\n"
+"\n"
+"���� �������� �� ��������� ��� firewall ��� ���� �� �������� Mandrake "
+"Linux.\n"
+"��� ��� ������ ���������� ���� firewall, �������� �������� ����\n"
+"����������� MandrakeSecurity Firewall �������."
 
-#: ../../tinyfirewall.pm_.c:15
+#: ../../tinyfirewall.pm_.c:14
 msgid ""
 "We'll now ask you questions about which services you'd like to allow\n"
 "the Internet to connect to.  Please think carefully about these\n"
@@ -7630,24 +8534,43 @@ msgid ""
 "it off.  You can change this configuration anytime you like by\n"
 "re-running this application!"
 msgstr ""
+"���� �� ��� ������� ��������� ��� �� ����� ��������� ������ �� �������\n"
+"�� ���������� ��� Internet.  �������� ��������� ���������� ��� ����� ���\n"
+"���������, ����� � �������� ��� ���������� ��� ����� ���������.\n"
+"\n"
+"��������, �� ��� �������� ������ ��� �������������� ������ ��� ����� ��� "
+"���������,\n"
+"������ ��� ��� �� firewall.  �������� �� �������� ����� ��� ��������� "
+"�����������\n"
+"������ ������ ������������� ����� ��� ��������!"
 
-#: ../../tinyfirewall.pm_.c:22
+#: ../../tinyfirewall.pm_.c:21
 msgid ""
 "Are you running a web server on this machine that you need the whole\n"
 "Internet to see? If you are running a webserver that only needs to be\n"
 "accessed by this machine, you can safely answer NO here.\n"
 "\n"
 msgstr ""
+"������� ���� ����������� web �� ���� �� �������� ��� ���������� �� ��� "
+"������\n"
+"�������� �� internet; �� ������� ���� ���������� web ��� ���� ���� �� "
+"��������\n"
+"���������� �� ��� ������, ���� �������� �� ���������� ��� �� �������� ���.\n"
+"\n"
 
-#: ../../tinyfirewall.pm_.c:27
+#: ../../tinyfirewall.pm_.c:26
 msgid ""
 "Are you running a name server on this machine? If you didn't set one\n"
 "up to give away IP and zone information to the whole Internet, please\n"
 "answer no.\n"
 "\n"
 msgstr ""
+"������� name ����������� �� ���� �� ��������; �� ��� ��������� ����\n"
+"���� �� ����� IP ��� ����������� ����� �� ��� �� internet, ��������\n"
+"��������� ���.\n"
+"\n"
 
-#: ../../tinyfirewall.pm_.c:32
+#: ../../tinyfirewall.pm_.c:31
 msgid ""
 "Do you want to allow incoming Secure Shell (ssh) connections? This\n"
 "is a telnet-replacement that you might use to login. If you're using\n"
@@ -7655,48 +8578,81 @@ msgid ""
 "encrypted -- so some attackers can steal your password if you use\n"
 "it. ssh is encrypted and doesn't allow for this eavesdropping."
 msgstr ""
+"Do you want to allow incoming Secure Shell (ssh) connections? This\n"
+"is a telnet-replacement that you might use to login. If you're using\n"
+"telnet now, you should definitely switch to ssh. telnet is not\n"
+"encrypted -- so some attackers can steal your password if you use\n"
+"it. ssh is encrypted and doesn't allow for this eavesdropping.��� �����\n"
+"��������������� -- ����� ������� �������� ������� �� ������� ��� ������\n"
+"��������� �� �� ��������������. To ssh ����� ��������������� ��� ��� �� "
+"��������� ����."
 
-#: ../../tinyfirewall.pm_.c:37
+#: ../../tinyfirewall.pm_.c:36
 msgid ""
 "Do you want to allow incoming telnet connections?\n"
 "This is horribly unsafe, as we explained in the previous screen. We\n"
 "strongly recommend answering No here and using ssh in place of\n"
 "telnet.\n"
 msgstr ""
+"������ �� ���������� ������������ ��������� telnet;\n"
+"���� ����� ������� �� �������, ���� ��������� ���� ����������� �����.\n"
+"����������� �� ���������� ��� ��� ��� �� ��������������� �� ssh ��� ���� "
+"���\n"
+"telnet.\n"
 
-#: ../../tinyfirewall.pm_.c:42
+#: ../../tinyfirewall.pm_.c:41
 msgid ""
 "Are you running an FTP server here that you need accessible to the\n"
 "Internet? If you are, we strongly recommend that you only use it for\n"
 "Anonymous transfers. Any passwords sent by FTP can be stolen by some\n"
 "attackers, since FTP also uses no encryption for transferring passwords.\n"
 msgstr ""
+"������� ���� FTP ����������� ��� ���������� �� ����� ����������� ��� "
+"Internet;\n"
+"��� ���, ���� ����������� �� �� �������������� ��� �������� ���������. "
+"����������\n"
+"������� ��������� ���������� ��� �� FTP ������� �� ������� ��� �������� "
+"��������,\n"
+"���� �� FTP ������ ��� ������������ ������������� ��� ��� �������� ������� "
+"���������\n"
 
-#: ../../tinyfirewall.pm_.c:47
+#: ../../tinyfirewall.pm_.c:46
 msgid ""
 "Are you running a mail server here? If you're sending you \n"
 "messages through pine, mutt or any other text-based mail client,\n"
 "you probably are.  Otherwise, you should firewall this off.\n"
 "\n"
 msgstr ""
+"������� ���� ����������� ������������ ���; ��� �������� �� \n"
+"�������� ��� ���� pine, mutt � ����� ������ ������������ ��� ��� �������,\n"
+"���� ������� �� �������.  ������ �� ������ �� �� ����������� �� firewall "
+"����.\n"
+"\n"
 
-#: ../../tinyfirewall.pm_.c:52
+#: ../../tinyfirewall.pm_.c:51
 msgid ""
 "Are you running a POP or IMAP server here? This would\n"
 "be used to host non-web-based mail accounts for people via \n"
 "this machine.\n"
 "\n"
 msgstr ""
+"������� ���� POP � IMAP ����������� ���; ���� ���������������\n"
+"��� ������ ����������� ������������ �� ���������� ��� web ��� ��������� \n"
+"���� ����� ��� �����������.\n"
+"\n"
 
-#: ../../tinyfirewall.pm_.c:57
+#: ../../tinyfirewall.pm_.c:56
 msgid ""
 "You appear to be running a 2.2 kernel.  If your network IP\n"
 "is automatically set by a computer in your home or office \n"
 "(dynamically assigned), we need to allow for this.  Is\n"
 "this the case?\n"
 msgstr ""
+"�������� ��� ������� ���� 2.2 ������.  ��� � IP ���\n"
+"����� ��������, ������ �� �� ����������� ����.  ����� ���� \n"
+"� ��������� ���;\n"
 
-#: ../../tinyfirewall.pm_.c:62
+#: ../../tinyfirewall.pm_.c:61
 msgid ""
 "Is your computer getting time syncronized to another computer?\n"
 "Mostly, this is used by medium-large Unix/Linux organizations\n"
@@ -7704,1770 +8660,1577 @@ msgid ""
 "of a larger office and haven't heard of this, you probably \n"
 "aren't."
 msgstr ""
+"������������� � ��� ��� ���������� ��� �� ����� ����������;\n"
+"�����������, ���� ��������������� ��� �������������� �����������\n"
+"�� Unix/Linux ��� �� �������������� �� logs ���.  ��� ��� ����� �����\n"
+"���� ������� �������� ��� ��� ����� ������� ��� ����, ���� ������� \n"
+"�� ��� ������ ����."
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
 "\n"
 "\n"
 msgstr ""
+"� ������� ������������.  �� �������� ����� �� ������� ��� �����;\n"
+"\n"
+"\n"
+"\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
-msgstr ""
+msgstr "�������� ���������� %s: %s\n"
 
-#: ../../tinyfirewall.pm_.c:85
-#, fuzzy, c-format
+#: ../../tinyfirewall.pm_.c:84
+#, c-format
 msgid "Can't open %s for writing: %s\n"
-msgstr "������ ���� �� ������� ��� %s ��� �������: %s"
+msgstr "������ ���� �� ������� ��� %s ��� �������: %s\n"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr ""
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Development"
-msgstr "��������"
+msgid "Network Computer (client)"
+msgstr "����������� ������� (�������)"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Workstation"
-msgstr "������� ��������"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS server, SMB server, Proxy server, ssh server"
 
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr ""
+msgid "Office"
+msgstr "�������"
 
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "���������� ���������� ���������"
+msgid "Gnome Workstation"
+msgstr "������� �������� Gnome"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "�������� - �������"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "�������� ��� Palm Pilot � Visor"
 
 #: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "��������"
+msgid "Workstation"
+msgstr "������� ��������"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer (client)"
-msgstr "��������� ������� (socket)"
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
 
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "�������� ����: mp3 � midi players, ������ ���"
+msgid "Domain Name and Network Information Server"
+msgstr "Domain Name ��� Network Information Server"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet station"
-msgstr "��������� ���������� (Internet)"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr "�������� ��������: ������������ ��������, ��������� ����� ���"
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "�������"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "�������� ����: mp3 � midi players, ������ ���"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia station"
-msgstr "�������� - ����"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "������ ��� ������ ��� �� Linux ��� �� �������� ���������"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"�������� ��� �������� ��� ���� ������������� ��� news (pine, mutt, tin...) "
-"��� Web Browsers"
+msgid "KDE Workstation"
+msgstr "������� �������� KDE"
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "����������� ��������� C ��� C++, ����������� ��� ���� ������"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ���"
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr ""
+msgid "Multimedia - Video"
+msgstr "�������� - Video"
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "����������� ����������� �����������, ���� �� gnucash"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "�������� ��� ������������, ���, web, �������� ������� ��� ���������"
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
+msgid "Database"
+msgstr "���� ���������"
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL � MySQL database ������������"
 
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "����������"
+msgid "Tools to ease the configuration of your computer"
+msgstr "�������� ��� �� �������������� ��� ������� ��� ���������� ���"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ���"
+msgid "Multimedia - Sound"
+msgstr "�������� - ����"
 
 #: ../../share/compssUsers:999
 msgid "Utilities"
 msgstr "��������"
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr ""
+msgid "Documentation"
+msgstr "����������"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "�������� - ����"
+msgid "Console Tools"
+msgstr "�������� ��������"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "���������� (���������)"
+msgid "Postfix mail server, Inn news server"
+msgstr "������������ ������������ Postfix, ������������ ���� Inn"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "����������� ������������ ��� ����������� video"
+msgid "Internet station"
+msgstr "������� Internet"
 
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "�������� ��������"
+msgid "Multimedia station"
+msgstr "������� ���������"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "����������� ������������ ��� ����������� video ��� ����"
+#, fuzzy
+msgid "Configuration"
+msgstr "������� L��"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Scientific Workstation"
-msgstr "������������� ���������"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "����������� ������� ������������ (Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "������������ ��������, ������, �������� �������, ���������"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "�� ���������� �������� KDE �� ��� ������� ������������ ���������"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "������ ��� ������ ��� �� Linux ��� �� �������� ���������"
+msgid "Graphical Environment"
+msgstr "������� ����������"
 
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr "������� ���������� �� ������ �������� ��� ���������"
+msgid "Development"
+msgstr "��������"
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr ""
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "���������"
+msgid "Tools to create and burn CD's"
+msgstr "�������� ��� ���������� ��� ������� CD"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "�������� - Video"
+msgid "Office Workstation"
+msgstr "������� �������� ��������"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer server"
-msgstr "��������� ������� (socket)"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, ���"
 
 #: ../../share/compssUsers:999
 msgid "Graphics programs such as The Gimp"
 msgstr "����������� �������� ���� �� Gimp"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Office Workstation"
-msgstr "������� ��������"
+msgid "DNS/NIS "
+msgstr "DNS/NIS "
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr "�� ���������� �������� KDE �� ��� ������� ������������ ���������"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "����������� ��������� C ��� C++, ����������� ��� ���� ������"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "����������� ������� ������������ (Gnome, IceWM)"
+msgid "Network Computer server"
+msgstr "������������ �������"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "�������� ��� ���������� ��� ������� CD"
+msgid "Mail/Groupware/News"
+msgstr "Mail/Groupware/News"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "�������� - ������� CD"
+msgid "Game station"
+msgstr "������� ����������"
 
 #: ../../share/compssUsers:999
-msgid "Archiving, emulators, monitoring"
-msgstr "������������, ����������, �������������"
+msgid "Video players and editors"
+msgstr "����������� ������������ ��� ����������� video"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Database"
-msgstr "������ ���������"
+msgid "Multimedia - Graphics"
+msgstr "�������� - �������"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr "�������� ��������: ������������ ��������, ��������� ����� ���"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "���������� (���������)"
 
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
+"�������� ��� �������� ��� ���� ������������� ��� news (pine, mutt, tin...) "
+"��� Web Browsers"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Server"
-msgstr "������������"
+msgid "Archiving, emulators, monitoring"
+msgstr "������������, ����������, �������������"
 
 #: ../../share/compssUsers:999
 msgid "Personal Finance"
 msgstr "���������� ���������� ����������� ���������"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "���������"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "������� ���������� �� ������ �������� ��� ���������"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "KDE Workstation"
-msgstr "������� ��������"
+msgid "Clients for different protocols including ssh"
+msgstr "������� ��� ����������� ���������� ������������������� ��� ssh"
 
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "���� ������� ������������"
+msgid "Internet gateway"
+msgstr "���� ��������"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr ""
+msgid "Sound and video playing/editing programs"
+msgstr "����������� ������������ ��� ����������� video ��� ����"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr ""
+msgid "Other Graphical Desktops"
+msgstr "���� ������� ������������"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Gnome Workstation"
-msgstr "������� ��������"
+msgid "Editors, shells, file tools, terminals"
+msgstr "������������ ��������, ������, �������� �������, ���������"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "��������"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "����������� ����������� �����������, ���� �� gnucash"
 
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "�������� ��� Palm Pilot � Visor"
+msgid "Games"
+msgstr "���������"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Game station"
-msgstr "����������"
+msgid "Personal Information Management"
+msgstr "���������� ���������� ���������"
 
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, ���"
+msgid "Multimedia - CD Burning"
+msgstr "�������� - ������� CD"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Tools to ease the configuration of your computer"
-msgstr "������ �� ���������� ��� ���������;"
+msgid "Scientific Workstation"
+msgstr "������� �������� ������������� ���������"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "�������� ��� ������������, ���, web, �������� ������� ��� ���������"
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "�������� ���������� ��� /etc/sysconfig/autologin ��� ��������: %s"
 
-#~ msgid "%d minutes"
-#~ msgstr "%d �����"
+#~ msgid "Do you want to restart the network"
+#~ msgstr "������ �� �������������� �� ������;"
 
-#~ msgid "1 minute"
-#~ msgstr "1 �����"
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "����������;"
 
-#~ msgid "%d seconds"
-#~ msgstr "%d ������������"
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "�� ������������ ��� �������� ������� �������:\n"
 
-#, fuzzy
-#~ msgid "Configure..."
-#~ msgstr "�������..."
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "�� ������������ ��� ������� ������� %s. ����������;"
 
 #, fuzzy
-#~ msgid "Lilo/Grub configuration"
-#~ msgstr "��������� ADSL"
+#~ msgid ""
+#~ "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
+#~ "(primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+#~ msgstr ""
+#~ "����� ��� �� ����� �������� ��� ��� ����� ����, � ����������� �������\n"
+#~ "����� \"/dev/hda\" (� ������ ������ ��� ����� ������), � \"/dev/sda\n"
+#~ "(� ������ SCSI ������)."
 
 #, fuzzy
-#~ msgid "Selected size %d%s"
-#~ msgstr "�������� ������"
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "�������� �� ��������� ����� ���������.\n"
+#~ "�������� �� ���������� �� ����� � �� �������� ��� ����������."
 
 #, fuzzy
-#~ msgid "Opening your connection..."
-#~ msgstr "������ ��������... "
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "�������� ��� ��' ������� ������:"
 
-#, fuzzy
-#~ msgid "Standard tools"
-#~ msgstr "������"
+#~ msgid "Spooler: "
+#~ msgstr "Spooler: "
 
-#, fuzzy
-#~ msgid "Configuration de Lilo/Grub"
-#~ msgstr "���������: �������� ����������"
+#~ msgid "Test the mouse here."
+#~ msgstr "��������� �� ������� ���."
 
-#~ msgid "This startup script try to load your modules for your usb mouse."
-#~ msgstr ""
-#~ "���� � ����� ������� ��������� �� �������� ���� ������� ��� usb mouse."
+#~ msgid "Press next to continue."
+#~ msgstr "������� ������� ��� �� ����������."
 
-#, fuzzy
-#~ msgid "Boot style configuration"
-#~ msgstr "��������� ���� ��� �����������"
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ msgstr "�������� �������� ������ ��� ����������� ��� �����."
 
 #~ msgid ""
-#~ "Now that your Internet connection is configured,\n"
-#~ "your computer can be configured to share its Internet connection.\n"
-#~ "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-#~ "(LAN).\n"
+#~ "You need to accept the terms of the above license to continue "
+#~ "installation.\n"
+#~ "\n"
+#~ "\n"
+#~ "Please click on \"Accept\" if you agree with its terms.\n"
 #~ "\n"
-#~ "Would you like to setup the Internet Connection Sharing?\n"
+#~ "\n"
+#~ "Please click on \"Refuse\" if you disagree with its terms. Installation "
+#~ "will end without modifying your current\n"
+#~ "configuration."
 #~ msgstr ""
-#~ "���� ��� � ������� ��� �� �� ��������� ����������, � ����������� ��� "
-#~ "������ \n"
-#~ "�� ��������� ���� ���� �� ��� ���������� �� ������ �����������. "
-#~ "��������: \n"
-#~ "���������� ���� ����������� ������� ���� ���� �� ������������� ��� ������ "
-#~ "������ (LAN).\n"
+#~ "������ �� ����������� ���� ����� ��� ������ ������ ���� ���������� ��� "
+#~ "�����������.\n"
 #~ "\n"
-#~ "������ �� ��������� ��� ����� ����� ��� �������� Internet;\n"
-
-#~ msgid "Automatic dependencies"
-#~ msgstr "�������� ������� ����������"
-
-#~ msgid "Configure LILO/GRUB"
-#~ msgstr "������� LILO/GRUB"
-
-#~ msgid "Create a boot floppy"
-#~ msgstr "���������� ��������� ���������"
+#~ "\n"
+#~ "�������� �������� \"�������\" ��� ���������� �� ���� �����.\n"
+#~ "\n"
+#~ "\n"
+#~ "�������� �������� \"������\" ��� ��� ����������. � ����������� �� "
+#~ "���������� ����� ��\n"
+#~ "��������� ������."
 
-#~ msgid "Format floppy"
-#~ msgstr "����������� ���������"
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr ""
+#~ "�������� ��� ���������� ��� ����������� ��� ������������ ������ ��� "
+#~ "�������� �����"
 
-#~ msgid "Choice"
-#~ msgstr "�������"
+#~ msgid ""
+#~ "If you wish other languages (than the one you choose at\n"
+#~ "beginning of installation) will be available after installation, please "
+#~ "chose\n"
+#~ "them in list above. If you want select all, you just need to select \"All"
+#~ "\"."
+#~ msgstr ""
+#~ "��� ������ ��� ����� ������� (����� ��� ���� ��� ��������� ���� ����)\n"
+#~ "�������� �������� ��� ��� ��� �������� ��������."
 
-#, fuzzy
-#~ msgid "gMonitor"
-#~ msgstr "�����"
+#~ msgid ""
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Customized: If you are familiar enough with GNU/Linux, you may then "
+#~ "choose\n"
+#~ "    the primary usage for your machine. See below for details.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
+#~ "    perform a highly customized installation. As for a \"Customized\"\n"
+#~ "    installation class, you will be able to select the usage for your "
+#~ "system.\n"
+#~ "    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
+#~ "DOING!"
+#~ msgstr ""
+#~ "��������:\n"
+#~ "\n"
+#~ "  - �������������: ��� ����� ������������� �� �� Linux, �� ��������� �� \n"
+#~ "��������� ������ ���������� ������� ������, ���������� ��������� � "
+#~ "�����������\n"
+#~ "�������.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - �������������: ��� ����� ���� ������������� �� ��������� GNU/Linux "
+#~ "���\n"
+#~ "������ �� ���������������� ��� ���������� ������������� �����������, "
+#~ "����\n"
+#~ "���� � ������� ����� ��� ���. �� ��������� �� ��������� ���� "
+#~ "������������\n"
+#~ "���� ��� ���� �������� (\"�������������\") �������."
 
 #~ msgid ""
-#~ "You can now select some miscellaneous options for your system.\n"
+#~ "You must now define your machine usage. Choices are:\n"
 #~ "\n"
-#~ "* Use hard drive optimizations: this option can improve hard disk "
-#~ "performance but is only for advanced users. Some buggy\n"
-#~ "  chipsets can ruin your data, so beware. Note that the kernel has a "
-#~ "builtin blacklist of drives and chipsets, but if\n"
-#~ "  you want to avoid bad surprises, leave this option unset.\n"
+#~ "* Workstation: this the ideal choice if you intend to use your machine "
+#~ "primarily for everyday use, at office or\n"
+#~ "  at home.\n"
 #~ "\n"
 #~ "\n"
-#~ "* Choose security level: you can choose a security level for your system. "
-#~ "Please refer to the manual for complete\n"
-#~ "  information. Basically, if you don't know what to choose, keep the "
-#~ "default option.\n"
+#~ "* Development: if you intend to use your machine primarily for software "
+#~ "development, it is the good choice. You\n"
+#~ "  will then have a complete collection of software installed in order to "
+#~ "compile, debug and format source code,\n"
+#~ "  or create software packages.\n"
 #~ "\n"
 #~ "\n"
-#~ "* Precise RAM if needed: unfortunately, there is no standard method to "
-#~ "ask the BIOS about the amount of RAM present in\n"
-#~ "  your computer. As consequence, Linux may fail to detect your amount of "
-#~ "RAM correctly. If this is the case, you can\n"
-#~ "  specify the correct amount or RAM here. Please note that a difference "
-#~ "of 2 or 4 MB between detected memory and memory\n"
-#~ "  present in your system is normal.\n"
+#~ "* Server: if you intend to use this machine as a server, it is the good "
+#~ "choice. Either a file server (NFS or\n"
+#~ "  SMB), a print server (Unix style or Microsoft Windows style), an "
+#~ "authentication server (NIS), a database\n"
+#~ "  server and so on. As such, do not expect any gimmicks (KDE, GNOME, "
+#~ "etc.) to be installed."
+#~ msgstr ""
+#~ "�� �������� ��� ����� ������� �� ��� ����� ��� ���������� ��� \n"
+#~ "����� �� ���������:\n"
+#~ "\n"
+#~ "* ������� ��������: �������� ����� ��� ��������� �� ��������������� �� "
+#~ "�������\n"
+#~ "  ��� ������ ��� ���������� �����, ��� ����� � ��� �������. \n"
+#~ "\n"
+#~ "* ��������: �������� ���� ��� ��������� �� ��������������� �� ������� "
+#~ "���\n"
+#~ "  ������ ��� �������� ����������. �� ������������ ��� ������ ������� "
+#~ "���������\n"
+#~ "  ��� �����������, ������������� ��� ����������� ������� ������, ����� "
+#~ "���\n"
+#~ "  ���������� ������� ����������.\n"
+#~ "\n"
+#~ "* ������������: �������� ���� ��� ��������� �� ��������������� �� ������� "
+#~ "���\n"
+#~ "  �� �����������, ���� ������� (NFS � SMB), ���� ���������� (lp � SMB), "
+#~ "����\n"
+#~ "  ������������ (NIS), ����� ��������� ���. �� ����� ��� ���������, ��� "
+#~ "��\n"
+#~ "  ������������� �������� ���� �� KDE, �� Gnome ���."
+
+#~ msgid ""
+#~ "You may now select the group of packages you wish to\n"
+#~ "install or upgrade.\n"
+#~ "\n"
+#~ "\n"
+#~ "DrakX will then check whether you have enough room to install them all. "
+#~ "If not,\n"
+#~ "it will warn you about it. If you want to go on anyway, it will proceed "
+#~ "onto the\n"
+#~ "installation of all selected groups but will drop some packages of "
+#~ "lesser\n"
+#~ "interest. At the bottom of the list you can select the option \n"
+#~ "\"Individual package selection\"; in this case you will have to browse "
+#~ "through\n"
+#~ "more than 1000 packages..."
+#~ msgstr ""
+#~ "�������� ���� �� ��������� ��� ������ ������� ��� ���������� �� "
+#~ "������������� � �� ������������.\n"
+#~ "\n"
+#~ "\n"
+#~ "�� DrakX �� ������������ ��� ����� ������ ���� ���� ����� ���.\n"
+#~ "��� ���, �� ������ ��� �������������. ��� ������ �� ����������, �� "
+#~ "�������������\n"
+#~ "���� �� ����������� ������, ���� �� ���������� ������ ������ ��������� "
+#~ "�������������.\n"
+#~ "��� ���� ����� ��� ������ �������� �� ��������� \"������� ����������� "
+#~ "�������\". �� ����\n"
+#~ "�� ��������� �� ������ �� ��������� ������� �� �������� ��� 1000 ������."
+
+#~ msgid ""
+#~ "You can now choose individually all the packages you\n"
+#~ "wish to install.\n"
 #~ "\n"
 #~ "\n"
-#~ "* Removable media automounting: if you would prefer not to manually mount "
-#~ "removable media (CD-Rom, floppy, Zip, etc.) by\n"
-#~ "  typing \"mount\" and \"umount\", select this option.\n"
+#~ "You can expand or collapse the tree by clicking on options in the left "
+#~ "corner of\n"
+#~ "the packages window.\n"
 #~ "\n"
 #~ "\n"
-#~ "* Clean \"/tmp\" at each boot: if you want delete all files and "
-#~ "directories stored in \"/tmp\" when you boot your system,\n"
-#~ "  select this option.\n"
+#~ "If you prefer to see packages sorted in alphabetic order, click on the "
+#~ "icon\n"
+#~ "\"Toggle flat and group sorted\".\n"
 #~ "\n"
 #~ "\n"
-#~ "* Enable num lock at startup: if you want NumLock key enabled after "
-#~ "booting, select this option. Please note that you\n"
-#~ "  should not enable this option on laptops and that NumLock may or may "
-#~ "not work under X."
+#~ "If you want not to be warned on dependencies, click on \"Automatic\n"
+#~ "dependencies\". If you do this, note that unselecting one package may "
+#~ "silently\n"
+#~ "unselect several other packages which depend on it."
 #~ msgstr ""
-#~ "�������� ���� �� ��������� �������� ��������� ��� �� ������� ���.\n"
-#~ "\n"
-#~ "* ����� ���������������� ������� ������: ���� � ������� ������ �� "
-#~ "���������\n"
-#~ "��� ��������� ��� ������� ��� ������, ���� ����������� ���� ��� "
-#~ "�������������\n"
-#~ "�������, ������ ������ ������������ chipsets ������� �� ������������ "
-#~ "��������.\n"
-#~ "� ������� �������� ��� \"����� �����\" ������������� chipsets, ���� �� "
-#~ "������ \n"
-#~ "�� ��������� ���������, �� ��������������� ����� ��� �������.\n"
-#~ "\n"
-#~ "\n"
-#~ "* ������� �������� ���������: �������� ������� ��������� ��� �� ������� "
-#~ "���.\n"
-#~ "�������� ��������� ���� ���������� ��� ��������� �����������.\n"
-#~ "��� ��� ������, �������� ��� ����������. \n"
-#~ "\n"
-#~ "* ������� ������� RAM ��� ����������: ��� �������� PC ��� ������� "
-#~ "�������������\n"
-#~ "������ ����������� ��� �������� ��� RAM ��� �� BIOS. �������, �� GNU/"
-#~ "Linux ���\n"
-#~ "������ �� ���������� ����� ����� ��� ������������� RAM. ��� ���� ������, "
-#~ "�������� �� �����\n"
-#~ "�������. ��������: ��� ������� 2 � 4 MB ��������� �����������.\n"
-#~ "\n"
-#~ "\n"
-#~ "* �������� ������� ����������� �����: ��� ��������� �� ������� �������� � "
-#~ "�������\n"
-#~ "������������ ����� ����������� (CD-ROM, ��������, Zip), �������� ����� "
-#~ "��� �������.\n"
+#~ "�������� ���� �� ��������� ���������� ��� �� ������ ��� ���������� \n"
+#~ "�� �������������.\n"
 #~ "\n"
 #~ "\n"
-#~ "* ���������� \"/tmp\" ���� ��� ��������: ��� ������ �� ������������ ��� "
-#~ "�� ��������� ������ ��� ���������\n"
-#~ "\"tmp\" ���� ��� ��������, �������� ��.\n"
+#~ "�������� �� ���������� � �� ���������� �� ������ ����������� ��� "
+#~ "��������\n"
+#~ "���� �������� ����� ��� ��������� ��� �������.\n"
 #~ "\n"
 #~ "\n"
-#~ "* ������������ numlock ���� ��������: ��� ������ �� Number Lock �� ����� "
-#~ "������\n"
-#~ "���� ��� ��������, �������� (��������: � ������� ��� ����� ��  ������� X "
-#~ "Window)."
-
-#, fuzzy
-#~ msgid "Internet/Network access"
-#~ msgstr "��������"
-
-#, fuzzy
-#~ msgid "Mail information"
-#~ msgstr "������� �����������"
-
-#, fuzzy
-#~ msgid "Firewall Configuration Wizard"
-#~ msgstr "��������� �������"
-
-#~ msgid "Miscellaneous"
-#~ msgstr "�������"
-
-#~ msgid "Miscellaneous questions"
-#~ msgstr "�������� ���������"
-
-#~ msgid "Can't use supermount in high security level"
-#~ msgstr "������� � ����� ��� supermount �� ����� ������� ���������"
+#~ "��� ��������� �� �� ������� �� ������ ������������ ����������, �������\n"
+#~ "\"�������� ������������\".\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ��� ������ �� ��������� ��������������� ��� ����������, �������\n"
+#~ "\"��������� ����������\". ��������� ��� �� ����� ��� ���������, � \n"
+#~ "���������� ���� ������� ������ �� ���������� ��� ������� ���������� \n"
+#~ "��� ����� ������� ��� ���������� ��� ����."
 
 #~ msgid ""
-#~ "beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
-#~ "If you want to be root, you have to login as a user and then use \"su\".\n"
-#~ "More generally, do not expect to use your machine for anything but as a "
-#~ "server.\n"
-#~ "You have been warned."
+#~ "If you have all the CDs in the list above, click Ok. If you have\n"
+#~ "none of those CDs, click Cancel. If only some CDs are missing, unselect "
+#~ "them,\n"
+#~ "then click Ok."
 #~ msgstr ""
-#~ "�������: �� ���� �� ������� ���������, � ������� �� ROOT ��� "
-#~ "����������� \n"
-#~ "��� ��� �������! ��� ������ �� ���������� �� root, ������ ����� �� "
-#~ "����������\n"
-#~ "�� ����� ������� ��� �� ��������������� ��� ������ \"su\". ������, ��� "
-#~ "����������\n"
-#~ "�� ��������������� �� ������� ��� ��� ���� ����� ����� ��� �����������."
+#~ "��� ����� ��� �� �������� CDs, ������� Ok.\n"
+#~ "��� ��� ����� ������ ��� �� �������� CDs, ������� �������.\n"
+#~ "��� ��� ����� ������ ��� ����, ����������� �� ��� ������� Ok."
 
 #~ msgid ""
-#~ "Be carefull, having numlock enabled causes a lot of keystrokes to\n"
-#~ "give digits instead of normal letters (eg: pressing `p' gives `6')"
+#~ "You can now test your mouse. Use buttons and wheel to verify\n"
+#~ "if settings are good. If not, you can click on \"Cancel\" to choose "
+#~ "another\n"
+#~ "driver.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you are installing on an Apple machine with a 1-button mouse, you "
+#~ "will\n"
+#~ "be given the opportunity to define some keyboard keys to emulate the 2nd\n"
+#~ "and 3rd mouse buttons.  This will allow you to be able to access the "
+#~ "full\n"
+#~ "functionality of the mouse in both the Linux console and the X Window "
+#~ "GUI.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you have an ADB mouse, please select USB, as the Linux kernel will "
+#~ "take\n"
+#~ "care of mapping your mouse hardware correctly."
 #~ msgstr ""
-#~ "�������, � ������������ ��� numlock ���� ��� ���������� ����� ������� "
-#~ "�� \n"
-#~ "������ ����� ���� ��� �������� (�.�. �������� `p' �������� `6')"
-
-#, fuzzy
-#~ msgid "Actions"
-#~ msgstr "���������"
-
-#~ msgid "Scientific applications"
-#~ msgstr "������������� ���������"
-
-#, fuzzy
-#~ msgid "toot"
-#~ msgstr "Root"
-
-#~ msgid "First DNS Server"
-#~ msgstr "������ ������������ DNS"
-
-#~ msgid "Second DNS Server"
-#~ msgstr "�������� ������������ DNS"
-
-#~ msgid "using module"
-#~ msgstr "����� ����������"
-
-#, fuzzy
-#~ msgid "Development, Database"
-#~ msgstr "��������"
-
-#~ msgid "loopback"
-#~ msgstr "loopback"
-
-#~ msgid "None"
-#~ msgstr "������"
-
-#~ msgid "Which bootloader(s) do you want to use?"
-#~ msgstr "���� ����������� ��������� ������ �� ����������;"
-
-#~ msgid "Auto install floppy"
-#~ msgstr "������� ��������� ������������"
-
-#~ msgid "Try to find a modem?"
-#~ msgstr "�� ���� ��� modem?"
-
-#~ msgid "Disable Internet Connection"
-#~ msgstr "�������������� �������� ��� ���������"
-
-#~ msgid "Configure local network"
-#~ msgstr "������� ������� �������"
-
-#~ msgid "Disable networking"
-#~ msgstr "�������������� �������"
-
-#~ msgid "Configure the Internet connection / Configure local Network"
-#~ msgstr "������� �������� ��� ��������� / ������� ������� �������"
+#~ "���� �������� �� ���������� �� ������� ���. �������������� �� ������� ��� "
+#~ "�� ������ ��� ��\n"
+#~ "������������� ��� �� ��������� ����� ������. �� ��� �����, �������� �� "
+#~ "������ ���� ��� \"�����\"\n"
+#~ "��� �� ��������� ���� ���� �����.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ������ ����������� �� ��� �������� Apple �� ������� ���� ��������, �� "
+#~ "��� ����� �\n"
+#~ "��������� �� ������� ������ ������� ��� ������������� ���� �� ����������� "
+#~ "�� 2� ��� �� 3�\n"
+#~ "������ ��� ���������. ���� �� ��� ��������� �� ����� �������� ���� ����� "
+#~ "���������������\n"
+#~ "��� ��������� ���� ���� ������� ��� Linux ��� ��� ��� X Window GUI.\n"
+#~ "\n"
+#~ "\n"
+#~ "�� ����� ��� ADB �������, �������� �������� USB, ����� � ������� ��� "
+#~ "Linux �� ���������\n"
+#~ "��� �� ������� ��� ���������."
 
 #~ msgid ""
-#~ "Local networking has already been configured.\n"
-#~ "Do you want to:"
+#~ "If you wish to connect your computer to the Internet or\n"
+#~ "to a local network please choose the correct option. Please turn on your "
+#~ "device\n"
+#~ "before choosing the correct option to let DrakX detect it automatically.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you do not have any connection to the Internet or a local network, "
+#~ "choose\n"
+#~ "\"Disable networking\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you wish to configure the network later after installation or if you "
+#~ "have\n"
+#~ "finished to configure your network connection, choose \"Done\"."
 #~ msgstr ""
-#~ "� ������ �������� ����� ��� ����������. \n"
-#~ "������ ��:"
-
-#, fuzzy
-#~ msgid "Reconfigure using wizard..."
-#~ msgstr "�������..."
-
-#~ msgid "Graphics Manipulation"
-#~ msgstr "���������� ��������"
-
-#~ msgid "Multimedia"
-#~ msgstr "��������"
-
-#~ msgid "Sciences"
-#~ msgstr "���������"
+#~ "��� ������ �� ��������� ��� ���������� ��� ��� ��������� � �� ��� "
+#~ "������ \n"
+#~ "������, �������� ����� ��� ��������� �������, ���� �������� ��� �������� "
+#~ "��� \n"
+#~ "������� ���� �� DrakX �� ��� ��������� ��������.\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ��� ����� ����� �������� �������, �������� \"�������������� �������"
+#~ "\".\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ������ �� ��������� �� ������ ��������, � �� ���������� �� ��� \n"
+#~ "��������� �������, �������� \"�����\"."
 
 #~ msgid ""
-#~ "Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and "
-#~ "file transfer tools"
+#~ "No modem has been detected. Please select the serial port on which it is "
+#~ "plugged.\n"
+#~ "\n"
+#~ "\n"
+#~ "For information, the first serial port (called \"COM1\" under Microsoft\n"
+#~ "Windows) is called \"ttyS0\" under Linux."
 #~ msgstr ""
-#~ "�������� �������� ���������� ���� xchat, licq, gaim ��� ��������� �������"
-
-#~ msgid "Communication facilities"
-#~ msgstr "�������� ������������"
-
-#~ msgid "KDE"
-#~ msgstr "KDE"
-
-#~ msgid "Gnome"
-#~ msgstr "Gnome"
-
-#~ msgid "Internet Tools"
-#~ msgstr "�������� ����������"
-
-#~ msgid "Databases clients and servers (mysql and postgresql)"
-#~ msgstr "������ ��������� (mysql ��� postgresql)"
-
-#~ msgid "Development C/C++"
-#~ msgstr "�������� C/C++"
-
-#~ msgid "Configure timezone"
-#~ msgstr "������� ����� ����"
-
-#~ msgid "Configure printer"
-#~ msgstr "������� ��������"
-
-#, fuzzy
-#~ msgid "Network adaptater 1 (eth0):"
-#~ msgstr "��������� ������� (socket)"
-
-#~ msgid "(may cause data corruption)"
-#~ msgstr "(������ �� ���������� ���������� ���������"
-
-#~ msgid "Use hard drive optimisations?"
-#~ msgstr "�� ������������� ���������������� ���� ������ �����;"
-
-#~ msgid "Enable num lock at startup"
-#~ msgstr "������������ num lock ���� ��� ��������"
-
-#~ msgid "Confirm Password"
-#~ msgstr "����������� ������������"
+#~ "��� ����������� modem. �������� �������� ��� �������� ���� ���� �����\n"
+#~ "����� �����������.\n"
+#~ "\n"
+#~ "\n"
+#~ "������������, � ����� ���� (��� ���������� \"COM1\" ��� Microsoft "
+#~ "Windows),\n"
+#~ "��� Linux ���������� \"ttyS0\"."
 
-#~ msgid "default"
-#~ msgstr "������� ��' �������"
+#~ msgid ""
+#~ "You may now enter dialup options. If you don't know\n"
+#~ "or are not sure what to enter, the correct informations can be obtained "
+#~ "from\n"
+#~ "your Internet Service Provider. If you do not enter the DNS (name "
+#~ "server)\n"
+#~ "information here, this information will be obtained from your Internet "
+#~ "Service\n"
+#~ "Provider at connection time."
+#~ msgstr ""
+#~ "�������� ���� �� ��������� ��� ��������� dial-up. ��� ��� ������ � ��� "
+#~ "�����\n"
+#~ "�������� ��� ����� ��� ���������, �������� �� ��� �������������� ��� "
+#~ "��� \n"
+#~ "������� ���. ��� ��� ������� ����������� �������� (DNS), �� ������� "
+#~ "�������� \n"
+#~ "���� ��� �������."
 
-#~ msgid "What is your system used for?"
-#~ msgstr "��� �� ����� ����������� �� ������� ���;"
+#~ msgid ""
+#~ "If your modem is an external modem, please turn on it now to let DrakX "
+#~ "detect it automatically."
+#~ msgstr ""
+#~ "��� �� modem ��� ����� ���������, �������� ������� �� ���� �� DrakX �� "
+#~ "�������� �� �� ��������� ��������."
 
-#~ msgid "Select the size you want to install"
-#~ msgstr "�������� �� ������� ��� ������ �� �������������"
+#~ msgid "Please turn on your modem and choose the correct one."
+#~ msgstr "�������� ������� �� modem ��� ��� �������� �� �����."
 
-#~ msgid "Use diskdrake"
-#~ msgstr "����� diskdrake"
+#~ msgid ""
+#~ "If you are not sure if informations above are\n"
+#~ "correct or if you don't know or are not sure what to enter, the correct\n"
+#~ "informations can be obtained from your Internet Service Provider. If you "
+#~ "do not\n"
+#~ "enter the DNS (name server) information here, this information will be "
+#~ "obtained\n"
+#~ "from your Internet Service Provider at connection time."
+#~ msgstr ""
+#~ "�������� ���� �� ��������� ��� ��������� dial-up. ��� ��� ������ � ��� "
+#~ "�����\n"
+#~ "�������� ��� ����� ��� ���������, �������� �� ��� �������������� ��� "
+#~ "��� \n"
+#~ "������� ���. ��� ��� ������� ����������� �������� (DNS), �� ������� "
+#~ "�������� \n"
+#~ "���� ��� �������."
 
-#~ msgid "Customized"
-#~ msgstr "�������������"
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, the correct informations can "
+#~ "be\n"
+#~ "obtained from your Internet Service Provider."
+#~ msgstr ""
+#~ "�������� ���� �� �������� �� �������� ����� (��� ����������). ��� ��� "
+#~ "����� ��������,\n"
+#~ "�������� �� �������� ����������� ��� ��� ������� ���."
 
 #~ msgid ""
-#~ "Are you sure you are an expert? \n"
-#~ "You will be allowed to make powerful but dangerous things here.\n"
+#~ "You may now configure your network device.\n"
+#~ "\n"
+#~ "   * IP address: if you don't know or are not sure what to enter, ask "
+#~ "your network administrator.\n"
+#~ "     You should not enter an IP address if you select the option "
+#~ "\"Automatic IP\" below.\n"
 #~ "\n"
-#~ "You will be asked questions such as: ``Use shadow file for passwords?'',\n"
-#~ "are you ready to answer that kind of questions?"
+#~ "   * Netmask: \"255.255.255.0\" is generally a good choice. If you don't "
+#~ "know or are not sure what to enter,\n"
+#~ "     ask your network administrator.\n"
+#~ "\n"
+#~ "   * Automatic IP: if your network uses BOOTP or DHCP protocol, select "
+#~ "this option. If selected, no value is needed in\n"
+#~ "    \"IP address\". If you don't know or are not sure if you need to "
+#~ "select this option, ask your network administrator."
 #~ msgstr ""
-#~ "����� �������� ��� ����� �������;\n"
-#~ "�� ��� ���������� ������� ���� ����������� ��������!\n"
-#~ "�� ��� ������ ��������� ����: ``����� ������� ������������;'',\n"
-#~ "����� ������� �� ���������� �� ������� ���������;"
-
-#~ msgid "Use shadow file"
-#~ msgstr "����� ������� shadow"
-
-#~ msgid "shadow"
-#~ msgstr "shadow"
-
-#~ msgid "MD5"
-#~ msgstr "MD5"
-
-#~ msgid "Use MD5 passwords"
-#~ msgstr "����� ������������ MD5"
-
-#~ msgid "Search"
-#~ msgstr "���������"
-
-#~ msgid "Package"
-#~ msgstr "������"
-
-#~ msgid "Text"
-#~ msgstr "�������"
-
-#~ msgid "Tree"
-#~ msgstr "������"
-
-#~ msgid "Sort by"
-#~ msgstr "���������� ����"
-
-#~ msgid "Category"
-#~ msgstr "���������"
-
-#~ msgid "See"
-#~ msgstr "���"
-
-#~ msgid "Installed packages"
-#~ msgstr "������������� ������"
-
-#~ msgid "Available packages"
-#~ msgstr "��������� ������"
-
-#~ msgid "Show only leaves"
-#~ msgstr "����� ���� �� �����"
-
-#~ msgid "Expand all"
-#~ msgstr "�������� ����"
-
-#~ msgid "Collapse all"
-#~ msgstr "�������� ����"
-
-#~ msgid "Add location of packages"
-#~ msgstr "�������� ���������� �������"
-
-#~ msgid "Update location"
-#~ msgstr "��������� ����������"
-
-#~ msgid "Remove"
-#~ msgstr "��������"
-
-#~ msgid "Find Package"
-#~ msgstr "������ �������"
-
-#~ msgid "Find Package containing file"
-#~ msgstr "������ ������� ��� �������� ������"
-
-#~ msgid "Toggle between Installed and Available"
-#~ msgstr "�������� ������ �������������� ��� ����������"
-
-#~ msgid "Uninstall"
-#~ msgstr "�������������"
-
-#~ msgid "Choose package to install"
-#~ msgstr "������� ������� ���� �����������"
-
-#~ msgid "Checking dependencies"
-#~ msgstr "������� ����������"
-
-#~ msgid "Wait"
-#~ msgstr "�������"
-
-#~ msgid "The following packages are going to be uninstalled"
-#~ msgstr "�� �������� ������ �� ���������������"
-
-#~ msgid "Uninstalling the RPMs"
-#~ msgstr "������������� ��� RPM"
-
-#~ msgid "Regexp"
-#~ msgstr "RegExp"
-
-#~ msgid "Which package are looking for"
-#~ msgstr "���� ������ �������"
-
-#~ msgid "%s not found"
-#~ msgstr "%s ��� �������"
-
-#~ msgid "No match"
-#~ msgstr "��� �������� ��������"
-
-#~ msgid "No more match"
-#~ msgstr "��� �������� ����� ��������"
+#~ "�������� ���� �� ��������� ��� ������� �������.\n"
+#~ "\n"
+#~ "  - ��������� IP: ��� ��� ��� ������, ������� ��� �������� ������� �\n"
+#~ "��� ������� ���.\n"
+#~ "��� ������ �� �������� ��������� IP ��� ��������� \"�������� ������� IP"
+#~ "\"\n"
+#~ "��������.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - ����� �������: \"255.255.255.0\" ����� ������� ���� �������. ��� ���\n"
+#~ "����� ��������, ������� ��� �������� ������� � ��� ������� ���.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - �������� ������� IP: ��� �� ������ ��� ������������ ��� ��� �� "
+#~ "����������\n"
+#~ "BOOTP � DHCP, �������� ����. �� ���� ��� ���������, ��� ���������� �� "
+#~ "������\n"
+#~ "��������� IP. ��� ��� ����� ��������, ������� ��� �������� ������� �\n"
+#~ "��� ������� ���."
 
 #~ msgid ""
-#~ "rpmdrake is currently in ``low memory'' mode.\n"
-#~ "I'm going to relaunch rpmdrake to allow searching files"
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, ask your network administrator."
 #~ msgstr ""
-#~ "�� rpmdrake ���������� �� ��������� ���������� ������.\n"
-#~ "�� ������������ ��� �� �������� ��� ��������� �������."
-
-#~ msgid "Which file are you looking for?"
-#~ msgstr "���� ������ �������;"
-
-#~ msgid "What are looking for?"
-#~ msgstr "�� �������;"
-
-#~ msgid "Give a name (eg: `extra', `commercial')"
-#~ msgstr "����� ��� ����� (�.�. `extra', `commercial')"
-
-#~ msgid "Directory"
-#~ msgstr "���������"
-
-#~ msgid "No cdrom available (nothing in /mnt/cdrom)"
-#~ msgstr "��� ������� cdrom (������ ��� /mnt/cdrom)"
-
-#~ msgid "URL of the directory containing the RPMs"
-#~ msgstr "URL ��� ��������� ��� �������� �� RPM"
+#~ "�������� ���� �� �������� �� �������� ��� �����. ��� ���\n"
+#~ "����� ��������, �������������� ��� �������� �������."
 
 #~ msgid ""
-#~ "For FTP and HTTP, you need to give the location for hdlist\n"
-#~ "It must be relative to the URL above"
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, leave blank."
 #~ msgstr ""
-#~ "��� FTP ��� HTTP, ������ �� ������ ��� ��������� ��� hdlist\n"
-#~ "������ �� ����� ������� �� �� �������� URL"
-
-#~ msgid "Please submit the following information"
-#~ msgstr "�������� �������� ��� �������� �����������"
-
-#~ msgid "%s is already in use"
-#~ msgstr "%s ��������������� ���"
-
-#~ msgid "Updating the RPMs base"
-#~ msgstr "��������� ����� ��������� RPM"
-
-#~ msgid "Going to remove entry %s"
-#~ msgstr "�� �������� ��� ������� %s"
-
-#~ msgid "Finding leaves"
-#~ msgstr "������ ������"
-
-#~ msgid "Finding leaves takes some time"
-#~ msgstr "� ������ ������ ���������� ������ �����"
-
-#~ msgid "I have found an ISDN Card:\n"
-#~ msgstr "����������� ����� ISDN:\n"
-
-#~ msgid "France"
-#~ msgstr "������"
-
-#~ msgid "Other countries"
-#~ msgstr "����� �����"
-
-#~ msgid "In which country are you located ?"
-#~ msgstr "�� ���� ���� ���������;"
-
-#~ msgid "Alcatel modem"
-#~ msgstr "Alcatel modem"
-
-#~ msgid "ECI modem"
-#~ msgstr "ECI modem"
+#~ "�������� ���� �� �������� �� �������� ��� �����. ��� ���\n"
+#~ "����� ��������, ������ �� ����."
 
 #~ msgid ""
-#~ "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
-#~ msgstr "��� �� adsl modem ��� ����� alcatel, �������� Alcatel. ������, ECI."
-
-#~ msgid "don't use pppoe"
-#~ msgstr "�� ����� pppoe"
-
-#~ msgid "mandatory"
-#~ msgstr "�����������"
-
-#~ msgid "interesting"
-#~ msgstr "����������"
-
-#~ msgid "i18n (important)"
-#~ msgstr "i18n (���������)"
-
-#~ msgid "i18n (very nice)"
-#~ msgstr "i18n (���� ����)"
-
-#~ msgid "i18n (nice)"
-#~ msgstr "i18n (����)"
-
-#~ msgid "Which serial port is your mouse connected to?"
-#~ msgstr "�� ���� �������� ���� ����� ����������� �� ������� ���;"
-
-#~ msgid "Czech"
-#~ msgstr "�������"
-
-#~ msgid "Slovakian"
-#~ msgstr "���������"
-
-#~ msgid "Could not install ipchains RPM with urpmi."
-#~ msgstr "��� ����� �� ����������� �� ipchains RPM �� �� urpmi."
-
-#~ msgid "Could not install dhcp RPM with urpmi."
-#~ msgstr "��� ����� �� ����������� �� dhcp RPM �� �� urpmi."
-
-#~ msgid "Could not install linuxconf RPM with urpmi."
-#~ msgstr "��� ����� �� ����������� �� linuxconf RPM �� �� urpmi."
-
-#~ msgid "Could not install bind RPM with urpmi."
-#~ msgstr "��� ����� �� ����������� �� bind RPM �� �� urpmi."
-
-#~ msgid "Could not install caching-nameserver RPM with urpmi."
-#~ msgstr "��� ����� �� ����������� �� caching-nameserver RPM �� �� urpmi."
+#~ "You may now enter dialup options. If you're not sure what to enter, the\n"
+#~ "correct information can be obtained from your ISP."
+#~ msgstr ""
+#~ "�������� ���� �� �������� ��� �������� ��� dialup. ��� ��� ����� "
+#~ "��������,\n"
+#~ "�������� �� �������� ����������� ��� ��� ������� ���."
 
-#~ msgid "��������������"
-#~ msgstr "�������"
+#~ msgid ""
+#~ "If you will use proxies, please configure them now. If you don't know if\n"
+#~ "you should use proxies, ask your network administrator or your ISP."
+#~ msgstr ""
+#~ "��� ��������������� proxies, �������� �������� ���� ����. ��� ��� "
+#~ "������,\n"
+#~ "������� ��� ������� ��� � ��� �������� �������."
 
 #~ msgid ""
-#~ "Your computer can be configured to share its Internet connection.\n"
+#~ "You can install cryptographic package if your internet connection has "
+#~ "been\n"
+#~ "set up correctly. First choose a mirror where you wish to download "
+#~ "packages and\n"
+#~ "after that select the packages to install.\n"
 #~ "\n"
+#~ "\n"
+#~ "Note you have to select mirror and cryptographic packages according\n"
+#~ "to your legislation."
 #~ msgstr ""
-#~ "� ����������� ��� ������ �� ��������� ���� ���� �� ���������� ��� \n"
-#~ "������� ��� �� �� Internet �� ������ �����������\n"
+#~ "�� � ������� ��� �� �� ��������� ����� ����� ����������, �������� ��\n"
+#~ "������������� ������ �������������. ����� �������� ���� ���� ��'\n"
+#~ "���� �� ���������� �� ������ ��� ���� �������� ���� ������ ��\n"
+#~ "�������������.\n"
+#~ "\n"
+#~ "��������� ��� ������ �� ��������� ���� ��� ������ ������� �� ���\n"
+#~ "��������� ���."
 
-#~ msgid "Everything has been configured.\n"
-#~ msgstr "����������� ���!\n"
+#~ msgid "You can now select your timezone according to where you live."
+#~ msgstr "�������� ���� �� ��������� ���� ���� ������� �� ��� ��������� ���."
 
 #~ msgid ""
-#~ "Time (secs) of inactivity after which\n"
-#~ "it hangs up. (leave blank to disable it)"
+#~ "You can configure a local printer (connected to your computer) or remote\n"
+#~ "printer (accessible via a Unix, Netware or Microsoft Windows network)."
 #~ msgstr ""
-#~ "������ (�� ������������) �������� �������������� ���\n"
-#~ "�������� �������� ������� (������ �� ���� ��� ��������������)"
-
-#~ msgid "Germany"
-#~ msgstr "��������"
-
-#~ msgid "Germany (1TR6)"
-#~ msgstr "�������� (1TR6)"
-
-#~ msgid "What do you wish to do?"
-#~ msgstr "�� ������ �� ������;"
-
-#~ msgid "Install/Rescue"
-#~ msgstr "�����������/�������"
-
-#~ msgid "Rescue"
-#~ msgstr "�������"
-
-#~ msgid "Which partition type do you want?"
-#~ msgstr "�� ���� ���������� ������;"
+#~ "�������� �� ������� ���� ������ �������� (����������� ���� ���������� "
+#~ "���) \n"
+#~ "� ���� ��������������� (���������� ���� UNIX �������, Netware � ������� \n"
+#~ "Microsoft Windows)."
 
 #~ msgid ""
-#~ "Choose \"Install\" if there are no previous versions of GNU/Linux\n"
-#~ "installed, or if you wish to use multiple distributions or versions.\n"
+#~ "If you wish to be able to print, please choose one printing system "
+#~ "between\n"
+#~ "CUPS and LPR.\n"
 #~ "\n"
-#~ "Choose \"Rescue\" if you wish to rescue a version of Linux-Mandrake "
-#~ "already installed.\n"
 #~ "\n"
+#~ "CUPS is a new, powerful and flexible printing system for Unix systems "
+#~ "(CUPS\n"
+#~ "means \"Common Unix Printing System\"). It is the default printing system "
+#~ "in\n"
+#~ "Mandrake Linux.\n"
 #~ "\n"
-#~ "Select:\n"
 #~ "\n"
-#~ "  - Recommended: If you have never installed GNU/Linux before, choose "
-#~ "this.\n"
+#~ "LPR is the old printing system used in previous Mandrake Linux "
+#~ "distributions.\n"
 #~ "\n"
-#~ "  - Customized: If you are familiar enough with GNU/Linux, you may then "
-#~ "choose\n"
-#~ "    the primary usage for your machine. See below for details.\n"
 #~ "\n"
-#~ "  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
-#~ "    perform a highly customized installation. As for a \"Customized\"\n"
-#~ "    installation class, you will be able to select the usage for your "
-#~ "system.\n"
-#~ "    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
-#~ "DOING!\n"
+#~ "If you don't have printer, click on \"None\"."
 #~ msgstr ""
-#~ "�������� \"�����������\" ��� ��� ������� ���������� ����������� GNU/"
-#~ "Linux\n"
-#~ "��� ������� ���, � ��� ������ �� ���������������� ��������� "
-#~ "�������������.\n"
+#~ "��� ������ �� ����������, �������� ��� ��� �� ��� ��������� ��������� \n"
+#~ "(CUPS ��� LPR.\n"
 #~ "\n"
-#~ "�������� \"�������\" ��� ������ �� ��������� ��� ���������\n"
-#~ "����������� ��� Mandrake Linux.\n"
 #~ "\n"
+#~ "�� CUPS ����� ��� ���, ������ ��� �������� ������� ��������� ��� UNIX \n"
+#~ "���������. ���� ����� � ������ ������� ��� �� Mandrake Linux.\n"
 #~ "\n"
-#~ "��������:\n"
-#~ "\n"
-#~ "  - �����������: ��� ���� ����� � ����� ���� ��� ����������� GNU/Linux.\n"
 #~ "\n"
-#~ "  - �������������: ��� ����� ������������� �� �� GNU/Linux, �� ��������� "
-#~ "�� \n"
-#~ "    ��������� �� ������ ����� ��� ���������� ��� (��� �������� ��� "
-#~ "������������)\n"
+#~ "�� LPR ����� �� ����� �������� ������� ���������.\n"
 #~ "\n"
-#~ "  - �������������: ��� ����� ���� ������������� �� ��������� GNU/Linux "
-#~ "���\n"
-#~ "   ������ �� ���������������� ��� ���������� ������������� �����������, "
-#~ "����\n"
-#~ "   ���� � ������� ����� ��� ���. �� ��������� �� ��������� ���� "
-#~ "������������\n"
-#~ "   ���� ��� ���� �������� (\"�������������\") �������.\n"
-#~ "   �������: �� ��������������� ����� ��� �������, ����� �� �� ������ ���� "
-#~ "���� �� ������!\n"
+#~ "��� ��� ����� ��������, �������� \"������\"."
 
 #~ msgid ""
-#~ "At this point, you may choose what partition(s) to use to install\n"
-#~ "your Linux-Mandrake system if they have been already defined (from a\n"
-#~ "previous install of GNU/Linux or from another partitioning tool). In "
-#~ "other\n"
-#~ "cases, hard drive partitions must be defined. This operation consists of\n"
-#~ "logically dividing the computer's hard drive capacity into separate\n"
-#~ "areas for use.\n"
+#~ "GNU/Linux can deal with many types of printer. Each of these types "
+#~ "requires\n"
+#~ "a different setup.\n"
 #~ "\n"
 #~ "\n"
-#~ "If you have to create new partitions, use \"Auto allocate\" to "
-#~ "automatically\n"
-#~ "create partitions for GNU/Linux. You can select the disk for partitioning "
-#~ "by\n"
-#~ "clicking on \"hda\" for the first IDE drive,\n"
-#~ "\"hdb\" for the second or \"sda\" for the first SCSI drive and so on.\n"
+#~ "If your printer is physically connected to your computer, select \"Local\n"
+#~ "printer\".\n"
 #~ "\n"
 #~ "\n"
-#~ "Two common partition are: the root partition (/), which is the starting\n"
-#~ "point of the filesystem's directory hierarchy, and /boot, which contains\n"
-#~ "all files necessary to start the operating system when the\n"
-#~ "computer is first turned on.\n"
+#~ "If you want to access a printer located on a remote Unix machine, select\n"
+#~ "\"Remote printer\".\n"
 #~ "\n"
 #~ "\n"
-#~ "Because the effects of this process are usually irreversible, "
-#~ "partitioning\n"
-#~ "can be intimidating and stressful to the unexperienced user. DiskDrake\n"
-#~ "simplifies the process so that it must not be. Consult the documentation\n"
-#~ "and take your time before proceeding.\n"
+#~ "If you want to access a printer located on a remote Microsoft Windows "
+#~ "machine\n"
+#~ "(or on Unix machine using SMB protocol), select \"SMB/Windows 95/98/NT\"."
+#~ msgstr ""
+#~ "�� GNU/Linux ������ �� ����������� �� ��������� ������ ���������. � "
+#~ "������� ���\n"
+#~ "������ ���������� ������������ ���������.\n"
+#~ "\n"
+#~ "��� � ��������� ��� ����� ������������ ��� ������� ���, �������� "
+#~ "\"�������\n"
+#~ "���������\".\n"
+#~ "\n"
+#~ "��� ������ �� ���������� �� ���� �������� ������������ �� ��������������� "
+#~ "UNIX\n"
+#~ "�������, �������� \"���������������� ���������\".\n"
+#~ "\n"
+#~ "\n"
+#~ "��� ������ �� ���������� �� ���� �������� ������������ �� ��������������� "
+#~ "Windows\n"
+#~ "������� (� UNIX �� SMB ����������), �������� \"SMB/Windows 95/98/NT\"."
+
+#~ msgid ""
+#~ "Please turn on your printer before continuing to let DrakX detect it.\n"
+#~ "\n"
+#~ "You have to enter some informations here.\n"
 #~ "\n"
 #~ "\n"
-#~ "You can reach any option using the keyboard: navigate through the "
-#~ "partitions\n"
-#~ "using Tab and Up/Down arrows. When a partition is selected, you can use:\n"
+#~ "   * Name of printer: the print spooler uses \"lp\" as default printer "
+#~ "name. So, you must have a printer named \"lp\".\n"
+#~ "     If you have only one printer, you can use several names for it. You "
+#~ "just need to separate them by a pipe\n"
+#~ "     character (a \"|\"). So, if you prefer a more meaningful name, you "
+#~ "have to put it first, eg: \"My printer|lp\".\n"
+#~ "     The printer having \"lp\" in its name(s) will be the default "
+#~ "printer.\n"
 #~ "\n"
-#~ "- Ctrl-c  to create a new partition (when an empty partition is "
-#~ "selected)\n"
 #~ "\n"
-#~ "- Ctrl-d  to delete a partition\n"
+#~ "   * Description: this is optional but can be useful if several printers "
+#~ "are connected to your computer or if you allow\n"
+#~ "     other computers to access to this printer.\n"
 #~ "\n"
-#~ "- Ctrl-m  to set the mount point\n"
+#~ "\n"
+#~ "   * Location: if you want to put some information on your\n"
+#~ "     printer location, put it here (you are free to write what\n"
+#~ "     you want, for example \"2nd floor\").\n"
 #~ msgstr ""
-#~ "�� ���� �� ������, �������� �� ��������� ����� ����������� �� "
-#~ "���������������\n"
-#~ "��� ��� ����������� ��� Linux-Mandrake, �� ����� ����� ��� ������� (���\n"
-#~ "���������� ����������� GNU/Linux � ��� ������ �������� �����������).  "
-#~ "�����������,\n"
-#~ "�� ������ �� ������� �����������. ���� � ���������� ���������� ���� \n"
-#~ "������ ���������� ��� ����� ��� ������� ��� ������ �� ��������.\n"
+#~ "�������� ������ ��� �������� ��� ��� �� �� ���������� �� DrakX.\n"
+#~ "\n"
+#~ "������ �� �������� ������� ����������� ���.\n"
+#~ "\n"
+#~ "\n"
+#~ "...* ����� ��������: � print spooler ������������ �� \"lp\"�� �� "
+#~ "�������������� �����. �����, ������ �� ����� ���� �������� ������� \"lp"
+#~ "\".\n"
+#~ "     ��� ����� ���� ���� ��������, �������� �� ������������� ����� "
+#~ "������� ��� �����.����� �� ������ �� �� ����������� �� ��� pipe\n"
+#~ "     ��������� (��� \"|\"). �����, ��� ��������� ��� ���� ��������� "
+#~ "�����, ������ �� �� ������ �����, �.�: \"My printer|lp\".\n"
+#~ "     � ��������� ��� ���� �� \"lp\" ��� ������� ��� �� ����� � "
+#~ "��������������� ���������.\n"
+#~ "\n"
+#~ "\n"
+#~ "...* ���������: ���� ����� ����������� ���� ������ �� ����� ������� ��� "
+#~ "������ ��������� ����� ������������ ���� ���������� ��� � �� ����������\n"
+#~ "     ������ ����������� �� ����� �������� �� ����� ��� ��������.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * ���������: ��� ������ �� ������ ������� ����������� ������� �� ���\n"
+#~ "     ��������� ��� �������� ���, ����� ��� ��� (����� ��������� �� "
+#~ "������� ���\n"
+#~ "     ������, ��� ���������� \"2�� ������\").\n"
+
+#~ msgid ""
+#~ "You need to enter some informations here.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Name of queue: the print spooler uses \"lp\" as default printer "
+#~ "name. So, you need have a printer named \"lp\".\n"
+#~ "    If you have only one printer, you can use several names for it. You "
+#~ "just need to separate them by a pipe\n"
+#~ "    character (a \"|\"). So, if you prefer to have a more meaningful "
+#~ "name, you have to put it first, eg: \"My printer|lp\".\n"
+#~ "    The printer having \"lp\" in its name(s) will be the default "
+#~ "printer.\n"
+#~ "\n"
+#~ "  \n"
+#~ "   * Spool directory: it is in this directory that printing jobs are "
+#~ "stored. Keep the default choice\n"
+#~ "     if you don't know what to use\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Printer Connection: If your printer is physically connected to your "
+#~ "computer, select \"Local printer\".\n"
+#~ "     If you want to access a printer located on a remote Unix machine, "
+#~ "select \"Remote lpd printer\".\n"
 #~ "\n"
 #~ "\n"
-#~ "��� ������ �� ������������� ���� �����������, �������� \"��������\n"
-#~ "��������\" ��� �������� ���������� ��� ���������� �����������.\n"
-#~ "�������� �� ��������� �� ����� ������ ����� �� ������������� ��\n"
-#~ "����������� �������� ���� ��� \"hda\" ��� ��� ����� IDE �����, \n"
-#~ "��� \"hdb\" ��� ��� ������� IDE �����, ��� \"sda\" ��� ��� �����\n"
-#~ "SCSI ����� ���.\n"
+#~ "     If you want to access a printer located on a remote Microsoft "
+#~ "Windows machine (or on Unix machine using SMB\n"
+#~ "     protocol), select \"SMB/Windows 95/98/NT\".\n"
 #~ "\n"
 #~ "\n"
-#~ "��� ������������ ����������� �����: � ����� ��������� (/), � �����\n"
-#~ "����� �� ������ ������ ��� ��������� ��� ���������� ������� ��� �\n"
-#~ "/boot, � ����� �������� �� ���������� ��� ��� �������� ��� ����������\n"
-#~ "������.\n"
+#~ "     If you want to acces a printer located on NetWare network, select "
+#~ "\"NetWare\".\n"
+#~ msgstr ""
+#~ "������ �� �������� ������� ����������� ���.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * ����� �����: � print spooler ������������ �� \"lp\" �� �� "
+#~ "�������������� ����� ��������. �����, ������ �� ����� ���� �������� �� �� "
+#~ "����� \"lp\".\n"
+#~ "     ��� ����� ���� ���� ��������, �������� �� ��������������� ����� "
+#~ "������� ��� �����. ���� ������ �� �� �������� �� ��� pipe\n"
+#~ "     ��������� (��� \"|\"). �����, ��� ��������� �� ����� ��� ��� "
+#~ "��������� �����, ������ �� �� ������ �����, �.�: \"My printer|lp\".\n"
+#~ "     � ��������� �� �� \"lp\" ��� ������� ��� �� ����� � ��������������� "
+#~ "���������.\n"
 #~ "\n"
+#~ "  \n"
+#~ "   * ��������� Spool: ����� ����� � ��������� ��� ������������� �� "
+#~ "�������� ��� ��������. ���������� ��� ��' ������� �������\n"
+#~ "     ��� ��� ������ �� �� ���������������\n"
 #~ "\n"
-#~ "������ �� ������������ ��� ����������� ���������� ����� ������� ��\n"
-#~ "�����������, � ���������� ���� ������ �� ����� ������� ��� ����\n"
-#~ "������ ������. �� DiskDrake ��� ��������� ��� ����� �������.\n"
-#~ "�������������� ��� ���������� ��� ��� ��������� ���� �������� ���.\n"
 #~ "\n"
+#~ "   * ������� ��������: ��� � ��������� ��� ����� ������� ������������ "
+#~ "���� ���������� ���, �������� \"������� ���������\".\n"
+#~ "     ��� ������ �� ����� �������� �� ���� �������� ��� ��������� �� ��� "
+#~ "������������� Unix ��������, �������� \"�������������� lpd ���������\".\n"
 #~ "\n"
-#~ "�������� �� ���������� ��� �������� ��������������� �� ������������: \n"
-#~ "������������� ��������������� �� ������� Tab ��� �� ���� ��� ���� ����.\n"
-#~ "���� ��� ��������� ���� ��������, �������� �� ��������:\n"
 #~ "\n"
-#~ "- Ctrl-C ��� ���������� ���� ���������� (�� ����� ����)\n"
+#~ "     ��� ������ �� ����� �������� �� ���� �������� ��� ��������� �� ��� "
+#~ "������������� Microsoft Windows �������� (� �� ��� Unix �������� �� SMB\n"
+#~ "     ����������), �������� \"SMB/Windows 95/98/NT\".\n"
 #~ "\n"
-#~ "- Ctrl-d ��� �������� ����������\n"
 #~ "\n"
-#~ "- Ctrl-m ��� ������ ������� ��������\n"
+#~ "     ��� ������ �� ����� �������� �� ���� �������� ��� ��������� �� ��� "
+#~ "NetWare ������, �������� \"NetWare\".\n"
 
 #~ msgid ""
-#~ "Any partitions that have been newly defined must be formatted for\n"
-#~ "use (formatting meaning creating a filesystem). At this time, you may\n"
-#~ "wish to re-format some already existing partitions to erase the data\n"
-#~ "they contain. Note: it is not necessary to re-format pre-existing\n"
-#~ "partitions, particularly if they contain files or data you wish to keep.\n"
-#~ "Typically retained are /home and /usr/local."
+#~ "Your printer has not been detected. Please enter the name of the device "
+#~ "on\n"
+#~ "which it is connected.\n"
+#~ "\n"
+#~ "\n"
+#~ "For information, most printers are connected on the first parallel port. "
+#~ "This\n"
+#~ "one is called \"/dev/lp0\" under GNU/Linux and \"LPT1\" under Microsoft "
+#~ "Windows."
 #~ msgstr ""
-#~ "���� �� ���� ����������� ������ �� ������������� ������ \n"
-#~ "��������������� (����������� ����� � ���������� ����������\n"
-#~ "�������). �� ���� �� ������, ���� �������� �� �������������\n"
-#~ "���� ��� ������� ���������� ����������� ��� �� ������� �������\n"
-#~ "�������� ��� ���� ���������. ��������: ��� ����� ���������� �� \n"
-#~ "������������������ ���������� �����������, ������ �� ���������\n"
-#~ "������ ��� �������� �� ����� �� ������ �� ���������. ������� \n"
-#~ "������������ �� ����������� /home ��� /usr/local."
+#~ "��� ����������� ���������. �������� �������� �� ����� ��� �������� ����\n"
+#~ " ����� ����� ������������.\n"
+#~ "\n"
+#~ "\n"
+#~ "�� ������������ ��������� ���������� ���� ����� ��������� ����. ���� "
+#~ "����������\n"
+#~ "\"/dev/lp0\" ��� GNU/Linux ��� \"LPT1\" ��� Microsoft Windows."
+
+#~ msgid "You must now select your printer in the above list."
+#~ msgstr "�������� ��� �������� ��� ���� �������� ��������"
 
 #~ msgid ""
-#~ "The packages selected are now being installed. This operation\n"
-#~ "should take a few minutes unless you have chosen to upgrade an\n"
-#~ "existing system, in that case it can take more time even before\n"
-#~ "upgrade starts."
+#~ "Please select the right options according to your printer.\n"
+#~ "Please see its documentation if you don't know what choose here.\n"
+#~ "\n"
+#~ "\n"
+#~ "You will be able to test your configuration in next step and you will be "
+#~ "able to modify it if it doesn't work as you want."
 #~ msgstr ""
-#~ "�� ������ ��� ��������� �� ������������� ����. ���� � ����������\n"
-#~ "�� ��������� ������ �����, ����� ��� ����� �������� �� ������������\n"
-#~ "��� ��������� �����������, ����� �� ��������� ����������� ����� ���\n"
-#~ "���� ������� � ����������."
+#~ "�������� �������� ��� ���������� ��������� ��� ��� �������� ���.\n"
+#~ "�������� ��� ���������� ��� �������� ��� ��� ������ �� �� ���������.\n"
+#~ "\n"
+#~ "\n"
+#~ "����� ��� ���������� �� �������� ��� �������� ��� ��� ������� ���� ��� "
+#~ "����� ������������� �� ��� ����������� ���� �� ������."
 
 #~ msgid ""
-#~ "If DrakX failed to find your mouse, or if you want to\n"
-#~ "check what it has done, you will be presented the list of mice\n"
-#~ "above.\n"
+#~ "You can now enter the root password for your Mandrake Linux system.\n"
+#~ "The password must be entered twice to verify that both password entries "
+#~ "are identical.\n"
+#~ "\n"
 #~ "\n"
+#~ "Root is the system's administrator and is the only user allowed to modify "
+#~ "the\n"
+#~ "system configuration. Therefore, choose this password carefully. \n"
+#~ "Unauthorized use of the root account can be extemely dangerous to the "
+#~ "integrity\n"
+#~ "of the system, its data and other system connected to it.\n"
 #~ "\n"
-#~ "If you agree with DrakX's settings, just click 'Ok'.\n"
-#~ "Otherwise you may choose the mouse that more closely matches your own\n"
-#~ "from the menu above.\n"
 #~ "\n"
+#~ "The password should be a mixture of alphanumeric characters and at least "
+#~ "8\n"
+#~ "characters long. It should never be written down.\n"
 #~ "\n"
-#~ "In case of a serial mouse, you will also have to tell DrakX\n"
-#~ "which serial port it is connected to."
+#~ "\n"
+#~ "Do not make the password too long or complicated, though: you must be "
+#~ "able to\n"
+#~ "remember it without too much effort."
 #~ msgstr ""
-#~ "��� �� DrakX ������� �� ������������ ��� ���� ��������� ���\n"
-#~ "��������������, � ��� ������ �� ����� �� ������� �����, �� ���\n"
-#~ "������������ � �������� ���������.\n"
+#~ "�������� ���� �� ������� �� ����-������ ��� ��� ������ \"root\".\n"
+#~ "� ���� ������ �� �������� ��� ������� ��� �����������.\n"
 #~ "\n"
 #~ "\n"
-#~ "��� ���������� �� ��� �������� ��� DrakX, ���� ������� 'Ok'\n"
-#~ "������, �������� ���� ���� ��������� ��� ���������\n"
-#~ "��� ����� ������������ ���� ���� ���.\n"
+#~ "� root ����� � ������������ ��� ���������� ��� � ����� ��� ���� \n"
+#~ "�� �������� �� ������� ��� ��������� ��� ����������. �� ����, \n"
+#~ "�������� ���������� ���� �� ���� ������! �� ��������������� \n"
+#~ "�������� ��� root ������ �� ��������������� ���������� ��� \n"
+#~ "��� ����������� ��� ���������� ��� ��� ��������� ���, ����� \n"
+#~ "��� ��� ���� ��������� ����������� �� ����. \n"
 #~ "\n"
 #~ "\n"
-#~ "���� ��������� ��������� ���������, �� ������ ������ �� ����� ���\n"
-#~ "DrakX �� ���� ���� ����� ����������� �� ������� ���."
+#~ "� ���� ������ ������ �� ����� ��� ���� �������������� ���������� \n"
+#~ "��� �� ����� ����������� ���� (8) ����������. ��� ������ *����* \n"
+#~ "�� �� ������� �� �����."
 
 #~ msgid ""
-#~ "This section is dedicated to configuring a local area\n"
-#~ "network (LAN) or a modem.\n"
+#~ "If your network uses LDAP (or NIS) protocol for authentication, select\n"
+#~ "\"LDAP\" (or \"NIS\") as authentication. If you don't know, ask your "
+#~ "network\n"
+#~ "administrator.\n"
+#~ "\n"
+#~ "If your computer is not connected to any administrated network, you may "
+#~ "want to\n"
+#~ "choose \"Local files\" for authentication."
+#~ msgstr ""
+#~ "�� �� ������ ��� ����������� LDAP (� NIS) ���������� ��� ����������, "
+#~ "��������\n"
+#~ "\"LDAP\" (� \"NIS\") �� ����������. �� ��� ���������, ������� ��� "
+#~ "�����������\n"
+#~ "������� ���.\n"
+#~ "�� � ����������� ��� ��� ����� ������������ �� ������ �� �����������, "
+#~ "���� ���������� �� ������ ��\n"
+#~ "��������� \"������ ������\" ��� ����������."
+
+#~ msgid ""
+#~ "You may now create one or more \"regular\" user account(s), as\n"
+#~ "opposed to the \"privileged\" user account, root. You can create\n"
+#~ "one or more account(s) for each person you want to allow to use\n"
+#~ "the computer. Note that each user account will have its own\n"
+#~ "preferences (graphical environment, program settings, etc.)\n"
+#~ "and its own \"home directory\", in which these preferences are\n"
+#~ "stored.\n"
+#~ "\n"
+#~ "\n"
+#~ "First of all, create an account for yourself! Even if you will be the "
+#~ "only user\n"
+#~ "of the machine, you may NOT connect as root for daily use of the system: "
+#~ "it's a\n"
+#~ "very high security risk. Making the system unusable is very often a typo "
+#~ "away.\n"
+#~ "\n"
+#~ "\n"
+#~ "Therefore, you should connect to the system using the user account\n"
+#~ "you will have created here, and login as root only for administration\n"
+#~ "and maintenance purposes."
+#~ msgstr ""
+#~ "�������� ���� �� ������������� ���� � ������������� \"������\" �������,\n"
+#~ "(�� �������� �� ��� \"���������������\" ������, root). �������� �� \n"
+#~ "������������� ���� � ������������� ������� ��� ���� ������� ��� ������\n"
+#~ "�� ���� �������� ��� ������� ���. ��������� ��� ���� ������� ���� ���\n"
+#~ "����� ��� ��������� (������� ����������, ��������� ��������� ���),\n"
+#~ "����� ��� �� ���� ��� \"home directory\", ��� ����� �������������\n"
+#~ "����� �� ���������.\n"
 #~ "\n"
-#~ "Choose \"Local LAN\" and DrakX will\n"
-#~ "try to find an Ethernet adapter on your machine. PCI adapters\n"
-#~ "should be found and initialized automatically.\n"
-#~ "However, if your peripheral is ISA, autodetection will not work,\n"
-#~ "and you will have to choose a driver from the list that will appear "
-#~ "then.\n"
 #~ "\n"
+#~ "���' �����, ������������ ���� ������ ��� ��� ����� ���! ����� ��� ���\n"
+#~ "����� � ��������� ������� ��� ����������, ��� ������ �� ��������������\n"
+#~ "�� root ��� ��� ���������� ����� ��� ����������, ����� ���� �� \n"
+#~ "������������ ���������. ��� ���� ����� �������������� ����� ������\n"
+#~ "��� �� ����������� ��� ����������� ��� ���� ��������� �� root.\n"
 #~ "\n"
-#~ "As for SCSI adapters, you can let the driver probe for the adapter\n"
-#~ "in the first time, otherwise you will have to specify the options\n"
-#~ "to the driver that you will have fetched from documentation of your\n"
-#~ "hardware.\n"
+#~ "\n"
+#~ "�� ����, �� ������ �� ��������� ��� ������� ��� ��������������� ����\n"
+#~ "������ ����� ������ ��� �� ��������� �� root ���� ��� �������� ���������\n"
+#~ "��� ���������� ��� ����������."
+
+#~ msgid ""
+#~ "Creating a boot disk is strongly recommended. If you can't\n"
+#~ "boot your computer, it's the only way to rescue your system without\n"
+#~ "reinstalling it."
+#~ msgstr ""
+#~ "���������� �� ������������� ���� ����� ���������. ��� ��� \n"
+#~ "�������� �� ���������� ��� ���������� ���, ����� � ����� ������ \n"
+#~ "�� ��������� �� ������� ��� ����� ���������������."
+
+#~ msgid ""
+#~ "LILO and grub main options are:\n"
+#~ "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
+#~ "partition) that contains the boot sector. Unless you know specifically\n"
+#~ "otherwise, choose \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Delay before booting default image: Specifies the number in tenths\n"
+#~ "of a second the boot loader should wait before booting the first image.\n"
+#~ "This is useful on systems that immediately boot from the hard disk after\n"
+#~ "enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+#~ "omitted or is set to zero.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Video mode: This specifies the VGA text mode that should be selected\n"
+#~ "when booting. The following values are available: \n"
+#~ "\n"
+#~ "    * normal: select normal 80x25 text mode.\n"
+#~ "\n"
+#~ "    * <number>:  use the corresponding text mode.\n"
 #~ "\n"
 #~ "\n"
-#~ "If you install a Linux-Mandrake system on a machine which is part\n"
-#~ "of an already existing network, the network administrator will\n"
-#~ "have given you all necessary information (IP address, network\n"
-#~ "submask or netmask for short, and hostname). If you're setting\n"
-#~ "up a private network at home for example, you should choose\n"
-#~ "addresses.\n"
+#~ "  - Clean \"/tmp\" at each boot: if you want delete all files and "
+#~ "directories\n"
+#~ "stored in \"/tmp\" when you boot your system, select this option.\n"
 #~ "\n"
 #~ "\n"
-#~ "Choose \"Dialup with modem\" and the Internet connection with\n"
-#~ "a modem will be configured. DrakX will try to find your modem,\n"
-#~ "if it fails you will have to select the right serial port where\n"
-#~ "your modem is connected to."
+#~ "  - Precise RAM if needed: unfortunately, there is no standard method to "
+#~ "ask the\n"
+#~ "BIOS about the amount of RAM present in your computer. As consequence, "
+#~ "Linux may\n"
+#~ "fail to detect your amount of RAM correctly. If this is the case, you "
+#~ "can\n"
+#~ "specify the correct amount or RAM here. Please note that a difference of "
+#~ "2 or 4\n"
+#~ "MB between detected memory and memory present in your system is normal."
 #~ msgstr ""
-#~ "���� �� ������ ����� ��� ������� ������� ������� (LAN) � ���\n"
-#~ "modem.\n"
+#~ "�� ������ �������� ��� LILO ��� ��� grub �����:\n"
+#~ "  - ������� ���������: ������ �� ����� ��� �������� (�.�. ��� \n"
+#~ "���������) ��� �������� ��� ����� ���������. ����� ��� �� �����\n"
+#~ "�������� ��� ����� ������, �������� \"/dev/hda\".\n"
 #~ "\n"
-#~ "�������� \"������ ������\" ��� �� DrakX �� ����������� �� \n"
-#~ "��������� ��� ����� ������� Ethernet ��� ������� ���. �� ������\n"
-#~ "PCI �� ����������� ��� �� ������������� ��������. \n"
-#~ "�� ���� � ����� ��� ����� ����� ISA, � ��������� ���������� ��� \n"
-#~ "�� ������������ ��� �� ������ �� ��������� ���� ����� ��� ��� \n"
-#~ "�������� ��� �� ���������� ������ ����.\n"
 #~ "\n"
+#~ "  - ����������� ���� ��� ��������: ������ �� ������ ��� �������������\n"
+#~ "��� �� ������� �� ��������� ���� ��������� �� ����� �����������.\n"
+#~ "���� ����� ������� ������� �� ��������� ��� �������� ��� ��� �����\n"
+#~ "������ ���� ��� ������������ ��� �������������. ��� ������� �����������\n"
+#~ "��� � ������� ����������� � ����� �����.\n"
 #~ "\n"
-#~ "��� ����� ��� ������ SCSI, �������� �� ������� ��� ����� �� ���������\n"
-#~ "��� ����������� (�����) ��� ����� ����, ������ �� ������ �� ������\n"
-#~ "����� ��� �������� �����������, ��� ������ �� ���������� ��� ���\n"
-#~ "���������� ��� ������ ���.\n"
 #~ "\n"
+#~ "  - ������� ������: ���� ������ ��� VGA ������� �������� ��� �� ��������\n"
+#~ "���� ��� ��������. �������� �� �������� ��������: \n"
 #~ "\n"
-#~ "��� ����������� �� Linux-Mandrake �� ����� ���� ��� ���������� �������,\n"
-#~ "� ������������ ��� ������� ��� �� ��� ���� ��� ����� ��� ����������� \n"
-#~ "����������� (��������� IP, �����, ����� �������). ��� ���������� ���\n"
-#~ "��� ������, ��� ���������� ��� �����, �� ������ �� ����������� �����\n"
-#~ "��� ��� ��� �����������.\n"
+#~ "    * normal: �������� ������� �������� 80�25.\n"
 #~ "\n"
+#~ "    * <�������>: ����� ��� ����������� �������� ��������.\n"
 #~ "\n"
-#~ "�������� \"����� modem\" ��� �� ��������� ��� ������� �� �� ���������\n"
-#~ "���� modem. �� DrakX �� ����������� �� ��������� �� modem ���. ���\n"
-#~ "��������, �� ������ �� ��������� ��� �������� ���� ���� ����� �����\n"
-#~ "����������� �� modem ���."
-
-#~ msgid ""
-#~ "GNU/Linux can deal with many types of printer. Each of these\n"
-#~ "types require a different setup. Note however that the print\n"
-#~ "spooler uses 'lp' as the default printer name; so you\n"
-#~ "must have one printer with such a name; but you can give\n"
-#~ "several names, separated by '|' characters, to a printer.\n"
-#~ "So, if you prefer to have a more meaningful name you just have\n"
-#~ "to put it first, eg: \"My Printer|lp\".\n"
-#~ "The printer having \"lp\" in its name(s) will be the default printer.\n"
+#~ "  - ���������� \"/tmp\" �� ���� ��������: ��� ������ �� ������� ��� �� "
+#~ "������ ��� ��� ��������\n"
+#~ "��� ����� ��� \"/tmp\" ���� �������� �� ������� ���, ������������� ����� "
+#~ "��� �������.\n"
 #~ "\n"
 #~ "\n"
-#~ "If your printer is physically connected to your computer, select\n"
-#~ "\"Local printer\". You will then have to tell which port your\n"
-#~ "printer is connected to, and select the appropriate filter.\n"
+#~ "  - ������� RAM �� ����������: ��������, ��� ������� ���������� ������� "
+#~ "�� ����� ��\n"
+#~ "BIOS ��� ������ ������ RAM ��� ���������� ���. ��� ��������, �� Linux "
+#~ "����\n"
+#~ "�������� �� ���������� ��� RAM �����. �� ����� ��� ���������, ��������\n"
+#~ "�� ������� ��� ����� ������ ���. �������� ��������� ��� ��� ������� ��� "
+#~ "����� ��� 2 � 4\n"
+#~ "MB ������ ��� ������ ��� ����������� ��� ��� ����������� RAM ��� "
+#~ "���������� ��� ����� ��������."
+
+#~ msgid ""
+#~ "SILO is a bootloader for SPARC: it is able to boot\n"
+#~ "either GNU/Linux or any other operating system present on your computer.\n"
+#~ "Normally, these other operating systems are correctly detected and\n"
+#~ "installed. If this is not the case, you can add an entry by hand in this\n"
+#~ "screen. Be careful as to choose the correct parameters.\n"
 #~ "\n"
 #~ "\n"
-#~ "If you want to access a printer located on a remote Unix machine,\n"
-#~ "you will have to select \"Remote lpd\". In order to make\n"
-#~ "it work, no username or password is required, but you will need\n"
-#~ "to know the name of the printing queue on this server.\n"
+#~ "You may also want not to give access to these other operating systems to\n"
+#~ "anyone, in which case you can delete the corresponding entries. But\n"
+#~ "in this case, you will need a boot disk in order to boot them!"
+#~ msgstr ""
+#~ "�� SILO ����� ��������� ��������� ��� SPARC: ������ �� ��������� \n"
+#~ "�� GNU/Linux � ����������� ���� ����������� ������� ��� ������� ���. "
+#~ "��������, \n"
+#~ "�� �������� ����������� ��������������� ��� ����������� �����. ��� ���� "
+#~ "��� \n"
+#~ "������, �������� �� ���������� �������� �������� �� ����� ��� �����. \n"
+#~ "�������� �� ��������� ��� ������ �����������.\n"
+#~ "\n"
+#~ "�������� ������ �� ����������� ��� �������� �� ���� ����������� ��������� "
+#~ "����������\n"
+#~ "��� ����������� ��������. �� ����� ���� ��� ���������, �� ����������� "
+#~ "�������� ���������\n"
+#~ "��� �� �� ���������������!"
+
+#~ msgid ""
+#~ "SILO main options are:\n"
+#~ "  - Bootloader installation: Indicate where you want to place the\n"
+#~ "information required to boot to GNU/Linux. Unless you know exactly\n"
+#~ "what you are doing, choose \"First sector of drive (MBR)\".\n"
 #~ "\n"
 #~ "\n"
-#~ "If you want to access a SMB printer (which means, a printer located\n"
-#~ "on a remote Windows 9x/NT machine), you will have to specify its\n"
-#~ "SMB name (which is not its TCP/IP name), and possibly its IP address,\n"
-#~ "plus the username, workgroup and password required in order to\n"
-#~ "access the printer, and of course the name of the printer. The same goes\n"
-#~ "for a NetWare printer, except that you need no workgroup information."
+#~ "  - Delay before booting default image: Specifies the number in tenths\n"
+#~ "of a second the boot loader should wait before booting the first image.\n"
+#~ "This is useful on systems that immediately boot from the hard disk after\n"
+#~ "enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+#~ "omitted or is set to zero."
 #~ msgstr ""
-#~ "�� GNU/Linux ������ �� ����������� �� ������� ������ ���������. �\n"
-#~ "������� ��� ������ ������� ������������ ���������. ��������� ���\n"
-#~ "�� ��������� ��������� ������������ �� 'lp' �� ��' ������� �����\n"
-#~ "��������, ����� ������ �� ����� ���������� ���� �������� �� ����\n"
-#~ "�� �����. �������� ���� �� ������ ����������� ��� ���� ������� ��\n"
-#~ "���� ��������, ������������� �� �� '|'. �����, ��� ��������� ��� ���\n"
-#~ "������ �����, ������ �� �� ������ �����, �.�. \"My Printer|lp\".\n"
-#~ "� ��������� ��� ���������� (���) \"lp\" �� ����� � ��' ������� "
-#~ "���������.\n"
+#~ "�� ������ �������� ��� SILO �����:\n"
+#~ "  - ����������� bootloader: ������ �� ��� ������ �� ������������� �� "
+#~ "�����������\n"
+#~ "��� ��� �������� ��� GNU/Linux �����������. ����� �� �� ������ �� ������� "
+#~ "������,\n"
+#~ "�������� \"������ ������ ��� ������ (MBR)\".\n"
 #~ "\n"
 #~ "\n"
-#~ "��� � ��������� ��� ����� ��' ������� ������������ ���� ����������\n"
-#~ "���, �������� \"������� ���������\". �� ������ ���� �� ������� \n"
-#~ "�� ���� ���� ����� ������������ � ��������� ��� ��� �� ���������\n"
-#~ "�� ��������� ������ (�����).\n"
+#~ "  - ����������� ���� ��� ��������: ������ �� ������ ��� �������������\n"
+#~ "��� �� ������� �� ��������� ���� ��������� �� ����� �����������.\n"
+#~ "���� ����� ������� ������� �� ��������� ��� �������� ��� ��� �����\n"
+#~ "������ ���� ��� ������������ ��� �������������. ��� ������� �����������\n"
+#~ "��� � ������� ����������� � ����� �����."
+
+#~ msgid ""
+#~ "Now it's time to configure the X Window System, which is the\n"
+#~ "core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
+#~ "you must configure your video card and monitor. Most of these\n"
+#~ "steps are automated, though, therefore your work may only consist\n"
+#~ "of verifying what has been done and accept the settings :)\n"
 #~ "\n"
 #~ "\n"
-#~ "��� ������ �� ��������������� ���� �������� ����������� �� ������\n"
-#~ "��������������� Unix �������, �������� \"���������������� lpd\".\n"
-#~ "��� ���������� �� ������ ������ ������ ��� ������, ���� ������ �� ������\n"
-#~ "�� ����� ��� ����� ��� �������� ��� �� ���������������.\n"
+#~ "When the configuration is over, X will be started (unless you\n"
+#~ "ask DrakX not to) so that you can check and see if the\n"
+#~ "settings suit you. If they don't, you can come back and\n"
+#~ "change them, as many times as necessary."
+#~ msgstr ""
+#~ "���� ������ �� ��������� �� X Window System, �� ����� ����� � \n"
+#~ "������� ��� �������� ������������� (GUI) ��� GNU/Linux. ������ ��\n"
+#~ "��������� ��� ����� �������� ��� ��� ����� ���. �� ����������\n"
+#~ "����� ��� ����������� ����� ����������������, ����� � �������\n"
+#~ "��� ���������� ���� ����������� ��� ������� ��� ��������� \n"
+#~ "��������� :)\n"
 #~ "\n"
 #~ "\n"
-#~ "��� ������ �� ��������������� ���� �������� SMB (������ ���� ��������\n"
-#~ "����������� �� ������ ������� Windows 9x/NT), �� ������ �� ������\n"
-#~ "�� ����� SMB (�� ����� ��� ����� ����� TCP/IP) ��� ������� ��� ���\n"
-#~ "��������� IP, ����� ������ ��� ������ ������, ���� ������ ��� \n"
-#~ "����� ����� � ������ �������� ��� ������ �� ����� ��� ��������.\n"
-#~ "�� ���� ������� ��� ��� ��������� NetWare, �� ��� ������� ��� \n"
-#~ "��� ���������� ����� ����� � ������ ��������."
+#~ "���� ����������� � ���������� ��������, �� ��������� ��\n"
+#~ "X Window ������� (����� ��� ����� ����������� ������), ���\n"
+#~ "�� �������� ��� �� ��������� ��� �����������. ��� ���, \n"
+#~ "�������� �� ����������� ��� ��� �� ����������� ��� ���������\n"
+#~ "���� ����� ���������."
 
 #~ msgid ""
-#~ "It is strongly recommended that you answer \"Yes\" here. If you install\n"
-#~ "Microsoft Windows at a later date it will overwrite the boot sector.\n"
-#~ "Unless you have made a bootdisk as suggested, you will not be able to\n"
-#~ "boot into GNU/Linux any more."
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
 #~ msgstr ""
-#~ "��� ���������� �� ���������� \"���\"! ��� ������ ��������\n"
-#~ "����������� ��� Windows, �� ������� ��� ����� ���������\n"
-#~ "(boot sector) ��� ����������. ��� �� �������� �� ����������\n"
-#~ "�� Linux, ����� ��� �� ����� ������������ �������� ���������\n"
-#~ "���� ����������� ���!"
-
-#~ msgid "Move your wheel!"
-#~ msgstr "������� �� ������!"
-
-#~ msgid "Forget the changes?"
-#~ msgstr "������� �������;"
-
-#~ msgid "What is the type of your mouse?"
-#~ msgstr "�� ���� ��������� �����;"
-
-#~ msgid "Automatic resolutions"
-#~ msgstr "�������� ������� ���������"
+#~ "��� ���� ��� ���� ���� �� ��� ��������� ��� �, ��������������� ����� ���\n"
+#~ "�������� ��� �� ��������� ����� �� ������� ���������� (X Window System)."
 
 #~ msgid ""
-#~ "To find the available resolutions I will try different ones.\n"
-#~ "Your screen will blink...\n"
-#~ "You can switch if off if you want, you'll hear a beep when it's over"
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
 #~ msgstr ""
-#~ "�� �������� �������� ��������� ��� �� �������� ����� ����� ����������.\n"
-#~ "� ����� ��� �� ������� �� �����������...\n"
-#~ "�������� �� ������ �� ��� ��������, �� �������� ��� ���� �� ���\n"
-#~ "���������� ��� �����������."
+#~ "��� ��������� �������� �� ������� ���������� �������� \"���\". ������, \n"
+#~ "�������� \"���\"."
 
 #~ msgid ""
-#~ "I can try to find the available resolutions (eg: 800x600).\n"
-#~ "Sometimes, though, it may hang the machine.\n"
-#~ "Do you want to try?"
+#~ "You can choose a security level for your system. Please refer to the "
+#~ "manual for complete\n"
+#~ "  information. Basically, if you don't know what to choose, keep the "
+#~ "default option.\n"
 #~ msgstr ""
-#~ "����� �� �������� �� ��� ��� ���������� ��������� (�� 800�600).\n"
-#~ "���� ���� ���� ���������� ������� ��� ����������.\n"
-#~ "������ �� ����������;"
+#~ "�������� �� ��������� ��� ������� ��������� ��� �� ������� ���. �������� "
+#~ "�������� �� manual ��� �������\n"
+#~ "  �����������. ������, �� ��� ������ �� �� ���������, �������� ��� "
+#~ "��������������� ��������.\n"
 
 #~ msgid ""
-#~ "No valid modes found\n"
-#~ "Try with another video card or monitor"
+#~ "Your system is going to reboot.\n"
+#~ "\n"
+#~ "After rebooting, your new Mandrake Linux system will load automatically.\n"
+#~ "If you want to boot into another existing operating system, please read\n"
+#~ "the additional instructions."
 #~ msgstr ""
-#~ "��� �������� ������� ���������� �����������\n"
-#~ "��������� ����������� ����� �������� � �����"
+#~ "�� ������� ��� �� �������������.\n"
+#~ "\n"
+#~ "���� ��� ������������, �� ��� ��� Mandrake Linux ������� �� ���������\n"
+#~ "��������. ��� ������ �� ���������� ��� ���� ������� �����������, "
+#~ "��������\n"
+#~ "�������� ��� �������� �������."
 
-#~ msgid "Automatical resolutions search"
-#~ msgstr "�������� ������ ���������"
+#~ msgid "Czech (Programmers)"
+#~ msgstr "������� (���������������)"
 
-#~ msgid "Apple ADB Mouse"
-#~ msgstr "Apple ADB Mouse"
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "��������� (���������������)"
 
-#~ msgid "Apple ADB Mouse (2 Buttons)"
-#~ msgstr "Apple ADB Mouse (2 �������)"
+#~ msgid "Name of the profile to create:"
+#~ msgstr "����� ��� ������ ��� ����������:"
 
-#~ msgid "Apple ADB Mouse (3+ Buttons)"
-#~ msgstr "Apple ADB Mouse (3 � ����������� �������)"
+#~ msgid "/File/_New"
+#~ msgstr "/������/_���"
 
-#~ msgid "Apple USB Mouse"
-#~ msgstr "Apple USB Mouse"
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
 
-#~ msgid "Apple USB Mouse (2 Buttons)"
-#~ msgstr "Apple USB Mouse (2 �������)"
+#~ msgid "/File/_Open"
+#~ msgstr "/������/_�������"
 
-#~ msgid "Apple USB Mouse (3+ Buttons)"
-#~ msgstr "Apple USB Mouse (3 � ����������� �������)"
+#~ msgid "<control>O"
+#~ msgstr "<control>O"
 
-#~ msgid "ASCII MieMouse"
-#~ msgstr "ASCII MieMouse"
+#~ msgid "/File/_Save"
+#~ msgstr "/������/���_�������"
 
-#~ msgid "Genius NetMouse Pro"
-#~ msgstr "Genius NetMouse Pro"
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
 
-#~ msgid "ATI Bus Mouse"
-#~ msgstr "ATI Bus Mouse"
+#~ msgid "/File/Save _As"
+#~ msgstr "/������/���������� _��"
 
-#~ msgid "Microsoft Bus Mouse"
-#~ msgstr "Microsoft Bus Mouse"
+#~ msgid "/File/-"
+#~ msgstr "/������/-"
 
-#~ msgid "Logitech Bus Mouse"
-#~ msgstr "Logitech Bus Mouse"
+#~ msgid "/Options/Test"
+#~ msgstr "/��������/����"
 
-#~ msgid "USB Mouse (3 buttons or more)"
-#~ msgstr "USB Mouse (3 � ����������� �������)"
+#~ msgid "/_Help"
+#~ msgstr "/_�������"
 
-#~ msgid "Microsoft Rev 2.1A or higher (serial)"
-#~ msgstr "Microsoft Rev 2.1A � ������� (��������)"
+#~ msgid "/Help/_About..."
+#~ msgstr "/�������/_������� ��..."
 
-#~ msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-#~ msgstr "Logitech MouseMan+/FirstMouse+ (��������)"
+#~ msgid "Default Runlevel"
+#~ msgstr "��' ������� Runlevel"
 
-#~ msgid "ASCII MieMouse (serial)"
-#~ msgstr "ASCII MieMouse (��������)"
+#~ msgid "Write /etc/fstab"
+#~ msgstr "���������� /etc/fstab"
 
-#~ msgid "Genius NetMouse (serial)"
-#~ msgstr "Genius NetMouse (��������)"
+#~ msgid "Restore from file"
+#~ msgstr "��������� ��� ������"
 
-#~ msgid "Generic Mouse (serial)"
-#~ msgstr "������� ����� (��������)"
+#~ msgid "Save in file"
+#~ msgstr "���������� �� ������"
 
-#~ msgid "Microsoft compatible (serial)"
-#~ msgstr "Microsoft ������� (��������)"
+#~ msgid "Restore from floppy"
+#~ msgstr "��������� ��� ��������"
 
-#~ msgid "Generic 3 Button Mouse (serial)"
-#~ msgstr "������� ����� �� 3 ������� (��������)"
+#~ msgid "Format all"
+#~ msgstr "����������� ����"
 
-#~ msgid "Kensington Thinking Mouse (serial)"
-#~ msgstr "Kensington Thinking Mouse (��������)"
+#~ msgid "After formatting all partitions,"
+#~ msgstr "���� ��� ����������� ���� ��� �����������,"
 
-#~ msgid "nfs mount failed"
-#~ msgstr "������� nfs �������"
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "��� �� �������� �� ����� ��� ����������� �� ������"
 
-#~ msgid "CHAP"
-#~ msgstr "CHAP"
+#~ msgid "Reload"
+#~ msgstr "������������"
 
 #~ msgid ""
-#~ "DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-#~ "By default, the 4.0 server is used unless your card is not supported.\n"
-#~ "\n"
-#~ "Do you want to keep XFree 3.3?"
+#~ "Do you want to generate an auto install floppy for linux replication?"
 #~ msgstr ""
-#~ "�� DrakX �� ������������ ������ ��������� ��� XFree 3.3 ��� XFree 4.0.\n"
-#~ "�� �������, ��������������� � ������ 4.0 ����� ��� ��� ������������� � "
-#~ "����� ���.\n"
-#~ "\n"
-#~ "������ �� ��������������� �� XFree 3.3;"
+#~ "������ �� ������������� ��� �������� ��������� ������������ ��� "
+#~ "����������� ����� ��� ������������;"
 
-#~ msgid "Cryptographic"
-#~ msgstr "������������"
-
-#~ msgid "Do not set up networking"
-#~ msgstr "��� ��������� �� ������"
-
-#~ msgid "Do you want to configure a local network for your system?"
-#~ msgstr "������ �� ��������� ��� ������ (LAN) �������� ��� ���������� ���;"
-
-#~ msgid "Show less"
-#~ msgstr "�������� ���������"
-
-#~ msgid "Show more"
-#~ msgstr "�������� ������������"
-
-#~ msgid "Take over the hard drive"
-#~ msgstr "������ �������� ��� ������"
-
-#~ msgid "tie"
-#~ msgstr "�������"
-
-#~ msgid "brunette"
-#~ msgstr "�������"
-
-#~ msgid "girl"
-#~ msgstr "�������"
-
-#~ msgid "woman-blond"
-#~ msgstr "������ �������"
-
-#~ msgid "automagic"
-#~ msgstr "����������"
-
-#~ msgid "Have you been provided with a hostname?"
-#~ msgstr "��� ����� ����������� ����� ������ (hostname);"
-
-#~ msgid "Local Area Network specification"
-#~ msgstr "������������� ������� �������"
+#~ msgid "ADSL configuration"
+#~ msgstr "��������� ADSL"
 
-#~ msgid "You may now decide which class C network to use.\n"
-#~ msgstr "�������� �� ��������� ���� ������ ����� C �� ���������������\n"
+#~ msgid "Europe"
+#~ msgstr "������"
 
-#~ msgid "Network:"
-#~ msgstr "������:"
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
 
-#~ msgid "Internet Connection Sharing - setup of $device"
-#~ msgstr "����������� �������� Internet - ������� ��� $device"
+#~ msgid "Remote queue name missing!"
+#~ msgstr "����� ���������������� ����� ������!"
 
 #~ msgid ""
-#~ "The following interface is about to be configured:\n"
-#~ "\n"
-#~ "$interface\n"
-#~ "\n"
+#~ "Here you can specify any arbitrary command line into which the job should "
+#~ "be piped instead of being sent directly to a printer."
 #~ msgstr ""
-#~ "��������� �� ��������� � �������� �������:\n"
-#~ "\n"
-#~ "$interface\n"
-#~ "\n"
+#~ "��� �������� �� ������� ��� ������ ������� ���� ����� � ��������� �� "
+#~ "�������������� ���� �� ��������� ���������� ���� ��������."
 
-#~ msgid "Everything configured!"
-#~ msgstr "����������� ���!"
+#~ msgid "Command line"
+#~ msgstr "������ �������"
 
-#~ msgid "What is your keyboard layout?"
-#~ msgstr "�� ���������� ������������� �����;"
+#~ msgid "A command line must be entered!"
+#~ msgstr "��� ������ ������� ������ �� ��������!"
 
-#~ msgid "Try to find PCMCIA cards?"
-#~ msgstr "�� �������� �� �������� ������ PCMCIA"
+#~ msgid "Enter Printer Name and Comments"
+#~ msgstr "�������� �� ����� ��� �������� ��� ������"
 
-#~ msgid "Try to find %s devices?"
-#~ msgstr "�� �������� �������� ��������� �������� %s;"
+#~ msgid "Remove queue"
+#~ msgstr "�������� �����"
 
-#~ msgid "Small(%dMB)"
-#~ msgstr "�����(%dMB)"
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "�� ����������� ��� ������� ��������� ��� ������� �� ������������"
 
-#~ msgid "Modem Configuration"
-#~ msgstr "������� modem"
+#~ msgid "Unrecognized config file"
+#~ msgstr "�� ������������ ������ ���������"
 
-#~ msgid ""
-#~ "Do you want to configure a dialup connection with modem for your system?"
-#~ msgstr "������ �� ��������� ��� �������� ��� ���������� ��� ���� modem;"
+#~ msgid "Adapter"
+#~ msgstr "Adapter"
 
-#~ msgid "Do you want to configure a ISDN connection for your system?"
-#~ msgstr "������ �� ��������� ��� ISDN �������� ��� ���������� ���;"
+#~ msgid "Disable network"
+#~ msgstr "�������������� �������"
 
-#~ msgid "Try to find PCI devices?"
-#~ msgstr "�� �������� �������� ��������� �������� PCI;"
+#~ msgid "Enable network"
+#~ msgstr "������������ �������"
 
-#~ msgid "Searching root partition."
-#~ msgstr "������ ��� root partition."
+#~ msgid "Network Monitoring"
+#~ msgstr "�������� �������"
 
-#~ msgid "%s: This is not a root partition, please select another one."
-#~ msgstr "%s: ���� ��� ����� root partition, �������� �������� ��� ����."
+#~ msgid "Settings"
+#~ msgstr "���������"
 
-#~ msgid "No root partition found"
-#~ msgstr "��� ������� root partition"
+#~ msgid "Profile "
+#~ msgstr "������ "
 
-#~ msgid "Please choose a partition to use as your root partition."
-#~ msgstr "���� ��������� �� ��������������� �� ����� (/);"
+#~ msgid "Statistics"
+#~ msgstr "����������"
 
-#~ msgid "You don't have any windows partitions!"
-#~ msgstr "��� ������� ����� ��������� windows!"
+#~ msgid "Sending Speed:"
+#~ msgstr "�������� ���������: "
 
-#~ msgid "You don't have any enough room for Lnx4win"
-#~ msgstr "��� ����� ������ ���� ��� �� Lnx4win!"
+#~ msgid "Receiving Speed:"
+#~ msgstr "�������� �����: "
 
-#~ msgid ", %U MB"
-#~ msgstr ", %U MB"
+#~ msgid "Logs"
+#~ msgstr "Logs"
 
-# NOTE: this message will be displayed by lilo at boot time; that is
-# using the BIOS font; that means cp437 charset on 99.99% of PC computers
-# out there. It is the nsuggested that for non latin languages an ascii
-# transliteration be used; or maybe the english text be used; as it is best
-#
-#~ msgid ""
-#~ "Welcome to LILO the operating system chooser!\n"
-#~ "\n"
-#~ "To list the possible choices, press <TAB>.\n"
-#~ "\n"
-#~ "To load one of them, write its name and press <ENTER> or wait %d seconds "
-#~ "for default boot.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "KALOS HRTHATE STON EPILOGEA LEITOURGIKOU SYSTHMATOS LILO!\n"
-#~ "\n"
-#~ "GIA NA DEITE TIS DIATHESIMES EPILOGES, PATHSTE <TAB>.\n"
-#~ "\n"
-#~ "GIA NA EPILEXETE MIA APO AUTES PLHKTROLOGHSTE TO ONOMA THS KAI \n"
-#~ "PATHSTE <ENTER>, H PERIMENETE %d DEUTEROLEPTA GIA THN AYTOMATH \n"
-#~ "EPILOGH.\n"
-#~ "\n"
+#~ msgid "Connecting to Internet "
+#~ msgstr "������� ��� ��������� (internet)"
 
-# 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
-#
-#~ msgid ""
-#~ "Welcome to SILO the operating system chooser!\n"
-#~ "\n"
-#~ "To list the possible choices, press <TAB>.\n"
-#~ "\n"
-#~ "To load one of them, write its name and press <ENTER> or\n"
-#~ "wait %d seconds for default boot.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "KALOS HRTHATE STON EPILOGEA LEITOURGIKOU SYSTHMATOS SILO!\n"
-#~ "\n"
-#~ "GIA NA DEITE TIS DIATHESIMES EPILOGES, PATHSTE <TAB>.\n"
-#~ "\n"
-#~ "GIA NA EPILEXETE MIA APO AUTES PLHKTROLOGHSTE TO ONOMA THS KAI \n"
-#~ "PATHSTE <ENTER>, H PERIMENETE %d DEUTEROLEPTA GIA THN AYTOMATH \n"
-#~ "EPILOGH.\n"
-#~ "\n"
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "���������� ��� �� ��������� (internet)"
 
-#~ msgid "SILO main options"
-#~ msgstr "������� �������� SILO"
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "���������� ��� �� ��������� (internet) �������."
 
-#~ msgid ""
-#~ "Here are the following entries in SILO.\n"
-#~ "You can add some more or change the existing ones."
-#~ msgstr ""
-#~ "�������� �� ��������� �������� ��� SILO.\n"
-#~ "�������� �� ���������� �� ����� � �� �������� ��� ����������."
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "���������� ��� �� ��������� (internet) ������������"
 
-#~ msgid "This label is already in use"
-#~ msgstr "���� � �������� ������� ���"
-
-#~ msgid "Installation of SILO failed. The following error occured:"
-#~ msgstr "� ����������� ��� SILO �������. ���������� �� �������� ������:"
+#~ msgid "Connection complete."
+#~ msgstr "� ������� ������������"
 
 #~ msgid ""
-#~ "DrakX will attempt at first to look for one or more PCI\n"
-#~ "SCSI adapter(s). If it finds it (or them)  and knows which driver(s)\n"
-#~ "to use, it will insert it (them)  automatically.\n"
-#~ "\n"
-#~ "\n"
-#~ "If your SCSI adapter is an ISA board, or is a PCI board but DrakX\n"
-#~ "doesn't know which driver to use for this card, or if you have no\n"
-#~ "SCSI adapters at all, you will then be prompted on whether you have\n"
-#~ "one or not. If you have none, answer \"No\". If you have one or more,\n"
-#~ "answer \"Yes\". A list of drivers will then pop up, from which you\n"
-#~ "will have to select one.\n"
-#~ "\n"
-#~ "\n"
-#~ "After you have selected the driver, DrakX will ask if you\n"
-#~ "want to specify options for it. First, try and let the driver\n"
-#~ "probe for the hardware: it usually works fine.\n"
-#~ "\n"
-#~ "\n"
-#~ "If not, do not forget the information on your hardware that you\n"
-#~ "could get from your documentation or from Windows (if you have it\n"
-#~ "on your system), as suggested by the installation guide. These\n"
-#~ "are the options you will need to provide to the driver."
+#~ "Connection failed.\n"
+#~ "Verify your configuration in the Mandrake Control Center."
 #~ msgstr ""
-#~ "�� DrakX �� ����������� ���' ����� �� ��������� ���� � �������������\n"
-#~ "PCI ������������ SCSI. ��� ��������� ������� � �������� ��� �����\n"
-#~ "������ ������� �� ��������������, �� �� ����� ��������.\n"
-#~ "\n"
-#~ "\n"
-#~ "��� � SCSI ������������ ��� ����� ISA � ������� PCI ��� ��� �����\n"
-#~ "������� ��� DrakX, � ��� ��� ����� ������������� ����������� SCSI,\n"
-#~ "�� ���������� ��� ����� ������� �����������. ��� ��� �����, ���������\n"
-#~ "\"���\". ��� �����, ��������� \"���\". �� ���������� ���� ���������\n"
-#~ "�� �������, ��� ��� ������ �� ������ �� ��������� ��� ���������.\n"
-#~ "\n"
-#~ "\n"
-#~ "���� ��� ������� ������, �� Dra�� �� ��� ������� ��� ������ �� �������\n"
-#~ "��������� ��� ��� �����. ���' �����, ������ ��� ����� �� ������������\n"
-#~ "����� ��� ��� ���������� ���������. ���� ������� ���� �� ���������\n"
-#~ "����������.\n"
-#~ "\n"
-#~ "\n"
-#~ "��� ���� ��� ������, �������������� ��� ��������� ��� �����������\n"
-#~ "���� ���������� ��� ������ ��� � ����� ��� ������� ��� Windows \n"
-#~ "(��� ���� ����� ������������� ���� ���������� ���), ���� ����������\n"
-#~ "���� ����� ������������."
+#~ "� ������� �������.\n"
+#~ "������������ ��� ��������� ��� ��� ������ ������� Mandrake."
 
-#~ msgid "Shutting down"
-#~ msgstr "��������"
+#~ msgid "Color configuration"
+#~ msgstr "��������� ��������"
 
-#~ msgid "useless"
-#~ msgstr "�������"
+#~ msgid "sent: "
+#~ msgstr "������������: "
 
-#~ msgid "garbage"
-#~ msgstr "��������"
+#~ msgid "received: "
+#~ msgstr "���������: "
 
-#~ msgid ""
-#~ "Choose \"Install\" if there are no previous versions of Linux\n"
-#~ "installed, or if you wish to use multiple distributions or versions.\n"
-#~ "\n"
-#~ "\n"
-#~ "Choose \"Upgrade\" if you wish to update a previous version of Mandrake "
-#~ "Linux:\n"
-#~ "5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold "
-#~ "2000\n"
-#~ "or 7.0 (Air)."
-#~ msgstr ""
-#~ "�������� \"�����������\" ��� ��� ������� ���������� ����������� Linux\n"
-#~ "��� ������� ���, � ��� ������ �� ��������������� ��������� "
-#~ "�������������.\n"
-#~ "\n"
-#~ "\n"
-#~ "�������� \"����������\" ��� ������ �� ������������ ��� ���������\n"
-#~ "����������� ��� Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo),\n"
-#~ "5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold 2000 or 7.0 (Air)."
+#~ msgid "average"
+#~ msgstr "����� ����"
 
-#~ msgid "Do you want to use LILO?"
-#~ msgstr "������ �� ��������������� �� LILO;"
+#~ msgid "Connect"
+#~ msgstr "�������"
 
-#~ msgid ""
-#~ "You may now select the packages you wish to install.\n"
-#~ "\n"
-#~ "\n"
-#~ "First you can select group of package to install or upgrade. After that\n"
-#~ "you can select more packages according to the total size you wish to\n"
-#~ "select.\n"
-#~ "\n"
-#~ "\n"
-#~ "If you are in expert mode, you can select packages individually.\n"
-#~ "Please note that some packages require the installation of others.\n"
-#~ "These are referred to as package dependencies. The packages you select,\n"
-#~ "and the packages they require will be automatically selected for\n"
-#~ "install. It is impossible to install a package without installing all\n"
-#~ "of its dependencies."
-#~ msgstr ""
-#~ "�������� ���� �� ��������� �� ������ ��� ������ �� ������������.\n"
-#~ "\n"
-#~ "\n"
-#~ "�������� ���' ����� �� ��������� ��� ����� ������� ���� �����������\n"
-#~ "� ����������. ����, �������� �� ���������� ������ ������� �� ���\n"
-#~ "��������� ����.\n"
-#~ "\n"
-#~ "\n"
-#~ "��� ����� �������� ������������� �����������, �������� �� ���������\n"
-#~ "��������� ������. �������� ��������� ��� ������ ������ �������� ���\n"
-#~ "����������� ������� �����. ���� ����������� ����������� ������. �� \n"
-#~ "������ ��� �� ���������, ����� ��� �� ����������� ������, �� \n"
-#~ "���������� ���� �����������. ��� ����� ������� �� ������������ ���\n"
-#~ "������, �� ��� ������������� ��� �� ����������� ��� ���� ������."
-
-#~ msgid ""
-#~ "LILO (the LInux LOader) can boot Linux and other operating systems.\n"
-#~ "Normally they are correctly detected during installation. If you don't\n"
-#~ "see yours detected, you can add one or more now.\n"
-#~ "\n"
-#~ "\n"
-#~ "If you don't want that everybody could access at one of them, you can "
-#~ "remove\n"
-#~ "it now (a boot disk will be needed to boot it)."
-#~ msgstr ""
-#~ "�� LILO ������ �� ��������� �� Linux ��� ���� �.�. �������� ����\n"
-#~ "�������������� �������� ���� ��� �����������. ��� ������ ��� �����\n"
-#~ "������������, �������� �� �� ���������� ����.\n"
-#~ "\n"
-#~ "\n"
-#~ "��� ������ ������ ��� ���� �� ��� ����� ������ ������������,\n"
-#~ "��������� �� ���� (�� ����������� ������� ��������� ��� �� ��\n"
-#~ "����������)."
+#~ msgid "Disconnect"
+#~ msgstr "����������"
 
 #~ msgid ""
-#~ "Now that you've selected desired groups, please choose \n"
-#~ "how many packages you want, ranging from minimal to full \n"
-#~ "installation of each selected groups."
+#~ "You can now test your mouse. Use buttons and wheel to verify\n"
+#~ "if settings are good. If not, you can click on \"Cancel\" to choose "
+#~ "another\n"
+#~ "driver."
 #~ msgstr ""
-#~ "���� ��� ��������� ������, �������� �������� ���� ������ \n"
-#~ "����������, ������������ ��� �������� �� ������� �����������\n"
-#~ "��� ���� �����."
+#~ "�������� ���� �� ���������� �� ������� ���. ��������� �� ������� ��� ��\n"
+#~ "������ ��� ����������� ��� ��� ����������� ���� ������. �� ���, ��������\n"
+#~ "\"�������\" ��� �������� ����� �����."
 
-#~ msgid ""
-#~ "You need %dMB for a full install of the groups you selected.\n"
-#~ "You can go on anyway, but be warned that you won't get all packages"
-#~ msgstr ""
-#~ "���������� %dMB ��� ��� ����� ����������� ��� ������� ��� ���������.\n"
-#~ "�������� �� ����������, ���� ��� �� ������������� ��� �� ������"
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "������� DSL (� ADSL)"
 
-#~ msgid "Choose other CD to install"
-#~ msgstr "�������� ���� CD ���� �����������"
+#~ msgid "Choose"
+#~ msgstr "�������"
 
-#~ msgid ""
-#~ "Select:\n"
-#~ "\n"
-#~ "  - Recommended: If you have never installed Linux before.\n"
-#~ "\n"
-#~ "\n"
-#~ "  - Customized: If you are familiar with Linux, you will be able to \n"
-#~ "select the usage for the installed system between normal, development or\n"
-#~ "server. Choose \"Normal\" for a general purpose installation of your\n"
-#~ "computer. You may choose \"Development\" if you will be using the "
-#~ "computer\n"
-#~ "primarily for software development, or choose \"Server\" if you wish to\n"
-#~ "install a general purpose server (for mail, printing...).\n"
-#~ "\n"
-#~ "\n"
-#~ "  - Expert: If you are fluent with GNU/Linux and want to perform\n"
-#~ "a highly customized installation, this Install Class is for you. You "
-#~ "will\n"
-#~ "be able to select the usage of your installed system as for \"Customized"
-#~ "\"."
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
 #~ msgstr ""
-#~ "��������:\n"
-#~ "\n"
-#~ "  - �����������: ��� ���� ����� � ����� ���� ��� ����������� Linux.\n"
-#~ "\n"
-#~ "\n"
-#~ "  - �������������: ��� ����� ������������� �� �� Linux, �� ��������� �� \n"
-#~ "��������� ������ ���������� ������� ������, ���������� ��������� � "
-#~ "�����������\n"
-#~ "�������.\n"
-#~ "\n"
-#~ "\n"
-#~ "  - �������������: ��� ����� ���� ������������� �� ��������� GNU/Linux "
-#~ "���\n"
-#~ "������ �� ���������������� ��� ���������� ������������� �����������, "
-#~ "����\n"
-#~ "���� � ������� ����� ��� ���. �� ��������� �� ��������� ���� "
-#~ "������������\n"
-#~ "���� ��� ���� �������� (\"�������������\") �������."
+#~ "�������� �� ������ ���������� �� URI ��� �������� ���� �������� ���� CUPS."
 
-#~ msgid "Downloading cryptographic packages"
-#~ msgstr "���� ������� �������������"
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "���, ������ ����������� ������ ASCII"
 
-#~ msgid "Setup SCSI"
-#~ msgstr "����������� SCSI"
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "���, ������ ����������� ������ PostScrip"
 
-#~ msgid "Installation CD Nr %s"
-#~ msgstr "����������� CD ��. %s"
+#~ msgid "Yes, print both test pages"
+#~ msgstr "���, ������ ��� ��� ��� ������������ �������"
 
-#~ msgid ""
-#~ "Update installation image!\n"
-#~ "\n"
-#~ "Ask your system administrator or reboot to update your installation image "
-#~ "to include\n"
-#~ "the Cd-Rom image labelled \"%s\". Press Ok if image has been updated or "
-#~ "press Cancel\n"
-#~ "to avoid installation from this Cd-Rom image."
-#~ msgstr ""
-#~ "������ image ������������!\n"
-#~ "\n"
-#~ "������� ��� ��� ����������� ��� � ������������� ���� �� ��� �������� �� "
-#~ "image ������������\n"
-#~ "�� ����� \"%s\". ������� �� ��� �������� � ������� ��� �� ��������� ��� "
-#~ "����������� ��� ���� �� Cd-Rom image."
+#~ msgid "Paper Size"
+#~ msgstr "������� �������"
 
-#~ msgid "Which language do you want?"
-#~ msgstr "�� ������ ���������;"
+#~ msgid "Eject page after job?"
+#~ msgstr "������� ������� �� �� ����� ��� ���������;"
 
-#~ msgid "Hurt me plenty"
-#~ msgstr "����� �� �������"
+#~ msgid "Uniprint driver options"
+#~ msgstr "�������� ������ Uniprint"
 
-#~ msgid "Which packages do you want to install"
-#~ msgstr "���� ������ ������ �� �������������"
+#~ msgid "Color depth options"
+#~ msgstr "�������� ������ ��������"
 
-#~ msgid "Local LAN"
-#~ msgstr "������ ������"
+#~ msgid "Print text as PostScript?"
+#~ msgstr "�������� �������� ��� PostScript;"
 
-#~ msgid "Going to install %d MB. You can choose to install more programs"
-#~ msgstr ""
-#~ "�� ����������� %d MB. �������� �� ������������� ����������� �����������"
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "�������� ��������-������;"
 
-#~ msgid "Bad kickstart file %s (failed %s)"
-#~ msgstr "���������� ������ ������������ %s (������� %s)"
+#~ msgid "Number of pages per output pages"
+#~ msgstr "������� ������� ��� ������� ������"
 
-#~ msgid "Size: %s MB"
-#~ msgstr "�������: %s MB"
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "��������/����� ��������� �� ������� (1/72 ��� ������)"
 
-#~ msgid "resizing"
-#~ msgstr "�������� ��������"
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "����/���� ��������� �� ������� (1/72 ��� ������)"
 
-#~ msgid "formatting"
-#~ msgstr "�����������"
+#~ msgid "Extra GhostScript options"
+#~ msgstr "�������� �������� GhostScript"
 
-#~ msgid "changing type of"
-#~ msgstr "������ ����� ���"
+#~ msgid "Extra Text options"
+#~ msgstr "�������� �������� ��������"
 
-#~ msgid "After %s partition %s,"
-#~ msgstr "���� %s ��������� %s,"
+#~ msgid "Reverse page order"
+#~ msgstr "���������� ����� �������;"
 
-#~ msgid "linear"
-#~ msgstr "��������"
+#~ msgid "CUPS starting"
+#~ msgstr "�������� CUPS"
 
-#~ msgid "Linear (needed for some SCSI drives)"
-#~ msgstr "�������� (���������� �� �������� SCSI �������)"
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "������ �������� ���������������� ��������"
 
-#~ msgid "User name:"
-#~ msgstr "������� ������:"
+#~ msgid ""
+#~ "With a remote CUPS server, you do not have to configure\n"
+#~ "any printer here; printers will be automatically detected.\n"
+#~ "In case of doubt, select \"Remote CUPS server\"."
+#~ msgstr ""
+#~ "�� ��� ����� ����������� CUPS, ��� ���������� �� ��������� ��������� \n"
+#~ "���. �� ��������� �� ������������� ��������. �� ����� ���������, "
+#~ "��������\n"
+#~ "\"����������� CUPS\"."
 
-#~ msgid "Password:"
-#~ msgstr "���� ������:"
+#~ msgid ""
+#~ "Every printer need a name (for example lp).\n"
+#~ "Other parameters such as the description of the printer or its location\n"
+#~ "can be defined. What name should be used for this printer and\n"
+#~ "how is the printer connected?"
+#~ msgstr ""
+#~ "���� ���������  ���������� ��� ����� (��� ���������� lp). ������� ������ "
+#~ "�� \n"
+#~ "�������� ����� ���������� ���� ��������� � � ���������. �� ����� �� \n"
+#~ "����� �� ����� ��� �������� ��� ��� ����� ������������ � ���������;"
 
-#~ msgid "expert"
-#~ msgstr "�������"
+#~ msgid ""
+#~ "Every print queue (which print jobs are directed to) needs a\n"
+#~ "name (often lp) and a spool directory associated with it. What\n"
+#~ "name and directory should be used for this queue and how is the printer "
+#~ "connected?"
+#~ msgstr ""
+#~ "���� ���� �������� (���� ����� ���������� �� ����������) ����������\n"
+#~ "��� ����� (����� lp) ��� ���� ��������. �� ����� ��� �������� �� \n"
+#~ "����� �� ����� ��� ���� �������� ��� ��� ����� ������������ � ���������;"
 
-#~ msgid "developer"
-#~ msgstr "���������������"
+#~ msgid "Name of queue"
+#~ msgstr "����� �����"
 
-#~ msgid "beginner"
-#~ msgstr "��������"
+#~ msgid "Spool directory"
+#~ msgstr "���������"
 
-#~ msgid "A entry %s already exists"
-#~ msgstr "� ������� %s ������� ���"
+#~ msgid "Light configuration"
+#~ msgstr "������� �������"
 
-#~ msgid "Choose install or upgrade"
-#~ msgstr "����������� � ����������;"
+#~ msgid "Provider dns 1"
+#~ msgstr "DNS 1"
 
-#~ msgid "What usage do you want?"
-#~ msgstr "�� ����� ������;"
+#~ msgid "Provider dns 2"
+#~ msgstr "DNS 2"
diff --git a/perl-install/share/po/eo.po b/perl-install/share/po/eo.po
index 136f5fab1..7c86e3d3f 100644
--- a/perl-install/share/po/eo.po
+++ b/perl-install/share/po/eo.po
@@ -5,65 +5,64 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-02 17:16+0200\n"
-"PO-Revision-Date: 2000-10-24 16:18-0500\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
+"PO-Revision-Date: 2001-08-02 22:36-0500\n"
 "Last-Translator: D. Dale Gulledge <dsplat@rochester.rr.com>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
+#: ../../Xconfigurator.pm_.c:231
+msgid "Configure all heads independently"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:239
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
-msgstr "Legas konfigura�on"
+msgstr "Plur-ekrana konfigura�o"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:239
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "Grafika karto"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "Elektu grafikan karton"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "Elektu X servilon"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "X server"
 msgstr "X servilo"
 
-#: ../../Xconfigurator.pm_.c:309 ../../Xconfigurator.pm_.c:316
-#: ../../Xconfigurator.pm_.c:366
+#: ../../Xconfigurator.pm_.c:307 ../../Xconfigurator.pm_.c:313
+#: ../../Xconfigurator.pm_.c:363 ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s"
 msgstr "XFree %s"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:310
 msgid "Which configuration of XFree do you want to have?"
 msgstr "Kiun konfiguron de XFree vi deziras havi?"
 
-#: ../../Xconfigurator.pm_.c:324
+#: ../../Xconfigurator.pm_.c:321
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -72,17 +71,18 @@ msgstr ""
 "Via karto povas havi 3D aparatan akceladon, sed nur kun XFree %s.\n"
 "XFree %s subtenas vian karton kiu eble havas pli bonan subtenon en 2D."
 
-#: ../../Xconfigurator.pm_.c:326 ../../Xconfigurator.pm_.c:359
+#: ../../Xconfigurator.pm_.c:323 ../../Xconfigurator.pm_.c:356
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with XFree %s."
 msgstr "Vi povas havi 3D aparatan akceladan subtenon kun XFree %s."
 
-#: ../../Xconfigurator.pm_.c:328 ../../Xconfigurator.pm_.c:361
+#: ../../Xconfigurator.pm_.c:325 ../../Xconfigurator.pm_.c:358
+#: ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s with 3D hardware acceleration"
 msgstr "XFree %s kun 3D aparata akcelado"
 
-#: ../../Xconfigurator.pm_.c:336 ../../Xconfigurator.pm_.c:350
+#: ../../Xconfigurator.pm_.c:333 ../../Xconfigurator.pm_.c:347
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -91,12 +91,12 @@ msgstr ""
 "Via karto povas havi 3D aparatan akceladon, sed nur kun XFree %s.\n"
 "NOTU KE �I TIO ESTAS EKSPERIMENTA SUBTENO KAJ EBLE SVENIGOS VIAN KOMPUTILON."
 
-#: ../../Xconfigurator.pm_.c:338 ../../Xconfigurator.pm_.c:352
+#: ../../Xconfigurator.pm_.c:335 ../../Xconfigurator.pm_.c:349
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "XFree %s kun EKSPERIMENTA 3D aparata akcelado"
 
-#: ../../Xconfigurator.pm_.c:347
+#: ../../Xconfigurator.pm_.c:344
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -108,27 +108,31 @@ msgstr ""
 "KOMPUTILON.\n"
 "XFree %s subtenas vian karton kiu eble havas pli bonan subtenon en 2D."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "XFree Konfigurado"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "Elektu memorkapaciton de via grafika karto"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "Elektu opciojn por servilo"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "Elektu ekranon"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Monitor"
 msgstr "Ekrano"
 
-#: ../../Xconfigurator.pm_.c:483
+#: ../../Xconfigurator.pm_.c:519
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -150,39 +154,39 @@ msgstr ""
 "sinkronamplekson kiu estas preter la kapabloj de via ekrano: vi eble\n"
 "difektus vian ekranon.  Se vi dubas, elektu zorgeman opcion."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Horizontala sinkronrapido (horizontal sync rate)"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Vertikala refre�igrapido (vertical refresh rate)"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "Ekrano ne estas konfigurata"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "Grafika karto ne jam konfigurita"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "Vi ne jam elektas distingivojn"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "�u vi deziras provi la konfigura�on?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Averto: provado de �i tiu grafika karto eble svenigos vian komputilon"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Provu konfigura�on"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -190,153 +194,156 @@ msgstr ""
 "\n"
 "penu �an�i iom da parametroj"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "Eraro okazis:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Mi eliros post %d sekundoj"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "�u tio �i pravas?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "Eraro okazis, penu �an�i iom da parametroj"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Distingivo"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "Elektu distingivon kaj kolorprofundon"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Grafika karto: %s"
 
-#: ../../Xconfigurator.pm_.c:734
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 servilo: %s"
 
-#: ../../Xconfigurator.pm_.c:750 ../../standalone/draknet_.c:280
-#: ../../standalone/draknet_.c:283
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:829 ../../printerdrake.pm_.c:1885
+#: ../../standalone/draknet_.c:298 ../../standalone/draknet_.c:301
 msgid "Expert Mode"
-msgstr "Spertula modalo"
+msgstr "Spertula Modalo"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "Montru tuton"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Distingivoj"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Klavara aran�o: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Speco de muso: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Musaparato: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1333
+#: ../../Xconfigurator.pm_.c:1440
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Ekrano: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1334
+#: ../../Xconfigurator.pm_.c:1441
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Ekrana horizontala sinkronrapido (horizontal sync rate): %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Ekrana vertikala refre�igrapido (vertical refresh rate): %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafika karto: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Grafika karto: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Graifka memoro: %s KB\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Kolorprofuneco: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Distingivo: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1342
+#: ../../Xconfigurator.pm_.c:1450
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 servilo: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1343
+#: ../../Xconfigurator.pm_.c:1451
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "XFree86 pelilo: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "Preparas X-Fenestran konfigura�on"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "Kion vi deziras fari?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "�an�u Ekranon"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "�an�u Grafika karto"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "�an�u Servilajn opciojn"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "�an�u distingivon"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "Montru informon"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "Provu denove"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "�esu"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -349,21 +356,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Bonvolu resaluti en %s-n por aktivigi la �an�ojn."
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr ""
 "Bonvole adia�u kaj sekve uzu Kontrol-Alt-Retropa�o (Ctrl-Alt-Backspace)."
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "X Fenestro �e komenco"
 
-#: ../../Xconfigurator.pm_.c:1447
+#: ../../Xconfigurator.pm_.c:1556
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -416,220 +423,225 @@ msgid "8 MB"
 msgstr "8 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
-msgstr "16 MB a� pli"
+msgid "16 MB"
+msgstr "16 MB"
+
+#: ../../Xconfigurator_consts.pm_.c:113
+msgid "32 MB"
+msgstr "32 MB"
+
+#: ../../Xconfigurator_consts.pm_.c:114
+msgid "64 MB or more"
+msgstr "64 MB a� pli"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Normala VGA, 640x480 �e 60 hercoj (Hz)"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Supera VGA, 800x600 �e 56 hercoj (Hz)"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr ""
 "8514 kongrua karto, 1024x768 �e 87 hercoj (Hz) interplektita (neniu 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr ""
 "Supera VGA, 1024x768 �e 87 hercoj (Hz) interplektita, 800x600 �e 56 hercoj"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "Etendita Supera VGA, 800x600 �e 60 hercoj (Hz), 640x480 �e 72 hercoj"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr ""
 "Neinterplektita Supera VGA, 1024x768 �e 60 hercoj (Hz), 640x480 �e 72 hercoj"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Altfrekvenca Supera VGA, 1024x768 �e 70 hercoj (Hz)"
 
-#: ../../Xconfigurator_consts.pm_.c:127
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Plurfrekvenca kiu povas fari 1024x768 �e 60 hercoj (Hz)"
 
-#: ../../Xconfigurator_consts.pm_.c:128
+#: ../../Xconfigurator_consts.pm_.c:130
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Plurfrekvenca kiu povas fari 1280x1024 �e 74 hercoj (Hz)"
 
-#: ../../Xconfigurator_consts.pm_.c:129
+#: ../../Xconfigurator_consts.pm_.c:131
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Plurfrekvenca kiu povas fari 1280x1024 �e 76 hercoj (Hz)"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Ekrano kiu povas fari 1600x1200 �e 70 hercoj (Hz)"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Ekrano kiu povas fari 1600x1200 �e 76 hercoj (Hz)"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124
+#: ../../any.pm_.c:96 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Unua sektoro de starta subdisko"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124 ../../any.pm_.c:197
+#: ../../any.pm_.c:96 ../../any.pm_.c:121 ../../any.pm_.c:194
 msgid "First sector of drive (MBR)"
 msgstr "Unu sektoro de drajvo (�efStartRikordo)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "SILO Instalado"
 
-#: ../../any.pm_.c:104 ../../any.pm_.c:117
+#: ../../any.pm_.c:101 ../../any.pm_.c:114
 msgid "Where do you want to install the bootloader?"
 msgstr "Kie vi deziras instali la start�argilon?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "LILO/grub Instalado"
 
-#: ../../any.pm_.c:128 ../../any.pm_.c:142
+#: ../../any.pm_.c:125 ../../any.pm_.c:139
 msgid "SILO"
 msgstr ""
 
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:127
 msgid "LILO with text menu"
 msgstr ""
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr ""
 
-#: ../../any.pm_.c:134
+#: ../../any.pm_.c:131
 msgid "Grub"
 msgstr ""
 
-#: ../../any.pm_.c:138
+#: ../../any.pm_.c:135
 msgid "Boot from DOS/Windows (loadlin)"
 msgstr ""
 
-#: ../../any.pm_.c:140 ../../any.pm_.c:142
-#, fuzzy
+#: ../../any.pm_.c:137 ../../any.pm_.c:139
 msgid "Yaboot"
-msgstr "Radiko"
+msgstr "Yaboot"
 
-#: ../../any.pm_.c:148 ../../any.pm_.c:180
+#: ../../any.pm_.c:145 ../../any.pm_.c:177
 msgid "Bootloader main options"
 msgstr "Start�argilo �efaj opcioj"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
-#, fuzzy
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
-msgstr "Start�argilo �efaj opcioj"
+msgstr "Start�argilo por uzi"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "Start�argila instalado"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "Starta aparato"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (ne funkcias kun malnovaj BIOSoj)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Kompakta"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "kompakta"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Grafika re�imo"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "Prokrastoperiodo anta� starti defa�ltan sistemon"
 
-#: ../../any.pm_.c:160 ../../any.pm_.c:741
-#: ../../install_steps_interactive.pm_.c:904 ../../netconnect.pm_.c:629
-#: ../../printerdrake.pm_.c:98 ../../printerdrake.pm_.c:132
-#: ../../standalone/draknet_.c:569
+#: ../../any.pm_.c:157 ../../any.pm_.c:730
+#: ../../install_steps_interactive.pm_.c:938 ../../network/modem.pm_.c:46
+#: ../../printerdrake.pm_.c:402 ../../printerdrake.pm_.c:481
+#: ../../standalone/draknet_.c:603
 msgid "Password"
 msgstr "Pasvorto"
 
-#: ../../any.pm_.c:161 ../../any.pm_.c:742
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../any.pm_.c:158 ../../any.pm_.c:731
+#: ../../install_steps_interactive.pm_.c:939
 msgid "Password (again)"
 msgstr "Pasvorto (denove)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Limigu komandliniajn opciojn"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "limigu"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "Purigu /tmp dum �iuj startadoj"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Preciza kvanto de memoro se bezonata (trovis %d MB)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "Ebligu multoblajn profilojn"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Donu kvanton de memoro en MB"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "Opcio ``Limigu komandliniajn opciojn'' ne estas utila sen pasvorto"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "Please try again"
 msgstr "Bonvole provu denove"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "The passwords do not match"
 msgstr "La pasvortoj ne egalas"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
 msgstr ""
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr ""
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
 msgstr ""
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
 msgstr ""
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr ""
 
-#: ../../any.pm_.c:188
-#, fuzzy
+#: ../../any.pm_.c:185
 msgid "Default OS?"
-msgstr "Defa�lta"
+msgstr "Defa�lta Mastruma Sistemo?"
 
-#: ../../any.pm_.c:210
+#: ../../any.pm_.c:207
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -637,148 +649,144 @@ msgstr ""
 "Jen la diversaj enskriboj.\n"
 "Vi povas aldoni pli a� �an�i la ekzistantajn."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "Aldonu"
 
-#: ../../any.pm_.c:220 ../../any.pm_.c:729 ../../diskdrake.pm_.c:46
-#: ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217 ../../any.pm_.c:718 ../../diskdrake.pm_.c:161
+#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:1846
+#: ../../printerdrake.pm_.c:1847 ../../printerdrake.pm_.c:1904
+#: ../../printerdrake.pm_.c:1948
 msgid "Done"
 msgstr "Finata"
 
-#: ../../any.pm_.c:220
-#, fuzzy
+#: ../../any.pm_.c:217
 msgid "Modify"
-msgstr "�an�u RAID (Redundanca Aro de Malmultekostaj Diskoj)"
+msgstr "�an�u"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "Kiun specon de enskribo vi deziras aldoni"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Linux"
 msgstr "Linukso"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Other OS (SunOS...)"
 msgstr "Alia Mastruma Sistemo (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "Alia Mastruma Sistemo (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "Alia Mastruma Sistemo (Vindozo...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "Kerna bildo"
 
-#: ../../any.pm_.c:253 ../../any.pm_.c:264
+#: ../../any.pm_.c:247 ../../any.pm_.c:258
 msgid "Root"
 msgstr "Radiko"
 
-#: ../../any.pm_.c:254 ../../any.pm_.c:283
+#: ../../any.pm_.c:248 ../../any.pm_.c:277
 msgid "Append"
 msgstr "Alfiksu"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "Lega-skriba"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "Tabelo"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "Dan�era"
 
-#: ../../any.pm_.c:274 ../../any.pm_.c:279 ../../any.pm_.c:282
+#: ../../any.pm_.c:268 ../../any.pm_.c:273 ../../any.pm_.c:276
 msgid "Label"
 msgstr "Etikedo"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "Defa�lta"
 
-#: ../../any.pm_.c:284
-#, fuzzy
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
-msgstr "Initrd"
+msgstr "Initrd-grandeco"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
 msgstr ""
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "Forigu enskribon"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "Malplena etikedo ne estas permesata"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "�i tiu etikedo estas jam uzata"
 
-#: ../../any.pm_.c:317
-#, fuzzy
-msgid "What type of partitioning?"
-msgstr "Kiun specon de printilo vi havas?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Trovis %s %s interfacojn"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "�u vi havas alian?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "�u vi havas iun %s interfacon?"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
-#: ../../printerdrake.pm_.c:237
+#: ../../any.pm_.c:601 ../../any.pm_.c:760 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "No"
 msgstr "Ne"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
+#: ../../any.pm_.c:601 ../../any.pm_.c:759 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "Yes"
 msgstr "Jes"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "Vidu hardvaran informon"
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:648
+#: ../../any.pm_.c:637
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "Instalas pelilon por %s karto %s"
 
-#: ../../any.pm_.c:649
+#: ../../any.pm_.c:638
 #, c-format
 msgid "(module %s)"
 msgstr "(modulo %s)"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:660
+#: ../../any.pm_.c:649
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Kiun %s pelilon devus mi provi?"
 
-#: ../../any.pm_.c:668
+#: ../../any.pm_.c:657
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -795,20 +803,20 @@ msgstr ""
 "por la informo �i bezonas?  Kelkfoje, esplori svenas komputilon, sed\n"
 "�i ne devus ka�zi difekton."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "A�tomate esploru"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "Specifu opciojn"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Nun vi povas provizi �iajn opciojn al modulo %s."
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -819,11 +827,11 @@ msgstr ""
 "Opcioj estas en la formo ``nomo=valoro nomo2=valoro2 ...''.\n"
 "Ekzemple, ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Modulaj opcioj:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -832,33 +840,33 @@ msgstr ""
 "�argado de modulo %s malsukcesis.\n"
 "�u vi deziras trovi denove kun aliaj parametroj?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(jam aldonis %s)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "�i tiu pasvorto estas tro simpla"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "Bonvole donu salutnomon"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Salutnomo devas enhavi nur minusklojn, ciferojn, `-' kaj `_'"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "�i tiu salutnomo estas jam aldonita"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "Aldonu uzanto"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -867,49 +875,63 @@ msgstr ""
 "Enigu uzanton\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Akceptu uzanto"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "Vera nomo"
 
-#: ../../any.pm_.c:740 ../../printerdrake.pm_.c:97
-#: ../../printerdrake.pm_.c:131
+#: ../../any.pm_.c:729 ../../printerdrake.pm_.c:401
+#: ../../printerdrake.pm_.c:480
 msgid "User name"
 msgstr "Salutnomo"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "�elo"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "Piktogramo"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:756
 msgid "Autologin"
 msgstr "A�tomata-enregistrado"
 
-#: ../../any.pm_.c:767
+#: ../../any.pm_.c:757
+#, fuzzy
 msgid ""
 "I can set up your computer to automatically log on one user.\n"
-"If you don't want to use this feature, click on the cancel button."
+"Do you want to use this feature?"
 msgstr ""
 "Mi povas konfiguri vian komputilon por a�tomate enregistri unu uzulon kiam\n"
 "�i startas.  Se vi ne deziras uzi �i tion, alklaku la `Nuligu' butonon."
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "Elektu la defa�ltan uzulon:"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "Elektu la fenestro-administrilon por lan�i:"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "Bonvole, elektu lingvon por uzi."
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr ""
+"Vi povas elektu aliajn lingvojn kiujn estos uzeblaj malanta� la instalado"
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "�iuj"
+
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:262 ../../bootloader.pm_.c:608
+#: ../../bootloader.pm_.c:259
 #, c-format
 msgid ""
 "Welcome to %s the operating system chooser!\n"
@@ -926,20 +948,20 @@ msgstr ""
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:809
+#: ../../bootloader.pm_.c:835
 msgid "Welcome to GRUB the operating system chooser!"
 msgstr "Bonvenon al GRUB la elektilo por mastrumaj sistemoj!"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:812
+#: ../../bootloader.pm_.c:838
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
 msgstr "Uzu la %c kaj %c klavoj por elekti kiun enskribon estas emfazata."
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:815
+#: ../../bootloader.pm_.c:841
 msgid "Press enter to boot the selected OS, 'e' to edit the"
 msgstr ""
 "Premu la enenklavon por starti la elektatan mastruman sistemon, 'e' por\n"
@@ -947,32 +969,37 @@ msgstr ""
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:818
+#: ../../bootloader.pm_.c:844
 msgid "commands before booting, or 'c' for a command-line."
 msgstr "ordonoj antaux startado, aux 'c' por uzi komandan linion."
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:821
+#: ../../bootloader.pm_.c:847
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr "La emfazata enskribo startos auxtomate post %d sekundoj."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
 msgstr "mankas sufi�e da spaco en /boot"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
 #. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:918
+#: ../../bootloader.pm_.c:951
 msgid "Desktop"
 msgstr "Desktop"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:920
+#: ../../bootloader.pm_.c:953
 msgid "Start Menu"
 msgstr "Start Menu"
 
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "Kie vi deziras instali la start�argilon?"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
 msgstr ""
@@ -983,523 +1010,707 @@ msgid "Boot Style Configuration"
 msgstr "Post-instala konfigurado"
 
 #: ../../bootlook.pm_.c:79
-#, fuzzy
 msgid "/_File"
-msgstr "Dosieroj:\n"
-
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr ""
+msgstr "/_Dosiero"
 
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr ""
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr ""
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr ""
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr ""
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr ""
+#: ../../bootlook.pm_.c:80
+msgid "/File/_Quit"
+msgstr "/Dosiero/_Eliru"
 
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr ""
+#: ../../bootlook.pm_.c:80
+msgid "<control>Q"
+msgstr "<control>E"
 
 #: ../../bootlook.pm_.c:91
-msgid "/File/-"
+msgid "NewStyle Categorizing Monitor"
 msgstr ""
 
+#: ../../bootlook.pm_.c:92
+msgid "NewStyle Monitor"
+msgstr "NovStila Ekrano"
+
 #: ../../bootlook.pm_.c:93
-msgid "/File/_Quit"
-msgstr ""
+msgid "Traditional Monitor"
+msgstr "Tradicia Ekrano"
 
 #: ../../bootlook.pm_.c:94
-msgid "<control>Q"
-msgstr ""
-
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr ""
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr ""
-
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr ""
+msgid "Traditional Gtk+ Monitor"
+msgstr "Tradicia Gtk+ Ekrano"
 
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
+#: ../../bootlook.pm_.c:95
+msgid "Launch Aurora at boot time"
 msgstr ""
 
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-#, fuzzy
-msgid "Configure"
-msgstr "Konfiguru X"
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "Lilo/grub modalo"
 
-#: ../../bootlook.pm_.c:114
+#: ../../bootlook.pm_.c:102
 #, fuzzy, c-format
 msgid ""
 "You are currently using %s as Boot Manager.\n"
 "Click on Configure to launch the setup wizard."
 msgstr "Disdividado de Interreta Konekto"
 
-#: ../../bootlook.pm_.c:121
-#, fuzzy
-msgid "Lilo/grub mode"
-msgstr "Diskuma modalo"
-
-#: ../../bootlook.pm_.c:131
-msgid "NewStyle Categorizing Monitor"
-msgstr ""
-
-#: ../../bootlook.pm_.c:134
-#, fuzzy
-msgid "NewStyle Monitor"
-msgstr "Ekrano"
-
-#: ../../bootlook.pm_.c:137
-#, fuzzy
-msgid "Traditional Monitor"
-msgstr "�an�u Ekranon"
-
-#: ../../bootlook.pm_.c:140
-msgid "Traditional Gtk+ Monitor"
-msgstr ""
-
-#: ../../bootlook.pm_.c:144
-msgid "Launch Aurora at boot time"
-msgstr ""
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "Konfiguru"
 
-#: ../../bootlook.pm_.c:169
-#, fuzzy
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
-msgstr "Starta aparato"
+msgstr "Starta modalo"
+
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "Sistema modalo"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr ""
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr ""
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr ""
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr ""
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "Defa�lta"
-
-#: ../../bootlook.pm_.c:236 ../../standalone/draknet_.c:88
-#: ../../standalone/draknet_.c:120 ../../standalone/draknet_.c:184
-#: ../../standalone/draknet_.c:302 ../../standalone/draknet_.c:396
-#: ../../standalone/draknet_.c:473 ../../standalone/draknet_.c:509
-#: ../../standalone/draknet_.c:617
+#: ../../bootlook.pm_.c:155 ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:140 ../../standalone/draknet_.c:208
+#: ../../standalone/draknet_.c:320 ../../standalone/draknet_.c:433
+#: ../../standalone/draknet_.c:507 ../../standalone/draknet_.c:543
+#: ../../standalone/draknet_.c:644
 msgid "OK"
-msgstr ""
+msgstr "Jes"
 
-#: ../../bootlook.pm_.c:238 ../../install_steps_gtk.pm_.c:576
-#: ../../interactive.pm_.c:114 ../../interactive.pm_.c:269
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:357
-#: ../../my_gtk.pm_.c:360 ../../my_gtk.pm_.c:617
-#: ../../standalone/drakgw_.c:639 ../../standalone/draknet_.c:95
-#: ../../standalone/draknet_.c:127 ../../standalone/draknet_.c:295
-#: ../../standalone/draknet_.c:485 ../../standalone/draknet_.c:631
-#: ../../standalone/tinyfirewall_.c:63
+#: ../../bootlook.pm_.c:156 ../../install_steps_gtk.pm_.c:516
+#: ../../interactive.pm_.c:122 ../../interactive.pm_.c:286
+#: ../../interactive.pm_.c:308 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:416 ../../my_gtk.pm_.c:419 ../../my_gtk.pm_.c:716
+#: ../../printerdrake.pm_.c:1158 ../../standalone/drakgw_.c:648
+#: ../../standalone/draknet_.c:115 ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:313 ../../standalone/draknet_.c:519
+#: ../../standalone/draknet_.c:658 ../../standalone/tinyfirewall_.c:63
 msgid "Cancel"
 msgstr "Nuligu"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr ""
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
 msgstr ""
 
-#: ../../bootlook.pm_.c:435 ../../standalone/drakboot_.c:47
+#: ../../bootlook.pm_.c:336 ../../standalone/drakboot_.c:47
 msgid "Installation of LILO failed. The following error occured:"
 msgstr "Instalado de LILO malsukcesis.  La sekvanta eraro okazis:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Kreu"
-
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Malmuntu"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Forigu"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "KB"
 
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "Formatu"
+#: ../../common.pm_.c:93 ../../install_steps_graphical.pm_.c:287
+#: ../../install_steps_graphical.pm_.c:334
+msgid "MB"
+msgstr "MB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:653
-msgid "Resize"
-msgstr "Regrandecigu"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr "TB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "Tipo"
+#: ../../common.pm_.c:109
+#, c-format
+msgid "%d minutes"
+msgstr "%d minutoj"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "Surmetingo"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 minuto"
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "Skribu /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekundoj"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "�an�u al Spertula re�imo"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "Bonvolu fari rezervan kopion de via dateno anta�e"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "�an�u al Normala re�imo"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "Legu zorge"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "Resta�ru de dosiero"
+#: ../../diskdrake.pm_.c:103
+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 ""
+"Se vi intencas uzi \"aboot\", zorgu lasi liberan spacon (2048 sektoroj "
+"sufi�as)\n"
+"�e la komenco de la disko"
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Konservu en dosiero"
+#: ../../diskdrake.pm_.c:122 ../../diskdrake_interactive.pm_.c:313
+#: ../../diskdrake_interactive.pm_.c:328 ../../install_steps.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:37
+#: ../../install_steps_interactive.pm_.c:310 ../../interactive_http.pm_.c:119
+#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:62
+msgid "Error"
+msgstr "Eraro"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "Sor�isto"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Resta�ru de disketo"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Nova"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Konservu sur disketo"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+#, fuzzy
+msgid "Remote"
+msgstr "Malproksima printvico"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "Forvi�u �ion"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "Surmetingo"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Formatu �ion"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Opcioj"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "A�tomate disponigu"
+#: ../../diskdrake.pm_.c:211 ../../diskdrake.pm_.c:417
+#: ../../diskdrake.pm_.c:534 ../../diskdrake_interactive.pm_.c:353
+#: ../../diskdrake_interactive.pm_.c:488
+msgid "Type"
+msgstr "Tipo"
 
-#: ../../diskdrake.pm_.c:59
-msgid "All primary partitions are used"
-msgstr "�iuj el la subdiskoj estas uzata"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Malmuntu"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "Mi ne povas aldoni plu da subdiskoj"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Muntu"
+
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Elektu agon"
 
-#: ../../diskdrake.pm_.c:59
+#: ../../diskdrake.pm_.c:235
 msgid ""
-"To have more partitions, please delete one to be able to create an extended "
-"partition"
+"You have one big FAT partition\n"
+"(generally used by MicroSoft Dos/Windows).\n"
+"I suggest you first resize that partition\n"
+"(click on it, then click on \"Resize\")"
 msgstr ""
-"Por havi plu da subdiskoj, bonvole forigu unu por povi krei etendigitan\n"
-"subdiskon"
+"Vi havas unu grandan FAT subdiskon.\n"
+"(�enerale uzata de MicroSoft DOS/Vindozo).\n"
+"Mi sugestas ke vi unue regrandecigi tiun subdiskon\n"
+"(klaku sur �in, kaj poste klaku sur \"Regrandecigu\")"
+
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Bonvolu klaki sur subdiskon"
 
-#: ../../diskdrake.pm_.c:61
+#: ../../diskdrake.pm_.c:240
 #, fuzzy
-msgid "Not enough space for auto-allocating"
-msgstr "Mankas sufi�an da libera spaco por disponigi novajn subdiskojn"
+msgid "Please click on a media"
+msgstr "Bonvolu klaki sur subdiskon"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Malfaru"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "Bonvolu klaki sur subdiskon"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "Skribu subdiskotabelon"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-#, fuzzy
-msgid "More"
-msgstr "Movu"
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "Detaloj"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Ext2"
 msgstr "2a Etendata (Ext2)"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "FAT"
 msgstr "Dosierlokigtabelo (FAT)"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
+#, fuzzy
+msgid "Journalised FS"
+msgstr "muntado malsukcesis"
+
+#: ../../diskdrake.pm_.c:395
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Swap"
 msgstr "Inter�an�a"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:396 ../../diskdrake_interactive.pm_.c:952
 msgid "Empty"
 msgstr "Malplena"
 
-#: ../../diskdrake.pm_.c:117 ../../install_steps_gtk.pm_.c:407
-#: ../../mouse.pm_.c:145
+#: ../../diskdrake.pm_.c:396 ../../install_steps_gtk.pm_.c:373
+#: ../../install_steps_gtk.pm_.c:433 ../../mouse.pm_.c:161
+#: ../../services.pm_.c:161
 msgid "Other"
 msgstr "Alia"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "Specoj de dosiersistemoj:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "Detaloj"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Kreu"
 
-#: ../../diskdrake.pm_.c:147
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Uzu ``%s'' anstata�e"
+
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Forigu"
+
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Uzu ``Malmuntu'' anta�e"
+
+#: ../../diskdrake.pm_.c:424 ../../diskdrake_interactive.pm_.c:480
+#, c-format
 msgid ""
-"You have one big FAT partition\n"
-"(generally used by MicroSoft Dos/Windows).\n"
-"I suggest you first resize that partition\n"
-"(click on it, then click on \"Resize\")"
+"After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
-"Vi havas unu grandan FAT subdiskon.\n"
-"(�enerale uzata de MicroSoft DOS/Vindozo).\n"
-"Mi sugestas ke vi unue regrandecigi tiun subdiskon\n"
-"(klaku sur �in, kaj poste klaku sur \"Regrandecigu\")"
+"Post vi �an�as la specon de subdisko %s, �iuj datenoj en �i tiu subdisko "
+"estos\n"
+"perdata"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Bonvolu fari rezervan kopion de via dateno anta�e"
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Kie vi deziras munti aparato %s?"
 
-#: ../../diskdrake.pm_.c:152 ../../diskdrake.pm_.c:170
-#: ../../diskdrake.pm_.c:179 ../../diskdrake.pm_.c:570
-#: ../../diskdrake.pm_.c:592
-msgid "Read carefully!"
-msgstr "Legu zorge"
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Mount options"
+msgstr "Modulaj opcioj:"
 
-#: ../../diskdrake.pm_.c:155
-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"
+#: ../../diskdrake.pm_.c:507
+msgid "Various"
 msgstr ""
-"Se vi intencas uzi \"aboot\", zorgu lasi liberan spacon (2048 sektoroj "
-"sufi�as)\n"
-"�e la komenco de la disko"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "Zorgu: �i tiu operacio estas dan�era."
+#: ../../diskdrake.pm_.c:525
+#, fuzzy
+msgid "Removable media"
+msgstr "A�tomata muntado de demetebla medio"
 
-#: ../../diskdrake.pm_.c:214 ../../install_steps.pm_.c:72
-#: ../../install_steps_interactive.pm_.c:37
-#: ../../install_steps_interactive.pm_.c:322 ../../standalone/diskdrake_.c:66
-msgid "Error"
-msgstr "Eraro"
+#: ../../diskdrake.pm_.c:532
+#, fuzzy
+msgid "Change type"
+msgstr "�an�u subdiskspecon"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Surmetingo: "
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Kiun dosierosistemo vi deziras uzi?"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Aparato: "
+#: ../../diskdrake.pm_.c:564
+msgid "Scanning available nfs shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:569
 #, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "DOS-a diskingolitero: %s (nur konjekto)\n"
+msgid "Scanning available nfs shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:244 ../../diskdrake.pm_.c:251
-#: ../../diskdrake.pm_.c:301
-msgid "Type: "
-msgstr "Speco: "
+#: ../../diskdrake.pm_.c:578 ../../diskdrake.pm_.c:648
+msgid "If the list above doesn't contain the wanted entry, enter it here:"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:248
-msgid "Name: "
-msgstr "Nomo: "
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "Servilo"
 
-#: ../../diskdrake.pm_.c:253
-#, c-format
-msgid "Start: sector %s\n"
-msgstr "Komenco: sektoro %s\n"
+#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
+msgid "Shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Size: %s"
-msgstr "Grandeco: %s"
+#: ../../diskdrake.pm_.c:615
+msgid "Scanning available samba shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:256
+#: ../../diskdrake.pm_.c:626 ../../diskdrake.pm_.c:639
 #, c-format
-msgid ", %s sectors"
-msgstr ", %s sektoroj"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:258
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "De cilindro %d al cilindro %d\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose a partition"
+msgstr "Elektu agon"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Formatita\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose another partition"
+msgstr "Kreu novan subdiskon"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "Ne formatita\n"
+#: ../../diskdrake_interactive.pm_.c:188
+#, fuzzy
+msgid "Exit"
+msgstr "2a Etendata (Ext2)"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "Muntita\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "�an�u al Spertula re�imo"
 
-#: ../../diskdrake.pm_.c:262
-#, c-format
-msgid "RAID md%s\n"
-msgstr "RAID (Redundanca Aro de Malmultekostaj Diskoj) md%s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to normal mode"
+msgstr "�an�u al Normala re�imo"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Retrokonekta(j) dosiero(j): %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Malfaru"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Subdisko startata defa�lte\n"
-"    (por MS-DOS starto, ne por \"lilo\")\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "�u mi devus da�ri malgra�e?"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "Nivelo %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "�u eliru sen konservi"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Grandeco de pecoj %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "�u eliru sen skribi la subdisktabelon?"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "RAID-aj (Redundanca Aro de Malmultekostaj Diskoj) diskoj %s\n"
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "�u vi deziras provi la konfigura�on?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Retrokonekta dosieronomo: %s"
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "A�tomate disponigu"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "Forvi�u �ion"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "Plu"
+
+#: ../../diskdrake_interactive.pm_.c:250
+#, fuzzy
+msgid "Hard drive information"
+msgstr "Detektado de fiksdisko(j)"
+
+#: ../../diskdrake_interactive.pm_.c:267
+#, fuzzy
+msgid "Not enough space for auto-allocating"
+msgstr "Mankas sufi�an da libera spaco por disponigi novajn subdiskojn"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "�iuj el la subdiskoj estas uzata"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "Mi ne povas aldoni plu da subdiskoj"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:275
 msgid ""
-"\n"
-"Chances are, this partition is\n"
-"a Driver partition, you should\n"
-"probably leave it alone.\n"
+"To have more partitions, please delete one to be able to create an extended "
+"partition"
 msgstr ""
+"Por havi plu da subdiskoj, bonvole forigu unu por povi krei etendigitan\n"
+"subdiskon"
+
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "Skribu subdiskotabelon"
+
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "Sava subdiskotabelo"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "Sava subdiskotabelo"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "Sava subdiskotabelo"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "A�tomata muntado de demetebla medio"
+
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Elektu dosieron"
+
+#: ../../diskdrake_interactive.pm_.c:308
 msgid ""
-"\n"
-"This special Bootstrap\n"
-"partition is for\n"
-"dual-booting your system.\n"
+"The backup partition table has not the same size\n"
+"Still continue?"
 msgstr ""
+"La rezerva subdisktabelo ne estas la sama grandeco\n"
+"�u da�ras tamen?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Bonvolu klaki sur subdiskon"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Averto"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Grandeco: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"En�ovu disketon en drajvo\n"
+"�iuj datenoj sur tiu disketo estos perdata"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geometrio: %s cilindroj, %s kapoj, %s sektoroj\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "Provas savi subdisktabelon"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "LVM-aj (Redundanca Aro de Malmultekostaj Diskoj) diskoj %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+#, fuzzy
+msgid "Detailed information"
+msgstr "Montru informon"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Subdiskotabelospeco: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Regrandecigu"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "�e buso %d identiga�o %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Movu"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Muntu"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Formatu"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Aktiva"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Aldonu al RAID (Redundanca Aro de Malmultekostaj Diskoj)"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "Forigu de RAID (Redundanca Aro de Malmultekostaj Diskoj)"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "�an�u RAID (Redundanca Aro de Malmultekostaj Diskoj)"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "Aldonu al LVM (Redundanca Aro de Malmultekostaj Diskoj)"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "Forigu de RAID (Redundanca Aro de Malmultekostaj Diskoj)"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "Forigu de LVM (Redundanca Aro de Malmultekostaj Diskoj)"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "�an�u RAID (Redundanca Aro de Malmultekostaj Diskoj)"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "Uzu por retrokonektado"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Elektu agon"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Kreu novan subdiskon"
+
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "Komenca sektoro: "
+
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Grandeco en MB: "
+
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Speco de dosiersistemo: "
+
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Surmetingo: "
+
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Prefero: "
+
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "Formatas retrokonektan dosieron %s"
+
+#: ../../diskdrake_interactive.pm_.c:486
+msgid "Change partition type"
+msgstr "�an�u subdiskspecon"
+
+#: ../../diskdrake_interactive.pm_.c:491
+msgid "Switching from ext2 to ext3"
+msgstr ""
+
+#: ../../diskdrake_interactive.pm_.c:521
+#, c-format
+msgid "Where do you want to mount loopback file %s?"
+msgstr "Kie vi deziras munti retrokonektan dosieron %s?"
+
+#: ../../diskdrake_interactive.pm_.c:528
+msgid ""
+"Can't unset mount point as this partition is used for loop back.\n"
+"Remove the loopback first"
+msgstr ""
+"Ne povas malfiksi surmetingon �ar �i tiu subdisko estas uzata por\n"
+"retrokonektado.  Unue forigu la retrokonektadon."
+
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "Kalkulas FAT dosiersistemajn limojn"
+
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "Regrandecigas"
+
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "�i tiu subdisko ne estas regrandecigebla"
+
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "�iuj datenoj en �i tiu subdisko devus esti rezervata"
+
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr ""
+"Post vi regrandecigas subdiskon %s, �iuj datenoj en �i tiu subdisko estos\n"
+"perdata"
+
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Elektu la novan grandecon"
+
+#: ../../diskdrake_interactive.pm_.c:591
+#, fuzzy
+msgid "New size in MB: "
+msgstr "Grandeco en MB: "
+
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Which disk do you want to move it to?"
+msgstr "Al kiu disko vi deziras movi?"
+
+#: ../../diskdrake_interactive.pm_.c:632
+msgid "Sector"
+msgstr "Sektoro"
+
+#: ../../diskdrake_interactive.pm_.c:633
+msgid "Which sector do you want to move it to?"
+msgstr "Al kiu sektoro vi deziras movi?"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving"
+msgstr "Movante"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving partition..."
+msgstr "Movas subdisko..."
 
-#: ../../diskdrake.pm_.c:435
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr ""
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "nova"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr ""
+"Elektu ekzistantan RAID (Redundanca Aro de Malmultekostaj Diskoj) por\n"
+"aldoni al"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr ""
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "Vi ne povas uzi �i tiun subdiskon por retrokonektado"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Retrokonektado"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Retrokonekta dosieronomo: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "Vera nomo"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "Alia retrokonektado jam uzas tiun dosieron, elektu alian"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "Dosiero jam ekzistas.  �u vi deziras uzi �in?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "aparato"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "nivelo"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "grandeco de pecoj"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "Zorgu: �i tiu operacio estas dan�era."
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "Kiun specon de subdiskado?"
+
+#: ../../diskdrake_interactive.pm_.c:834
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -1511,7 +1722,7 @@ msgstr ""
 "A� vi uzos LILO kaj �i ne funkcios, a� vi ne uzos LILO kaj vi ne bezonas\n"
 "/boot."
 
-#: ../../diskdrake.pm_.c:439
+#: ../../diskdrake_interactive.pm_.c:838
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -1523,7 +1734,7 @@ msgstr ""
 "subdiskon.  Se vi intencas uzi la LILO startadministranto, zorgu aldoni\n"
 "/boot subdiskon."
 
-#: ../../diskdrake.pm_.c:445
+#: ../../diskdrake_interactive.pm_.c:844
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
 "No bootloader is able to handle this without a /boot partition.\n"
@@ -1533,334 +1744,282 @@ msgstr ""
 "Neniu start�argilo povas trakti tiun sen /boot subdisko.\n"
 "Do zorgu aldoni /boot subdiskon."
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "Uzu ``%s'' anstata�e"
-
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "Uzu ``Malmuntu'' anta�e"
-
-#: ../../diskdrake.pm_.c:469 ../../diskdrake.pm_.c:513
-#, c-format
-msgid ""
-"After changing type of partition %s, all data on this partition will be lost"
-msgstr ""
-"Post vi �an�as la specon de subdisko %s, �iuj datenoj en �i tiu subdisko "
-"estos\n"
-"perdata"
-
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "�u mi devus da�ri malgra�e?"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "�u eliru sen konservi"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "�u eliru sen skribi la subdisktabelon?"
-
-#: ../../diskdrake.pm_.c:516
-msgid "Change partition type"
-msgstr "�an�u subdiskspecon"
-
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "Kiun dosierosistemo vi deziras uzi?"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Vi ne povas uzi ReiserFS por subdisko pli malgranda ol 32MB"
-
-#: ../../diskdrake.pm_.c:537
-#, c-format
-msgid "Where do you want to mount loopback file %s?"
-msgstr "Kie vi deziras munti retrokonektan dosieron %s?"
-
-#: ../../diskdrake.pm_.c:538
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Kie vi deziras munti aparato %s?"
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "La subdisktabelo de drajvo %s estos skribata al disko!"
 
-#: ../../diskdrake.pm_.c:542
-msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
-"Remove the loopback first"
-msgstr ""
-"Ne povas malfiksi surmetingon �ar �i tiu subdisko estas uzata por\n"
-"retrokonektado.  Unue forigu la retrokonektadon."
+#: ../../diskdrake_interactive.pm_.c:868
+msgid "You'll need to reboot before the modification can take place"
+msgstr "Vi bezonos restarti anta� ol la �an�o povas efektivi�i"
 
-#: ../../diskdrake.pm_.c:561
+#: ../../diskdrake_interactive.pm_.c:879
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 "Post vi formatas la subdiskon %s, �iuj datenoj en �i tiu subdisko estos\n"
 "perdata"
 
-#: ../../diskdrake.pm_.c:563
+#: ../../diskdrake_interactive.pm_.c:881
 msgid "Formatting"
 msgstr "Formatas"
 
-#: ../../diskdrake.pm_.c:564
+#: ../../diskdrake_interactive.pm_.c:882
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Formatas retrokonektan dosieron %s"
 
-#: ../../diskdrake.pm_.c:565 ../../install_steps_interactive.pm_.c:430
+#: ../../diskdrake_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:419
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Formatas subdiskon %s"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "Post formatado de �iuj subdisko,"
-
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "�iuj datenoj sur tiuj subdisko estos perdata"
-
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Movu"
-
-#: ../../diskdrake.pm_.c:577
-msgid "Which disk do you want to move it to?"
-msgstr "Al kiu disko vi deziras movi?"
-
-#: ../../diskdrake.pm_.c:578
-msgid "Sector"
-msgstr "Sektoro"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid malsukcesis"
 
-#: ../../diskdrake.pm_.c:579
-msgid "Which sector do you want to move it to?"
-msgstr "Al kiu sektoro vi deziras movi?"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "Mankas sufi�an da libera spaco por disponigi novajn subdiskojn"
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving"
-msgstr "Movante"
+#: ../../diskdrake_interactive.pm_.c:895
+#, c-format
+msgid ""
+"Directory %s already contain some data\n"
+"(%s)"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving partition..."
-msgstr "Movas subdisko..."
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "Mankas sufi�an da libera spaco por disponigi novajn subdiskojn"
 
-#: ../../diskdrake.pm_.c:592
+#: ../../diskdrake_interactive.pm_.c:910
 #, c-format
-msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "La subdisktabelo de drajvo %s estos skribata al disko!"
+msgid "Copying %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:594
-msgid "You'll need to reboot before the modification can take place"
-msgstr "Vi bezonos restarti anta� ol la �an�o povas efektivi�i"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Distingivo: %s\n"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "Kalkulas FAT dosiersistemajn limojn"
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Aparato: "
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "Regrandecigas"
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "DOS-a diskingolitero: %s (nur konjekto)\n"
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "�i tiu subdisko ne estas regrandecigebla"
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Speco: "
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "�iuj datenoj en �i tiu subdisko devus esti rezervata"
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Nomo: "
 
-#: ../../diskdrake.pm_.c:650
+#: ../../diskdrake_interactive.pm_.c:954
 #, c-format
-msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr ""
-"Post vi regrandecigas subdiskon %s, �iuj datenoj en �i tiu subdisko estos\n"
-"perdata"
+msgid "Start: sector %s\n"
+msgstr "Komenco: sektoro %s\n"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Elektu la novan grandecon"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Grandeco: %s"
 
-#: ../../diskdrake.pm_.c:660 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
-msgid "MB"
-msgstr "MB"
+#: ../../diskdrake_interactive.pm_.c:957
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s sektoroj"
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "Kreu novan subdiskon"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "De cilindro %d al cilindro %d\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "Komenca sektoro: "
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Formatita\n"
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Grandeco en MB: "
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "Ne formatita\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Speco de dosiersistemo: "
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "Muntita\n"
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "Prefero: "
+#: ../../diskdrake_interactive.pm_.c:963
+#, c-format
+msgid "RAID md%s\n"
+msgstr "RAID (Redundanca Aro de Malmultekostaj Diskoj) md%s\n"
 
-#: ../../diskdrake.pm_.c:798
-msgid "This partition can't be used for loopback"
-msgstr "Vi ne povas uzi �i tiun subdiskon por retrokonektado"
+#: ../../diskdrake_interactive.pm_.c:965
+#, fuzzy, c-format
+msgid ""
+"Loopback file(s):\n"
+"   %s\n"
+msgstr "Retrokonekta(j) dosiero(j): %s\n"
 
-#: ../../diskdrake.pm_.c:808
-msgid "Loopback"
-msgstr "Retrokonektado"
+#: ../../diskdrake_interactive.pm_.c:966
+msgid ""
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
+msgstr ""
+"Subdisko startata defa�lte\n"
+"    (por MS-DOS starto, ne por \"lilo\")\n"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Retrokonekta dosieronomo: "
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "Nivelo %s\n"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "Alia retrokonektado jam uzas tiun dosieron, elektu alian"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Grandeco de pecoj %s\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "Dosiero jam ekzistas.  �u vi deziras uzi �in?"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "RAID-aj (Redundanca Aro de Malmultekostaj Diskoj) diskoj %s\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Elektu dosieron"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Retrokonekta dosieronomo: %s"
 
-#: ../../diskdrake.pm_.c:876
+#: ../../diskdrake_interactive.pm_.c:975
 msgid ""
-"The backup partition table has not the same size\n"
-"Still continue?"
+"\n"
+"Chances are, this partition is\n"
+"a Driver partition, you should\n"
+"probably leave it alone.\n"
 msgstr ""
-"La rezerva subdisktabelo ne estas la sama grandeco\n"
-"�u da�ras tamen?"
-
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "Averto"
 
-#: ../../diskdrake.pm_.c:885
+#: ../../diskdrake_interactive.pm_.c:978
 msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
 msgstr ""
-"En�ovu disketon en drajvo\n"
-"�iuj datenoj sur tiu disketo estos perdata"
-
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "Provas savi subdisktabelon"
 
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "aparato"
-
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "nivelo"
-
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "grandeco de pecoj"
-
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr ""
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Grandeco: %s\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "nova"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geometrio: %s cilindroj, %s kapoj, %s sektoroj\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr ""
-"Elektu ekzistantan RAID (Redundanca Aro de Malmultekostaj Diskoj) por\n"
-"aldoni al"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Informo: "
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr ""
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM-aj (Redundanca Aro de Malmultekostaj Diskoj) diskoj %s\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "A�tomata muntado de demetebla medio"
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Subdiskotabelospeco: %s\n"
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "Sava subdiskotabelo"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "�e buso %d identiga�o %d\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "Re�argu"
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Opcioj: %s"
 
-#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
-#: ../../fs.pm_.c:113
+#: ../../fs.pm_.c:447 ../../fs.pm_.c:457 ../../fs.pm_.c:461 ../../fs.pm_.c:465
+#: ../../fs.pm_.c:469 ../../fs.pm_.c:473
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s formatado de %s malsukcesis"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "ne scias kiel formati %s kiel speco %s"
 
-#: ../../fs.pm_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "muntado malsukcesis"
+
+#: ../../fs.pm_.c:588
+#, c-format
+msgid "fsck failed with exit code %d or signal %d"
+msgstr ""
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
 msgid "mount failed: "
 msgstr "muntado malsukcesis: "
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "eraro dum malmunti %s: %s"
 
 #: ../../fsedit.pm_.c:21
-#, fuzzy
 msgid "simple"
-msgstr "Dosiero"
+msgstr "simpla"
 
 #: ../../fsedit.pm_.c:30
-#, fuzzy
 msgid "server"
-msgstr "X servilo"
+msgstr "servilo"
+
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Vi ne povas uzi JFS por subdisko pli malgranda ol 16MB"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Vi ne povas uzi ReiserFS por subdisko pli malgranda ol 32MB"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "Surmetingoj devas komenci kun anta�a /"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Jam estas subdisko kun surmetingo �e %s\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Cirklaj surmetingoj %s\n"
-
-#: ../../fsedit.pm_.c:285
+#: ../../fsedit.pm_.c:476
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr ""
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
 msgstr "�i tiu dosierujo devus resti interne de la radika dosierosistemo (/)"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr "Vi bezonas veran dosiersistemon (ext2, reiserfs) por tiu surmetingo\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Eraro dum malfermado de %s por skribi: %s"
 
-#: ../../fsedit.pm_.c:453
+#: ../../fsedit.pm_.c:681
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
@@ -1869,1059 +2028,732 @@ msgstr ""
 "novajn dosiersistemojn.  Bonvolu kontroli vian ekipa�on por la ka�zo de �i "
 "tiu problemo."
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "Vi ne havas iujn ajn subdiskojn!"
 
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr ""
-"Bonvole elektu vian preferatan lingvon por instalado kaj sistema uzado."
-
-#: ../../help.pm_.c:12
-msgid ""
-"You need to accept the terms of the above license to continue installation.\n"
+#: ../../help.pm_.c:13
+msgid ""
+"GNU/Linux is a multiuser system, and this means that each user can have his\n"
+"own preferences, his own files and so on. You can read the ``User Guide''\n"
+"to learn more. But unlike \"root\", which is the administrator, the users\n"
+"you will add here will not be entitled to change anything except their own\n"
+"files and their own configuration. You will have to create at least one\n"
+"regular user for yourself. That account is where you should log in for\n"
+"routine use. Although it is very practical to log in as \"root\" everyday,\n"
+"it may also be very dangerous! The slightest mistake could mean that your\n"
+"system would not work any more. If you make a serious mistake as a regular\n"
+"user, you may only lose some information, but not the entire system.\n"
+"\n"
+"First, you have to enter your real name. This is not mandatory, of course -\n"
+"as you can actually enter whatever you want. DrakX will then take the first\n"
+"word you have entered in the box and will bring it over to the \"User\n"
+"name\". This is the name this particular user will use to log into the\n"
+"system. You can change it. You then have to enter a password here. A\n"
+"non-privileged (regular) user's password is not as crucial as that of\n"
+"\"root\" from a security point of view, but that is no reason to neglect it\n"
+"- after all, your files are at risk.\n"
+"\n"
+"If you click on \"Accept user\", you can then add as many as you want. Add\n"
+"a user for each one of your friends: your father or your sister, for\n"
+"example. When you finish adding all the users you want, select \"Done\".\n"
+"\n"
+"Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
+"for that user (bash by default)."
+msgstr ""
+
+#: ../../help.pm_.c:41
+msgid ""
+"Listed above are the existing Linux partitions detected on your hard drive.\n"
+"You can keep the choices made by the wizard, they are good for most common\n"
+"installs. If you make any changes, you must at least define a root\n"
+"partition (\"/\"). Do not choose too small a partition or you will not be\n"
+"able to install enough software. If you want to store your data on a\n"
+"separate partition, you will also need to create a partition for \"/home\"\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"
-"Please click on \"Accept\" if you agree with its terms.\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"
-"Please click on \"Refuse\" if you disagree with its terms. Installation will "
-"end without modifying your current\n"
-"configuration."
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc."
 msgstr ""
 
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Elektu la aran�on de via klavaro el la listo supre"
-
-#: ../../help.pm_.c:25
+#: ../../help.pm_.c:72
 msgid ""
-"If you wish other languages (than the one you choose at\n"
-"beginning of installation) will be available after installation, please "
-"chose\n"
-"them in list above. If you want select all, you just need to select \"All\"."
+"The Mandrake Linux installation is spread out over several CDROMs. DrakX\n"
+"knows if a selected package is located on another CDROM and will eject the\n"
+"current CD and ask you to insert a different one as required."
 msgstr ""
 
-#: ../../help.pm_.c:30
+#: ../../help.pm_.c:77
 msgid ""
-"Please choose \"Install\" if there are no previous version of Linux-"
-"Mandrake\n"
-"installed or if you wish to use several operating systems.\n"
+"It is now time to specify which programs you wish to install on your\n"
+"system. There are thousands of packages available for Mandrake Linux, and\n"
+"you are not supposed to know them all by heart.\n"
 "\n"
+"If you are performing a standard installation from CDROM, you will first be\n"
+"asked to specify the CDs you currently have (in Expert mode only). Check\n"
+"the CD labels and highlight the boxes corresponding to the CDs you have\n"
+"available for installation. Click \"OK\" when you are ready to continue.\n"
 "\n"
-"Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\n"
+"Packages are sorted in groups corresponding to a particular use of your\n"
+"machine. The groups themselves are sorted into four sections:\n"
 "\n"
+" * \"Workstation\": if you plan to use your machine as a workstation, "
+"select\n"
+"one or more of the corresponding groups.\n"
 "\n"
-"Depend of your knowledge in GNU/Linux, you can choose one of the following "
-"levels to install or update your\n"
-"Linux-Mandrake operating system:\n"
+" * \"Development\": if the machine is to be used for programming, choose "
+"the\n"
+"desired group(s).\n"
 "\n"
-"\t* Recommended: if you have never installed a GNU/Linux operating system "
-"choose this. Installation will be\n"
-"\t  be very easy and you will be asked only on few questions.\n"
+" * \"Server\": finally, if the machine is intended to be a server, you will\n"
+"be able to select which of the most common services you wish to see\n"
+"installed on the machine.\n"
 "\n"
+" * \"Graphical Environment\": this is where you will choose your preferred\n"
+"graphical environment. At least one must be selected if you want to have a\n"
+"graphical workstation!\n"
 "\n"
-"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
-"the primary usage (workstation, server,\n"
-"\t  development) of your system. You will need to answer to more questions "
-"than in \"Recommended\" installation\n"
-"\t  class, so you need to know how GNU/Linux works to choose this "
-"installation class.\n"
+"Moving the mouse cursor over a group name will display a short explanatory\n"
+"text about that group.\n"
 "\n"
+"You can check the \"Individual package selection\" box, which is useful if\n"
+"you are familiar with the packages being offered or if you want to have\n"
+"total control over what will be installed.\n"
 "\n"
-"\t* Expert: if you have a good knowledge in GNU/Linux, you can choose this "
-"installation class. As in \"Customized\"\n"
-"\t  installation class, you will be able to choose the primary usage "
-"(workstation, server, development). Be very\n"
-"\t  careful before choose this installation class. You will be able to "
-"perform a higly customized installation.\n"
-"\t  Answer to some questions can be very difficult if you haven't a good "
-"knowledge in GNU/Linux. So, don't choose\n"
-"\t  this installation class unless you know what you are doing."
+"If you started the installation in \"Update\" mode, you can unselect all\n"
+"groups to avoid installing any new package. This is useful for repairing or\n"
+"updating an existing system."
 msgstr ""
 
-#: ../../help.pm_.c:56
+#: ../../help.pm_.c:115
 msgid ""
-"Select:\n"
-"\n"
-"  - Customized: If you are familiar enough with GNU/Linux, you may then "
-"choose\n"
-"    the primary usage for your machine. See below for details.\n"
+"Finally, depending on your choice of whether or not to select individual\n"
+"packages, you will be presented a tree containing all packages classified\n"
+"by groups and subgroups. While browsing the tree, you can select entire\n"
+"groups, subgroups, or individual packages.\n"
 "\n"
+"Whenever you select a package on the tree, a description appears on the\n"
+"right. When your selection is finished, click the \"Install\" button which\n"
+"will then launch the installation process. Depending on the speed of your\n"
+"hardware and the number of packages that need to be installed, it may take\n"
+"a while to complete the process. A time to complete estimate is displayed\n"
+"on the screen to help you gauge if there is sufficient time to enjoy a cup\n"
+"of coffee.\n"
 "\n"
-"  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
-"    perform a highly customized installation. As for a \"Customized\"\n"
-"    installation class, you will be able to select the usage for your "
-"system.\n"
-"    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
-"DOING!"
-msgstr ""
-"Elektu:\n"
-"\n"
-"  - Akomodata: Se vi sufi�e konas GNU/Linukson, vi povas elektu la �efan\n"
-"    uzadon por via komputilo.  Vidu malanta�e por detaloj.\n"
+"!! If a server package has been selected either intentionally or because it\n"
+"was part of a whole group, you will be asked to confirm that you really\n"
+"want those servers to be installed. Under Mandrake Linux, any installed\n"
+"servers are started by default at boot time. Even if they are safe and have\n"
+"no known issues at the time the distribution was shipped, it may happen\n"
+"that security holes are discovered after this version of Mandrake Linux was\n"
+"finalized. If you do not know what a particular service is supposed to do\n"
+"or why it is being installed, then click \"No\". Clicking \"Yes\" will\n"
+"install the listed services and they will be started automatically by\n"
+"default. !!\n"
 "\n"
+"The \"Automatic dependencies\" option simply disables the warning dialog\n"
+"which appears whenever the installer automatically selects a package. This\n"
+"occurs because it has determined that it needs to satisfy a dependency with\n"
+"another package in order to successfully complete the installation.\n"
 "\n"
-"  - Spertulo: �i tio supoza ke vi flue konas GNU/Linukson kaj deziras fari\n"
-"    treege akomodatan instaladon.  Simile kiel \"Akomodata\" instalado, vi "
-"povos\n"
-"    elekti la uzado por via komputilo.\n"
-"    Sed bonvolege, NE ELEKTU �I TION KROM SE VI SCIAS KION VI FARAS!"
+"The tiny floppy disc icon at the bottom of the list allows to load the\n"
+"packages list chosen during a previous installation. Clicking on this icon\n"
+"will ask you to insert a floppy disk previously created at the end of\n"
+"another installation. See the second tip of last step on how to create such\n"
+"a floppy."
+msgstr ""
 
-#: ../../help.pm_.c:68
+#: ../../help.pm_.c:151
 msgid ""
-"You must now define your machine usage. Choices are:\n"
+"If you wish to connect your computer to the Internet or to a local network,\n"
+"please choose the correct option. Please turn on your device before\n"
+"choosing the correct option to let DrakX detect it automatically.\n"
 "\n"
-"\t* Workstation: this the ideal choice if you intend to use your machine "
-"primarily for everyday use, at office or\n"
-"\t  at home.\n"
+"Mandrake Linux proposes the configuration of an Internet connection at\n"
+"installation time. Available connections are: traditional modem, ISDN\n"
+"modem, ADSL connection, cable modem, and finally a simple LAN connection\n"
+"(Ethernet).\n"
 "\n"
+"Here, we will not detail each configuration. Simply make sure that you have\n"
+"all the parameters from your Internet Service Provider or system\n"
+"administrator.\n"
 "\n"
-"\t* Development: if you intend to use your machine primarily for software "
-"development, it is the good choice. You\n"
-"\t  will then have a complete collection of software installed in order to "
-"compile, debug and format source code,\n"
-"\t  or create software packages.\n"
+"You can consult the manual chapter about Internet connections for details\n"
+"about the configuration, or simply wait until your system is installed and\n"
+"use the program described there to configure your connection.\n"
 "\n"
-"\n"
-"\t* Server: if you intend to use this machine as a server, it is the good "
-"choice. Either a file server (NFS or\n"
-"\t  SMB), a print server (Unix style or Microsoft Windows style), an "
-"authentication server (NIS), a database\n"
-"\t  server and so on. As such, do not expect any gimmicks (KDE, GNOME, etc.) "
-"to be installed."
+"If you wish to configure the network later after installation or if you\n"
+"have finished configuring your network connection, click \"Cancel\"."
 msgstr ""
-"Nun vi devas elekti la uzadon por via komputilo.  Jen la elektoj:\n"
-"\n"
-"\t* Laborstacio: �i tio estas la ideala opcio se vi intencas uzi vian\n"
-"\t  komputilon �efe por �iutaga uzado �e la oficejo a� hejme.\n"
-"\n"
-"\n"
-"\t* Programado: se vi intencas uzi vian komputilon �efe por programado,\n"
-"\t  �i tio estas bona opcio.  Vi havos plenan aron de programiloj por\n"
-"\t  kompili, erarser�i, formati programfontojn, kaj krei\n"
-"\t  programpaka�ojn.\n"
-"\n"
-"\n"
-"\t* Servilo: se vi intencas uzi �i tiun komputilon kiel servilo, �i tio\n"
-"\t  estas bona opcio.  A� dosierservilo (NFS a� SMB), printservilo\n"
-"\t  (Uniksa stilo a� Mikrosofta Vindoza stilo), a�tentikada servilo\n"
-"\t  (NIS), a� datumbaza servilo, ktp.  Kiel tia, ne atendu umojn (KDE,\n"
-"\t  GNOME, ktp.) estas instalotaj."
 
-#: ../../help.pm_.c:84
+#: ../../help.pm_.c:172
 #, fuzzy
 msgid ""
-"DrakX will attempt to look for PCI SCSI adapter(s). If DrakX\n"
-"finds an SCSI adapter and knows which driver to use, it will be "
-"automatically\n"
-"installed.\n"
-"\n"
-"\n"
-"If you have no SCSI adapter, an ISA SCSI adapter or a PCI SCSI adapter that\n"
-"DrakX doesn't recognize, you will be asked if a SCSI adapter is present in "
-"your\n"
-"system. If there is no adapter present, you can click on \"No\". If you "
-"click on\n"
-"\"Yes\", a list of drivers will be presented from which you can select your\n"
-"specific adapter.\n"
+"You may now choose which services you wish to start at boot time.\n"
 "\n"
+"Here are presented all the services available with the current\n"
+"installation. Review them carefully and uncheck those which are not always\n"
+"needed at boot time.\n"
 "\n"
-"If you have to manually specify your adapter, DrakX will ask if you want to\n"
-"specify options for it. You should allow DrakX to probe the hardware for "
-"the\n"
-"options. This usually works well.\n"
-"\n"
+"You can get a short explanatory text about a service by selecting a\n"
+"specific service. However, if you are not sure whether a service is useful\n"
+"or not, it is safer to leave the default behavior.\n"
 "\n"
-"If not, you will need to provide options to the driver. Please review the "
-"User\n"
-"Guide (chapter 3, section \"Collective informations on your hardware) for "
-"hints\n"
-"on retrieving this information from hardware documentation, from the\n"
-"manufacturer's Web site (if you have Internet access) or from Microsoft "
-"Windows\n"
-"(if you have it on your system)."
+"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."
 msgstr ""
-"DrakX provos ser�i PCI-a(j)n SCSI-a(j)n adaptilo(j)n\n"
-"Se DrakX trovas SCSI-an adaptilon kaj scias kiun pelilon �i devas uzi\n"
-"�i a�tomate instalos �in (a� ilin).\n"
-"\n"
-"Se vi havas neniom da SCSI-aj adaptiloj, ISA-an SCSI-an adapilon, a�\n"
-"PCI-an SCSI-an adaptilon kiun DrakX ne rekonas DrakX demandos al vi\n"
-"se vi havas SCSI-an adaptilon sur via komputilo.  Se vi ne havas adaptilon\n"
-"vi povas nur klaki 'Ne'.  Se vi klakos 'Jes', DrakX montros al vi liston de\n"
-"peliloj.  Vi povos elekti vian specifan pelilon de la listo.\n"
-"\n"
-"\n"
-"Se vi devas permane elekti vian adaptilon, DrakX demandos\n"
-"�u vi deziras specifi opciojn por �i.  Vi devus permesi al DrakX\n"
-"esplori la aparaton por la opcioj.  �i tiu kutime bone funkcias.\n"
+"Nun vi povas elekti kiujn servojn vi deziras starti kiam vi startas\n"
+"vian komputilon.  Kiam via muso estas supre de ero, malgranda balono\n"
+"ekaperas por helpi vin.  �i priskribas la rolon de la servo.\n"
 "\n"
-"Se ne, vi bezonos provizi opciojn al la pelilo.\n"
-"Reviziu la Instalgvidlibron por sugestoj pri ekstrakado de �i tiu\n"
-"informo de Vindozo (se vi havas �in sur via komputilo),\n"
-"de dokumenta�o de aparato, a� de la TTT-ejo de la fabrikanto\n"
-"(se vi havas atingon al la reto)."
+"Zorgegu en �i tiu pa�o se vi intencas uzi vian komputilon kiel servilo:\n"
+"ne startu servojn kiujn vi ne deziras uzi."
 
-#: ../../help.pm_.c:108
+#: ../../help.pm_.c:188
 msgid ""
-"At this point, you need to choose where to install your\n"
-"Linux-Mandrake operating system on your hard drive. If it is empty or if an\n"
-"existing operating system uses all the space available on it, you need to\n"
-"partition it. Basically, partitioning a hard drive consists of logically\n"
-"dividing it to create space to install your new Linux-Mandrake system.\n"
-"\n"
-"\n"
-"Because the effects of the partitioning process are usually irreversible,\n"
-"partitioning can be intimidating and stressful if you are an inexperienced "
-"user.\n"
-"This wizard simplifies this process. Before beginning, please consult the "
-"manual\n"
-"and take your time.\n"
-"\n"
-"\n"
-"You need at least two partitions. One is for the operating system itself and "
-"the\n"
-"other is for the virtual memory (also called Swap).\n"
-"\n"
-"\n"
-"If partitions have been already defined (from a previous installation or "
-"from\n"
-"another partitioning tool), you just need choose those to use to install "
-"your\n"
-"Linux system.\n"
-"\n"
-"\n"
-"If partitions haven't been already defined, you need to create them. \n"
-"To do that, use the wizard available above. Depending of your hard drive\n"
-"configuration, several solutions can be available:\n"
-"\n"
-"\t* Use existing partition: the wizard has detected one or more existing "
-"Linux partitions on your hard drive. If\n"
-"\t  you want to keep them, choose this option. \n"
-"\n"
-"\n"
-"\t* Erase entire disk: if you want delete all data and all partitions "
-"present on your hard drive and replace them by\n"
-"\t  your new Linux-Mandrake system, you can choose this option. Be careful "
-"with this solution, you will not be\n"
-"\t  able to revert your choice after confirmation.\n"
-"\n"
-"\n"
-"\t* Use the free space on the Windows partition: if Microsoft Windows is "
-"installed on your hard drive and takes\n"
-"\t  all space available on it, you have to create free space for Linux data. "
-"To do that you can delete your\n"
-"\t  Microsoft Windows partition and data (see \"Erase entire disk\" or "
-"\"Expert mode\" solutions) or resize your\n"
-"\t  Microsoft Windows partition. Resizing can be performed without loss of "
-"any data. This solution is\n"
-"\t  recommended if you want use both Linux-Mandrake and Microsoft Windows on "
-"same computer.\n"
-"\n"
-"\n"
-"\t  Before choosing this solution, please understand that the size of your "
-"Microsoft\n"
-"\t  Windows partition will be smaller than at present time. It means that "
-"you will have less free space under\n"
-"\t  Microsoft Windows to store your data or install new software.\n"
-"\n"
-"\n"
-"\t* Expert mode: if you want to partition manually your hard drive, you can "
-"choose this option. Be careful before\n"
-"\t  choosing this solution. It is powerful but it is very dangerous. You can "
-"lose all your data very easily. So,\n"
-"\t  don't choose this solution unless you know what you are doing."
+"GNU/Linux manages time in GMT (Greenwich Manage Time) and translates it in\n"
+"local time according to the time zone you selected."
 msgstr ""
+"GNU/Linukso administras tempon en GMT a� \"Grenvi�a Meza Tempo\" kaj "
+"tradukas �in\n"
+"en lokan tempon la� la horzono vi elektis."
 
-#: ../../help.pm_.c:160
+#: ../../help.pm_.c:192
 msgid ""
-"At this point, you need to choose what\n"
-"partition(s) to use to install your new Linux-Mandrake system. If "
-"partitions\n"
-"have been already defined (from a previous installation of GNU/Linux or "
-"from\n"
-"another partitioning tool), you can use existing partitions. In other "
-"cases,\n"
-"hard drive partitions must be defined.\n"
-"\n"
-"\n"
-"To create partitions, you must first select a hard drive. You can select "
-"the\n"
-"disk for partitioning by clicking on \"hda\" for the first IDE drive, \"hdb"
-"\" for\n"
-"the second or \"sda\" for the first SCSI drive and so on.\n"
-"\n"
-"\n"
-"To partition the selected hard drive, you can use these options:\n"
-"\n"
-"   * Clear all: this option deletes all partitions available on the selected "
-"hard drive.\n"
-"\n"
-"\n"
-"   * Auto allocate: this option allows you to automatically create Ext2 and "
-"swap partitions in free space of your\n"
-"     hard drive.\n"
-"\n"
-"\n"
-"   * Rescue partition table: if your partition table is damaged, you can try "
-"to recover it using this option. Please\n"
-"     be careful and remember that it can fail.\n"
-"\n"
-"\n"
-"   * Undo: you can use this option to cancel your changes.\n"
-"\n"
-"\n"
-"   * Reload: you can use this option if you wish to undo all changes and "
-"load your initial partitions table\n"
-"\n"
+"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
+"on which all the graphics environments (KDE, Gnome, AfterStep,\n"
+"WindowMaker...) bundled with Mandrake Linux rely. In this section, DrakX\n"
+"will try to configure X automatically.\n"
 "\n"
-"   * Wizard: If you wish to use a wizard to partition your hard drive, you "
-"can use this option. It is recommended if\n"
-"     you do not have a good knowledge in partitioning.\n"
+"It is extremely rare for it to fail, unless the hardware is very old (or\n"
+"very new). If it succeeds, it will start X automatically with the best\n"
+"resolution possible depending on the size of the monitor. A window will\n"
+"then appear and ask you if you can see it.\n"
 "\n"
+"If you are doing an \"Expert\" install, you will enter the X configuration\n"
+"wizard. See the corresponding section of the manual for more information\n"
+"about this wizard.\n"
 "\n"
-"   * Restore from floppy: if you have saved your partition table on a floppy "
-"during a previous installation, you can\n"
-"     recover it using this option.\n"
-"\n"
-"\n"
-"   * Save on floppy: if you wish to save your partition table on a floppy to "
-"be able to recover it, you can use this\n"
-"     option. It is strongly recommended to use this option\n"
-"\n"
-"\n"
-"   * Done: when you have finished partitioning your hard drive, use this "
-"option to save your changes.\n"
-"\n"
-"\n"
-"For information, you can reach any option using the keyboard: navigate "
-"trough the partitions using Tab and Up/Down arrows.\n"
-"\n"
-"\n"
-"When a partition is selected, you can use:\n"
-"\n"
-"           * Ctrl-c to create a new partition (when a empty partition is "
-"selected)\n"
-"\n"
-"           * Ctrl-d to delete a partition\n"
-"\n"
-"           * Ctrl-m to set the mount point\n"
-"           \n"
-"\n"
-"           \n"
-"If you are installing on a PPC Machine, you will want to create a small HFS "
-"'bootstrap' partition of at least 1MB for use\n"
-"by the yaboot bootloader. If you opt to make the partition a bit larger, say "
-"50MB, you may find it a useful place to store \n"
-"a spare kernel and ramdisk image for emergency boot situations."
+"If you can see the message and answer \"Yes\", then DrakX will proceed to\n"
+"the next step. If you cannot see the message, it simply means that the\n"
+"configuration was wrong and the test will automatically end after 10\n"
+"seconds, restoring the screen."
 msgstr ""
 
-#: ../../help.pm_.c:224
+#: ../../help.pm_.c:212
 msgid ""
-"Above are listed the existing Linux partitions detected on\n"
-"your hard drive. You can keep choices make by the wizard, they are good for "
-"a\n"
-"common usage. If you change these choices, you must at least define a root\n"
-"partition (\"/\"). Don't choose a too little partition or you will not be "
-"able\n"
-"to install enough software. If you want store your data on a separate "
-"partition,\n"
-"you need also to choose a \"/home\" (only possible if you have more than "
-"one\n"
-"Linux partition available).\n"
-"\n"
-"\n"
-"For information, each partition is listed as follows: \"Name\", \"Capacity"
-"\".\n"
-"\n"
-"\n"
-"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
-"\n"
-"\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and "
-"\"sd\"\n"
-"if it is an SCSI hard drive.\n"
-"\n"
-"\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE "
-"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"
+"The first time you try the X configuration, you may not be very satisfied\n"
+"with its display (screen is too small, shifted left or right...). Hence,\n"
+"even if X starts up correctly, DrakX then asks you if the configuration\n"
+"suits you. It will also propose to change it by displaying a list of valid\n"
+"modes it could find, asking you to select one.\n"
 "\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc..."
+"As a last resort, if you still cannot get X to work, choose \"Change\n"
+"graphics card\", select \"Unlisted card\", and when prompted on which\n"
+"server you want, choose \"FBDev\". This is a failsafe option which works\n"
+"with any modern graphics card. Then choose \"Test again\" to be sure."
 msgstr ""
 
-#: ../../help.pm_.c:258
+#: ../../help.pm_.c:224
 msgid ""
-"Choose the hard drive you want to erase to install your\n"
-"new Linux-Mandrake partition. Be careful, all data present on it will be "
-"lost\n"
-"and will not be recoverable."
+"Finally, you will be asked whether you want to see the graphical interface\n"
+"at boot. Note this question will be asked even if you chose not to test the\n"
+"configuration. Obviously, you want to answer \"No\" if your machine is to\n"
+"act as a server, or if you were not successful in getting the display\n"
+"configured."
 msgstr ""
 
-#: ../../help.pm_.c:263
+#: ../../help.pm_.c:231
 msgid ""
-"Click on \"OK\" if you want to delete all data and\n"
-"partitions present on this hard drive. Be careful, after clicking on \"OK\", "
-"you\n"
-"will not be able to recover any data and partitions present on this hard "
-"drive,\n"
-"including any Windows data.\n"
+"The Mandrake Linux CDROM has a built-in rescue mode. You can access it by\n"
+"booting from the CDROM, press the >>F1<< key at boot and type >>rescue<< at\n"
+"the prompt. But in case your computer cannot boot from the CDROM, you\n"
+"should come back to this step for help in at least two situations:\n"
 "\n"
+" * when installing the boot loader, DrakX will rewrite the boot sector "
+"(MBR)\n"
+"of your main disk (unless you are using another boot manager) so that you\n"
+"can start up with either Windows or GNU/Linux (assuming you have Windows in\n"
+"your system). If you need to reinstall Windows, the Microsoft install\n"
+"process will rewrite the boot sector, and then you will not be able to\n"
+"start GNU/Linux!\n"
 "\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
-"partitions present on this hard drive."
+" * if a problem arises and you cannot start up GNU/Linux from the hard "
+"disk,\n"
+"this floppy disk will be the only means of starting up GNU/Linux. It\n"
+"contains a fair number of system tools for restoring a system, which has\n"
+"crashed due to a power failure, an unfortunate typing error, a typo in a\n"
+"password, or any other reason.\n"
+"\n"
+"When you click on this step, you will be asked to enter a disk inside the\n"
+"drive. The floppy disk you will insert must be empty or contain data which\n"
+"you do not need. You will not have to format it since DrakX will rewrite\n"
+"the whole disk."
 msgstr ""
 
-#: ../../help.pm_.c:273
+#: ../../help.pm_.c:255
 msgid ""
-"More than one Microsoft Windows partition have been\n"
-"detected on your hard drive. Please choose the one you want resize to "
-"install\n"
-"your new Linux-Mandrake operating system.\n"
-"\n"
+"At this point you need to choose where on your hard drive to install your\n"
+"Mandrake Linux operating system. If your hard drive is empty or if an\n"
+"existing operating system is using all the space available, you will need\n"
+"to partition it. Basically, partitioning a hard drive consists of logically\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
-"For information, each partition is listed as follow; \"Linux name\", "
-"\"Windows\n"
-"name\" \"Capacity\".\n"
+"Because the effects of the partitioning process are usually irreversible,\n"
+"partitioning can be intimidating and stressful if you are an inexperienced\n"
+"user. Fortunately, there is a wizard which simplifies this process. Before\n"
+"beginning, please consult the manual and take your time.\n"
 "\n"
-"\"Linux name\" is coded as follow: \"hard drive type\", \"hard drive number"
-"\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
+"If you are running the install in Expert mode, you will enter DiskDrake,\n"
+"the Mandrake Linux partitioning tool, which allows you to fine-tune your\n"
+"partitions. See the DiskDrake chapter of the manual. From the installation\n"
+"interface, you can use the wizards as described here by clicking the\n"
+"\"Wizard\" button of the dialog.\n"
 "\n"
+"If partitions have already been defined, either from a previous\n"
+"installation or from another partitioning tool, simply select those to\n"
+"install your Linux system.\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and \"sd"
-"\"\n"
-"if it is an SCSI hard drive.\n"
+"If partitions are not defined, you will need to create them using the\n"
+"wizard. Depending on your hard drive configuration, several options are\n"
+"available:\n"
 "\n"
+" * \"Use free space\": this option will simply lead to an automatic\n"
+"partitioning of your blank drive(s). You will not be prompted further.\n"
 "\n"
-"\"Hard drive number\" is always a letter putted after \"hd\" or \"sd\". With "
-"IDE hard drives:\n"
+" * \"Use existing partition\": the wizard has detected one or more existing\n"
+"Linux partitions on your hard drive. If you want to use them, choose this\n"
+"option.\n"
 "\n"
-"   * \"a\" means \"master hard drive on the primary IDE controller\",\n"
+" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+"installed on your hard drive and takes all the space available on it, you\n"
+"have to create free space for Linux data. To do that, you can delete your\n"
+"Microsoft Windows partition and data (see \"Erase entire disk\" or \"Expert\n"
+"mode\" solutions) or resize your Microsoft Windows partition. Resizing can\n"
+"be performed without the loss of any data. This solution is recommended if\n"
+"you want to use both Mandrake Linux and Microsoft Windows on same computer.\n"
 "\n"
-"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
+"   Before choosing this option, please understand that after this "
+"procedure,\n"
+"the size of your Microsoft Windows partition will be smaller than at the\n"
+"present time. You will have less free space under Microsoft Windows to\n"
+"store your data or to install new software.\n"
 "\n"
-"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
+" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
+"present on your hard drive and replace them with your new Mandrake Linux\n"
+"system, choose this option. Be careful with this solution because you will\n"
+"not be able to revert your choice after confirmation.\n"
 "\n"
-"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc.\n"
+" * \"Remove Windows\": this will simply erase everything on the drive and\n"
+"begin fresh, partitioning everything from scratch. All data on your disk\n"
+"will be lost.\n"
 "\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first "
-"disk\n"
-"or partition is called \"C:\")."
-msgstr ""
-
-#: ../../help.pm_.c:306
-msgid "Please be patient. This operation can take several minutes."
+" * \"Expert mode\": choose this option if you want to manually partition\n"
+"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"can very easily lose all your data. Hence, do not choose this unless you\n"
+"know what you are doing."
 msgstr ""
 
-#: ../../help.pm_.c:309
+#: ../../help.pm_.c:319
 msgid ""
-"Any partitions that have been newly defined must be\n"
-"formatted for use (formatting meaning creating a filesystem).\n"
-"\n"
-"\n"
-"At this time, you may wish to reformat some already existing partitions to "
-"erase\n"
-"the data they contain. If you wish do that, please also select the "
-"partitions\n"
-"you want to format.\n"
+"There you are. Installation is now complete and your GNU/Linux system is\n"
+"ready to use. Just click \"OK\" to reboot the system. You can start\n"
+"GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
+"soon as the computer has booted up again.\n"
 "\n"
+"The \"Advanced\" button (in Expert mode only) shows two more buttons to:\n"
 "\n"
-"Please note that it is not necessary to reformat all pre-existing "
-"partitions.\n"
-"You must reformat the partitions containing the operating system (such as \"/"
-"\",\n"
-"\"/usr\" or \"/var\") but do you no have to reformat partitions containing "
-"data\n"
-"that you wish to keep (typically /home).\n"
+" * \"generate auto-install floppy\": to create an installation floppy disk\n"
+"which will automatically perform a whole installation without the help of\n"
+"an operator, similar to the installation you just configured.\n"
 "\n"
+"   Note that two different options are available after clicking the button:\n"
 "\n"
-"Please be careful selecting partitions, after formatting, all data will be\n"
-"deleted and you will not be able to recover any of them.\n"
-"\n"
-"\n"
-"Click on \"OK\" when you are ready to format partitions.\n"
+"    * \"Replay\". This is a partially automated install as the partitioning\n"
+"step (and only this one) remains interactive.\n"
 "\n"
+"    * \"Automated\". Fully automated install: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
 "\n"
-"Click on \"Cancel\" if you want to choose other partitions to install your "
-"new\n"
-"Linux-Mandrake operating system."
-msgstr ""
-
-#: ../../help.pm_.c:335
-#, fuzzy
-msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
+"   This feature is very handy when installing a great number of similar\n"
+"machines. See the Auto install section at our web site.\n"
 "\n"
+" * \"Save packages selection\"(*): saves the packages selection as made\n"
+"previously. Then, when doing another installation, insert the floppy inside\n"
+"the driver and run the installation going to the help screen by pressing on\n"
+"the [F1] key, and by issuing >>linux defcfg=\"floppy\"<<.\n"
 "\n"
-"DrakX will then check whether you have enough room to install them all. If "
-"not,\n"
-"it will warn you about it. If you want to go on anyway, it will proceed onto "
-"the\n"
-"installation of all selected groups but will drop some packages of lesser\n"
-"interest. At the bottom of the list you can select the option \n"
-"\"Individual package selection\"; in this case you will have to browse "
-"through\n"
-"more than 1000 packages..."
+"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
+"\"mformat a:\")"
 msgstr ""
-"Nun vi povas elekti la paka�aron kiun vi deziras instali a� promocii.\n"
-"\n"
-"Tiam DrakX kontrolos �u vi havas sufi�e da spaco por instali �iujn de ili.\n"
-"Se ne, �i informas vin pir �i.  Se vi deziras anta�eniri malgra�e, �i\n"
-"anta�eniros je la instalado de �iuj de la elektitaj paka�aroj sed lasos\n"
-"fali iujn paka�ojn kiujn estas malpli interesaj.  Suben de la listo vi\n"
-"povas elekti la opcion \"Elektado de apartaj paka�oj\"; �iokaze vi devus\n"
-"foliumi tra pli ol 1000 paka�oj..."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:350
 msgid ""
-"You can now choose individually all the packages you\n"
-"wish to install.\n"
+"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"
-"You can expand or collapse the tree by clicking on options in the left "
-"corner of\n"
-"the packages window.\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"
+"any of them.\n"
 "\n"
-"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
-"\"Toggle flat and group sorted\".\n"
+"Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
+"Click on \"Cancel\" if you want to choose another partition for your new\n"
+"Mandrake Linux operating system installation.\n"
 "\n"
-"If you want not to be warned on dependencies, click on \"Automatic\n"
-"dependencies\". If you do this, note that unselecting one package may "
-"silently\n"
-"unselect several other packages which depend on it."
-msgstr ""
-
-#: ../../help.pm_.c:364
-#, fuzzy
-msgid ""
-"If you have all the CDs in the list above, click Ok. If you have\n"
-"none of those CDs, click Cancel. If only some CDs are missing, unselect "
-"them,\n"
-"then click Ok."
+"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
+"for bad blocks on the disc."
 msgstr ""
-"Se vi havas �iujn de la KDROM-oj en la listo sube, klaku \"Jes\".\n"
-"Se vi havas neniujn de �i tiuj KDROM-oj, klaku \"Nuligu\".\n"
-"Se vi mankas nur iujn de la KDROM-oj, malelektu ilin, kaj poste klaku \"Jes"
-"\"."
 
-#: ../../help.pm_.c:369
+#: ../../help.pm_.c:376
 msgid ""
-"Your new Linux-Mandrake operating system is currently being\n"
-"installed. This operation should take a few minutes (it depends on size you\n"
-"choose to install and the speed of your computer).\n"
-"\n"
+"Your new Mandrake Linux operating system is currently being installed.\n"
+"Depending on the number of packages you will be installing and the speed of\n"
+"your computer, this operation could take from a few minutes to a\n"
+"significant amount of time.\n"
 "\n"
 "Please be patient."
 msgstr ""
 
-#: ../../help.pm_.c:377
-msgid ""
-"You can now test your mouse. Use buttons and wheel to verify\n"
-"if settings are good. If not, you can click on \"Cancel\" to choose another\n"
-"driver."
-msgstr ""
-
-#: ../../help.pm_.c:382
+#: ../../help.pm_.c:384
 msgid ""
-"Please select the correct port. For example, the COM1\n"
-"port under MS Windows is named ttyS0 under GNU/Linux."
+"Before continuing you should read carefully the terms of the license. It\n"
+"covers the whole Mandrake Linux distribution, and if you do not agree with\n"
+"all the terms in it, click on the \"Refuse\" button which will immediately\n"
+"terminate the installation. To continue with the installation, click the\n"
+"\"Accept\" button."
 msgstr ""
-"Bonvolu elekti la �ustan pordon.  Ekzemple, la COM1-a\n"
-"pordo sub MS Vindozo estas nomata ttyS0 sub GNU/Linukso."
 
-#: ../../help.pm_.c:386
+#: ../../help.pm_.c:391
 msgid ""
-"If you wish to connect your computer to the Internet or\n"
-"to a local network please choose the correct option. Please turn on your "
-"device\n"
-"before choosing the correct option to let DrakX detect it automatically.\n"
-"\n"
-"\n"
-"If you do not have any connection to the Internet or a local network, "
-"choose\n"
-"\"Disable networking\".\n"
-"\n"
+"At this point, it is time to choose the security level desired for the\n"
+"machine. As a rule of thumb, the more exposed the machine is, and the more\n"
+"the data stored in it is crucial, the higher the security level should be.\n"
+"However, a higher security level is generally obtained at the expenses of\n"
+"easiness of use. Refer to the MSEC chapter of the ``Reference Manual'' to\n"
+"get more information about the meaning of these levels.\n"
 "\n"
-"If you wish to configure the network later after installation or if you "
-"have\n"
-"finished to configure your network connection, choose \"Done\"."
+"If you do not know what to choose, keep the default option."
 msgstr ""
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:401
 msgid ""
-"No modem has been detected. Please select the serial port on which it is "
-"plugged.\n"
+"At this point, you need to choose what partition(s) will be used for the\n"
+"installation of your Mandrake Linux system. If partitions have been already\n"
+"defined, either from a previous installation of GNU/Linux or from 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"
-"For information, the first serial port (called \"COM1\" under Microsoft\n"
-"Windows) is called \"ttyS0\" under Linux."
-msgstr ""
-
-#: ../../help.pm_.c:406
-msgid ""
-"You may now enter dialup options. If you don't know\n"
-"or are not sure what to enter, the correct informations can be obtained "
-"from\n"
-"your Internet Service Provider. If you do not enter the DNS (name server)\n"
-"information here, this information will be obtained from your Internet "
-"Service\n"
-"Provider at connection time."
-msgstr ""
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr ""
-
-#: ../../help.pm_.c:419
-msgid ""
-"If you are not sure if informations above are\n"
-"correct or if you don't know or are not sure what to enter, the correct\n"
-"informations can be obtained from your Internet Service Provider. If you do "
-"not\n"
-"enter the DNS (name server) information here, this information will be "
-"obtained\n"
-"from your Internet Service Provider at connection time."
-msgstr ""
-
-#: ../../help.pm_.c:426
-#, fuzzy
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, the correct informations can be\n"
-"obtained from your Internet Service Provider."
-msgstr ""
-"Nun vi povas enigi telefon-konektajn opciojn.  Se vi ne estas certa kio "
-"enigi,\n"
-"vi povas havigi la �ustan informon de via interretprovizanto."
-
-#: ../../help.pm_.c:431
-#, fuzzy
-msgid ""
-"You may now configure your network device.\n"
+"To partition the selected hard drive, you can use these options:\n"
 "\n"
-"   * IP address: if you don't know or are not sure what to enter, ask your "
-"network administrator.\n"
-"     You should not enter an IP address if you select the option \"Automatic "
-"IP\" below.\n"
+" * \"Clear all\": this option deletes all partitions on the selected hard\n"
+"drive.\n"
 "\n"
-"   * Netmask: \"255.255.255.0\" is generally a good choice. If you don't "
-"know or are not sure what to enter,\n"
-"     ask your network administrator.\n"
+" * \"Auto allocate\": this option allows you to automatically create Ext2\n"
+"and swap partitions in free space of your hard drive.\n"
 "\n"
-"   * Automatic IP: if your network uses BOOTP or DHCP protocol, select this "
-"option. If selected, no value is needed in\n"
-"    \"IP address\". If you don't know or are not sure if you need to select "
-"this option, ask your network administrator."
-msgstr ""
-"Enigu:\n"
+" * \"Rescue partition table\": if your partition table is damaged, you can\n"
+"try to recover it using this option. Please be careful and remember that it\n"
+"can fail.\n"
 "\n"
-"  - IP-adreson: Se vi ne scias, demandu al via retadministranto.\n"
+" * \"Undo\": use this option to cancel your changes.\n"
 "\n"
+" * \"Reload\": you can use this option if you wish to undo all changes and\n"
+"load your initial partitions table.\n"
 "\n"
-"  - Retmaskon: \"255.255.255.0\" �enerale estas bona elekta�o.  Se vi ne\n"
-"estas certa, demandu al via retadministranto a� interretprovizanto.\n"
+" * \"Wizard\": 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 knowledge of\n"
+"partitioning.\n"
 "\n"
+" * \"Restore from floppy\": this option will allow you to restore a\n"
+"previously saved partition table from floppy disk.\n"
 "\n"
-"  - A�tomata IP-adreson: Se via reto uzas BOOTP-an a� DHCP-an protokolon,\n"
-"elektu �i tiun opcion.  Se elektita, neniu valoro estas bezonata en\n"
-"\"IP-adreson\".  Se vi ne estas certa, demandu al via retadministranto\n"
-"a� interretprovizanto.\n"
-
-#: ../../help.pm_.c:443
-#, fuzzy
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, ask your network administrator."
-msgstr ""
-"Se via reto uzas NIS, elektu \"Uzu NIS\".  Se vi ne scias, demandu al via\n"
-"retadministranto."
-
-#: ../../help.pm_.c:447
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, leave blank."
-msgstr ""
-
-#: ../../help.pm_.c:451
-msgid ""
-"You may now enter dialup options. If you're not sure what to enter, the\n"
-"correct information can be obtained from your ISP."
-msgstr ""
-"Nun vi povas enigi telefon-konektajn opciojn.  Se vi ne estas certa kio "
-"enigi,\n"
-"vi povas havigi la �ustan informon de via interretprovizanto."
-
-#: ../../help.pm_.c:455
-msgid ""
-"If you will use proxies, please configure them now. If you don't know if\n"
-"you should use proxies, ask your network administrator or your ISP."
-msgstr ""
-"Se vi uzos prokurajn servilojn, bonvolu konfiguri ilin nune.  Se vi ne\n"
-"scias �u vi uzos prokurajn servilojn, demandu al via retadministranto a�\n"
-"interretprovizanto."
-
-#: ../../help.pm_.c:459
-#, fuzzy
-msgid ""
-"You can install cryptographic package if your internet connection has been\n"
-"set up correctly. First choose a mirror where you wish to download packages "
-"and\n"
-"after that select the packages to install.\n"
+" * \"Save to floppy\": saves the partition table to a floppy. Useful for\n"
+"later partition-table recovery if necessary. It is strongly recommended to\n"
+"perform this step.\n"
 "\n"
+" * \"Done\": when you have finished partitioning your hard drive, this will\n"
+"save your changes back to disc.\n"
 "\n"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
-msgstr ""
-"Vi povas instali kriptografian paka�on se via interreta konekto estas �uste\n"
-"pretigita.  Unue elektu spegulon de kie vi deziras el�uti paka�ojn kaj "
-"poste\n"
-"elektu la paka�ojn por instali.\n"
+"Note: you can reach any option using the keyboard. Navigate through the\n"
+"partitions using [Tab] and [Up/Down] arrows.\n"
 "\n"
-"Notu ke vi devas elekti spegulon kaj kriptografiajn paka�ojn la� la "
-"le�donoj\n"
-"de via lando."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr ""
-
-#: ../../help.pm_.c:471
-#, fuzzy
-msgid ""
-"GNU/Linux manages time in GMT (Greenwich Manage\n"
-"Time) and translates it in local time according to the time zone you have\n"
-"selected.\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"
-"If you use Microsoft Windows on this computer, choose \"No\"."
-msgstr ""
-"Nun vi povas elekti vian horzonon la� kie vi lo�as.\n"
+" * Ctrl-d to delete a partition;\n"
 "\n"
+" * Ctrl-m to set the mount point.\n"
 "\n"
-"GNU/Linukso administras tempon en GMT a� \"Grenvi�a Meza Tempo\" kaj "
-"tradukas �in\n"
-"en lokan tempon la� la horzono vi elektis."
+"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"
+"boot loader. 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_.c:479
-#, fuzzy
+#: ../../help.pm_.c:460
 msgid ""
-"You may now choose which services you want to start at boot time.\n"
+"More than one Microsoft Windows partition has been detected on your hard\n"
+"drive. Please choose the one you want 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"
-"When your mouse comes over an item, a small balloon help will popup which\n"
-"describes the role of the service.\n"
-"\n"
+"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"Be very careful in this step if you intend to use your machine as a server: "
-"you\n"
-"will probably want not to start any services that you don't need. Please\n"
-"remember that several services can be dangerous if they are enable on a "
-"server.\n"
-"In general, select only the services that you really need."
-msgstr ""
-"Nun vi povas elekti kiujn servojn vi deziras starti kiam vi startas\n"
-"vian komputilon.  Kiam via muso estas supre de ero, malgranda balono\n"
-"ekaperas por helpi vin.  �i priskribas la rolon de la servo.\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"
-"Zorgegu en �i tiu pa�o se vi intencas uzi vian komputilon kiel servilo:\n"
-"ne startu servojn kiujn vi ne deziras uzi."
-
-#: ../../help.pm_.c:492
-msgid ""
-"You can configure a local printer (connected to your computer) or remote\n"
-"printer (accessible via a Unix, Netware or Microsoft Windows network)."
-msgstr ""
-
-#: ../../help.pm_.c:496
-msgid ""
-"If you wish to be able to print, please choose one printing system between\n"
-"CUPS and LPR.\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"
-"CUPS is a new, powerful and flexible printing system for Unix systems (CUPS\n"
-"means \"Common Unix Printing System\"). It is the default printing system "
-"in\n"
-"Linux-Mandrake.\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"
-"LPR is the old printing system used in previous Linux-Mandrake "
-"distributions.\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"
-"If you don't have printer, click on \"None\"."
+"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"disk or partition is called \"C:\")."
 msgstr ""
 
-#: ../../help.pm_.c:511
-msgid ""
-"GNU/Linux can deal with many types of printer. Each of these types requires\n"
-"a different setup.\n"
-"\n"
-"\n"
-"If your printer is physically connected to your computer, select \"Local\n"
-"printer\".\n"
-"\n"
-"\n"
-"If you want to access a printer located on a remote Unix machine, select\n"
-"\"Remote printer\".\n"
-"\n"
-"\n"
-"If you want to access a printer located on a remote Microsoft Windows "
-"machine\n"
-"(or on Unix machine using SMB protocol), select \"SMB/Windows 95/98/NT\"."
+#: ../../help.pm_.c:491
+msgid "Please be patient. This operation can take several minutes."
 msgstr ""
 
-#: ../../help.pm_.c:527
+#: ../../help.pm_.c:494
 msgid ""
-"Please turn on your printer before continuing to let DrakX detect it.\n"
-"\n"
-"You have to enter some informations here.\n"
-"\n"
+"DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
+"installation or if you want to have greater control (\"Expert\"). You also\n"
+"have the choice of performing a new install or an upgrade of an existing\n"
+"Mandrake Linux system. Clicking \"Install\" will completely wipe out the\n"
+"old system. Select \"Upgrade\" if you are upgrading or repairing an\n"
+"existing system.\n"
 "\n"
-"   * Name of printer: the print spooler uses \"lp\" as default printer name. "
-"So, you must have a printer named \"lp\".\n"
-"     If you have only one printer, you can use several names for it. You "
-"just need to separate them by a pipe\n"
-"     character (a \"|\"). So, if you prefer a more meaningful name, you have "
-"to put it first, eg: \"My printer|lp\".\n"
-"     The printer having \"lp\" in its name(s) will be the default printer.\n"
+"Please choose \"Install\" if there are no previous version of Mandrake\n"
+"Linux installed or if you wish to boot between various operating systems.\n"
 "\n"
+"Please choose \"Update\" if you wish to update or repair an already\n"
+"installed version of Mandrake Linux.\n"
 "\n"
-"   * Description: this is optional but can be useful if several printers are "
-"connected to your computer or if you allow\n"
-"     other computers to access to this printer.\n"
+"Depending on your knowledge of GNU/Linux, please choose one of the\n"
+"following to install or update your Mandrake Linux operating system:\n"
 "\n"
+" * Recommended: choose this if you have never installed a GNU/Linux\n"
+"operating system. The installation will be very easy and you will only be\n"
+"asked a few questions.\n"
 "\n"
-"   * Location: if you want to put some information on your\n"
-"     printer location, put it here (you are free to write what\n"
-"     you want, for example \"2nd floor\").\n"
+" * Expert: if you have a good knowledge of GNU/Linux, you can choose this\n"
+"installation class. The expert installation will allow you to perform a\n"
+"highly customized installation. Answering some of the questions can be\n"
+"difficult if you do not have a good knowledge of GNU/Linux so do not choose\n"
+"this unless you know what you are doing."
 msgstr ""
 
-#: ../../help.pm_.c:548
+#: ../../help.pm_.c:521
 msgid ""
-"You need to enter some informations here.\n"
-"\n"
-"\n"
-"   * Name of queue: the print spooler uses \"lp\" as default printer name. "
-"So, you need have a printer named \"lp\".\n"
-"    If you have only one printer, you can use several names for it. You just "
-"need to separate them by a pipe\n"
-"    character (a \"|\"). So, if you prefer to have a more meaningful name, "
-"you have to put it first, eg: \"My printer|lp\".\n"
-"    The printer having \"lp\" in its name(s) will be the default printer.\n"
-"\n"
-"  \n"
-"   * Spool directory: it is in this directory that printing jobs are stored. "
-"Keep the default choice\n"
-"     if you don't know what to use\n"
-"\n"
-"\n"
-"   * Printer Connection: If your printer is physically connected to your "
-"computer, select \"Local printer\".\n"
-"     If you want to access a printer located on a remote Unix machine, "
-"select \"Remote lpd printer\".\n"
-"\n"
+"Normally, DrakX selects the right keyboard for you (depending on the\n"
+"language you have chosen) and you will not even see this step. However, you\n"
+"might not have a keyboard that corresponds exactly to your language: for\n"
+"example, if you are an English speaking Swiss person, you may still want\n"
+"your keyboard to be a Swiss keyboard. Or if you speak English but are\n"
+"located in Quebec, you may find yourself in the same situation. In both\n"
+"cases, you will have to go back to this installation step and select an\n"
+"appropriate keyboard from the list.\n"
 "\n"
-"     If you want to access a printer located on a remote Microsoft Windows "
-"machine (or on Unix machine using SMB\n"
-"     protocol), select \"SMB/Windows 95/98/NT\".\n"
-"\n"
-"\n"
-"     If you want to acces a printer located on NetWare network, select "
-"\"NetWare\".\n"
+"Click on the \"More\" button to be presented with the complete list of\n"
+"supported keyboards."
 msgstr ""
 
-#: ../../help.pm_.c:573
+#: ../../help.pm_.c:534
 msgid ""
-"Your printer has not been detected. Please enter the name of the device on\n"
-"which it is connected.\n"
+"Please choose your preferred language for installation and system usage.\n"
 "\n"
+"Clicking on the \"Advanced\" button will allow you to select other\n"
+"languages to be installed on your workstation. Selecting other languages\n"
+"will install the language-specific files for system documentation and\n"
+"applications. For example, if you will host users from Spain on your\n"
+"machine, select English as the main language in the tree view and in the\n"
+"Advanced section click on the grey star corresponding to \"Spanish|Spain\".\n"
 "\n"
-"For information, most printers are connected on the first parallel port. "
-"This\n"
-"one is called \"/dev/lp0\" under GNU/Linux and \"LPT1\" under Microsoft "
-"Windows."
-msgstr ""
-
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
+"Note that multiple languages may be installed. Once you have selected any\n"
+"additional locales click the \"OK\" button to continue."
 msgstr ""
 
-#: ../../help.pm_.c:584
+#: ../../help.pm_.c:547
 msgid ""
-"Please select the right options according to your printer.\n"
-"Please see its documentation if you don't know what choose here.\n"
+"By default, DrakX assumes you have a two-button mouse and will set it up\n"
+"for third-button emulation. DrakX will automatically know whether it is a\n"
+"PS/2, serial or USB mouse.\n"
 "\n"
+"If you wish to specify a different type of mouse select the appropriate\n"
+"type from the list provided.\n"
 "\n"
-"You will be able to test your configuration in next step and you will be "
-"able to modify it if it doesn't work as you want."
+"If you choose a mouse other than the default you will be presented with a\n"
+"mouse test screen. Use the buttons and wheel to verify that the settings\n"
+"are good. If the mouse is not working correctly press the space bar or\n"
+"RETURN to \"Cancel\" and choose again."
 msgstr ""
 
-#: ../../help.pm_.c:591
+#: ../../help.pm_.c:560
 #, fuzzy
 msgid ""
-"You can now enter the root password for your Linux-Mandrake system.\n"
-"The password must be entered twice to verify that both password entries are "
-"identical.\n"
-"\n"
-"\n"
-"Root is the system's administrator and is the only user allowed to modify "
-"the\n"
-"system configuration. Therefore, choose this password carefully. \n"
-"Unauthorized use of the root account can be extemely dangerous to the "
-"integrity\n"
-"of the system, its data and other system connected to it.\n"
-"\n"
+"Please select the correct port. For example, the COM1 port under MS Windows\n"
+"is named ttyS0 under GNU/Linux."
+msgstr ""
+"Bonvolu elekti la �ustan pordon.  Ekzemple, la COM1-a\n"
+"pordo sub MS Vindozo estas nomata ttyS0 sub GNU/Linukso."
+
+#: ../../help.pm_.c:564
+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 one authorized to make updates, add users,\n"
+"change the overall system configuration, and so on. In short, \"root\" can\n"
+"do everything! That is why you must choose a password that is difficult to\n"
+"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
+"choose not to enter a password, but we strongly advise you against this if\n"
+"only for one reason: do not think that because you booted GNU/Linux that\n"
+"your other operating systems are safe from mistakes. Since \"root\" can\n"
+"overcome all limitations and unintentionally erase all data on partitions\n"
+"by carelessly accessing the partitions themselves, it is important for it\n"
+"to be difficult to become \"root\".\n"
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. It should never be written down.\n"
+"characters long. Never write down the \"root\" password - it makes it too\n"
+"easy to compromise a system.\n"
 "\n"
+"However, please do not make the password too long or complicated because\n"
+"you must be able to remember it without too much effort.\n"
 "\n"
-"Do not make the password too long or complicated, though: you must be able "
-"to\n"
-"remember it without too much effort."
-msgstr ""
-"Nun vi povas enigi la \"root\" (radiko) pasvorto por via Linuks-Mandrejka\n"
-"sistemo.  Vi devas enigi la pasvorton dufoje por konfirmi ke amba� fojoj\n"
-"estas identaj.\n"
+"The password will not be displayed on screen as you type it in. Hence, you\n"
+"will have to type the password twice to reduce the chance of a typing\n"
+"error. If you do happen to make the same typing error twice, this\n"
+"\"incorrect\" password will have to be used the first time you connect.\n"
 "\n"
+"In expert mode, you will be asked if you will be connecting to an\n"
+"authentication server, like NIS or LDAP.\n"
 "\n"
-"La \"root\"-a uzanto estas la administranto de la sistemo, kaj estas la "
-"sola\n"
-"uzanto permesata �an�i la sisteman konfigura�on.  Tial, elektu �i tiun\n"
-"pasvorton zorge!  Nepermesata uzado de la \"root\"-a uzanto povas esti\n"
-"treege dan�era al la sistema integreco kaj dateno, kaj al aliaj sistemoj\n"
-"konektata al �i.  La pasvorto devus esti miksa�o de literciferaj signoj kaj\n"
-"almena� 8 signoj longa.  *Neniam* surpaperigu �in.  Tamen, ne elektu tro\n"
-"longan a� komplikan pasvorton: vi devas povi memori �in sen tro multe da\n"
-"peno."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"Por ebligi pli sekuran sistemon, vi devus elekti \"ombran dosieron\" kaj\n"
-"\"Uzu MD5-ajn pasvortojn\"."
-
-#: ../../help.pm_.c:613
-msgid ""
-"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
-"network administrator."
+"If your network uses LDAP (or NIS) protocol for authentication, select\n"
+"\"LDAP\" (or \"NIS\") as authentication. If you do not know, ask your\n"
+"network administrator.\n"
+"\n"
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"Se via reto uzas NIS, elektu \"Uzu NIS\".  Se vi ne scias, demandu al via\n"
-"retadministranto."
 
-#: ../../help.pm_.c:617
+#: ../../help.pm_.c:600
 msgid ""
-"You may now create one or more \"regular\" user account(s), as\n"
-"opposed to the \"privileged\" user account, root. You can create\n"
-"one or more account(s) for each person you want to allow to use\n"
-"the computer. Note that each user account will have its own\n"
-"preferences (graphical environment, program settings, etc.)\n"
-"and its own \"home directory\", in which these preferences are\n"
-"stored.\n"
+"LILO and GRUB are boot loaders for GNU/Linux. This stage, normally, is\n"
+"totally automated. In fact, DrakX analyzes the disk boot sector and acts\n"
+"accordingly, depending on what it finds here:\n"
 "\n"
+" * if Windows boot sector is found, it will replace it with a GRUB/LILO "
+"boot\n"
+"sector. Hence, you will be able to load either GNU/Linux or another OS;\n"
 "\n"
-"First of all, create an account for yourself! Even if you will be the only "
-"user\n"
-"of the machine, you may NOT connect as root for daily use of the system: "
-"it's a\n"
-"very high security risk. Making the system unusable is very often a typo "
-"away.\n"
+" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
+"one;\n"
 "\n"
+"If in doubt, DrakX will display a dialog with various options.\n"
 "\n"
-"Therefore, you should connect to the system using the user account\n"
-"you will have created here, and login as root only for administration\n"
-"and maintenance purposes."
-msgstr ""
-"Nun vi povas krei unu a� pli \"ordinara(j)\" uzanto(j), male al la\n"
-"\"privilegia\" uzanto, \"root\".  Vi povas krei unu a� pli uzanto(j) por\n"
-"�iu persono vi deziras permesi uzi la komputilon.  Notu ke �iu uzanto\n"
-"havos viajn proprajn preferojn (grafikan medion, programajn aran�ojn,\n"
-"ktp.) kaj �ian propran \"hejman dosierujon\", kie �i tiuj preferoj estas\n"
-"konservata.\n"
+" * \"Boot loader to use\": you have three choices:\n"
 "\n"
+"    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
+"interface.\n"
 "\n"
-"Anta� �io, krei uzanton por vi mem!  E� se vi estos la sola uzulo �e la\n"
-"komputilo, vi ne devus konekti kiel \"root\" por �iutaga uzado de la\n"
-"sistemo: �i estas tre alta sekureca risko.  Fari la sistemon neuzebla\n"
-"estas oftege nur unu misklavo fora.\n"
+"    * \"GRUB\": if you prefer GRUB (text menu).\n"
 "\n"
+"    * \"LILO with text menu\": if you prefer LILO with its text menu "
+"interface.\n"
 "\n"
-"Tial, vi devus konekti al la sistemo per ordinara uzanto vi kreos �i tie,\n"
-"kaj saluti kiel \"root\" nur por administraj kaj flegadaj kialoj."
-
-#: ../../help.pm_.c:636
-msgid ""
-"Creating a boot disk is strongly recommended. If you can't\n"
-"boot your computer, it's the only way to rescue your system without\n"
-"reinstalling it."
-msgstr ""
-
-#: ../../help.pm_.c:641
-msgid ""
-"You need to indicate where you wish\n"
-"to place the information required to boot to GNU/Linux.\n"
+" * \"Boot device\": in most cases, you will not change the default\n"
+"(\"/dev/hda\"), but if you prefer, the boot loader can be installed on the\n"
+"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\").\n"
 "\n"
+" * \"Delay before booting the default image\": when rebooting the computer,\n"
+"this is the delay granted to the user to choose - in the boot loader menu,\n"
+"another boot entry than the default one.\n"
 "\n"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"Vi bezonas indiki kie vi deziras meti la informon postulata\n"
-"por starti GNU/Linukson.\n"
+"!! Beware that if you choose not to install a boot loader (by selecting\n"
+"\"Cancel\" here), you must ensure that you have a way to boot your Mandrake\n"
+"Linux system! Also be sure you know what you do before changing any of the\n"
+"options. !!\n"
 "\n"
+"Clicking the \"Advanced\" button in this dialog will offer many advanced\n"
+"options, which are reserved to the expert user.\n"
 "\n"
-"Krom se vi scias precize kion vi faras, elektu \"Unua sektoro de\n"
-"drajvo (MBR)\""
-
-#: ../../help.pm_.c:649
-msgid ""
-"Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
-" (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+"Mandrake Linux installs its own boot loader, which will let you boot either\n"
+"GNU/Linux or any other operating systems which you have on your system.\n"
+"\n"
+"If there is another operating system installed on your machine, it will be\n"
+"automatically added to the boot menu. Here, you can choose to fine-tune the\n"
+"existing options. Double-clicking on an existing entry allows you to change\n"
+"its parameters or remove it; \"Add\" creates a new entry; and \"Done\" goes\n"
+"on to the next installation step."
 msgstr ""
-"Krom se vi scias precize alie, la kutima elekto estas \"/dev/hda\"\n"
-" (unua �efa IDE-a disko) a� \"/dev/sda\" (unua SCSI-a disko)."
 
-#: ../../help.pm_.c:653
+#: ../../help.pm_.c:647
+#, fuzzy
 msgid ""
-"LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
+"LILO (the LInux LOader) and GRUB are boot loaders: they are able to boot\n"
 "either GNU/Linux or any other operating system present on your computer.\n"
 "Normally, these other operating systems are correctly detected and\n"
 "installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
+"screen. Be careful to choose the correct parameters.\n"
 "\n"
-"\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
+"You may also not want to give access to these other operating systems to\n"
+"anyone. In which case, you can delete the corresponding entries. But then,\n"
+"you will need a boot disk in order to boot those other operating systems!"
 msgstr ""
 "LILO (la Linuksa �argilo) kaj Grub estas start�argiloj: ili povas starti\n"
 "a� GNU/Linukson a� iun ajn mastruman sistemon �eestanta �e via komputilo.\n"
@@ -2934,379 +2766,246 @@ msgstr ""
 "al iu ajn.  �iokaze vi povas forstreki la respondajn enskribojn.  Sed\n"
 "�iokaze, vi bezonos startdiskon por starti ilin!"
 
-#: ../../help.pm_.c:665
+#: ../../help.pm_.c:658
 #, fuzzy
 msgid ""
-"LILO and grub main options are:\n"
-"  - Boot device: Sets the name of the device (e.g. a hard disk\n"
-"partition) that contains the boot sector. Unless you know specifically\n"
-"otherwise, choose \"/dev/hda\".\n"
-"\n"
-"\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero.\n"
-"\n"
-"\n"
-"  - Video mode: This specifies the VGA text mode that should be selected\n"
-"when booting. The following values are available: \n"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\n"
 "\n"
-"    * normal: select normal 80x25 text mode.\n"
-"\n"
-"    * <number>:  use the corresponding text mode.\n"
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
+msgstr ""
+"Vi bezonas indiki kie vi deziras meti la informon postulata\n"
+"por starti GNU/Linukson.\n"
 "\n"
 "\n"
-"  - Clean \"/tmp\" at each boot: if you want delete all files and "
-"directories\n"
-"stored in \"/tmp\" when you boot your system, select this option.\n"
+"Krom se vi scias precize kion vi faras, elektu \"Unua sektoro de\n"
+"drajvo (MBR)\""
+
+#: ../../help.pm_.c:665
+msgid ""
+"Here we select a printing system for your computer to use. Other OSes may\n"
+"offer you one, but Mandrake offers three.\n"
 "\n"
+" * \"pdq\" - which means ``print, don't queue'', is the choice if you have "
+"a\n"
+"direct connection to your printer and you want to be able to panic out of\n"
+"printer jams, and you do not have any networked printers. It will handle\n"
+"only very simple network cases and is somewhat slow for networks. Pick\n"
+"\"pdq\" if this is your maiden voyage to GNU/Linux. You can change your\n"
+"choices after install by running PrinterDrake from the Mandrake Control\n"
+"Center and clicking the expert button.\n"
+"\n"
+" * \"CUPS\" - ``Common Unix Printing System'' is excellent at printing to\n"
+"your local printer and also halfway round the planet. It is simple and can\n"
+"act like a server or a client for the ancient \"lpd\" printing system, so\n"
+"it is compatible with the systems that went before. It can do many tricks,\n"
+"but the basic setup is almost as easy as \"pdq\". If you need this to\n"
+"emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
+"graphical front-ends for printing or choosing printer options.\n"
+"\n"
+" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
+"approximately the same things the others can do, but it will print to\n"
+"printers mounted on a Novell Network, because it supports IPX protocol, and\n"
+"it can print directly to shell commands. If you have need of Novell or\n"
+"printing to commands without using a separate pipe construct, use lprNG.\n"
+"Otherwise, CUPS is preferable as it is simpler and better at working over\n"
+"networks."
+msgstr ""
+
+#: ../../help.pm_.c:693
+#, fuzzy
+msgid ""
+"DrakX is now detecting any IDE devices present in your computer. It will\n"
+"also scan for one or more PCI SCSI card(s) on your system. If a SCSI card\n"
+"is found DrakX will automatically install the appropriate driver.\n"
+"\n"
+"Because hardware detection will sometimes not detect a piece of hardware\n"
+"DrakX will ask you to confirm if a PCI SCSI card is present. Click \"Yes\"\n"
+"if you know that there is a SCSI card installed in your machine. You will\n"
+"be presented a list of SCSI cards to choose from. Click \"No\" if you have\n"
+"no SCSI hardware. If you are unsure you can check the list of hardware\n"
+"detected in your machine by selecting \"See hardware info\" and clicking\n"
+"\"OK\". Examine the list of hardware and then click on the \"OK\" button to\n"
+"return to the SCSI interface question.\n"
 "\n"
-"  - Precise RAM if needed: unfortunately, there is no standard method to ask "
-"the\n"
-"BIOS about the amount of RAM present in your computer. As consequence, Linux "
-"may\n"
-"fail to detect your amount of RAM correctly. If this is the case, you can\n"
-"specify the correct amount or RAM here. Please note that a difference of 2 "
-"or 4\n"
-"MB between detected memory and memory present in your system is normal."
+"If you have to manually specify your adapter, DrakX will ask if you want to\n"
+"specify options for it. You should allow DrakX to probe the hardware for\n"
+"the card-specific options that the hardware needs to initialize. This\n"
+"usually works well.\n"
+"\n"
+"If DrakX is not able to probe for the options that need to be passed, you\n"
+"will need to manually provide options to the driver. Please review the\n"
+"``User Guide'' (chapter 3, section \"Collecting information on your\n"
+"hardware\") for hints on retrieving the parameters required from hardware\n"
+"documentation, from the manufacturer's web site (if you have Internet\n"
+"access) or from Microsoft Windows (if you used this hardware with Windows\n"
+"on your system)."
 msgstr ""
-"LILO kaj Grub �efaj opcioj estas:\n"
-"  - Startaparato: Fiksas la nomon de la aparato (ekz-e subdisko de "
-"fiksdisko)\n"
-"tiu enhavas la startsektoron.  Krom se vi scias specife alie, elektu\n"
-"\"/dev/hda\".\n"
+"DrakX provos ser�i PCI-a(j)n SCSI-a(j)n adaptilo(j)n\n"
+"Se DrakX trovas SCSI-an adaptilon kaj scias kiun pelilon �i devas uzi\n"
+"�i a�tomate instalos �in (a� ilin).\n"
 "\n"
+"Se vi havas neniom da SCSI-aj adaptiloj, ISA-an SCSI-an adapilon, a�\n"
+"PCI-an SCSI-an adaptilon kiun DrakX ne rekonas DrakX demandos al vi\n"
+"se vi havas SCSI-an adaptilon sur via komputilo.  Se vi ne havas adaptilon\n"
+"vi povas nur klaki 'Ne'.  Se vi klakos 'Jes', DrakX montros al vi liston de\n"
+"peliloj.  Vi povos elekti vian specifan pelilon de la listo.\n"
 "\n"
-"  - Prokrastoperiodo anta� starti defa�ltan sistemon: Elektas la nombron\n"
-"da dekonoj de sekundo ke la start�argilo devus atendi anta� starti la\n"
-"unuan sistemon.  �i tiu utilas �e sistemoj kiuj tuj startas de la\n"
-"fiksdisko malanta� ili ebligas la klavaron.  La start�argilo ne atendas se\n"
-"\"delay\" (prokrastoperiodo) estas ellasita a� estas fiksita al nul.\n"
 "\n"
+"Se vi devas permane elekti vian adaptilon, DrakX demandos\n"
+"�u vi deziras specifi opciojn por �i.  Vi devus permesi al DrakX\n"
+"esplori la aparaton por la opcioj.  �i tiu kutime bone funkcias.\n"
 "\n"
-"  - Grafika re�imo: �i tiu specifas la VGA tekstan re�imon por uzi dum\n"
-"start.  La sekvantaj valoroj estas uzeblaj:\n"
-"    * normala: elektu normalan 80 per 25 tekstan re�imon.\n"
-"    * <numero>: uzu la respondan tekstan re�imon."
+"Se ne, vi bezonos provizi opciojn al la pelilo.\n"
+"Reviziu la Instalgvidlibron por sugestoj pri ekstrakado de �i tiu\n"
+"informo de Vindozo (se vi havas �in sur via komputilo),\n"
+"de dokumenta�o de aparato, a� de la TTT-ejo de la fabrikanto\n"
+"(se vi havas atingon al la reto)."
 
-#: ../../help.pm_.c:697
+#: ../../help.pm_.c:720
 msgid ""
-"Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able\n"
-"to boot either GNU/Linux, MacOS, or MacOSX, if present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
+"You can add additional entries for yaboot, either for other operating\n"
+"systems, alternate kernels, or for an emergency boot image.\n"
 "\n"
+"For other OS's, the entry consists only of a label and the root partition.\n"
 "\n"
-"Yaboot main options are:\n"
+"For Linux, there are a few possible options:\n"
 "\n"
+" * Label: this is simply the name you will have to type at the yaboot "
+"prompt\n"
+"to select this boot option.\n"
 "\n"
-"  - Init Message: A simple text message that is displayed before the boot\n"
-"prompt.\n"
-"\n"
-"\n"
-"  - Boot Device: Indicate where you want to place the information required "
-"to \n"
-"boot to GNU/Linux. Generally, you will have setup a bootstrap partition "
-"earlier \n"
-"to hold this information.\n"
+" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
+"or a variation of vmlinux with an extension.\n"
 "\n"
+" * Root: the \"root\" device or \"/\" for your Linux installation.\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"
+" * Append: on Apple hardware, the kernel append option is used quite often\n"
+"to assist in initializing video hardware, or to enable keyboard mouse\n"
+"button emulation for the often lacking 2nd and 3rd mouse buttons on a stock\n"
+"Apple mouse. The following are some examples:\n"
 "\n"
+"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"hda=autotune\n"
 "\n"
-"  - Kernel Boot Timeout: This timeout is similar to the LILO boot delay.  "
-"After \n"
-"selecting Linux, you will have this delay in 0.1 seconds before your "
-"default\n"
-"kernel description is selected.\n"
-"\n"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-"  - Enable CD Boot?: Checking this option will allow you to choose 'C' for "
-"CD at\n"
-"the first boot prompt.\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 4,096 bytes. If you\n"
+"need to allocate a large ramdisk, this option can be used.\n"
 "\n"
-"  - Enable OF Boot?: Checking this option will allow you to choose 'N' for "
-"Open\n"
-"Firmware at the first boot prompt.\n"
+" * Read-write: normally the \"root\" partition is initially brought up in\n"
+"read-only, to allow a file system check before the system becomes \"live\".\n"
+"Here, you can override 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 OS: You can select which OS will boot by default when the Open "
-"Firmware \n"
-"Delay expires."
+" * Default: selects this entry as being the default Linux selection,\n"
+"selectable by just pressing ENTER at the yaboot prompt. This entry will\n"
+"also be highlighted with a \"*\", if you press [Tab] to see the boot\n"
+"selections."
 msgstr ""
 
-#: ../../help.pm_.c:738
+#: ../../help.pm_.c:765
 msgid ""
-"You can add additional entries for yaboot, either for other operating "
-"systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"\n"
-"For other OS's - the entry consists only of a label and the root partition.\n"
-"\n"
-"\n"
-"For Linux, there are a few possible options: \n"
-"\n"
+"Yaboot is a boot loader for NewWorld MacIntosh hardware. It is able to boot\n"
+"either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
+"these other operating systems are correctly detected and installed. If this\n"
+"is not the case, you can add an entry by hand in this screen. Be careful as\n"
+"to choose the correct parameters.\n"
 "\n"
-"  - Label: This is simply the name will type at the yaboot prompt to select "
-"this \n"
-"boot option.\n"
-"\n"
-"\n"
-"  - Image: This would be the name of the kernel to boot.  Typically vmlinux "
-"or\n"
-"a variation of vmlinux with an extension.\n"
-"\n"
-"\n"
-"  - Root: The root device or '/' for your Linux installation.\n"
+"Yaboot's main options are:\n"
 "\n"
+" * Init Message: a simple text message that is displayed before the boot\n"
+"prompt.\n"
 "\n"
-"  \n"
-"  - Append: On Apple hardware, the kernel append option is used quite often "
+" * Boot Device: indicate where you want to place the information required "
 "to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button "
-"emulation\n"
-"for the often lacking 2nd and 3rd mouse buttons on a stock Apple mouse.  The "
-"following \n"
-"are some examples:\n"
-"\n"
-"\n"
-"\t\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
-"hda=autotune\n"
-"\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
-"\n"
-"\n"
-" \n"
-"  - Initrd: This option can be used either to load initial modules, before "
-"the boot \n"
-"device is available, or to load a ramdisk image for an emergency boot "
-"situation.\n"
-"\n"
+"boot to GNU/Linux. Generally, you setup a bootstrap partition earlier to\n"
+"hold this information.\n"
 "\n"
-"  - Initrd-size: The default ramdisk size is generally 4096 bytes.  If you "
-"should need\n"
-"to allocate a large ramdisk, this option can be used.\n"
+" * 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 before your\n"
+"default kernel description is selected.\n"
 "\n"
-"  - Read-write: Normally the 'root' partition is initially brought up read-"
-"only, to allow\n"
-"a filesystem check before the system becomes 'live'.  You can override this "
-"option here.\n"
-"\n"
-"\n"
-"  - NoVideo: Should the Apple video hardware prove to be exceptionally "
-"problematic, you can\n"
-"select this option to boot in 'novideo' mode, with native framebuffer "
-"support.\n"
-"\n"
-"\n"
-"  - Default: Selects this entry as being the default Linux selection, "
-"selectable by just\n"
-"pressing ENTER at the yaboot prompt.  This entry will also be highlighted "
-"with a '*', if you\n"
-"press TAB to see the boot selections."
-msgstr ""
-
-#: ../../help.pm_.c:793
-msgid ""
-"SILO is a bootloader for SPARC: it is able to boot\n"
-"either GNU/Linux or any other operating system present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
+" * 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 "
+"Open\n"
+"Firmware at the first boot prompt.\n"
 "\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
+" * Default OS: you can select which OS will boot by default when the Open\n"
+"Firmware Delay expires."
 msgstr ""
-"SILO estas start�argilo por Sparc: �i povas starti a� Linukson a� iun ajn\n"
-"mastruman sistemon �eestanta �e via komputilo.  Normale, �i tiuj aliaj\n"
-"mastrumaj sistemoj estas �uste detektata kaj instalada.  Se tiel ne estas,\n"
-"vi povas aldoni enskribon mane per �i tiu ekrano.  Zorgu elekti la �ustajn\n"
-"parametrojn.\n"
-"\n"
-"\n"
-"Eble vi anka� ne deziras doni atingon al �i tiuj aliaj mastrumaj sistemoj\n"
-"al iu ajn.  �iokaze vi povas forstreki la respondajn enskribojn.  Sed\n"
-"�iokaze, vi bezonos startdiskon por starti ilin!"
 
-#: ../../help.pm_.c:805
+#: ../../help.pm_.c:798
 msgid ""
-"SILO main options are:\n"
-"  - Bootloader installation: Indicate where you want to place the\n"
-"information required to boot to GNU/Linux. Unless you know exactly\n"
-"what you are doing, choose \"First sector of drive (MBR)\".\n"
-"\n"
+"Here are presented various parameters concerning your machine. Depending on\n"
+"your installed hardware, you may - or not, see the following entries:\n"
 "\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero."
-msgstr ""
-"SILO �efaj opcioj estas:\n"
-"  - Instalado de Start�argilo: Indiki kie vi deziras meti la informon\n"
-"bezonata por start GNU/Linukso.  Krom se vi scias specife kion vi faras,\n"
-"elektu \"Unua sektoro de drajvo (MBR)\".\n"
+" * \"Mouse\": mouse check the current mouse configuration and click on the\n"
+"button to change it if necessary.\n"
 "\n"
+" * \"Keyboard\": keyboard check the current keyboard map configuration and\n"
+"click on the button to change that if necessary.\n"
 "\n"
-"  - Prokrastoperiodo anta� starti defa�ltan sistemon: Elektas la nombron\n"
-"da dekonoj de sekundo ke la start�argilo devus atendi anta� starti la\n"
-"unuan sistemon.  �i tiu utilas �e sistemoj kiuj tuj startas de la\n"
-"fiksdisko malanta� ili ebligas la klavaron.  La start�argilo ne atendas se\n"
-"\"delay\" (prokrastoperiodo) estas ellasita a� estas fiksita al nul."
-
-#: ../../help.pm_.c:818
-msgid ""
-"Now it's time to configure the X Window System, which is the\n"
-"core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
-"you must configure your video card and monitor. Most of these\n"
-"steps are automated, though, therefore your work may only consist\n"
-"of verifying what has been done and accept the settings :)\n"
+" * \"Timezone\": time zoneDrakX, by default, guesses your time zone from "
+"the\n"
+"language you have chosen. But here again, as for the choice of a keyboard,\n"
+"you may not be in the country for which the chosen language should\n"
+"correspond. Hence, you may need to click on the \"Timezone\" button in\n"
+"order to configure the clock according to the time zone you are in.\n"
 "\n"
+" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
+"configuration wizard.\n"
 "\n"
-"When the configuration is over, X will be started (unless you\n"
-"ask DrakX not to) so that you can check and see if the\n"
-"settings suit you. If they don't, you can come back and\n"
-"change them, as many times as necessary."
-msgstr ""
-"Nun estas tempo por konfiguri la X Fenestra Sistemo, kiu estas la kerno\n"
-"de la GNU/Linuksa GUI (Grafika UzulInterfaco).  Por tiu celo, vi devas\n"
-"konfiguri vian grafikan karton kaj ekranon.  La plejparto de �i tiuj pa�oj\n"
-"estas a�tomatitaj, tamen, do via laboro eble konsistos en konfirmi kion\n"
-"estis farata kaj akcepti la aran�ojn. :)\n"
+" * \"Sound card\": if a sound card is detected on your system, it is\n"
+"displayed here. No modification possible at installation time.\n"
 "\n"
+" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
+"here. No modification possible at installation time.\n"
 "\n"
-"Kiam la konfigurado estas kompleta, X lan�i�os (krom se vi demandas al\n"
-"DrakX ne fari tion) pro ke vi kontrolu �in la observu se la aran�ojn\n"
-"ta�gas por vi.  Se ne, vi povas reveni kaj �an�i ilin, tiom da tempoj kiom\n"
-"estas necesa."
-
-#: ../../help.pm_.c:831
-msgid ""
-"If something is wrong in X configuration, use these options to correctly\n"
-"configure the X Window System."
-msgstr ""
-"Se iu misas en la X-a konfigura�o, uzu �i tiujn opciojn por �uste konfiguri\n"
-"la X Fenestran Sistemon."
-
-#: ../../help.pm_.c:835
-msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
+" * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
+"displayed here. You can click on the button to change the parameters\n"
+"associated to it."
 msgstr ""
-"Se vi preferas uzi grafikan saluton, elektu \"Jes\".  Aliokaze, elektu \"Ne"
-"\"."
 
-#: ../../help.pm_.c:839
+#: ../../help.pm_.c:827
 msgid ""
-"You can choose a security level for your system. Please refer to the manual "
-"for complete\n"
-"  information. Basically, if you don't know what to choose, keep the default "
-"option.\n"
+"Choose the hard drive you want to erase to install your new Mandrake Linux\n"
+"partition. Be careful, all data present on it will be lost and will not be\n"
+"recoverable!"
 msgstr ""
 
-#: ../../help.pm_.c:844
+#: ../../help.pm_.c:832
 msgid ""
-"Your system is going to reboot.\n"
+"Click on \"OK\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
 "\n"
-"After rebooting, your new Linux Mandrake system will load automatically.\n"
-"If you want to boot into another existing operating system, please read\n"
-"the additional instructions."
-msgstr ""
-"Via sistemo restartos.\n"
-"\n"
-"Post restartado, via nova Linuks-Mandrejka sistemo �argi�os a�tomate.  Se "
-"vi\n"
-"deziras starti en alian ekzistanta mastruman sistemon, bonvole legu la\n"
-"pluan instrukcion."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Elektu vian lingvon"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Elektu instalklason"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Detektado de fiksdisko(j)"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Konfiguru muson"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Elektu vian klavaron"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
 
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Dosiersistemo konfiguro"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Formatu subdiskojn"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Elektu paka�ojn"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Instalu sistemon"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "Difinu pasvorton de root"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Aldonu uzulon"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Konfiguru retumon"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
+#: ../../install2.pm_.c:114
+#, c-format
+msgid ""
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
 
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Konfiguru servojn"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Kreu pra�argdisketon"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Instalu restart-�argilon"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Konfiguru X"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Eliru instalprogramon"
-
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3321,50 +3020,39 @@ msgid ""
 "Do you really want to install these servers?\n"
 msgstr ""
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
 msgstr ""
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, fuzzy, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "En�ovu disketon en drajvo %s"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
 msgstr ""
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 msgstr ""
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "Eraro dum legi dosiero $f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "Eraro legante dosiero %s"
 
-#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:310
-#: ../../interactive.pm_.c:99 ../../interactive.pm_.c:114
-#: ../../interactive.pm_.c:269 ../../interactive_newt.pm_.c:166
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:356
-#: ../../my_gtk.pm_.c:617 ../../my_gtk.pm_.c:640
+#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:325
+#: ../../interactive.pm_.c:107 ../../interactive.pm_.c:122
+#: ../../interactive.pm_.c:286 ../../interactive.pm_.c:308
+#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:170
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:415
+#: ../../my_gtk.pm_.c:716 ../../my_gtk.pm_.c:738
 msgid "Ok"
 msgstr "Jeso"
 
-#: ../../install_gtk.pm_.c:423
-msgid "Please test the mouse"
-msgstr "Bonvole, provu la muson"
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-#, fuzzy
-msgid "To activate the mouse,"
-msgstr "Bonvole, provu la muson"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "MOVU VIAN RADON!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -3375,7 +3063,7 @@ msgstr ""
 "funkcii.\n"
 "Vi povas trovi iun informon pri ili �e: %s"
 
-#: ../../install_interactive.pm_.c:41
+#: ../../install_interactive.pm_.c:44
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -3385,11 +3073,11 @@ msgstr ""
 "Por �i tiu, kreu subdiskon (a� klaku estantan).\n"
 "Sekve elektu la agon \"Surmetingo\" kaj faru �in '/'"
 
-#: ../../install_interactive.pm_.c:46 ../../install_steps_graphical.pm_.c:259
+#: ../../install_interactive.pm_.c:49 ../../install_steps_graphical.pm_.c:259
 msgid "You must have a swap partition"
 msgstr "Vi devas havi inter�an�an subdiskon"
 
-#: ../../install_interactive.pm_.c:47 ../../install_steps_graphical.pm_.c:261
+#: ../../install_interactive.pm_.c:50 ../../install_steps_graphical.pm_.c:261
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -3399,56 +3087,61 @@ msgstr ""
 "\n"
 "�u vi deziras da�ri tamen?"
 
-#: ../../install_interactive.pm_.c:68
+#: ../../install_interactive.pm_.c:53 ../../install_steps.pm_.c:165
+#, fuzzy
+msgid "You must have a FAT partition mounted in /boot/efi"
+msgstr "Vi devas havi inter�an�an subdiskon"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Uzu liberan spacon"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "Mankas sufi�an da libera spaco por disponigi novajn subdiskojn"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "Uzu ekzistantajn subdiskojn"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "Ne ekzistas subdiskojn por uzi"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "Uzu la Vindoza subdiskon por retrokonektado"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 #, fuzzy
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Kiun subdiskon vi deziras uzi por meti Linux4Win?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "Elektu la grandecojn"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "Radikosubdiska grandeco en MB: "
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "Inter�an�a subdiska grandeco en MB: "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "Uzu la liberan spacon sur la Vindoza subdisko"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "Kiun subdiskon vi deziras regrandecigi?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "Kalkulas Vindozajn dosiersistemajn limojn"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -3457,12 +3150,12 @@ msgstr ""
 "La regrandecigilo por la FAT (Dosiero-Atingo-Tablo) ne povas trakti\n"
 "vian subdiskon, la sekvanta eraro okazis: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "Via Vindoza subdisko estas tro fragmentigata, bonvole uzu ``defrag'' anta�e"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -3482,21 +3175,21 @@ msgstr ""
 "instaladon.  Anka� vi devus fari rezervan kopion de via dateno.\n"
 "Kiam vi estas certa, klaku \"Jeso\"."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "Kiun grandecon vi deziras teni por Vindozo?"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "subdisko: %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Regrandeci�o de FAT malsukcesis: %s"
 
-#: ../../install_interactive.pm_.c:145
+#: ../../install_interactive.pm_.c:154
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
@@ -3504,34 +3197,34 @@ msgstr ""
 "Ne ekzistas FAT-ajn (Dosiero-Atingo-Tablo) subdiskojn por regrandecigi\n"
 "a� uzi kiel retrokonektaj subdiskoj (a� ne estas sufi�a da spaco)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "Forvi�u la tutan diskon"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "Forigu Vindozon"
 
-#: ../../install_interactive.pm_.c:154
+#: ../../install_interactive.pm_.c:163
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "Vi havas pli ol unu fiksdisko, sur kiu vi deziras instali Linukson?"
 
-#: ../../install_interactive.pm_.c:157
+#: ../../install_interactive.pm_.c:166
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr ""
 "�iuj ekzistantaj subdiskoj kaj iliaj datenoj estos perdata sur drajvo %s"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 #, fuzzy
 msgid "Custom disk partitioning"
 msgstr "Uzu ekzistantajn subdiskojn"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "Uzu fdisk"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -3540,30 +3233,30 @@ msgstr ""
 "Nun vi povas dispartigi %s.\n"
 "Kiam vi fini�os, ne forgesu savi kun `w'."
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 #, fuzzy
 msgid "You don't have enough free space on your Windows partition"
 msgstr "Uzu la liberan spacon sur la Vindoza subdisko"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 #, fuzzy
 msgid "I can't find any room for installing"
 msgstr "Mi ne povas aldoni plu da subdiskoj"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "La Dispartigsor�ilo de DrakX trovis �i tiujn solvojn:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Dispartigado malsukcesis: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "Startado de la reto"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "Haltas de la reto"
 
@@ -3575,12 +3268,12 @@ msgstr ""
 "Eraro okazis, sed mi ne scias kiel trakti �in bone.\n"
 "Da�ri je via propra risko."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Duobla surmetingo %s"
 
-#: ../../install_steps.pm_.c:385
+#: ../../install_steps.pm_.c:384
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
@@ -3592,16 +3285,16 @@ msgstr ""
 "Kontrolu la KDROM sur instalata komputilo per\n"
 "\"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "Bonvenon al %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "Neniu disketilo havebla"
 
-#: ../../install_steps_auto_install.pm_.c:51
+#: ../../install_steps_auto_install.pm_.c:77
 #: ../../install_steps_stdio.pm_.c:23
 #, c-format
 msgid "Entering step `%s'\n"
@@ -3615,32 +3308,32 @@ msgstr "Elektu la grandecon kiu vi deziras instali"
 msgid "Total size: "
 msgstr "Tuta grandeco: "
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:437
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:387
 #, c-format
 msgid "Version: %s\n"
 msgstr "Versio: %s\n"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:438
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:388
 #, c-format
 msgid "Size: %d KB\n"
 msgstr "Grandeco: %d KB\n"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:337
-#: ../../install_steps_interactive.pm_.c:520
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:509
 msgid "Choose the packages you want to install"
 msgstr "Elektu la paka�ojn kiuj vi deziras instali"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:340
+#: ../../install_steps_graphical.pm_.c:465 ../../interactive_gtk.pm_.c:571
 msgid "Info"
 msgstr "Informo"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:345
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:457
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Install"
 msgstr "Instalu"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:558
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:497
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Installing"
 msgstr "Instalanta"
 
@@ -3648,7 +3341,7 @@ msgstr "Instalanta"
 msgid "Please wait, "
 msgstr "Bonvolu atendi"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:570
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:510
 msgid "Time remaining "
 msgstr "Tempo restanta "
 
@@ -3657,21 +3350,21 @@ msgid "Total time "
 msgstr "Tuta tempo "
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "Preparas instaladon"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:618
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:558
 #, c-format
 msgid "Installing package %s"
 msgstr "Instalanta paka�o %s"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
+#: ../../install_steps_gtk.pm_.c:646
 msgid "Go on anyway?"
 msgstr "�u vi deziras da�ri tamen?"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
 msgid "There was an error ordering packages:"
 msgstr "Estis eraro ordigi paka�ojn:"
 
@@ -3679,10 +3372,10 @@ msgstr "Estis eraro ordigi paka�ojn:"
 msgid "Use existing configuration for X11?"
 msgstr "Uzu ekzistantan konfiguron de X11 (X-fenestroj)?"
 
-#: ../../install_steps_gtk.pm_.c:142
+#: ../../install_steps_gtk.pm_.c:148
 msgid ""
 "Your system is low on resource. You may have some problem installing\n"
-"Linux-Mandrake. If that occurs, you can try a text install instead. For "
+"Mandrake Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -3691,17 +3384,21 @@ msgstr ""
 "instaladon.  Por �i tio, premu `F1' kiam vi startas de KDROM, kaj sekve\n"
 "tajpu `text'."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Instalklaso"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "Bonvole, elektu unu el la sekvantaj specoj de instalado:"
 
-#: ../../install_steps_gtk.pm_.c:222
+#: ../../install_steps_gtk.pm_.c:228
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr "La totala grandeco de la grupoj vi elektis estas proksimume %d MB.\n"
 
-#: ../../install_steps_gtk.pm_.c:224
+#: ../../install_steps_gtk.pm_.c:230
 #, c-format
 msgid ""
 "If you wish to install less than this size,\n"
@@ -3716,7 +3413,7 @@ msgstr ""
 "Malalta procento instalos nur la plej gravajn paka�ojn;\n"
 "100%% instalos �iujn paka�ojn."
 
-#: ../../install_steps_gtk.pm_.c:229
+#: ../../install_steps_gtk.pm_.c:235
 #, c-format
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
@@ -3733,85 +3430,69 @@ msgstr ""
 "Malalta procento instalos nur la plej gravajn paka�ojn;\n"
 "%d%% instalos tiom paka�ojn kiom eblajn."
 
-#: ../../install_steps_gtk.pm_.c:235
+#: ../../install_steps_gtk.pm_.c:241
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "Vi povos elekti ilin pli precize en la sekvanta pa�o."
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "Procento da paka�oj por instali"
 
-#: ../../install_steps_gtk.pm_.c:285 ../../install_steps_interactive.pm_.c:599
+#: ../../install_steps_gtk.pm_.c:291 ../../install_steps_interactive.pm_.c:619
 msgid "Package Group Selection"
 msgstr "Elektado de Paka�aj Grupoj"
 
-#: ../../install_steps_gtk.pm_.c:305 ../../install_steps_interactive.pm_.c:614
+#: ../../install_steps_gtk.pm_.c:320 ../../install_steps_interactive.pm_.c:634
 msgid "Individual package selection"
 msgstr "Elektado de individuaj paka�oj"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "Etendu Arbon"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Maletendu Arbon"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "�an�u inter ebena kaj ordigita je grupoj"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Tuta grandeco: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Malbona paka�o"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nomo: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Graveco: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Tuta grandeco: %d / %d MB"
-
-#: ../../install_steps_gtk.pm_.c:467
+#: ../../install_steps_gtk.pm_.c:411
 msgid ""
 "You can't select this package as there is not enough space left to install it"
 msgstr ""
 "Vi ne povas elekti �i tiun paka�on �ar ne estas sufi�e da spaco por instali\n"
 "�in."
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "La sekvaj paka�oj estos instalataj"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "La sekvaj paka�oj estos malinstalataj"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "Vi ne povas elektu/malelektu �i tiun paka�on"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "�i tiu estas deviga paka�o, vi ne povas malelekti �in"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
 msgstr "Vi ne povas malelekti �i tiun paka�on.  �i estas jam instalita."
 
-#: ../../install_steps_gtk.pm_.c:507
+#: ../../install_steps_gtk.pm_.c:447
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -3819,25 +3500,43 @@ msgstr ""
 "�i tiu paka�o devus esti promociata.\n"
 "�u vi certas ke vi deziras malelekti �in?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Vi ne povas malelekti �i tiun paka�on.  �i devus esti promociata."
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:460
+msgid "Load/Save on floppy"
+msgstr "�argu/Konservu sur disketo"
+
+#: ../../install_steps_gtk.pm_.c:461
+#, fuzzy
+msgid "Updating package selection"
+msgstr "Elektado de individuaj paka�oj"
+
+#: ../../install_steps_gtk.pm_.c:466
+#, fuzzy
+msgid "Minimal install"
+msgstr "Eliru instalprogramon"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "Taksas"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 #, fuzzy
 msgid "Please wait, preparing installation"
 msgstr "Preparas instaladon"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d paka�oj"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -3869,15 +3568,15 @@ msgid ""
 "copyright laws applicable to software programs.\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Accept"
 msgstr "Akceptu"
 
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Refuse"
 msgstr "Malakceptu"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -3893,7 +3592,7 @@ msgstr ""
 "kiam vi finos.\n"
 "Se vi ne havas �in, klaku \"Nuligu\" por eviti la instaladon de �i tiu KDROM."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "Estis eraro dum instalado de paka�oj:"
 
@@ -3901,35 +3600,21 @@ msgstr "Estis eraro dum instalado de paka�oj:"
 msgid "An error occurred"
 msgstr "Eraro okazis"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "Bonvole, elektu lingvon por uzi."
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr ""
-"Vi povas elektu aliajn lingvojn kiujn estos uzeblaj malanta� la instalado"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "�iuj"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "Licenca kontrakto"
 
-#: ../../install_steps_interactive.pm_.c:87
+#: ../../install_steps_interactive.pm_.c:72
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Linux-"
-"Mandrake distribution \n"
+"The operating system and the different components available in the Mandrake "
+"Linux 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 Linux-Mandrake distribution.\n"
+"system and the different components of the Mandrake Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -3983,7 +3668,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 Linux-Mandrake sites  which are prohibited or restricted in some "
+"from one of Mandrake Linux 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"
@@ -4020,7 +3705,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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
 "MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -4040,105 +3725,99 @@ msgid ""
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:182
-#: ../../install_steps_interactive.pm_.c:822
+#: ../../install_steps_interactive.pm_.c:168
+#: ../../install_steps_interactive.pm_.c:871
 #: ../../standalone/keyboarddrake_.c:28
 msgid "Keyboard"
 msgstr "Klavaro"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "Bonvole, elektu vian klavaran aran�on."
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Instalklaso"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "Kiun instalklaso deziras vi?"
 
-#: ../../install_steps_interactive.pm_.c:203
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
-msgstr "Instalu"
+msgstr "Instalu/�isdatigu"
 
-#: ../../install_steps_interactive.pm_.c:203
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
-msgstr "�u tiu �i estas instalado a� savado?"
+msgstr "�u tiu �i estas instalado a� �isdatigado?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Rekomendata"
 
-#: ../../install_steps_interactive.pm_.c:215
-#: ../../install_steps_interactive.pm_.c:218
+#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:204
 msgid "Expert"
 msgstr "Spertulo"
 
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Update"
 msgstr "�isdatigu"
 
-#: ../../install_steps_interactive.pm_.c:238 ../../standalone/mousedrake_.c:41
+#: ../../install_steps_interactive.pm_.c:224 ../../standalone/mousedrake_.c:48
 msgid "Please, choose the type of your mouse."
 msgstr "Bonvole, elektu la specon de via muso."
 
-#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:57
+#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
 msgid "Mouse Port"
 msgstr "Muspordo"
 
-#: ../../install_steps_interactive.pm_.c:245 ../../standalone/mousedrake_.c:58
+#: ../../install_steps_interactive.pm_.c:231 ../../standalone/mousedrake_.c:65
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Bonvole, elektu al kiu seria pordo estas via muso konektata."
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "Konfiguras PCMCIA kartojn..."
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "Configuring IDE"
 msgstr "Konfiguras IDE"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:295
+#: ../../install_steps_interactive.pm_.c:281
 msgid "no available partitions"
 msgstr "neniuj haveblaj subdiskoj"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "Elektu surmetingojn"
 
-#: ../../install_steps_interactive.pm_.c:323
+#: ../../install_steps_interactive.pm_.c:311
 #, c-format
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
@@ -4155,7 +3834,7 @@ msgstr ""
 "\n"
 "�u vi konsentas perdi �iujn subdiskojn?\n"
 
-#: ../../install_steps_interactive.pm_.c:336
+#: ../../install_steps_interactive.pm_.c:324
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
@@ -4163,78 +3842,116 @@ msgstr ""
 "DiskDrake malsukcesis �uste legi la subdisktabelon.\n"
 "Da�ri je via propra risko!"
 
-#: ../../install_steps_interactive.pm_.c:361
+#: ../../install_steps_interactive.pm_.c:340
+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_.c:349
+#, fuzzy
+msgid "No root partition found to perform an upgrade"
+msgstr "Elektu la subdiskoj kiuj vi deziras formati"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "Radikosubdisko"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
 msgstr "Kiu estas la radikosubdisko (/) �e via sistemo?"
 
-#: ../../install_steps_interactive.pm_.c:376
+#: ../../install_steps_interactive.pm_.c:365
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "Vi bezonas restarti por la �an�oj al la subdisktabelo efektivigi"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "Elektu la subdiskoj kiuj vi deziras formati"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "�u kontrolas malbonajn blokojn?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "Formatas subdiskojn"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Kreas kaj formatas dosieron %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Nesufi�a inter�an�ospaco por plenumi instalado, bonvolu aldoni iom"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "Ser�as haveblajn paka�ojn"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "Trovadas paka�ojn por promocii"
 
-#: ../../install_steps_interactive.pm_.c:461
+#: ../../install_steps_interactive.pm_.c:450
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
 "Via komputilo ne havas sufi�e da spaco por instalado a� promocio (%d > %d)."
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Kompleta (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "Minimuma (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Rekomendata (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "Akomodata"
 
-#: ../../install_steps_interactive.pm_.c:585
+#: ../../install_steps_interactive.pm_.c:522
+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_.c:525
+msgid "Load from floppy"
+msgstr "�argu de disketo"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Loading from floppy"
+msgstr "�argas de disketo"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Package selection"
+msgstr "Elektado de Paka�oj"
+
+#: ../../install_steps_interactive.pm_.c:532
+#, fuzzy
+msgid "Insert a floppy containing package selection"
+msgstr "En�ovu disketon en drajvo %s"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Konservu sur disketo"
+
+#: ../../install_steps_interactive.pm_.c:605
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:650
+#: ../../install_steps_interactive.pm_.c:670
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -4245,12 +3962,12 @@ msgstr ""
 "Se vi mankas nur iujn de la KDROM-oj, malelektu ilin, kaj poste klaku \"Jes"
 "\"."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "KDROM etikedata \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -4259,11 +3976,21 @@ msgstr ""
 "Instalas paka�o %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "Post-instala konfigurado"
 
-#: ../../install_steps_interactive.pm_.c:718
+#: ../../install_steps_interactive.pm_.c:719
+#, fuzzy, c-format
+msgid "Please insert the Boot floppy used in drive %s"
+msgstr "En�ovu disketon en drajvo %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, fuzzy, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "En�ovu malplenan disketon en drajvo %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -4330,98 +4057,135 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:750
+#: ../../install_steps_interactive.pm_.c:782
 msgid "Choose a mirror from which to get the packages"
 msgstr "Elektu spegulon de kiu havigi la paka�ojn"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Kontaktu la spegulon por havigi la liston de havebla paka�oj"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "Bonvole, elektu la paka�ojn kiujn vi deziras instali."
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "kio estas vian horzonon?"
 
-#: ../../install_steps_interactive.pm_.c:778
-msgid "Is your hardware clock set to GMT?"
+#: ../../install_steps_interactive.pm_.c:813
+#, fuzzy
+msgid "Hardware clock set to GMT"
 msgstr "�u via hardvara horlo�o estas �ustigata en GMT?"
 
-#: ../../install_steps_interactive.pm_.c:806 ../../printer.pm_.c:22
-#: ../../printerdrake.pm_.c:415
+#: ../../install_steps_interactive.pm_.c:814
+msgid "Automatic time synchronization (using NTP)"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:821
+msgid "NTP Server"
+msgstr "NTP Servilo"
+
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
 msgstr "Malproksima CUPS-a servilo"
 
-#: ../../install_steps_interactive.pm_.c:807
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
-msgstr "Nomo de printilo"
+msgstr "Neniu printilo"
 
-#: ../../install_steps_interactive.pm_.c:821
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
-msgstr "Movu"
+msgstr "Muso"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:824 ../../printerdrake.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:873 ../../printerdrake.pm_.c:1773
+#: ../../printerdrake.pm_.c:1844
 msgid "Printer"
 msgstr "Printilo"
 
-#: ../../install_steps_interactive.pm_.c:826
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:875
 msgid "ISDN card"
-msgstr "Interna ISDN-karto"
+msgstr "ISDN-karto"
 
-#: ../../install_steps_interactive.pm_.c:829
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
-msgstr "La�norma"
+msgstr "Sonkarto"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "Kiun printsistemo vi deziras uzi?"
+#: ../../install_steps_interactive.pm_.c:917
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:945
+msgid "LDAP"
+msgstr "LDAP"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:918
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:954
+msgid "NIS"
+msgstr "NIS"
+
+#: ../../install_steps_interactive.pm_.c:919
+#: ../../install_steps_interactive.pm_.c:941
+msgid "Local files"
+msgstr "Lokaj dosieroj"
+
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "Difinu pasvorton de root"
+
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Neniu pasvorto"
 
-#: ../../install_steps_interactive.pm_.c:901
+#: ../../install_steps_interactive.pm_.c:935
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr ""
 "�i tiu pasvorto ests tro simpla (�i devas esti almena� %d signoj longa)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "Uzu NIS"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "A�tentikigado"
+
+#: ../../install_steps_interactive.pm_.c:949
+msgid "Authentication LDAP"
+msgstr "A�tentikiga LDAP"
+
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "flavaj pa�oj"
+#: ../../install_steps_interactive.pm_.c:951
+msgid "LDAP Server"
+msgstr "LDAP Servilo"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
-msgstr "A�tentikigado NIS"
+#: ../../install_steps_interactive.pm_.c:957
+msgid "Authentication NIS"
+msgstr "A�tentikiga NIS"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "NIS Domajno"
 
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:959
 msgid "NIS Server"
 msgstr "NIS Servilo"
 
-#: ../../install_steps_interactive.pm_.c:951
+#: ../../install_steps_interactive.pm_.c:994
 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 "
@@ -4449,19 +4213,19 @@ msgstr ""
 "Se vi deziras krei startdisketon por via sistemo, en�ovu disketon en la\n"
 "unua drajvo kaj klaku \"JES\"."
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Unua disketa drajvo"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Dua disketa drajvo"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "Ellasu"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:1017
 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 "
@@ -4482,32 +4246,40 @@ msgstr ""
 "esti uzata kun la Mandrejka savdisko, kiu plifaciligas resani�i de severaj\n"
 "sistemaj paneoj.  �u vi deziras krei startdisketo por via sistemo?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "Beda�rinde, neniu disketdrajvo havebla"
 
-#: ../../install_steps_interactive.pm_.c:987
+#: ../../install_steps_interactive.pm_.c:1030
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Elektu la disketdrajvo vi deziras uzi por krei la startdisketon"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "En�ovu disketon en drajvo %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "Kreas startdisketon"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "Preparas start�argilon"
 
-#: ../../install_steps_interactive.pm_.c:1010
+#: ../../install_steps_interactive.pm_.c:1055
+msgid ""
+"You appear to have an OldWorld or Unknown\n"
+" machine, the yaboot bootloader will not work for you.\n"
+"The install will continue, but you'll\n"
+" need to use BootX to boot your machine"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:1060
 msgid "Do you want to use aboot?"
 msgstr "�u vi deziras uzi aboot-on?"
 
-#: ../../install_steps_interactive.pm_.c:1013
+#: ../../install_steps_interactive.pm_.c:1063
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -4515,76 +4287,78 @@ msgstr ""
 "Eraro da�re mi instalis \"aboot\",\n"
 "�u mi devus provi perforte instali e� se tio detruas la unuan subdiskon?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "Instalu restart-�argilon"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Instalado de start�argilo malsukcesis.  La sekvanta eraro okazis:"
 
-#: ../../install_steps_interactive.pm_.c:1030
+#: ../../install_steps_interactive.pm_.c:1084
+#, 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 $of_boot,\\\\:tbxi\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_.c:1038 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1092 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "Malalta"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Meza"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Alta"
 
-#: ../../install_steps_interactive.pm_.c:1044 ../../standalone/draksec_.c:49
+#: ../../install_steps_interactive.pm_.c:1098 ../../standalone/draksec_.c:62
 msgid "Choose security level"
 msgstr "Elektu sekurnivelon?"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr "�u vi deziras krei a�toinstalan disketon por replikado de Linukso?"
-
-#: ../../install_steps_interactive.pm_.c:1082
+#: ../../install_steps_interactive.pm_.c:1134
+#: ../../standalone/drakautoinst_.c:80
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "En�ovu malplenan disketon en drajvo %s"
 
-#: ../../install_steps_interactive.pm_.c:1096
-#: ../../install_steps_interactive.pm_.c:1128
+#: ../../install_steps_interactive.pm_.c:1138
+#: ../../standalone/drakautoinst_.c:82
 msgid "Creating auto install floppy"
 msgstr "Kreas a�toinstalan disketon"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1167
+#: ../../install_steps_interactive.pm_.c:1160
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
-"For information on fixes which are available for this release of Linux-"
-"Mandrake,\n"
-"consult the Errata available from http://www.linux-mandrake.com/.\n"
+"For information on fixes which are available for this release of Mandrake "
+"Linux,\n"
+"consult the Errata available from http://www.mandrakelinux.com/.\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Linux-Mandrake User's Guide."
+"install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1179
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
-msgstr "Kreas a�toinstalan disketon"
+msgstr "Kreu a�toinstalan disketon"
 
-#: ../../install_steps_interactive.pm_.c:1181
+#: ../../install_steps_interactive.pm_.c:1174
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -4593,44 +4367,58 @@ msgid ""
 "You may prefer to replay the installation.\n"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1186
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
-msgstr "A�tomata IP"
+msgstr "A�tomata"
 
-#: ../../install_steps_interactive.pm_.c:1186
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
-msgstr "Re�argu"
+msgstr "Reludu"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 #, fuzzy
 msgid "Save packages selection"
 msgstr "Elektado de individuaj paka�oj"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
+msgid "Mandrake Linux Installation %s"
 msgstr "Linuks-Mandrejka Instalado %s"
 
-#: ../../install_steps_newt.pm_.c:33
+#: ../../install_steps_newt.pm_.c:34
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr "  <Tabo>/<Alt-Tabo> inter eroj | <Spaco> elektas | <F12> sekva ekrano "
 
-#: ../../interactive.pm_.c:65
-#, fuzzy
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
-msgstr "forsendu"
+msgstr "kdesu mankas"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "Elektu agon"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr ""
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "Bonvole atendu"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Etendu Arbon"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Maletendu Arbon"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "�an�u inter ebena kaj ordigita je grupoj"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -4656,269 +4444,288 @@ msgstr "Via elekta�o? (defa�lo estas %s) "
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Via elekta�o (defa�lto estas %s  enigu `neniu' por elekti neniu) "
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "�e�a (QWERTZ)"
 
-#: ../../keyboard.pm_.c:125 ../../keyboard.pm_.c:138 ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:141 ../../keyboard.pm_.c:155 ../../keyboard.pm_.c:180
 msgid "German"
 msgstr "Germana"
 
-#: ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:142
 msgid "Dvorak"
 msgstr "Dvorak-a"
 
-#: ../../keyboard.pm_.c:127 ../../keyboard.pm_.c:164
+#: ../../keyboard.pm_.c:143 ../../keyboard.pm_.c:186
 msgid "Spanish"
 msgstr "Hispana"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "Finna"
 
-#: ../../keyboard.pm_.c:129 ../../keyboard.pm_.c:139 ../../keyboard.pm_.c:166
+#: ../../keyboard.pm_.c:145 ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:188
 msgid "French"
 msgstr "Franca"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
 msgstr "Norvega"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "Pola"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "Rusa"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "Sveda"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "Unui�inta Regna klavaro"
 
-#: ../../keyboard.pm_.c:134 ../../keyboard.pm_.c:137 ../../keyboard.pm_.c:204
+#: ../../keyboard.pm_.c:152 ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:237
 msgid "US keyboard"
 msgstr "Usona klavaro"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+msgid "Albanian"
+msgstr "Albana"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "Armena (malnova)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "Armena (skribma�ina)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "Armena (fonetika)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "Azerbaj�ana (latina)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Azerbaj�ana (cirila)"
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "Belga"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "Bulgara"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
-msgstr "Brazila"
+msgstr "Brazila (ABNT-2)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Belarusa"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "Svisa (germana aran�o)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "Svisa (franca aran�o)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "�e�a (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr ""
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "Germana (neniom da mortaj klavoj)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "Dana"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:183
 msgid "Dvorak (US)"
 msgstr "Dvorak-a (US)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:184
 msgid "Dvorak (Norwegian)"
 msgstr "Dvorak-a (Norvega)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Estona"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Kartvela (\"Rusa\" aran�o)"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Kartvela (\"Latina\" aran�o)"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "Greka"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "Hungara"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Kroata"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "Israela"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "Israela (fonetika)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Irana"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "Islanda"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "Itala"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "Japana 106 klavoj"
 
-#: ../../keyboard.pm_.c:178
-#, fuzzy
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
-msgstr "Unui�inta Regna klavaro"
+msgstr "Korea klavaro"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "Latinamerika"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr ""
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "Nederlanda"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Litova AZERTY-a (malnova)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Litova AZERTY-a (nova)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Litova \"numero-vica\" QWERTY-a"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Litova \"fonetika\" QWERTY-a"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "Loko"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Macedona"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "Nederlanda"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Pola (qwerty aran�o)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Pola (qwertz aran�o)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "Portugala"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "Kanada (Kebeka)"
 
-#: ../../keyboard.pm_.c:193
+#: ../../keyboard.pm_.c:217
+msgid "Romanian (qwertz)"
+msgstr "Rumana (qwertz-a)"
+
+#: ../../keyboard.pm_.c:218
+msgid "Romanian (qwerty)"
+msgstr "Rumana (qwerty-a)"
+
+#: ../../keyboard.pm_.c:220
 msgid "Russian (Yawerty)"
 msgstr "Rusa (Yawerty-a)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "Sveda"
-
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "Slovena"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "Slovaka (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "Slovaka (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr ""
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "Azerbaj�ana (cirila)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Taja klavaro"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "Taja klavaro"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turka (tradicia \"F\" modelo)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turka (moderna \"Q\" modelo)"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ukrajna"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "Usona klavaro (internacia)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vjetnama \"numero-vica\" QWERTY-a"
 
-#: ../../keyboard.pm_.c:207
+#: ../../keyboard.pm_.c:240
 #, fuzzy
-msgid "Yugoslavian (latin/cyrillic)"
-msgstr "Jugoslava (Latina aran�o)"
+msgid "Yugoslavian (latin)"
+msgstr "Jugoslava (latina/cirila)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Cirklaj surmetingoj %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr ""
 
@@ -4935,9 +4742,8 @@ msgid "Logitech MouseMan+"
 msgstr "Lo�iteka MouseMan+"
 
 #: ../../mouse.pm_.c:33
-#, fuzzy
 msgid "Generic PS2 Wheel Mouse"
-msgstr "Nespecifa 2 Butona Muso"
+msgstr "Nespecifa PS2 RadoMuso"
 
 #: ../../mouse.pm_.c:34
 msgid "GlidePoint"
@@ -4956,9 +4762,8 @@ msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
 #: ../../mouse.pm_.c:43 ../../mouse.pm_.c:67
-#, fuzzy
 msgid "1 button"
-msgstr "2 butonoj"
+msgstr "1 butona"
 
 #: ../../mouse.pm_.c:44
 msgid "Generic"
@@ -5033,173 +4838,225 @@ msgstr "neniu"
 msgid "No mouse"
 msgstr "Neniu Muso"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Bonvole, provu la muson"
+
+#: ../../mouse.pm_.c:483
 #, fuzzy
+msgid "To activate the mouse,"
+msgstr "Bonvole, provu la muson"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "MOVU VIAN RADON!"
+
+#: ../../my_gtk.pm_.c:380
+msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:415
 msgid "Finish"
-msgstr "Finna"
+msgstr "Finu"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "Sekvanta ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
-msgstr ""
+msgstr "<- Anta�a"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "�u tio �i pravas?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Interreta Konfigurado"
-
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "�u vi deziras provi konekti al la interreto nun?"
-
-#: ../../netconnect.pm_.c:148
-#, fuzzy
-msgid "Testing your connection..."
-msgstr "Konfiguru interretan konekta�on"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Konektu al la Interreto"
 
-#: ../../netconnect.pm_.c:154 ../../standalone/draknet_.c:196
+#: ../../network/adsl.pm_.c:20
 #, fuzzy
-msgid "The system is now connected to Internet."
-msgstr "Kiel vi deziras konekti al la Interreto?"
+msgid ""
+"The most common way to connect with adsl is pppoe.\n"
+"Some connections use pptp, a few ones use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"La plej ofte uzata maniero por konekti kun ADSL estas dhcp + pppoe.\n"
+"Tamen, ekzistas konektojn kiuj nur uzas dhcp.\n"
+"Se vi ne scias, elektu 'uzu pppoe'"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
+#: ../../network/adsl.pm_.c:22
+msgid "Alcatel speedtouch usb"
 msgstr ""
 
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
-#, fuzzy
-msgid ""
-"The system doesn't seem to be connected to internet.\n"
-"Try to reconfigure your connection."
-msgstr "Konektu al la Interreto / Konfiguru lokan Reton"
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "uzu dhcp"
 
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-#, fuzzy
-msgid "Network Configuration"
-msgstr "ISDN-a Konfigura�on"
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "uzu pppoe"
 
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
-msgid "ISDN Configuration"
-msgstr "ISDN-a Konfigura�on"
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "uzu pptp"
 
-#: ../../netconnect.pm_.c:222
+#: ../../network/ethernet.pm_.c:37
 msgid ""
-"Select your provider.\n"
-" If it's not in the list, choose Unlisted"
+"Which dhcp client do you want to use?\n"
+"Default is dhcpcd"
 msgstr ""
-"Elektu vian interretprovizanton.\n"
-" Se �in ne estas en la listo, elektu Nelisti�itan"
+"Kiun dhcp-an klienton vi deziras uzi?\n"
+"La defa�lto estas dhcpcd"
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Konfigurado de Konekto"
+#: ../../network/ethernet.pm_.c:88
+#, fuzzy
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+"Mi ne detektas eterretan retadaptilom sur via sistemo.  Bonvole lan�u la\n"
+"aparatokonfigurilon."
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Bonvole plenigu a� marku la suban kampon"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Elektu la retan interfacon"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "IRQ de Karto"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+"Bonvole elektu kiun retadaptilon vi deziras uzi por konekti al la interreto"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "Memoro de Karto (DMA)"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "neniu retkarto trovita"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "I/O (Eneligo) de Karto"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "Konfiguras reto"
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "I/O 0 (Eneligo 0) de Karto"
+#: ../../network/ethernet.pm_.c:203
+msgid ""
+"Please enter your host name if you know it.\n"
+"Some DHCP servers require the hostname to work.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''."
+msgstr ""
+"Bonvole enigu vian po�tejon se vi scias �in.\n"
+"Iuj DHCP-aj serviloj bezonas po�tejon por funkcii.\n"
+"Via po�tejo devus esti plene specifita po�tejo,\n"
+"ekzemple ``miakomputilo.mialaborejo.miafirmao.com''."
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "I/O 1 (Eneligo 1) de Karto"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "Po�tejo"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "Via persona telefonnumero"
+#: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
+#: ../../network/netconnect.pm_.c:91 ../../network/netconnect.pm_.c:105
+#: ../../network/netconnect.pm_.c:154 ../../network/netconnect.pm_.c:164
+#: ../../network/netconnect.pm_.c:190 ../../network/netconnect.pm_.c:213
+#: ../../network/netconnect.pm_.c:221
+#, fuzzy
+msgid "Network Configuration Wizard"
+msgstr "ISDN-a Konfigura�on"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Nomo de interretprovizanto (ekz-e provizanto.net)"
+#: ../../network/isdn.pm_.c:22
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "Interna ISDN-karto"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "Telefonnumero de interretprovizanto"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Interna ISDN-karto"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "Provizanto DNS 1"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "Kia estas via ISDN-a konekta�o?"
 
-#: ../../netconnect.pm_.c:248
-msgid "Provider dns 2"
-msgstr "Provizanto DNS 2"
+#: ../../network/isdn.pm_.c:45
+msgid ""
+"Which ISDN configuration do you prefer?\n"
+"\n"
+"* The Old configuration uses isdn4net. It contains powerfull\n"
+"  tools, but is tricky to configure, and not standard.\n"
+"\n"
+"* The New configuration is easier to understand, more\n"
+"  standard, but with less tools.\n"
+"\n"
+"We recommand the light configuration.\n"
+msgstr ""
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "Diskuma modalo"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "New configuration (isdn-light)"
+msgstr "Konfigura�o de barilo detektata!"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Konta Salutnomo (uzula nomo)"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "Old configuration (isdn4net)"
+msgstr "Konfigura�o de barilo detektata!"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Konta Pasvorto"
+#: ../../network/isdn.pm_.c:169 ../../network/isdn.pm_.c:187
+#: ../../network/isdn.pm_.c:197 ../../network/isdn.pm_.c:204
+#: ../../network/isdn.pm_.c:214
+msgid "ISDN Configuration"
+msgstr "ISDN-a Konfigura�on"
+
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Elektu vian interretprovizanton.\n"
+" Se �in ne estas en la listo, elektu Nelisti�itan"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "E�ropo"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "Protokolo"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol (EDSS1)"
 msgstr "E�ropo (EDSS1)"
 
-#: ../../netconnect.pm_.c:263
-msgid "Rest of the world"
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
+msgid "Protocol for the rest of the world"
 msgstr "La cetero de la mondo"
 
-#: ../../netconnect.pm_.c:263
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
 msgid ""
-"Rest of the world \n"
+"Protocol for the rest of the world \n"
 " no D-Channel (leased lines)"
 msgstr ""
 "La cetero de la mondo \n"
 " neniom da D-Kanelo (lukontraktataj lineoj)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Kiun protokolon vi deziras uzi?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Kiun specon de karto vi havas?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "Mi ne scias"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../netconnect.pm_.c:284
+#: ../../network/isdn.pm_.c:205
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -5213,19 +5070,19 @@ msgstr ""
 "Se vi havas PCMCIA-an karton, vi bezonas scii la IRQ-o kaj I/O (Eneligo)\n"
 "por via karto.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "�esigu"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "�u mi devus da�ri?"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "Kiu estas via ISDN-a karto?"
 
-#: ../../netconnect.pm_.c:314
+#: ../../network/isdn.pm_.c:234
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
@@ -5234,241 +5091,131 @@ msgstr ""
 "elektu\n"
 "unu el la PCI-aj kartojn sur la sekvanta ekrano."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 "Neniu ISDN-a PCI-a karto trovata.  Bonvole elektu unu el la PCI-aj kartojn "
 "sur\n"
 "la sekvanta ekrano."
 
-#: ../../netconnect.pm_.c:371
-#, fuzzy
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Mi ne detektas eterretan retadaptilom sur via sistemo.  Bonvole lan�u la\n"
-"aparatokonfigurilon."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "Elektu la retan interfacon"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr ""
-"Bonvole elektu kiun retadaptilon vi deziras uzi por konekti al la interreto"
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "Reta interfaco"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"�u vi konsentas?"
-
-#: ../../netconnect.pm_.c:386
-#, fuzzy
-msgid "I'm about to restart the network device:\n"
-msgstr "�u vi deziras provi la konfigura�on?"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "ADSL Konfigura�o"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "�u vi deziras starti vian konekta�on je startado de la sistemo?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Bonvole, elektu al kiu seria pordo estas via modemo konektata?"
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Telefon-konektaj opcioj"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "Nomo de konekto"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "Telefonnumero"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "Salutnomo"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "A�tentikigado"
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
+msgid "CHAP"
+msgstr ""
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "PAP"
 msgstr "PAP (Pasvorta A�tentikigada Protokolo)"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Script-based"
 msgstr "Programeto-bazata"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Finaparato-bazata"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Domajna nomo"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
-#, fuzzy
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
-msgstr "Unu DNA-a Servilo"
+msgstr "Unu DNS-a Servilo (nedeviga)"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
-#, fuzzy
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 msgid "Second DNS Server (optional)"
-msgstr "Dua DNA Servilo"
-
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr ""
+msgstr "Du DNS-a Servilo (nedeviga)"
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
 msgstr ""
 
-#: ../../netconnect.pm_.c:745 ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:33 ../../network/netconnect.pm_.c:36
 #, fuzzy
 msgid ""
 "\n"
 "You can reconfigure your connection."
 msgstr "Konfiguru interretan konekta�on"
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 #, fuzzy
 msgid "You are currently connected to internet."
 msgstr "Kiel vi deziras konekti al la Interreto?"
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 #, fuzzy
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
 msgstr "Konektu al la Interreto / Konfiguru lokan Reton"
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 #, fuzzy
 msgid "You are not currently connected to Internet."
 msgstr "Kiel vi deziras konekti al la Interreto?"
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
-#, fuzzy
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
-msgstr "Konekti al la interreto"
+msgstr "Konektu al la Interreto"
 
-#: ../../netconnect.pm_.c:754
-#, fuzzy
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
-msgstr "Malkonekti el la interreto"
+msgstr "Malkonektu el la Interreto"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 #, fuzzy
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Konfiguru interretan konekta�on"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Interreta konekta�o kaj konfiguro"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-#, fuzzy
-msgid "Network Configuration Wizard"
-msgstr "ISDN-a Konfigura�on"
-
-#: ../../netconnect.pm_.c:812
-#, fuzzy
-msgid "External ISDN modem"
-msgstr "Interna ISDN-karto"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Interna ISDN-karto"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "Kia estas via ISDN-a konekta�o?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Konektu al la Interreto"
-
-#: ../../netconnect.pm_.c:834
-#, fuzzy
-msgid ""
-"The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few ones use dhcp.\n"
-"If you don't know, choose 'use pppoe'"
-msgstr ""
-"La plej ofte uzata maniero por konekti kun ADSL estas dhcp + pppoe.\n"
-"Tamen, ekzistas konektojn kiuj nur uzas dhcp.\n"
-"Se vi ne scias, elektu 'uzu pppoe'"
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr ""
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "uzu pppoe"
-
-#: ../../netconnect.pm_.c:836
-#, fuzzy
-msgid "use pptp"
-msgstr "uzu pppoe"
-
-#: ../../netconnect.pm_.c:846
+#: ../../network/netconnect.pm_.c:96
 #, fuzzy, c-format
-msgid "I'm about to restart the network device %s. Do you agree?"
-msgstr "�u vi deziras provi la konfigura�on?"
-
-#: ../../netconnect.pm_.c:883
-msgid ""
-"Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
-msgstr ""
-"Kiun dhcp-an klienton vi deziras uzi?\n"
-"La defa�lto estas dhcpcd"
-
-#: ../../netconnect.pm_.c:900
-#, fuzzy
-msgid "Network configuration"
-msgstr "ISDN-a Konfigura�on"
-
-#: ../../netconnect.pm_.c:901
-#, fuzzy
-msgid "Do you want to restart the network"
-msgstr "�u vi deziras provi la konfigura�on?"
+msgid "We are now going to configure the %s connection."
+msgstr "Konfiguru interretan konekta�on"
 
-#: ../../netconnect.pm_.c:904
+#: ../../network/netconnect.pm_.c:105
 #, fuzzy, c-format
 msgid ""
-"A problem occured while restarting the network: \n"
 "\n"
-"%s"
-msgstr "�u vi deziras provi la konfigura�on?"
+"\n"
+"\n"
+"We are now going to configure the %s connection.\n"
+"\n"
+"\n"
+"Press OK to continue."
+msgstr "Konfiguru interretan konekta�on"
 
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:129 ../../network/netconnect.pm_.c:243
+#: ../../network/netconnect.pm_.c:255 ../../network/tools.pm_.c:56
+msgid "Network Configuration"
+msgstr "Reta Konfigura�o"
+
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -5476,7 +5223,7 @@ msgid ""
 "Internet & Network connection.\n"
 msgstr ""
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -5484,105 +5231,118 @@ msgid ""
 "If you don't want to use the auto detection, deselect the checkbox.\n"
 msgstr ""
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 #, fuzzy
 msgid "Choose the profile to configure"
 msgstr "Elektu la defa�ltan uzulon:"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
 msgstr ""
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "Detektas aparatojn..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, fuzzy
 msgid "Normal modem connection"
 msgstr "Konfiguru interretan konekta�on"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, fuzzy, c-format
 msgid "detected on port %s"
 msgstr "Duobla surmetingo %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, fuzzy
 msgid "ISDN connection"
 msgstr "Konfiguru interretan konekta�on"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr ""
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, fuzzy
-msgid "DSL (or ADSL) connection"
-msgstr "Konfiguru interretan konekta�on"
+msgid "ADSL connection"
+msgstr "LAN Konfigura�o"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, fuzzy, c-format
 msgid "detected on interface %s"
 msgstr "Reta interfaco"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 #, fuzzy
 msgid "Cable connection"
 msgstr "Konfiguru interretan konekta�on"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 #, fuzzy
+msgid "cable connection detected"
+msgstr "Konfiguru interretan konekta�on"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
-msgstr "ADSL Konfigura�o"
+msgstr "LAN Konfigura�o"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr ""
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "Kiel vi deziras konekti al la Interreto?"
+#: ../../network/netconnect.pm_.c:190
+#, fuzzy
+msgid "Choose the connection you want to configure"
+msgstr "Elektu la ilon kiun vi deziras instali"
 
-#: ../../netconnect.pm_.c:1004
+#: ../../network/netconnect.pm_.c:214
 msgid ""
-"Congratulation, The network and internet configuration is finished.\n"
+"You have configured multiple ways to connect to the Internet.\n"
+"Choose the one you want to use.\n"
 "\n"
-"The configuration will now be applied to your system."
 msgstr ""
 
-#: ../../netconnect.pm_.c:1007
-msgid ""
-"After that is done, we recommend you to restart your X\n"
-"environnement to avoid hostname changing problem."
-msgstr ""
+#: ../../network/netconnect.pm_.c:215
+#, fuzzy
+msgid "Internet connection"
+msgstr "Disdividado de Interreta Konekto"
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "neniu retkarto trovita"
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "�u vi deziras starti vian konekta�on je startado de la sistemo?"
 
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "Konfiguras reto"
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "Reta Konfigura�o"
+
+#: ../../network/netconnect.pm_.c:240
+msgid "The network needs to be restarted"
+msgstr ""
 
-#: ../../network.pm_.c:278
+#: ../../network/netconnect.pm_.c:243
+#, fuzzy, c-format
 msgid ""
-"Please enter your host name if you know it.\n"
-"Some DHCP servers require the hostname to work.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''."
+"A problem occured while restarting the network: \n"
+"\n"
+"%s"
+msgstr "�u vi deziras provi la konfigura�on?"
+
+#: ../../network/netconnect.pm_.c:247
+msgid ""
+"Congratulations, the network and internet configuration is finished.\n"
+"\n"
+"The configuration will now be applied to your system.\n"
 msgstr ""
-"Bonvole enigu vian po�tejon se vi scias �in.\n"
-"Iuj DHCP-aj serviloj bezonas po�tejon por funkcii.\n"
-"Via po�tejo devus esti plene specifita po�tejo,\n"
-"ekzemple ``miakomputilo.mialaborejo.miafirmao.com''."
 
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "Po�tejo"
+#: ../../network/netconnect.pm_.c:250
+msgid ""
+"After that is done, we recommend you to restart your X\n"
+"environnement to avoid hostname changing problem."
+msgstr ""
 
-#: ../../network.pm_.c:319
+#: ../../network/network.pm_.c:283
 #, fuzzy
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
@@ -5595,7 +5355,7 @@ msgstr ""
 "Simple klaki JES por teni la konfiguron de �i tiu aparato.\n"
 "Se vi modifos la subajn kampojn, vi �an�os �i tiun konfiguron."
 
-#: ../../network.pm_.c:324
+#: ../../network/network.pm_.c:288
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
@@ -5605,38 +5365,38 @@ msgstr ""
 "�iu ero devus esti enigata kiel IP-adreson en punktita-decimala notacio\n"
 "(ekzemple, 1.2.3.4)."
 
-#: ../../network.pm_.c:333 ../../network.pm_.c:334
+#: ../../network/network.pm_.c:297 ../../network/network.pm_.c:298
 #, c-format
 msgid "Configuring network device %s"
 msgstr "Konfiguras retan aparaton %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr ""
+#: ../../network/network.pm_.c:298
+#, fuzzy, c-format
+msgid " (driver %s)"
+msgstr "XFree86 pelilo: %s\n"
 
-#: ../../network.pm_.c:336 ../../standalone/draknet_.c:231
-#: ../../standalone/draknet_.c:427
+#: ../../network/network.pm_.c:300 ../../standalone/draknet_.c:255
+#: ../../standalone/draknet_.c:461
 msgid "IP address"
 msgstr "IP-adreso"
 
-#: ../../network.pm_.c:337 ../../standalone/draknet_.c:428
+#: ../../network/network.pm_.c:301 ../../standalone/draknet_.c:462
 msgid "Netmask"
 msgstr "Retmasko"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "(bootp/dhcp)"
 msgstr "(bootp/dhcp)"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "Automatic IP"
 msgstr "A�tomata IP"
 
-#: ../../network.pm_.c:359 ../../printerdrake.pm_.c:102
-#: ../../printerdrake.pm_.c:425
+#: ../../network/network.pm_.c:323 ../../printerdrake.pm_.c:406
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-adreso devus esti en la notacio 1.2.3.4"
 
-#: ../../network.pm_.c:388
+#: ../../network/network.pm_.c:351
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -5648,43 +5408,151 @@ msgstr ""
 "ekzemple ``miakomputilo.mialaborejo.miafirmao.com''.\n"
 "Vi anka� povas enigi la IP-adreson de la prokura kluzo se via havas unu."
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "DNA servilo"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
 msgstr "Kluzo"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "Prokura kluzaparato"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Konfigurado de prokuraj serviloj"
 
-#: ../../network.pm_.c:408
+#: ../../network/network.pm_.c:372
 msgid "HTTP proxy"
 msgstr "HTTP prokura servilo"
 
-#: ../../network.pm_.c:409
+#: ../../network/network.pm_.c:373
 msgid "FTP proxy"
 msgstr "FTP prokura servilo"
 
-#: ../../network.pm_.c:412
+#: ../../network/network.pm_.c:374
+msgid "Track network card id (usefull for laptops)"
+msgstr ""
+
+#: ../../network/network.pm_.c:377
 msgid "Proxy should be http://..."
 msgstr "Prokura servilo devus esti http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "Prokura servilo devus esti ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Interreta Konfigurado"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "�u vi deziras provi konekti al la interreto nun?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+#, fuzzy
+msgid "Testing your connection..."
+msgstr "Konfiguru interretan konekta�on"
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+#, fuzzy
+msgid "The system is now connected to Internet."
+msgstr "Kiel vi deziras konekti al la Interreto?"
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr ""
+
+#: ../../network/tools.pm_.c:51 ../../standalone/draknet_.c:220
+#, fuzzy
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr "Konektu al la Interreto / Konfiguru lokan Reton"
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Konfigurado de Konekto"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Bonvole plenigu a� marku la suban kampon"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "IRQ de Karto"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "Memoro de Karto (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "I/O (Eneligo) de Karto"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "I/O 0 (Eneligo 0) de Karto"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "I/O 1 (Eneligo 1) de Karto"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "Via persona telefonnumero"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Nomo de interretprovizanto (ekz-e provizanto.net)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "Telefonnumero de interretprovizanto"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "Provizanto DNS 1 (nedeviga)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "Provizanto DNS 2 (nedeviga)"
+
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "Elektu vian klavaron"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "Diskuma modalo"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+#, fuzzy
+msgid "Connection speed"
+msgstr "Speco de konekto"
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "Speco de konekto"
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Konta Salutnomo (uzula nomo)"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Konta Pasvorto"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
 msgstr "�i tiu platformo ne subtenas etendatajn subdiskojn"
 
-#: ../../partition_table.pm_.c:581
+#: ../../partition_table.pm_.c:640
 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 "
@@ -5694,26 +5562,21 @@ msgstr ""
 "La sola solvo estas movi viajn �efajn subdiskojn por situigi la truon\n"
 "apud la etendataj subdiskoj."
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "Eraro legante dosiero %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Resta�ris el dosiero %s malsukcesis: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "Malbona rezerva dosiero"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Eraro skribante al dosiero %s"
 
-#: ../../partition_table_raw.pm_.c:161
+#: ../../partition_table_raw.pm_.c:154
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
@@ -5740,49 +5603,213 @@ msgstr "agrabla(j)"
 msgid "maybe"
 msgstr "elbe"
 
-#: ../../printer.pm_.c:20
+#: ../../printer.pm_.c:23
+msgid "CUPS - Common Unix Printing System"
+msgstr ""
+
+#: ../../printer.pm_.c:24
+msgid "LPRng - LPR New Generation"
+msgstr ""
+
+#: ../../printer.pm_.c:25
+msgid "LPD - Line Printer Daemon"
+msgstr ""
+
+#: ../../printer.pm_.c:26
+msgid "PDQ - Print, Don't Queue"
+msgstr ""
+
+#: ../../printer.pm_.c:32
+msgid "CUPS"
+msgstr ""
+
+#: ../../printer.pm_.c:33
+msgid "LPRng"
+msgstr ""
+
+#: ../../printer.pm_.c:34
+msgid "LPD"
+msgstr ""
+
+#: ../../printer.pm_.c:35
+msgid "PDQ"
+msgstr ""
+
+#: ../../printer.pm_.c:40
 msgid "Local printer"
 msgstr "Loka printilo"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "Malproksima printilo"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
+#: ../../printer.pm_.c:42
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "Malproksima CUPS-a servilo"
+
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "Malproksimaj lpd servilo"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "Reta Printilo (ingo)"
 
-#: ../../printer.pm_.c:25
-msgid "SMB/Windows 95/98/NT"
+#: ../../printer.pm_.c:45
+#, fuzzy
+msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/Vindozo 95/98/NT"
 
-#: ../../printer.pm_.c:26
-msgid "NetWare"
-msgstr "NetWare"
+#: ../../printer.pm_.c:46
+#, fuzzy
+msgid "Printer on NetWare server"
+msgstr "Printservilo"
 
-#: ../../printer.pm_.c:27 ../../printerdrake.pm_.c:158
-#: ../../printerdrake.pm_.c:160
-msgid "Printer Device URI"
+#: ../../printer.pm_.c:47
+#, fuzzy
+msgid "Enter a printer device URI"
 msgstr "Printila Aparato URI"
 
-#: ../../printerdrake.pm_.c:19
+#: ../../printer.pm_.c:48
+msgid "Pipe job into a command"
+msgstr ""
+
+#: ../../printer.pm_.c:418 ../../printer.pm_.c:839
+#: ../../printerdrake.pm_.c:1227 ../../printerdrake.pm_.c:2023
+msgid "Unknown model"
+msgstr ""
+
+#: ../../printer.pm_.c:546 ../../printerdrake.pm_.c:790
+msgid "Raw printer (No driver)"
+msgstr ""
+
+#: ../../printer.pm_.c:693
+#, fuzzy, c-format
+msgid "(on %s)"
+msgstr "(modulo %s)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "Elektu Printilan Konekton"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "Kiel estas la printilo konektata?"
+
+#: ../../printerdrake.pm_.c:25
+#, fuzzy
+msgid ""
+"\n"
+"Printers on remote CUPS servers you do not have to configure\n"
+"here; these printers will be automatically detected. Please\n"
+"select \"Printer on remote CUPS server\" in this case."
+msgstr ""
+"Kun malproksima CUPS servilo, vi ne devas konfiguri iun printilon\n"
+"�i tie; printiloj estos a�tomate dektektataj.  Se vi havas dubojn,\n"
+"elektu \"Malproksima CUPS servilo\"."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+#, fuzzy
+msgid "None"
+msgstr "Finata"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Elektu la defa�ltan uzulon:"
+
+#: ../../printerdrake.pm_.c:105
+msgid ""
+"With remote CUPS servers, you do not have to configure any \n"
+"printer here; CUPS servers inform your machine automatically\n"
+"about their printers. All printers known to your machine\n"
+"currently are listed in the \"Default printer\" field. Choose\n"
+"the default printer for your machine there and click the\n"
+"\"Apply/Re-read printers\" button. Click the same button to\n"
+"refresh the list (it can take up to 30 seconds after the start\n"
+"of CUPS until all remote printers are visible).\n"
+"When your CUPS server is in a different network, you have to \n"
+"give the CUPS server IP address and optionally the port number\n"
+"to get the printer information from the server, otherwise leave\n"
+"these fields blank."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:117
+msgid ""
+"\n"
+"Normally, CUPS is automatically configured according to your\n"
+"network environment, so that you can access the printers on the\n"
+"CUPS servers in your local network. If this does not work \n"
+"correctly, turn off \"Automatic CUPS configuration\" and edit\n"
+"your file /etc/cups/cupsd.conf manually. Do not forget to restart\n"
+"CUPS afterwards (command: \"service cups restart\")."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:124 ../../printerdrake.pm_.c:1290
+#: ../../printerdrake.pm_.c:1294 ../../printerdrake.pm_.c:1295
+#: ../../printerdrake.pm_.c:1296 ../../printerdrake.pm_.c:2011
+msgid "Close"
+msgstr "Malfermu"
+
+#: ../../printerdrake.pm_.c:125
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "Malproksima printilo"
+
+#: ../../printerdrake.pm_.c:129
+#, fuzzy
+msgid "The IP address should look like 192.168.1.20"
+msgstr "IP-adreso devus esti en la notacio 1.2.3.4"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+msgid "The port number should be an integer!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+#, fuzzy
+msgid "Default printer"
+msgstr "Loka printilo"
+
+#: ../../printerdrake.pm_.c:146
+#, fuzzy
+msgid "CUPS server IP"
+msgstr "IP de SMB servilo"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Pordo"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "Post-instala konfigurado"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "Detektas aparatojn..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "Provu pordojn"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Printilo, tipo \"%s\", estas detektita �e "
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Loka Printila Aparato"
 
-#: ../../printerdrake.pm_.c:53
+#: ../../printerdrake.pm_.c:256
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -5790,37 +5817,60 @@ msgstr ""
 "Al kiu aparato estas via printilo konektata\n"
 "(notu ke /dev/lp0 egalas LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Printila Aparato"
 
-#: ../../printerdrake.pm_.c:74
+#: ../../printerdrake.pm_.c:261
+msgid "Device/file name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:274 ../../printerdrake.pm_.c:698
+#: ../../printerdrake.pm_.c:786
+#, fuzzy
+msgid "Reading printer database ..."
+msgstr "Legas datumbason de CUPS peliloj..."
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "Malproksimaj lpd Printilaj Opcioj"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:313
+#, fuzzy
 msgid ""
-"To use a remote lpd print queue, you need to supply\n"
-"the hostname of the printer server and the queue name\n"
-"on that server which jobs should be placed in."
+"To use a remote lpd printer, you need to supply\n"
+"the hostname of the printer server and the printer name\n"
+"on that server."
 msgstr ""
 "Por uzi malproksima lpd printvico, vi devas provizi la po�tejon de la\n"
 "printservilo kaj la printviconomon �e tiu servilo en kiun taskoj devus\n"
 "esti metata."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
 msgstr "Malproksima po�tejo"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Malproksima printvico"
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "Malproksima printilo"
+
+#: ../../printerdrake.pm_.c:320
+#, fuzzy
+msgid "Remote host name missing!"
+msgstr "Malproksima po�tejo"
+
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "Malproksima po�tejo"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Vindozo 9x/NT) Printilaj Opcioj"
 
-#: ../../printerdrake.pm_.c:89
+#: ../../printerdrake.pm_.c:393
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -5835,29 +5885,37 @@ msgstr ""
 "aldone al la opuzan nomon de la printilo vi deziras atingi kaj iun ajn\n"
 "ta�gan salutnomon, pasvorton, kaj laborgrupan informon."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "Po�tejo de SMB servilo"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "IP de SMB servilo"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "Opuza nomo"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "Laborgrupo"
 
-#: ../../printerdrake.pm_.c:124
+#: ../../printerdrake.pm_.c:410
+msgid "Either the server name or the server's IP must be given!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:414
+msgid "Samba share name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:473
 msgid "NetWare Printer Options"
 msgstr "NetWare Printilaj Opcioj"
 
-#: ../../printerdrake.pm_.c:125
+#: ../../printerdrake.pm_.c:474
 msgid ""
-"To print to a NetWare printer, you need to provide the\n"
+"To print on a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
 "TCP/IP hostname!) as well as the print queue name for the printer you\n"
 "wish to access and any applicable user name and password."
@@ -5867,59 +5925,228 @@ msgstr ""
 "printvican nomon por la printilo vi deziras atingi kaj iun ajn ta�gan\n"
 "salutnomon kaj pasvorton."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Printservilo"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "Printvica Nomo"
 
-#: ../../printerdrake.pm_.c:142
+#: ../../printerdrake.pm_.c:484
+msgid "NCP server name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:488
+msgid "NCP queue name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:527
 msgid "Socket Printer Options"
 msgstr "Ing-Printilaj Opcioj"
 
-#: ../../printerdrake.pm_.c:143
+#: ../../printerdrake.pm_.c:528
+#, fuzzy
 msgid ""
 "To print to a socket printer, you need to provide the\n"
-"hostname of the printer and optionally the port number."
+"host name of the printer and optionally the port number.\n"
+"On HP JetDirect servers the port number is usually 9100,\n"
+"on other servers it can vary. See the manual of your\n"
+"hardware."
 msgstr ""
 "Por printi al inga printilo, vi bezonas provizi la\n"
 "po�tejon de la printilo kaj opcie la pordnumeron."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
+msgstr "Printilaj Po�tejo"
+
+#: ../../printerdrake.pm_.c:537
+#, fuzzy
+msgid "Printer host name missing!"
 msgstr "Printilaj Po�tejo"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Pordo"
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "Printila Aparato URI"
+
+#: ../../printerdrake.pm_.c:567
+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 ""
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "Vi povas specifi rekte la URI por atingi la printilon per CUPS."
+#: ../../printerdrake.pm_.c:582
+msgid "A valid URI must be entered!"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
+#: ../../printerdrake.pm_.c:682
+msgid ""
+"Every printer needs a name (for example lp).\n"
+"The Description and Location fields do not need \n"
+"to be filled in. They are comments for the users."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:685
+msgid "Name of printer"
+msgstr "Nomo de printilo"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Priskribo"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Loko"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "Legas datumbason de CUPS peliloj..."
+
+#: ../../printerdrake.pm_.c:793
+#, fuzzy
+msgid "Printer model selection"
+msgstr "Printilan Konekton"
+
+#: ../../printerdrake.pm_.c:794
+#, fuzzy
+msgid "Which printer model do you have?"
 msgstr "Kiun specon de printilo vi havas?"
 
-#: ../../printerdrake.pm_.c:204 ../../printerdrake.pm_.c:305
-msgid "Do you want to test printing?"
+#: ../../printerdrake.pm_.c:866
+#, fuzzy
+msgid "OKI winprinter configuration"
+msgstr "Interreta Konfigurado"
+
+#: ../../printerdrake.pm_.c:867
+msgid ""
+"You are configuring an OKI laser winprinter. These printers\n"
+"use a very special communication protocol and therefore they\n"
+"work only when connected to the first parallel port. When\n"
+"your printer is connected to another port or to a print\n"
+"server box please connect the printer to the first parallel\n"
+"port before you print a test page. Otherwise the printer\n"
+"will not work. Your connection type setting will be ignored\n"
+"by the driver."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:916 ../../printerdrake.pm_.c:946
+#, fuzzy
+msgid "Lexmark inkjet configuration"
+msgstr "Interreta Konfigurado"
+
+#: ../../printerdrake.pm_.c:917
+msgid ""
+"The inkjet printer drivers provided by Lexmark only support\n"
+"local printers, no printers on remote machines or print server\n"
+"boxes. Please connect your printer to a local port or\n"
+"configure it on the machine where it is connected to."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:947
+msgid ""
+"To be able to print with your Lexmark inkjet and this\n"
+"configuration, you need the inkjet printer drivers\n"
+"provided by Lexmark (http://www.lexmark.com/). Go to\n"
+"the US site and click on the \"Drivers\" button. Then\n"
+"choose your model and afterwards \"Linux\" as\n"
+"operating system. The drivers come as RPM packages\n"
+"or shell scripts with interactive graphical installation.\n"
+"You do not need to do this configuration by the\n"
+"graphical frontends. Cancel directly after the license\n"
+"agreement. Then print printhead alignment pages with\n"
+"\"lexmarkmaintain\" and adjust the head alignment\n"
+"settings with this program."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1079
+msgid ""
+"Printer default settings\n"
+"You should make sure that the page size and the\n"
+"ink type (if available) are set correctly. Note\n"
+"that with a very high printout quality printing\n"
+"can get substantially slower."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1090
+#, c-format
+msgid "Option %s must be an integer number!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1094
+#, c-format
+msgid "Option %s must be a number!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1099
+#, c-format
+msgid "Option %s out of range!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1136
+#, fuzzy, c-format
+msgid ""
+"Do you want to set this printer (\"%s\")\n"
+"as the default printer?"
 msgstr "�u vi deziras provi printado?"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "Provu pordojn"
+
+#: ../../printerdrake.pm_.c:1153
+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\n"
+"and on laser printers with too low memory it can even not come out.\n"
+"In most cases it is enough to print the standard test page."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1158
+#, fuzzy
+msgid "No test pages"
+msgstr "Jes, printu amba� de la provpa�ojn"
+
+#: ../../printerdrake.pm_.c:1159
+#, fuzzy
+msgid "Print"
+msgstr "Printilo"
+
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "La�norma"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "Printas provpa�o(j)n..."
+
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "Printas provpa�o(j)n..."
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "Printas provpa�o(j)n..."
 
-#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:324
-#, c-format
+#: ../../printerdrake.pm_.c:1200
+#, fuzzy, c-format
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
+"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"
-"Does it work properly?"
 msgstr ""
 "Provpa�o(j)n estis sendataj al la printila demono.\n"
 "�i tiu eble postulas iom da tempo anta� ol la printilo komencas.\n"
@@ -5928,237 +6155,599 @@ msgstr ""
 "\n"
 "�u �i �uste funkcias?"
 
-#: ../../printerdrake.pm_.c:218 ../../printerdrake.pm_.c:328
+#: ../../printerdrake.pm_.c:1204
+#, fuzzy
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Does it work properly?"
+"Test page(s) have been sent to the printer.\n"
+"It may take some time before the printer starts.\n"
 msgstr ""
 "Provpa�o(j)n estis sendataj al la printila demono.\n"
 "�i tiu eble postulas iom da tempo anta� ol la printilo komencas.\n"
 "�u �i �uste funkcias?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "Jes, printu Askian provpa�on"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "Jes, printu PostSkriban provpa�on"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Neniu printilo"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "Jes, printu amba� de la provpa�ojn"
+#: ../../printerdrake.pm_.c:1237
+#, 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 "
+"\"qtcups <file>\". The graphical tools allow you to choose the printer and "
+"to modify the option settings easily.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:243
-msgid "Configure Printer"
-msgstr "Konfiguru Printilon"
+#: ../../printerdrake.pm_.c:1239
+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 ""
 
-#: ../../printerdrake.pm_.c:273
-msgid "Printer options"
+#: ../../printerdrake.pm_.c:1242 ../../printerdrake.pm_.c:1254
+#: ../../printerdrake.pm_.c:1266
+#, 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 ""
+
+#: ../../printerdrake.pm_.c:1244 ../../printerdrake.pm_.c:1284
+msgid ""
+"To get a list of the options available for the current printer read either "
+"the list shown below or click on the \"Print option list\" button.\n"
+"\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1249 ../../printerdrake.pm_.c:1261
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\".\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1251 ../../printerdrake.pm_.c:1263
+#: ../../printerdrake.pm_.c:1275
+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 ""
+
+#: ../../printerdrake.pm_.c:1256 ../../printerdrake.pm_.c:1268
+msgid ""
+"To get a list of the options available for the current printer click on the "
+"\"Print option list\" button.\n"
+"\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1273
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\" or \"%s <file>\".\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1277
+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 ""
+
+#: ../../printerdrake.pm_.c:1281
+#, 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 ""
+
+#: ../../printerdrake.pm_.c:1292
+#, fuzzy, c-format
+msgid "Printing on the printer \"%s\""
+msgstr "Haltas de la reto"
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
 msgstr "Printilaj opcioj"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Papergrandeco"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+#, fuzzy
+msgid "Reading printer data ..."
+msgstr "Legas datumbason de CUPS peliloj..."
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "El�etu pa�on post tasko?"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "Interreta Konfigurado"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Uniprint-aj pelilaj opcioj"
+#: ../../printerdrake.pm_.c:1339
+#, c-format
+msgid ""
+"You can copy the printer configuration which you have done \n"
+"for the spooler %s to %s, your current spooler. All the\n"
+"configuration data (printer name, description, location, \n"
+"connection type, and default option settings) is overtaken,\n"
+"but jobs will not be transferred.\n"
+"Not all queues can be transferred due to the following \n"
+"reasons:\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:281
-msgid "Color depth options"
-msgstr "Kolorprofunecaj opcioj"
+#: ../../printerdrake.pm_.c:1347
+msgid ""
+"CUPS does not support printers on Novell servers or printers\n"
+"sending the data into a free-formed command.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:283
-msgid "Print text as PostScript?"
-msgstr "Printu tekston kiel PostScripto?"
+#: ../../printerdrake.pm_.c:1350
+msgid ""
+"PDQ only supports local printers, remote LPD printers, and\n"
+"Socket/TCP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:285
-msgid "Fix stair-stepping text?"
-msgstr "Riparu �tuparan tekston?"
+#: ../../printerdrake.pm_.c:1353
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:287
-msgid "Number of pages per output pages"
-msgstr "Nombro de pa�oj en eliga pa�o"
+#: ../../printerdrake.pm_.c:1355
+msgid ""
+"In addition, queues not created with this program or\n"
+"\"foomatic-configure\" cannot be transferred."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:288
-msgid "Right/Left margins in points (1/72 of inch)"
+#: ../../printerdrake.pm_.c:1357
+msgid ""
+"\n"
+"Also printers configured with the PPD files provided by\n"
+"their manufacturers or with native CUPS drivers can not be\n"
+"transferred."
 msgstr ""
-"Dekstra/Maldrekstra mar�enoj en punktoj (1/72 de colo, proksimume 1/3 mm)"
 
-#: ../../printerdrake.pm_.c:289
-msgid "Top/Bottom margins in points (1/72 of inch)"
-msgstr "Supra/Malsupra mar�enoj en punktoj (1/72 de colo, proksimume 1/3 mm)"
+#: ../../printerdrake.pm_.c:1360
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:291
-msgid "Extra GhostScript options"
-msgstr "Aldonaj GhostScript-aj opcioj"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "Aldonaj Tekstaj opcioj"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "Inversigu ordon de pa�oj"
+#: ../../printerdrake.pm_.c:1377
+#, 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 ""
 
-#: ../../printerdrake.pm_.c:345
-msgid "Would you like to configure a printer?"
-msgstr "�u vi deziras konfiguri printilon?"
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:351
+#: ../../printerdrake.pm_.c:1390
+#, c-format
 msgid ""
-"Here are the following print queues.\n"
-"You can add some more or change the existing ones."
+"The printer \"%s\" already exists,\n"
+"do you really want to overwrite its configuration?"
 msgstr ""
-"Jen la sekvantaj printvicoj.\n"
-"Vi povas aldoni pli a� �an�i la ekzistantajn."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "CUPS startas"
+#: ../../printerdrake.pm_.c:1398
+#, fuzzy
+msgid "New printer name"
+msgstr "Neniu printilo"
+
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1412
+#, c-format
+msgid ""
+"You have transferred your former default printer (\"%s\"),\n"
+"Should it be also the default printer under the\n"
+"new printing system %s?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:370
-msgid "Reading CUPS drivers database..."
+#: ../../printerdrake.pm_.c:1423
+#, fuzzy
+msgid "Refreshing printer data ..."
 msgstr "Legas datumbason de CUPS peliloj..."
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "Elektu Printilan Konekton"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+msgid "Configuration of a remote printer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "Kiel estas la printilo konektata?"
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "Startas vian konekta�on..."
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "Elektu Malproksiman Printilan Konekton"
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "Konfiguru retumon"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "Ekrano ne estas konfigurata"
+
+#: ../../printerdrake.pm_.c:1456
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected.\n"
-"In case of doubt, select \"Remote CUPS server\"."
+"You are going to configure a remote printer. This needs working\n"
+"network access, but your network is not configured yet. If you\n"
+"go on without network configuration, you will not be able to use\n"
+"the printer which you are configuring now. How do you want \n"
+"to proceed?"
 msgstr ""
-"Kun malproksima CUPS servilo, vi ne devas konfiguri iun printilon\n"
-"�i tie; printiloj estos a�tomate dektektataj.  Se vi havas dubojn,\n"
-"elektu \"Malproksima CUPS servilo\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1463
 #, fuzzy
+msgid "Go on without configuring the network"
+msgstr "Konfiguras reto"
+
+#: ../../printerdrake.pm_.c:1496
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected\n"
-"unless you have a server on a different network; in the\n"
-"latter case, you have to give the CUPS server IP address\n"
-"and optionally the port number."
+"The network configuration done during the installation \n"
+"cannot be started now. Please check whether the network\n"
+"gets accessable after booting your system and correct the\n"
+"configuration using the Mandrake Control Center, section\n"
+"\"Network & Internet\"/\"Connection\", and afterwards set\n"
+"up the printer, also using the Mandrake Control Center,\n"
+"section \"Hardware\"/\"Printer\""
 msgstr ""
-"Kun malproksima CUPS servilo, vi ne devas konfiguri iun printilon\n"
-"�i tie; printiloj estos a�tomate dektektataj.  Se vi havas dubojn,\n"
-"elektu \"Malproksima CUPS servilo\"."
 
-#: ../../printerdrake.pm_.c:421
+#: ../../printerdrake.pm_.c:1503
+msgid ""
+"The network access was not running and could not be \n"
+"started. Please check your configuration and your \n"
+"hardware. Then try to configure your remote printer\n"
+"again."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1516
 #, fuzzy
-msgid "CUPS server IP"
-msgstr "IP de SMB servilo"
+msgid "Restarting printing system ..."
+msgstr "Kiun printsistemo vi deziras uzi?"
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "Alta"
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Paranoja"
+
+#: ../../printerdrake.pm_.c:1549
+#, c-format
+msgid "Installing a printing system in the %s security level"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:429
-msgid "Port number should be numeric"
+#: ../../printerdrake.pm_.c:1550
+#, c-format
+msgid ""
+"You are about to install the printing system %s on\n"
+"a system running in the %s security level.\n"
+"\n"
+"This printing system runs a daemon (background process)\n"
+"which waits for print jobs and handles them. This daemon\n"
+"is also accessable by remote machines through the network\n"
+"and so it is a possible point for attacks. Therefore only\n"
+"a few selected daemons are started by default in this\n"
+"security level.\n"
+"\n"
+"Do you really want to configure printing on this\n"
+"machine?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "Malinstalu printvicon"
+#: ../../printerdrake.pm_.c:1584
+#, fuzzy
+msgid "Starting the printing system at boot time"
+msgstr "Kiun printsistemo vi deziras uzi?"
 
-#: ../../printerdrake.pm_.c:454
+#: ../../printerdrake.pm_.c:1585
+#, c-format
 msgid ""
-"Name of printer should contains only letters, numbers and the underscore"
+"The printing system (%s) will not be started automatically\n"
+"when the machine is booted.\n"
+"\n"
+"It is possible that the automatic starting was turned off \n"
+"by changing to a higher security level, because the printing\n"
+"system is a potential point for attacks.\n"
+"\n"
+"Do you want to have the automatic starting of the printing\n"
+"system turned on again?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1612 ../../printerdrake.pm_.c:1644
+#: ../../printerdrake.pm_.c:1671 ../../printerdrake.pm_.c:1701
+#: ../../printerdrake.pm_.c:1778
+msgid "Checking installed software..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1727
+#, fuzzy
+msgid "Select Printer Spooler"
+msgstr "Elektu Printilan Konekton"
+
+#: ../../printerdrake.pm_.c:1728
+#, fuzzy
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Kiun printsistemo vi deziras uzi?"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Konfiguru Printilon"
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Printilaj opcioj"
+
+#: ../../printerdrake.pm_.c:1815
+#, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "Legas datumbason de CUPS peliloj..."
+
+#: ../../printerdrake.pm_.c:1845
+#, fuzzy
+msgid "Would you like to configure printing?"
+msgstr "�u vi deziras konfiguri printilon?"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
 msgstr ""
 
-#: ../../printerdrake.pm_.c:461
+#: ../../printerdrake.pm_.c:1879
 msgid ""
-"Every printer need a name (for example lp).\n"
-"Other parameters such as the description of the printer or its location\n"
-"can be defined. What name should be used for this printer and\n"
-"how is the printer connected?"
+"The following printers are configured.\n"
+"Click on one of them to modify it or\n"
+"to get information about it or on \n"
+"\"Add Printer\" to add a new printer."
 msgstr ""
-"�iuj printilo bezonas nomon (ekzemple lp).\n"
-"Aliaj parametroj, ekzemple la priskribon de la printilo a� �ian lokon\n"
-"vi povas difini.  Kiu nomo devus uzata por �i tiu printilo kaj kiel\n"
-"�i estas konektata?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Nomo de printilo"
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "Normala Modalo"
 
-#: ../../printerdrake.pm_.c:466
-msgid "Description"
-msgstr "Priskribo"
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Defa�lta)"
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Loko"
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "Malproksima CUPS-a servilo"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "Malproksima CUPS-a servilo"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+#, fuzzy
+msgid "Add printer"
+msgstr "Neniu printilo"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "�u vi deziras provi la konfigura�on?"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "Interreta Konfigurado"
+
+#: ../../printerdrake.pm_.c:2004
+#, c-format
 msgid ""
-"Every print queue (which print jobs are directed to) needs a\n"
-"name (often lp) and a spool directory associated with it. What\n"
-"name and directory should be used for this queue and how is the printer "
-"connected?"
+"Printer %s: %s %s\n"
+"What do you want to modify on this printer?"
 msgstr ""
-"�iuj printvico (al kiu printajn taskojn estas direktata) bezonas nomon\n"
-"(ofte lp) kaj fonan eneligan dosierujon asociata kun �i.  Kiu nomo kaj\n"
-"dosierujo devus uzata por �i tiu printvico?"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "Nomo de printvico"
+#: ../../printerdrake.pm_.c:2012
+msgid "Do it!"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "Fona eneliga dosierujo"
+#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+#, fuzzy
+msgid "Printer connection type"
+msgstr "Disdividado de Interreta Konekto"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
 msgstr "Printilan Konekton"
 
-#: ../../raid.pm_.c:33
+#: ../../printerdrake.pm_.c:2018 ../../printerdrake.pm_.c:2081
+msgid "Printer manufacturer, model, driver"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2019 ../../printerdrake.pm_.c:2082
+msgid "Printer manufacturer, model"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2028 ../../printerdrake.pm_.c:2092
+msgid "Set this printer as the default"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2029 ../../printerdrake.pm_.c:2097
+#, fuzzy
+msgid "Print test pages"
+msgstr "Printas provpa�o(j)n..."
+
+#: ../../printerdrake.pm_.c:2030 ../../printerdrake.pm_.c:2099
+msgid "Know how to print with this printer"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2031 ../../printerdrake.pm_.c:2101
+#, fuzzy
+msgid "Remove printer"
+msgstr "Malproksima printilo"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "Legas datumbason de CUPS peliloj..."
+
+#: ../../printerdrake.pm_.c:2096
+#, c-format
+msgid "The printer \"%s\" is set as the default printer now."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2103
+#, fuzzy, c-format
+msgid "Do you really want to remove the printer \"%s\"?"
+msgstr "�u vi deziras provi la konfigura�on?"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "Legas datumbason de CUPS peliloj..."
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+#, fuzzy
+msgid "Proxy configuration"
+msgstr "Konfigurado de prokuraj serviloj"
+
+#: ../../proxy.pm_.c:30
+msgid ""
+"Welcome to the proxy configuration utility.\n"
+"\n"
+"Here, you'll be able to set up your http and ftp proxies\n"
+"with or without login and password\n"
+msgstr ""
+
+#: ../../proxy.pm_.c:38
+msgid ""
+"Please fill in the http proxy informations\n"
+"Leave it blank if you don't want an http proxy"
+msgstr ""
+
+#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
+msgid "URL"
+msgstr ""
+
+#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
+msgid "port"
+msgstr "porto"
+
+#: ../../proxy.pm_.c:44
+#, fuzzy
+msgid "Url should begin with 'http:'"
+msgstr "Prokura servilo devus esti http://..."
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+msgid "The port part should be numeric"
+msgstr ""
+
+#: ../../proxy.pm_.c:59
+msgid ""
+"Please fill in the ftp proxy informations\n"
+"Leave it blank if you don't want an ftp proxy"
+msgstr ""
+
+#: ../../proxy.pm_.c:65
+#, fuzzy
+msgid "Url should begin with 'ftp:'"
+msgstr "Prokura servilo devus esti ftp://..."
+
+#: ../../proxy.pm_.c:79
+msgid ""
+"Please enter proxy login and password, if any.\n"
+"Leave it blank if you don't want login/passwd"
+msgstr ""
+
+#: ../../proxy.pm_.c:80
+#, fuzzy
+msgid "login"
+msgstr "A�tomata-enregistrado"
+
+#: ../../proxy.pm_.c:82
+msgid "password"
+msgstr "pasvorto"
+
+#: ../../proxy.pm_.c:84
+#, fuzzy
+msgid "re-type password"
+msgstr "Neniu pasvorto"
+
+#: ../../proxy.pm_.c:88
+msgid "The passwords don't match. Try again!"
+msgstr "La pasvortoj ne egalas.  Provu denove!"
+
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Ne povas aldoni subdiskon al _formatita_ RAID md%d"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "Ne povas skribi dosieron $file."
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "Ne povas skribi dosieron %s."
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid malsukcesis"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid malsukcesis (eble raidtools mankas)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Ne estas sufi�aj subdiskoj por RAID nivelo %d\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
 msgstr ""
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron, perioda ordonvicigilo."
 
-#: ../../services.pm_.c:18
+#: ../../services.pm_.c:17
 msgid ""
 "apmd is used for monitoring batery status and logging it via syslog.\n"
 "It can also be used for shutting down the machine when the battery is low."
@@ -6167,7 +6756,7 @@ msgstr ""
 "sistemlogdosiero (syslog).  Vi anka� povas uzi �in por halti la komputilon\n"
 "kiam la baterio�argo estas malgranda."
 
-#: ../../services.pm_.c:20
+#: ../../services.pm_.c:19
 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."
@@ -6176,7 +6765,7 @@ msgstr ""
 "'at' estis uzata, kaj lan�as ba�ajn ordonojn kiam la �argmezo estas\n"
 "sufi�e malgranda."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:21
 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 "
@@ -6188,7 +6777,7 @@ msgstr ""
 "baza Uniksa cron, inkluzive de pli bona sekureco kaj pli fortaj\n"
 "konfiguraj opcioj."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:24
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -6199,21 +6788,21 @@ msgstr ""
 "la 'Midnight Commander' (Meznokta Estro).  Anka� �i permesas uzi la muson\n"
 "por transpo�igi �e la konzolo (Sen X Fenestroj)."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr ""
 
-#: ../../services.pm_.c:30
+#: ../../services.pm_.c:29
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
 msgstr ""
 "Apache estas Tut-Tera Teksa�a servilo.  �i liveras HTML-ajn dosierojn\n"
-"kaj CGI (komuna\tkluza interfaco)."
+"kaj CGI (komunakluza interfaco)."
 
-#: ../../services.pm_.c:32
+#: ../../services.pm_.c:31
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -6227,13 +6816,13 @@ msgstr ""
 "servoj, inkluzive de telnet, ftp, rsh, kaj rlogin.  Se vi mal�altas inetd,\n"
 "ve mal�altas �iujn el la servoj por kiuj �i respondas."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:35
 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_.c:38
+#: ../../services.pm_.c:37
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -6243,23 +6832,23 @@ msgstr ""
 "Vi povas elekti �i tion per la kbdconfig utilprogramo.  Vi lasus �i tion\n"
 "ebligatan por la plejmulto da sistemoj."
 
-#: ../../services.pm_.c:41
+#: ../../services.pm_.c:40
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
 msgstr ""
 
-#: ../../services.pm_.c:43
+#: ../../services.pm_.c:42
 msgid "Automatic detection and configuration of hardware at boot."
 msgstr ""
 
-#: ../../services.pm_.c:44
+#: ../../services.pm_.c:43
 msgid ""
 "Linuxconf will sometimes arrange to perform various tasks\n"
 "at boot-time to maintain the system configuration."
 msgstr ""
 
-#: ../../services.pm_.c:46
+#: ../../services.pm_.c:45
 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)."
@@ -6267,13 +6856,13 @@ msgstr ""
 "lpd estas la printvica dajmono bezonata por lpr ta�ge funkcii.  �i estas\n"
 "baze servilo kiu arbitracias printajn taskojn al printilo(j)."
 
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:47
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
 msgstr ""
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:49
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -6281,7 +6870,7 @@ msgstr ""
 "'named' (BIND) estas Domajna NomServilo (DNS) kiun vi uzas por trovi\n"
 "po�tejojn de IP adresoj."
 
-#: ../../services.pm_.c:52
+#: ../../services.pm_.c:51
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -6289,7 +6878,7 @@ msgstr ""
 "Muntas kaj malmuntas �iujn RetDosierSistemajn (NFS), SMB (Lan\n"
 "Manager/Vindozaj), kaj NCP (NetWare) surmetingojn."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -6297,7 +6886,7 @@ msgstr ""
 "�altas/Mal�altas �iujn retajn interfacojn konfiguratajn por lan�i\n"
 "dum sistemstartado."
 
-#: ../../services.pm_.c:56
+#: ../../services.pm_.c:55
 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"
@@ -6307,7 +6896,7 @@ msgstr ""
 "�i tiu servo provizas NFS dosier�losado, kiun vi konfiguras per la\n"
 "/etc/exports dosiero."
 
-#: ../../services.pm_.c:59
+#: ../../services.pm_.c:58
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -6315,17 +6904,17 @@ msgstr ""
 "NFS estas populara protokolo por dosierdistribuado tra TCP/IP retoj.\n"
 "�i tiu servo provizas NFS dosier�losado."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
 msgstr ""
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
 msgstr ""
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:63
 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 "
@@ -6336,7 +6925,7 @@ msgstr ""
 "tekkomputiloj.  �i ne estos lan�ata krom se vi konfiguras �i por ke �i\n"
 "estu sendan�era �e komputiloj kiuj ne bezonas �in."
 
-#: ../../services.pm_.c:67
+#: ../../services.pm_.c:66
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -6348,7 +6937,7 @@ msgstr ""
 "La pordmapservilo devas esti uzata �e komputiloj kiuj agas kiel serviloj\n"
 "por protokoloj kiuj uzas la RPC mekanismon."
 
-#: ../../services.pm_.c:70
+#: ../../services.pm_.c:69
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -6356,7 +6945,7 @@ msgstr ""
 "\"Postfix\" estas Po�tTransportPerilo, kiu estas la programo kiu movas\n"
 "retpo�ton de unu komputilo al alia."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -6364,13 +6953,13 @@ msgstr ""
 "Savas kaj resta�ras sisteman entropikomuna�on por pli altkvalita\n"
 "generado de aleatoraj nombroj."
 
-#: ../../services.pm_.c:74
+#: ../../services.pm_.c:73
 msgid ""
 "Assign raw devices to block devices (such as hard drive\n"
 "partitions), for the use of applications such as Oracle"
 msgstr ""
 
-#: ../../services.pm_.c:76
+#: ../../services.pm_.c:75
 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"
@@ -6380,7 +6969,7 @@ msgstr ""
 "per la RIP protokolo.  Kvankam RIP estas vaste uzata je malgrandaj retoj,\n"
 "pli malsimplaj enkursigaj protokoloj estas bezonataj por malsimplaj retoj."
 
-#: ../../services.pm_.c:79
+#: ../../services.pm_.c:78
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -6388,7 +6977,7 @@ msgstr ""
 "La rstat protokolo permesas al uzuloj sur reto ekstrakti metrikojn\n"
 "pri la rapideco de iu ajn komputilo sur tiu reto."
 
-#: ../../services.pm_.c:81
+#: ../../services.pm_.c:80
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -6396,7 +6985,7 @@ msgstr ""
 "La ruser protokolo permesas al uzuloj sur reto identigi kiujn estas\n"
 "konektataj �e aliaj respondantaj komputiloj."
 
-#: ../../services.pm_.c:83
+#: ../../services.pm_.c:82
 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)."
@@ -6404,11 +6993,11 @@ msgstr ""
 "La rwho protokolo permesas al uzuloj havigi liston de �iuj el la uzuloj\n"
 "konektataj �e komputilo kiu estas uzanta la rwho dajmono (simila al finger)."
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:84
 msgid "Launch the sound system on your machine"
 msgstr ""
 
-#: ../../services.pm_.c:86
+#: ../../services.pm_.c:85
 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."
@@ -6417,46 +7006,89 @@ msgstr ""
 "mesa�ojn al diversaj sistemlogdosieroj.  �i estas bona ideo �iam uzi\n"
 "syslog."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
 msgstr ""
 
-#: ../../services.pm_.c:89
+#: ../../services.pm_.c:88
 #, fuzzy
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
 msgstr ""
 "Startas kaj �esigas la X Tiparan Servilon je starttempo kaj �esiga tempo."
 
-#: ../../services.pm_.c:118
+#: ../../services.pm_.c:114 ../../services.pm_.c:156
 msgid "Choose which services should be automatically started at boot time"
-msgstr "Elektu kiujn servojn devus a�tomate startata �e starta tempo"
+msgstr ""
+
+#: ../../services.pm_.c:126
+#, fuzzy
+msgid "Printing"
+msgstr "Printilo"
+
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "Interreto"
+
+#: ../../services.pm_.c:130
+msgid "File sharing"
+msgstr ""
+
+#: ../../services.pm_.c:132
+#, fuzzy
+msgid "System"
+msgstr "Sistema modalo"
 
 #: ../../services.pm_.c:137
 #, fuzzy
+msgid "Remote Administration"
+msgstr "Malproksimaj lpd Printilaj Opcioj"
+
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Datumbazoj"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+#, fuzzy
+msgid "Services"
+msgstr "Servilo"
+
+#: ../../services.pm_.c:198
+#, fuzzy
 msgid "running"
 msgstr "Averto"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 #, fuzzy
 msgid "stopped"
 msgstr "Alfiksu"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr ""
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
 msgstr ""
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 #, fuzzy
 msgid "On boot"
-msgstr "Radiko"
+msgstr "Yaboot"
+
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "Instalanta paka�o %s"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone/diskdrake_.c:63
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
 "I'll try to go on blanking bad partitions"
@@ -6464,15 +7096,66 @@ msgstr ""
 "Mi ne povas legi vian subdisktabelon, �i estas tro difektita por mi :(\n"
 "Mi penos da�ri per blankigi difektitajn subdiskojn"
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+#, fuzzy
+msgid "Error!"
+msgstr "Eraro"
+
+#: ../../standalone/drakautoinst_.c:45
+#, c-format
+msgid "I can't find needed image file `%s'."
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:47
+#, fuzzy
+msgid "Auto Install Configurator"
+msgstr "Post-instala konfigurado"
+
+#: ../../standalone/drakautoinst_.c:48
+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"
+"Do you want to continue?"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:70
+#, fuzzy
+msgid "Automatic Steps Configuration"
+msgstr "Post-instala konfigurado"
+
+#: ../../standalone/drakautoinst_.c:71
+msgid ""
+"Please choose for each step whether it will replay like your install, or it "
+"will be manual"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:112 ../../standalone/drakgw_.c:599
+msgid "Congratulations!"
+msgstr "Gratulojn!"
+
+#: ../../standalone/drakautoinst_.c:113
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:36 ../../standalone/drakgw_.c:181
 msgid "Internet Connection Sharing"
 msgstr "Disdividado de Interreta Konekto"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Disdividado de Interreta Konekto nuntempe kapabligata"
 
-#: ../../standalone/drakgw_.c:119
+#: ../../standalone/drakgw_.c:120
 #, fuzzy
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -6482,34 +7165,33 @@ msgid ""
 msgstr ""
 "La konfigurado de la disdividado de la Interreta konekto jam estas farita.\n"
 
-#: ../../standalone/drakgw_.c:123
-#, fuzzy
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
-msgstr "Tabelo"
+msgstr "malebligu"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr "forsendu"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
 msgstr "rekonfiguru"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 #, fuzzy
 msgid "Disabling servers..."
 msgstr "Detektas aparatojn..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 #, fuzzy
 msgid "Internet connection sharing is now disabled."
 msgstr "Disdividado de Interreta Konekto nuntempe malkapabligata"
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Disdividado de Interreta Konekto nuntempe malkapabligata"
 
-#: ../../standalone/drakgw_.c:144
+#: ../../standalone/drakgw_.c:145
 #, fuzzy
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -6519,28 +7201,20 @@ msgid ""
 msgstr ""
 "La konfigurado de la disdividado de la Interreta konekto jam estas farita.\n"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "ebligu"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 #, fuzzy
 msgid "Internet connection sharing is now enabled."
 msgstr "Disdividado de Interreta Konekto nuntempe kapabligata"
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "Mi ne povas kompreni la enhavon de la konfigurodosiero."
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr ""
-
-#: ../../standalone/drakgw_.c:181
+#: ../../standalone/drakgw_.c:182
 #, fuzzy
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -6556,21 +7230,21 @@ msgstr ""
 "\n"
 "�u vi deziras konfiguri Disdividadon de Interreta Konekto?\n"
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:208
-#, fuzzy, c-format
+#: ../../standalone/drakgw_.c:209
+#, c-format
 msgid "Interface %s"
-msgstr "Interreto"
+msgstr "Interfaco %s"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:217
 msgid "No network adapter on your system!"
 msgstr "Via komputilo ne havas retadaptilon!"
 
-#: ../../standalone/drakgw_.c:217
+#: ../../standalone/drakgw_.c:218
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
@@ -6579,7 +7253,11 @@ msgstr ""
 "aparatokonfigurilon."
 
 #: ../../standalone/drakgw_.c:224
-#, fuzzy, c-format
+msgid "Network interface"
+msgstr "Reta interfaco"
+
+#: ../../standalone/drakgw_.c:225
+#, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
 "\n"
@@ -6589,18 +7267,18 @@ msgid ""
 msgstr ""
 "Ekzitas nur unu konfigurita retadaptilo sur via sistemo:\n"
 "\n"
-"$interface\n"
+"%s\n"
 "\n"
 "�u vi deziras konfiguri vian Lokan Reton (LAN) kun �i tiu adaptilo?"
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr ""
 "Bonvole elektu kiun retadaptilon estos konektata al via Loka Reto (LAN)."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 #, fuzzy
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
@@ -6608,15 +7286,16 @@ msgstr ""
 "Averto, la retadaptilo estas jam konfigurata.\n"
 "�u vi deziras rekonfiguri �in?"
 
-#: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
-msgstr "Ebla konflikto pri Loka-Reta adreso trovata en nuna konfiguro de $_!\n"
+#: ../../standalone/drakgw_.c:254
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr "Ebla konflikto pri Loka-Reta adreso trovata en nuna konfiguro de %s!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "Konfigura�o de barilo detektata!"
 
-#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:263 ../../standalone/drakgw_.c:269
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
@@ -6624,53 +7303,50 @@ msgstr ""
 "Averto.  Ekzistanta konfigura�o de barilo detektata.  Vi eble devas permane\n"
 "fiksi �in poste de la instalado."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "Mi konfiguras..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 "Mi konfiguras komandodosierojn, instalas programojn, startas servilojn..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "Problemoj instalante paka�on $_"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "Gratulojn!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Problemoj instalante paka�on %s"
 
-#: ../../standalone/drakgw_.c:591
+#: ../../standalone/drakgw_.c:600
 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 ""
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 #, fuzzy
 msgid "The setup has already been done, but it's currently disabled."
 msgstr ""
 "La konfigurado de la disdividado de la Interreta konekto jam estas farita.\n"
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 #, fuzzy
 msgid "The setup has already been done, and it's currently enabled."
 msgstr ""
 "La konfigurado de la disdividado de la Interreta konekto jam estas farita.\n"
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 #, fuzzy
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "Disdividado de Interreta Konekto nuntempe kapabligata"
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 #, fuzzy
 msgid "Internet connection sharing configuration"
 msgstr "Interreta konekta�o kaj konfiguro"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, fuzzy, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -6680,92 +7356,85 @@ msgid ""
 "Click on Configure to launch the setup wizard."
 msgstr "Disdividado de Interreta Konekto"
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, fuzzy, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "ISDN-a Konfigura�on"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:539
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 #, fuzzy
 msgid "Profile: "
 msgstr "muntado malsukcesis: "
 
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:94
 msgid "Del profile..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
+#: ../../standalone/draknet_.c:134
+msgid ""
+"Name of the profile to create (the new profile is created as a copy of the "
+"current one) :"
 msgstr ""
 
-#: ../../standalone/draknet_.c:140
-#, fuzzy
+#: ../../standalone/draknet_.c:160
 msgid "Hostname: "
-msgstr "Po�tejo"
+msgstr "Po�tejo: "
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 #, fuzzy
 msgid "Internet access"
 msgstr "Interreto"
 
-#: ../../standalone/draknet_.c:160
-#, fuzzy
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
-msgstr "Speco: "
+msgstr "Speco:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "Kluzo:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 #, fuzzy
 msgid "Interface:"
 msgstr "Interreto"
 
-#: ../../standalone/draknet_.c:168
+#: ../../standalone/draknet_.c:192
 msgid "Status:"
-msgstr ""
+msgstr "Stato:"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:122 ../../standalone/net_monitor_.c:224
-#, fuzzy
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 msgid "Connected"
-msgstr "Nomo de konekto"
+msgstr "Konektita"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:83 ../../standalone/net_monitor_.c:122
-#: ../../standalone/net_monitor_.c:224
-#, fuzzy
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 msgid "Not connected"
-msgstr "ADSL Konfigura�o"
+msgstr "Ne konektita"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
-msgstr ""
+msgstr "Konektu..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Disconnect..."
-msgstr ""
+msgstr "Malkonektu..."
 
-#: ../../standalone/draknet_.c:191
-#, fuzzy
+#: ../../standalone/draknet_.c:215
 msgid "Starting your connection..."
-msgstr "Konfiguru interretan konekta�on"
+msgstr "Startas vian konekta�on..."
 
-#: ../../standalone/draknet_.c:199
-#, fuzzy
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
-msgstr "Konfiguru interretan konekta�on"
+msgstr "Fermas vian konekta�on..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -6773,135 +7442,121 @@ msgid ""
 "in root."
 msgstr ""
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 #, fuzzy
 msgid "The system is now disconnected."
 msgstr "Kiel vi deziras konekti al la Interreto?"
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 #, fuzzy
 msgid "Configure Internet Access..."
 msgstr "Konfiguru servojn"
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
-#, fuzzy
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
-msgstr "ADSL Konfigura�o"
-
-#: ../../standalone/draknet_.c:231
-#, fuzzy
-msgid "Adapter"
-msgstr "�isdatigu"
+msgstr "LAN Konfigura�o"
 
-#: ../../standalone/draknet_.c:231
-#, fuzzy
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
-msgstr "Servilo"
+msgstr "Pelilo"
 
-#: ../../standalone/draknet_.c:231
-#, fuzzy
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
-msgstr "Interreto"
+msgstr "Interfaco"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
-msgstr ""
+msgstr "Protokolo"
+
+#: ../../standalone/draknet_.c:255
+#, fuzzy
+msgid "State"
+msgstr "Stato:"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:267
 #, fuzzy
 msgid "Configure Local Area Network..."
 msgstr "Konfiguru lokan reton"
 
-#: ../../standalone/draknet_.c:283
-msgid "Normal Mode"
+#: ../../standalone/draknet_.c:279
+msgid "Click here to launch the wizard ->"
 msgstr ""
 
-#: ../../standalone/draknet_.c:288
+#: ../../standalone/draknet_.c:306
 msgid "Apply"
-msgstr ""
+msgstr "Apliku"
 
-#: ../../standalone/draknet_.c:307
+#: ../../standalone/draknet_.c:325
 #, fuzzy
 msgid "Please Wait... Applying the configuration"
 msgstr "Provu konfigura�on"
 
-#: ../../standalone/draknet_.c:391
+#: ../../standalone/draknet_.c:428
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 
-#: ../../standalone/draknet_.c:415
-#, fuzzy
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
-msgstr "ADSL Konfigura�o"
+msgstr "LAN Konfigura�o"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
-msgstr ""
+msgstr "Adaptilo %s: %s"
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
 msgstr ""
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
 msgstr ""
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
 msgstr ""
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
 #, fuzzy
-msgid "Disable"
-msgstr "Tabelo"
+msgid "activate now"
+msgstr "Aktiva"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "Ebligu"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "desactivate now"
+msgstr "Aktiva"
 
-#: ../../standalone/draknet_.c:504
+#: ../../standalone/draknet_.c:538
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
 msgstr ""
 
-#: ../../standalone/draknet_.c:528
+#: ../../standalone/draknet_.c:562
 #, fuzzy
 msgid "Internet connection configuration"
 msgstr "Interreta konekta�o kaj konfiguro"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 #, fuzzy
 msgid "Internet Connection Configuration"
 msgstr "Interreta konekta�o kaj konfiguro"
 
-#: ../../standalone/draknet_.c:541
-#, fuzzy
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
-msgstr "Nomo de konekto"
+msgstr "Speco de konekto"
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr ""
 
-#: ../../standalone/draknet_.c:560
-#, fuzzy
-msgid "Provider dns 1 (optional)"
-msgstr "Provizanto DNS 1"
-
-#: ../../standalone/draknet_.c:561
-#, fuzzy
-msgid "Provider dns 2 (optional)"
-msgstr "Provizanto DNS 2"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr ""
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr ""
 
@@ -6970,23 +7625,37 @@ msgstr ""
 "Ni uzas aspektojn de la kvara nivelo, sed nun la komputilo estas tute\n"
 "malfermita.  Sekurecaj aspektoj estas �e iliaj maksimumoj."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "Elektas sekurnivelon"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "Elektu opciojn por servilo"
+
+#: ../../standalone/draksec_.c:68
+msgid ""
+"A library which defends against buffer overflow and format string attacks."
+msgstr ""
+
+#: ../../standalone/draksec_.c:72
 msgid "Setting security level"
 msgstr "Elektas sekurnivelon"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 #, fuzzy
 msgid "Control Center"
 msgstr "Konekti al la interreto"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "Elektu la ilon kiun vi deziras instali"
 
 #: ../../standalone/keyboarddrake_.c:16
-#, fuzzy
 msgid "usage: keyboarddrake [--expert] [keyboard]\n"
-msgstr "uzado: keyboarddrake [--expert]\n"
+msgstr "uzado: keyboarddrake [--expert] [klavaro]\n"
 
 #: ../../standalone/keyboarddrake_.c:36
 msgid "Do you want the BackSpace to return Delete in console?"
@@ -7013,90 +7682,14 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr ""
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "neniu serial_usb (seria USB) trovita\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "�u vi deziras emuli trian musbutonon?"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "Bonvole, provu la muson"
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-#, fuzzy
-msgid "Network Monitoring"
-msgstr "ISDN-a Konfigura�on"
-
-#: ../../standalone/net_monitor_.c:56
-msgid "Statistics"
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:59
-msgid "Sending Speed: "
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:61
-msgid "Receiving Speed: "
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:66
-#, fuzzy
-msgid "Close"
-msgstr "Movu"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Connecting to Internet "
-msgstr "Konekti al la interreto"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Disconnecting from Internet "
-msgstr "Malkonekti el la interreto"
-
-#: ../../standalone/net_monitor_.c:114
-#, fuzzy
-msgid "Disconnection from Internet failed."
-msgstr "Malkonekti el la interreto"
-
-#: ../../standalone/net_monitor_.c:115
-#, fuzzy
-msgid "Disconnection from Internet complete."
-msgstr "Malkonekti el la interreto"
-
-#: ../../standalone/net_monitor_.c:117
-#, fuzzy
-msgid "Connection complete."
-msgstr "Nomo de konekto"
-
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:222
-#, fuzzy
-msgid "Connect"
-msgstr "Nomo de konekto"
-
-#: ../../standalone/net_monitor_.c:222
-#, fuzzy
-msgid "Disconnect"
-msgstr "Konfiguru interretan konekta�on"
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "Konfigura�o de barilo"
@@ -7120,16 +7713,84 @@ msgid ""
 "Click on Configure to set up a standard firewall"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:10
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "Elektu vian lingvon"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Elektu instalklason"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Detektado de fiksdisko(j)"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Konfiguru muson"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Elektu vian klavaron"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr ""
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Dosiersistemo konfiguro"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Formatu subdiskojn"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Elektu paka�ojn"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Instalu sistemon"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "Aldonu uzulon"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Konfiguru retumon"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Konfiguru servojn"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Kreu pra�argdisketon"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Instalu restart-�argilon"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Konfiguru X"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Eliru instalprogramon"
+
+#: ../../tinyfirewall.pm_.c:9
 msgid ""
 "tinyfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Linux Mandrake machine.\n"
+"This configures a personal firewall for this Mandrake Linux machine.\n"
 "For a powerful dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:15
+#: ../../tinyfirewall.pm_.c:14
 msgid ""
 "We'll now ask you questions about which services you'd like to allow\n"
 "the Internet to connect to.  Please think carefully about these\n"
@@ -7140,7 +7801,7 @@ msgid ""
 "re-running this application!"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:22
+#: ../../tinyfirewall.pm_.c:21
 msgid ""
 "Are you running a web server on this machine that you need the whole\n"
 "Internet to see? If you are running a webserver that only needs to be\n"
@@ -7148,7 +7809,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:27
+#: ../../tinyfirewall.pm_.c:26
 msgid ""
 "Are you running a name server on this machine? If you didn't set one\n"
 "up to give away IP and zone information to the whole Internet, please\n"
@@ -7156,7 +7817,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:32
+#: ../../tinyfirewall.pm_.c:31
 msgid ""
 "Do you want to allow incoming Secure Shell (ssh) connections? This\n"
 "is a telnet-replacement that you might use to login. If you're using\n"
@@ -7165,7 +7826,7 @@ msgid ""
 "it. ssh is encrypted and doesn't allow for this eavesdropping."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:37
+#: ../../tinyfirewall.pm_.c:36
 msgid ""
 "Do you want to allow incoming telnet connections?\n"
 "This is horribly unsafe, as we explained in the previous screen. We\n"
@@ -7173,7 +7834,7 @@ msgid ""
 "telnet.\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:42
+#: ../../tinyfirewall.pm_.c:41
 msgid ""
 "Are you running an FTP server here that you need accessible to the\n"
 "Internet? If you are, we strongly recommend that you only use it for\n"
@@ -7181,7 +7842,7 @@ msgid ""
 "attackers, since FTP also uses no encryption for transferring passwords.\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:47
+#: ../../tinyfirewall.pm_.c:46
 msgid ""
 "Are you running a mail server here? If you're sending you \n"
 "messages through pine, mutt or any other text-based mail client,\n"
@@ -7189,7 +7850,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:52
+#: ../../tinyfirewall.pm_.c:51
 msgid ""
 "Are you running a POP or IMAP server here? This would\n"
 "be used to host non-web-based mail accounts for people via \n"
@@ -7197,7 +7858,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:57
+#: ../../tinyfirewall.pm_.c:56
 msgid ""
 "You appear to be running a 2.2 kernel.  If your network IP\n"
 "is automatically set by a computer in your home or office \n"
@@ -7205,7 +7866,7 @@ msgid ""
 "this the case?\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:62
+#: ../../tinyfirewall.pm_.c:61
 msgid ""
 "Is your computer getting time syncronized to another computer?\n"
 "Mostly, this is used by medium-large Unix/Linux organizations\n"
@@ -7214,7 +7875,7 @@ msgid ""
 "aren't."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
@@ -7222,46 +7883,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:85
-#, fuzzy, c-format
+#: ../../tinyfirewall.pm_.c:84
+#, c-format
 msgid "Can't open %s for writing: %s\n"
-msgstr "Eraro dum malfermado de %s por skribi: %s"
+msgstr "Ne povis malfermi %s por skribi: %s\n"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr ""
-
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Development"
-msgstr "Programisto"
-
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Workstation"
-msgstr "Laborstacio"
-
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr ""
-
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia - Graphics"
-msgstr "Plurmedia - Grafiko"
-
-#: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "Interreto"
+msgid "Web/FTP"
+msgstr "TTT/FTP"
 
 #: ../../share/compssUsers:999
 #, fuzzy
@@ -7269,127 +7903,137 @@ msgid "Network Computer (client)"
 msgstr "Reta Printilo (ingo)"
 
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet station"
-msgstr "Interreta Konfigurado"
-
-#: ../../share/compssUsers:999
 msgid "Office"
 msgstr "Oficejo"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia station"
-msgstr "Plurmedia - Sono"
+msgid "Gnome Workstation"
+msgstr "Gnoma Laborstacio"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
+msgid "Tools for your Palm Pilot or your Visor"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C kaj C++ programadaj bibliotekoj, programoj kaj �apdosieroj"
+msgid "Workstation"
+msgstr "Laborstacio"
+
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr ""
 
 #: ../../share/compssUsers:999
 msgid "Domain Name and Network Information Server"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
+msgid "Books and Howto's on Linux and Free Software"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentaro"
+msgid "KDE Workstation"
+msgstr "KDE Laborstacio"
 
 #: ../../share/compssUsers:999
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr ""
+msgid "Multimedia - Video"
+msgstr "Plurmedia - Video"
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
+msgid "Set of tools for mail, news, web, file transfer, and chat"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
+#, fuzzy
+msgid "Database"
+msgstr "Datumbazoj"
+
+#: ../../share/compssUsers:999
+msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
 #: ../../share/compssUsers:999
+#, fuzzy
+msgid "Tools to ease the configuration of your computer"
+msgstr "�u vi deziras provi la konfigura�on?"
+
+#: ../../share/compssUsers:999
 msgid "Multimedia - Sound"
 msgstr "Plurmedia - Sono"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
+msgid "Utilities"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr ""
+msgid "Documentation"
+msgstr "Dokumentaro"
 
 #: ../../share/compssUsers:999
 msgid "Console Tools"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
+msgid "Postfix mail server, Inn news server"
 msgstr ""
 
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Scientific Workstation"
-msgstr "Laborstacio"
+msgid "Internet station"
+msgstr "Interreta Konfigurado"
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Redaktiloj, �eloj, dosieriloj, terminaloj"
+#, fuzzy
+msgid "Multimedia station"
+msgstr "Plurmedia - Sono"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr ""
+#, fuzzy
+msgid "Configuration"
+msgstr "LAN Konfigura�o"
 
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
+msgid "More Graphical Desktops (Gnome, IceWM)"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "Ludoj"
+msgid "Graphical Environment"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Plurmedia - Video"
+#, fuzzy
+msgid "Development"
+msgstr "Programisto"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer server"
-msgstr "Reta Printilo (ingo)"
+msgid "Apache, Pro-ftpd"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
+msgid "Tools to create and burn CD's"
 msgstr ""
 
 #: ../../share/compssUsers:999
@@ -7398,76 +8042,70 @@ msgid "Office Workstation"
 msgstr "Laborstacio"
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
+msgid "Graphics programs such as The Gimp"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Plurmedia - KD-ROM Kreado"
+msgid "DNS/NIS "
+msgstr "DNS/NIS"
 
 #: ../../share/compssUsers:999
-msgid "Archiving, emulators, monitoring"
-msgstr ""
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C kaj C++ programadaj bibliotekoj, programoj kaj �apdosieroj"
 
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Database"
-msgstr "Datumbazoj"
-
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
+msgid "Network Computer server"
+msgstr "Reta Printilo (ingo)"
 
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
+msgid "Mail/Groupware/News"
 msgstr ""
 
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Server"
-msgstr "X servilo"
+msgid "Game station"
+msgstr "Dokumentaro"
 
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
+msgid "Video players and editors"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfigura�on"
+msgid "Multimedia - Graphics"
+msgstr "Plurmedia - Grafiko"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "KDE Workstation"
-msgstr "Laborstacio"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
+msgid "Archiving, emulators, monitoring"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
+msgid "Personal Finance"
 msgstr ""
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Gnome Workstation"
-msgstr "Laborstacio"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+#: ../../share/compssUsers:999
+msgid "Clients for different protocols including ssh"
+msgstr ""
 
 #: ../../share/compssUsers:999
 #, fuzzy
@@ -7475,560 +8113,802 @@ msgid "Internet gateway"
 msgstr "Interreto"
 
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
+msgid "Sound and video playing/editing programs"
 msgstr ""
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Game station"
-msgstr "Dokumentaro"
-
-#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Other Graphical Desktops"
 msgstr ""
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Tools to ease the configuration of your computer"
-msgstr "�u vi deziras provi la konfigura�on?"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Redaktiloj, �eloj, dosieriloj, terminaloj"
 
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgid "Programs to manage your finance, such as gnucash"
 msgstr ""
 
-#~ msgid "%d minutes"
-#~ msgstr "%d minutoj"
+#: ../../share/compssUsers:999
+msgid "Games"
+msgstr "Ludoj"
 
-#~ msgid "1 minute"
-#~ msgstr "1 minuto"
+#: ../../share/compssUsers:999
+msgid "Personal Information Management"
+msgstr ""
 
-#~ msgid "%d seconds"
-#~ msgstr "%d sekundoj"
+#: ../../share/compssUsers:999
+msgid "Multimedia - CD Burning"
+msgstr "Plurmedia - KD-ROM Kreado"
 
+#: ../../share/compssUsers:999
 #, fuzzy
-#~ msgid "Configure..."
-#~ msgstr "Mi konfiguras..."
+msgid "Scientific Workstation"
+msgstr "Laborstacio"
 
 #, fuzzy
-#~ msgid "Lilo/Grub configuration"
-#~ msgstr "ADSL Konfigura�o"
+#~ msgid "Do you want to restart the network"
+#~ msgstr "�u vi deziras provi la konfigura�on?"
 
-#, fuzzy
-#~ msgid "Selected size %d%s"
-#~ msgstr "Elektu dosieron"
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "�u vi konsentas?"
 
 #, fuzzy
-#~ msgid "Opening your connection..."
-#~ msgstr "Konfiguru interretan konekta�on"
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "�u vi deziras provi la konfigura�on?"
 
 #, fuzzy
-#~ msgid "Standard tools"
-#~ msgstr "La�norma"
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "�u vi deziras provi la konfigura�on?"
 
 #, fuzzy
-#~ msgid "Configuration de Lilo/Grub"
-#~ msgstr "Konfigurado: Aldonu Lokon"
-
-#~ msgid "This startup script try to load your modules for your usb mouse."
+#~ msgid ""
+#~ "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
+#~ "(primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
 #~ msgstr ""
-#~ "�i tiu starta komandodosiero provas �argi viajn modulojn por via USB muso."
+#~ "Krom se vi scias precize alie, la kutima elekto estas \"/dev/hda\"\n"
+#~ " (unua �efa IDE-a disko) a� \"/dev/sda\" (unua SCSI-a disko)."
 
 #, fuzzy
-#~ msgid "Boot style configuration"
-#~ msgstr "Post-instala konfigurado"
-
 #~ msgid ""
-#~ "Now that your Internet connection is configured,\n"
-#~ "your computer can be configured to share its Internet connection.\n"
-#~ "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-#~ "(LAN).\n"
-#~ "\n"
-#~ "Would you like to setup the Internet Connection Sharing?\n"
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
 #~ msgstr ""
-#~ "Nun kiam via Interreta konekto estas konfigurata,\n"
-#~ "vi povas konfiguri vian komputilon por disdividi �ian Interretan "
-#~ "konekton.\n"
-#~ "Notu: vi bezonas dedi�an Retadaptilon por konfiguri Lokan Reton (LAN).\n"
-#~ "\n"
-#~ "�u vi deziras konfiguri Disdividadon de Interreta Konekto?\n"
-
-#~ msgid "Automatic dependencies"
-#~ msgstr "A�tomaciataj dependa�oj"
+#~ "Jen la sekvantaj printvicoj.\n"
+#~ "Vi povas aldoni pli a� �an�i la ekzistantajn."
 
-#~ msgid "Configure LILO/GRUB"
-#~ msgstr "Konfiguru LILO/GRUB"
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "Speco de konekto"
 
-#~ msgid "Create a boot floppy"
-#~ msgstr "Kreu pra�argdisketon"
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "Elektu la defa�ltan uzulon:"
 
-#~ msgid "Format floppy"
-#~ msgstr "Formatu disketon"
+#, fuzzy
+#~ msgid "Test the mouse here."
+#~ msgstr "Bonvole, provu la muson"
 
-#~ msgid "Choice"
-#~ msgstr "Elekto"
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ msgstr ""
+#~ "Bonvole elektu vian preferatan lingvon por instalado kaj sistema uzado."
 
-#, fuzzy
-#~ msgid "gMonitor"
-#~ msgstr "Ekrano"
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr "Elektu la aran�on de via klavaro el la listo supre"
 
-#, fuzzy
 #~ msgid ""
-#~ "You can now select some miscellaneous options for your system.\n"
+#~ "Select:\n"
 #~ "\n"
-#~ "* Use hard drive optimizations: this option can improve hard disk "
-#~ "performance but is only for advanced users. Some buggy\n"
-#~ "  chipsets can ruin your data, so beware. Note that the kernel has a "
-#~ "builtin blacklist of drives and chipsets, but if\n"
-#~ "  you want to avoid bad surprises, leave this option unset.\n"
+#~ "  - Customized: If you are familiar enough with GNU/Linux, you may then "
+#~ "choose\n"
+#~ "    the primary usage for your machine. See below for details.\n"
 #~ "\n"
 #~ "\n"
-#~ "* Choose security level: you can choose a security level for your system. "
-#~ "Please refer to the manual for complete\n"
-#~ "  information. Basically, if you don't know what to choose, keep the "
-#~ "default option.\n"
+#~ "  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
+#~ "    perform a highly customized installation. As for a \"Customized\"\n"
+#~ "    installation class, you will be able to select the usage for your "
+#~ "system.\n"
+#~ "    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
+#~ "DOING!"
+#~ msgstr ""
+#~ "Elektu:\n"
 #~ "\n"
+#~ "  - Akomodata: Se vi sufi�e konas GNU/Linukson, vi povas elektu la �efan\n"
+#~ "    uzadon por via komputilo.  Vidu malanta�e por detaloj.\n"
 #~ "\n"
-#~ "* Precise RAM if needed: unfortunately, there is no standard method to "
-#~ "ask the BIOS about the amount of RAM present in\n"
-#~ "  your computer. As consequence, Linux may fail to detect your amount of "
-#~ "RAM correctly. If this is the case, you can\n"
-#~ "  specify the correct amount or RAM here. Please note that a difference "
-#~ "of 2 or 4 MB between detected memory and memory\n"
-#~ "  present in your system is normal.\n"
 #~ "\n"
+#~ "  - Spertulo: �i tio supoza ke vi flue konas GNU/Linukson kaj deziras "
+#~ "fari\n"
+#~ "    treege akomodatan instaladon.  Simile kiel \"Akomodata\" instalado, "
+#~ "vi povos\n"
+#~ "    elekti la uzado por via komputilo.\n"
+#~ "    Sed bonvolege, NE ELEKTU �I TION KROM SE VI SCIAS KION VI FARAS!"
+
+#~ msgid ""
+#~ "You must now define your machine usage. Choices are:\n"
 #~ "\n"
-#~ "* Removable media automounting: if you would prefer not to manually mount "
-#~ "removable media (CD-Rom, floppy, Zip, etc.) by\n"
-#~ "  typing \"mount\" and \"umount\", select this option.\n"
+#~ "* Workstation: this the ideal choice if you intend to use your machine "
+#~ "primarily for everyday use, at office or\n"
+#~ "  at home.\n"
 #~ "\n"
 #~ "\n"
-#~ "* Clean \"/tmp\" at each boot: if you want delete all files and "
-#~ "directories stored in \"/tmp\" when you boot your system,\n"
-#~ "  select this option.\n"
+#~ "* Development: if you intend to use your machine primarily for software "
+#~ "development, it is the good choice. You\n"
+#~ "  will then have a complete collection of software installed in order to "
+#~ "compile, debug and format source code,\n"
+#~ "  or create software packages.\n"
 #~ "\n"
 #~ "\n"
-#~ "* Enable num lock at startup: if you want NumLock key enabled after "
-#~ "booting, select this option. Please note that you\n"
-#~ "  should not enable this option on laptops and that NumLock may or may "
-#~ "not work under X."
+#~ "* Server: if you intend to use this machine as a server, it is the good "
+#~ "choice. Either a file server (NFS or\n"
+#~ "  SMB), a print server (Unix style or Microsoft Windows style), an "
+#~ "authentication server (NIS), a database\n"
+#~ "  server and so on. As such, do not expect any gimmicks (KDE, GNOME, "
+#~ "etc.) to be installed."
 #~ msgstr ""
-#~ "Nun vi povas elekti kelkajn diversajn opciojn por via sistemo.\n"
+#~ "Nun vi devas elekti la uzadon por via komputilo.  Jen la elektoj:\n"
 #~ "\n"
-#~ "  - Uzu drajvajn optimumiga�ojn: �i tiu opcio povas plibonigi la "
-#~ "rapidecon\n"
-#~ "    de la drajvo, sed �i estas nur por spertaj uzuloj: iuj difektaj "
-#~ "�iparoj\n"
-#~ "    povas detrui viajn datenojn, do zorgu.  Notu ke la kerno havas\n"
-#~ "    enkonstruitan nigran liston de drajvoj kaj �iparoj, sed se via "
-#~ "deziras\n"
-#~ "    eviti malbonajn surprizojn, lasu �i tiun opcion ne elektatan\n"
+#~ "* Laborstacio: �i tio estas la ideala opcio se vi intencas uzi vian\n"
+#~ "  komputilon �efe por �iutaga uzado �e la oficejo a� hejme.\n"
 #~ "\n"
-#~ "  - Elektu sekurnivelon: vi povas elekti sekurnivelon por via sistemo.\n"
-#~ "    Bonvole konsultu la gvidlibron por plena informo.  Baze: se vi ne "
-#~ "scias,\n"
-#~ "    elektu \"Meza\".\n"
 #~ "\n"
-#~ "  - Preciza kvanto de memoro se bezonata: beda�rinde, en la hodia�a "
-#~ "persona\n"
-#~ "    komputila mondo, ne estas normala metodo por demandi de la BIOS pri\n"
-#~ "    la kvanto da memoro estanta en via komputilo.  Konsekvence de tio,\n"
-#~ "    GNU/Linukso eble malsukcesas detekti vian kvanton da memoro �uste.  "
-#~ "Se\n"
-#~ "    tiel estas, vi povas specifi la �ustan kvanton da memoro �i tie.  "
-#~ "Notu ke\n"
-#~ "    diferenco je 2 a� 4 MB estas normala.\n"
+#~ "* Programado: se vi intencas uzi vian komputilon �efe por programado,\n"
+#~ "  �i tio estas bona opcio.  Vi havos plenan aron de programiloj por\n"
+#~ "  kompili, erarser�i, formati programfontojn, kaj krei\n"
+#~ "  programpaka�ojn.\n"
 #~ "\n"
-#~ "  - A�tomata muntado de demetebla medio: se vi preferus ne mane munti\n"
-#~ "    demeteblajn mediojn (KDROM, Disketo, Zipdisko) per tajpi \"mount\" "
-#~ "kaj\n"
-#~ "    \"umount\", elektu �i tiun opcion.\n"
 #~ "\n"
-#~ "  - Ebligu NumLock je startado: se vi dezirus ke NumLock estus ebligata\n"
-#~ "    post startado, elektu �i tiun opcion (Notu: NumLock eble funkcias a�\n"
-#~ "    ne funkcias sub X)."
-
-#, fuzzy
-#~ msgid "Internet/Network access"
-#~ msgstr "Interreto"
+#~ "* Servilo: se vi intencas uzi �i tiun komputilon kiel servilo, �i tio\n"
+#~ "  estas bona opcio.  A� dosierservilo (NFS a� SMB), printservilo\n"
+#~ "  (Uniksa stilo a� Mikrosofta Vindoza stilo), a�tentikada servilo\n"
+#~ "  (NIS), a� datumbaza servilo, ktp.  Kiel tia, ne atendu umojn (KDE,\n"
+#~ "  GNOME, ktp.) estas instalotaj."
 
 #, fuzzy
-#~ msgid "Mail information"
-#~ msgstr "Montru informon"
+#~ msgid ""
+#~ "You may now select the group of packages you wish to\n"
+#~ "install or upgrade.\n"
+#~ "\n"
+#~ "\n"
+#~ "DrakX will then check whether you have enough room to install them all. "
+#~ "If not,\n"
+#~ "it will warn you about it. If you want to go on anyway, it will proceed "
+#~ "onto the\n"
+#~ "installation of all selected groups but will drop some packages of "
+#~ "lesser\n"
+#~ "interest. At the bottom of the list you can select the option \n"
+#~ "\"Individual package selection\"; in this case you will have to browse "
+#~ "through\n"
+#~ "more than 1000 packages..."
+#~ msgstr ""
+#~ "Nun vi povas elekti la paka�aron kiun vi deziras instali a� promocii.\n"
+#~ "\n"
+#~ "Tiam DrakX kontrolos �u vi havas sufi�e da spaco por instali �iujn de "
+#~ "ili.\n"
+#~ "Se ne, �i informas vin pir �i.  Se vi deziras anta�eniri malgra�e, �i\n"
+#~ "anta�eniros je la instalado de �iuj de la elektitaj paka�aroj sed lasos\n"
+#~ "fali iujn paka�ojn kiujn estas malpli interesaj.  Suben de la listo vi\n"
+#~ "povas elekti la opcion \"Elektado de apartaj paka�oj\"; �iokaze vi devus\n"
+#~ "foliumi tra pli ol 1000 paka�oj..."
 
 #, fuzzy
-#~ msgid "Firewall Configuration Wizard"
-#~ msgstr "ISDN-a Konfigura�on"
-
-#~ msgid "Miscellaneous"
-#~ msgstr "Diversaj"
-
-#~ msgid "Miscellaneous questions"
-#~ msgstr "Diversaj demandoj"
-
-#~ msgid "Can't use supermount in high security level"
-#~ msgstr "Ne povas uzi \"supermount\" en alta sekurnivelo"
-
 #~ msgid ""
-#~ "beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
-#~ "If you want to be root, you have to login as a user and then use \"su\".\n"
-#~ "More generally, do not expect to use your machine for anything but as a "
-#~ "server.\n"
-#~ "You have been warned."
+#~ "If you have all the CDs in the list above, click Ok. If you have\n"
+#~ "none of those CDs, click Cancel. If only some CDs are missing, unselect "
+#~ "them,\n"
+#~ "then click Ok."
 #~ msgstr ""
-#~ "Zorgu: EN �I TIU SEKURNIVELO, LA \"ROOT\" SALUTNOMO ESTAS MALPERMESATA �E "
-#~ "LA\n"
-#~ "KONZOLO!  Se vi deziras esti \"root\", vi devas saluti kiel alia uzulo "
-#~ "kaj\n"
-#~ "sekve uzi \"su\".  Pli �enerale, ne ekspektu uzi vian komputilon por iu "
-#~ "ajn\n"
-#~ "escepte de servilo.\n"
-#~ "Vi estas avertita."
+#~ "Se vi havas �iujn de la KDROM-oj en la listo sube, klaku \"Jes\".\n"
+#~ "Se vi havas neniujn de �i tiuj KDROM-oj, klaku \"Nuligu\".\n"
+#~ "Se vi mankas nur iujn de la KDROM-oj, malelektu ilin, kaj poste klaku "
+#~ "\"Jes\"."
 
+#, fuzzy
 #~ msgid ""
-#~ "Be carefull, having numlock enabled causes a lot of keystrokes to\n"
-#~ "give digits instead of normal letters (eg: pressing `p' gives `6')"
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, the correct informations can "
+#~ "be\n"
+#~ "obtained from your Internet Service Provider."
 #~ msgstr ""
-#~ "Zorgu, kapabligi \"NumLock\" ka�zas multe da klavopremoj produkti "
-#~ "ciferojn\n"
-#~ "anstata� normaj literoj (ekzemple: premi `p' produktas `6')"
+#~ "Nun vi povas enigi telefon-konektajn opciojn.  Se vi ne estas certa kio "
+#~ "enigi,\n"
+#~ "vi povas havigi la �ustan informon de via interretprovizanto."
 
 #, fuzzy
-#~ msgid "Actions"
-#~ msgstr "Loko"
+#~ msgid ""
+#~ "You may now configure your network device.\n"
+#~ "\n"
+#~ "   * IP address: if you don't know or are not sure what to enter, ask "
+#~ "your network administrator.\n"
+#~ "     You should not enter an IP address if you select the option "
+#~ "\"Automatic IP\" below.\n"
+#~ "\n"
+#~ "   * Netmask: \"255.255.255.0\" is generally a good choice. If you don't "
+#~ "know or are not sure what to enter,\n"
+#~ "     ask your network administrator.\n"
+#~ "\n"
+#~ "   * Automatic IP: if your network uses BOOTP or DHCP protocol, select "
+#~ "this option. If selected, no value is needed in\n"
+#~ "    \"IP address\". If you don't know or are not sure if you need to "
+#~ "select this option, ask your network administrator."
+#~ msgstr ""
+#~ "Enigu:\n"
+#~ "\n"
+#~ "  - IP-adreson: Se vi ne scias, demandu al via retadministranto.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Retmaskon: \"255.255.255.0\" �enerale estas bona elekta�o.  Se vi ne\n"
+#~ "estas certa, demandu al via retadministranto a� interretprovizanto.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - A�tomata IP-adreson: Se via reto uzas BOOTP-an a� DHCP-an "
+#~ "protokolon,\n"
+#~ "elektu �i tiun opcion.  Se elektita, neniu valoro estas bezonata en\n"
+#~ "\"IP-adreson\".  Se vi ne estas certa, demandu al via retadministranto\n"
+#~ "a� interretprovizanto.\n"
 
 #, fuzzy
-#~ msgid "toot"
-#~ msgstr "Radiko"
-
-#~ msgid "First DNS Server"
-#~ msgstr "Unu DNA-a Servilo"
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, ask your network administrator."
+#~ msgstr ""
+#~ "Se via reto uzas NIS, elektu \"Uzu NIS\".  Se vi ne scias, demandu al "
+#~ "via\n"
+#~ "retadministranto."
 
-#~ msgid "Second DNS Server"
-#~ msgstr "Dua DNA Servilo"
+#~ msgid ""
+#~ "You may now enter dialup options. If you're not sure what to enter, the\n"
+#~ "correct information can be obtained from your ISP."
+#~ msgstr ""
+#~ "Nun vi povas enigi telefon-konektajn opciojn.  Se vi ne estas certa kio "
+#~ "enigi,\n"
+#~ "vi povas havigi la �ustan informon de via interretprovizanto."
 
-#, fuzzy
-#~ msgid "using module"
-#~ msgstr "Diskuma modalo"
+#~ msgid ""
+#~ "If you will use proxies, please configure them now. If you don't know if\n"
+#~ "you should use proxies, ask your network administrator or your ISP."
+#~ msgstr ""
+#~ "Se vi uzos prokurajn servilojn, bonvolu konfiguri ilin nune.  Se vi ne\n"
+#~ "scias �u vi uzos prokurajn servilojn, demandu al via retadministranto a�\n"
+#~ "interretprovizanto."
 
 #, fuzzy
-#~ msgid "Development, Database"
-#~ msgstr "Aliaj Programadaj Iloj"
+#~ msgid ""
+#~ "You can install cryptographic package if your internet connection has "
+#~ "been\n"
+#~ "set up correctly. First choose a mirror where you wish to download "
+#~ "packages and\n"
+#~ "after that select the packages to install.\n"
+#~ "\n"
+#~ "\n"
+#~ "Note you have to select mirror and cryptographic packages according\n"
+#~ "to your legislation."
+#~ msgstr ""
+#~ "Vi povas instali kriptografian paka�on se via interreta konekto estas "
+#~ "�uste\n"
+#~ "pretigita.  Unue elektu spegulon de kie vi deziras el�uti paka�ojn kaj "
+#~ "poste\n"
+#~ "elektu la paka�ojn por instali.\n"
+#~ "\n"
+#~ "Notu ke vi devas elekti spegulon kaj kriptografiajn paka�ojn la� la "
+#~ "le�donoj\n"
+#~ "de via lando."
 
 #, fuzzy
-#~ msgid "Development, Standard tools"
-#~ msgstr "Programisto"
-
-#~ msgid "loopback"
-#~ msgstr "retrokonekta"
-
-#~ msgid "None"
-#~ msgstr "Neniu"
-
-#~ msgid "Which bootloader(s) do you want to use?"
-#~ msgstr "Kiu(j)n start�argilo(j)n vi deziras uzi?"
-
-#~ msgid "Auto install floppy"
-#~ msgstr "A�toinstala disketo"
+#~ msgid ""
+#~ "You can now enter the root password for your Mandrake Linux system.\n"
+#~ "The password must be entered twice to verify that both password entries "
+#~ "are identical.\n"
+#~ "\n"
+#~ "\n"
+#~ "Root is the system's administrator and is the only user allowed to modify "
+#~ "the\n"
+#~ "system configuration. Therefore, choose this password carefully. \n"
+#~ "Unauthorized use of the root account can be extemely dangerous to the "
+#~ "integrity\n"
+#~ "of the system, its data and other system connected to it.\n"
+#~ "\n"
+#~ "\n"
+#~ "The password should be a mixture of alphanumeric characters and at least "
+#~ "8\n"
+#~ "characters long. It should never be written down.\n"
+#~ "\n"
+#~ "\n"
+#~ "Do not make the password too long or complicated, though: you must be "
+#~ "able to\n"
+#~ "remember it without too much effort."
+#~ msgstr ""
+#~ "Nun vi povas enigi la \"root\" (radiko) pasvorto por via Linuks-"
+#~ "Mandrejka\n"
+#~ "sistemo.  Vi devas enigi la pasvorton dufoje por konfirmi ke amba� fojoj\n"
+#~ "estas identaj.\n"
+#~ "\n"
+#~ "\n"
+#~ "La \"root\"-a uzanto estas la administranto de la sistemo, kaj estas la "
+#~ "sola\n"
+#~ "uzanto permesata �an�i la sisteman konfigura�on.  Tial, elektu �i tiun\n"
+#~ "pasvorton zorge!  Nepermesata uzado de la \"root\"-a uzanto povas esti\n"
+#~ "treege dan�era al la sistema integreco kaj dateno, kaj al aliaj sistemoj\n"
+#~ "konektata al �i.  La pasvorto devus esti miksa�o de literciferaj signoj "
+#~ "kaj\n"
+#~ "almena� 8 signoj longa.  *Neniam* surpaperigu �in.  Tamen, ne elektu tro\n"
+#~ "longan a� komplikan pasvorton: vi devas povi memori �in sen tro multe da\n"
+#~ "peno."
 
-#~ msgid "Try to find a modem?"
-#~ msgstr "Provu trovi modemon?"
+#~ msgid ""
+#~ "You may now create one or more \"regular\" user account(s), as\n"
+#~ "opposed to the \"privileged\" user account, root. You can create\n"
+#~ "one or more account(s) for each person you want to allow to use\n"
+#~ "the computer. Note that each user account will have its own\n"
+#~ "preferences (graphical environment, program settings, etc.)\n"
+#~ "and its own \"home directory\", in which these preferences are\n"
+#~ "stored.\n"
+#~ "\n"
+#~ "\n"
+#~ "First of all, create an account for yourself! Even if you will be the "
+#~ "only user\n"
+#~ "of the machine, you may NOT connect as root for daily use of the system: "
+#~ "it's a\n"
+#~ "very high security risk. Making the system unusable is very often a typo "
+#~ "away.\n"
+#~ "\n"
+#~ "\n"
+#~ "Therefore, you should connect to the system using the user account\n"
+#~ "you will have created here, and login as root only for administration\n"
+#~ "and maintenance purposes."
+#~ msgstr ""
+#~ "Nun vi povas krei unu a� pli \"ordinara(j)\" uzanto(j), male al la\n"
+#~ "\"privilegia\" uzanto, \"root\".  Vi povas krei unu a� pli uzanto(j) por\n"
+#~ "�iu persono vi deziras permesi uzi la komputilon.  Notu ke �iu uzanto\n"
+#~ "havos viajn proprajn preferojn (grafikan medion, programajn aran�ojn,\n"
+#~ "ktp.) kaj �ian propran \"hejman dosierujon\", kie �i tiuj preferoj estas\n"
+#~ "konservata.\n"
+#~ "\n"
+#~ "\n"
+#~ "Anta� �io, krei uzanton por vi mem!  E� se vi estos la sola uzulo �e la\n"
+#~ "komputilo, vi ne devus konekti kiel \"root\" por �iutaga uzado de la\n"
+#~ "sistemo: �i estas tre alta sekureca risko.  Fari la sistemon neuzebla\n"
+#~ "estas oftege nur unu misklavo fora.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tial, vi devus konekti al la sistemo per ordinara uzanto vi kreos �i "
+#~ "tie,\n"
+#~ "kaj saluti kiel \"root\" nur por administraj kaj flegadaj kialoj."
 
 #, fuzzy
-#~ msgid "Disable Internet Connection"
-#~ msgstr "Konfiguru interretan konekta�on"
+#~ msgid ""
+#~ "LILO and grub main options are:\n"
+#~ "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
+#~ "partition) that contains the boot sector. Unless you know specifically\n"
+#~ "otherwise, choose \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Delay before booting default image: Specifies the number in tenths\n"
+#~ "of a second the boot loader should wait before booting the first image.\n"
+#~ "This is useful on systems that immediately boot from the hard disk after\n"
+#~ "enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+#~ "omitted or is set to zero.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Video mode: This specifies the VGA text mode that should be selected\n"
+#~ "when booting. The following values are available: \n"
+#~ "\n"
+#~ "    * normal: select normal 80x25 text mode.\n"
+#~ "\n"
+#~ "    * <number>:  use the corresponding text mode.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Clean \"/tmp\" at each boot: if you want delete all files and "
+#~ "directories\n"
+#~ "stored in \"/tmp\" when you boot your system, select this option.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Precise RAM if needed: unfortunately, there is no standard method to "
+#~ "ask the\n"
+#~ "BIOS about the amount of RAM present in your computer. As consequence, "
+#~ "Linux may\n"
+#~ "fail to detect your amount of RAM correctly. If this is the case, you "
+#~ "can\n"
+#~ "specify the correct amount or RAM here. Please note that a difference of "
+#~ "2 or 4\n"
+#~ "MB between detected memory and memory present in your system is normal."
+#~ msgstr ""
+#~ "LILO kaj Grub �efaj opcioj estas:\n"
+#~ "  - Startaparato: Fiksas la nomon de la aparato (ekz-e subdisko de "
+#~ "fiksdisko)\n"
+#~ "tiu enhavas la startsektoron.  Krom se vi scias specife alie, elektu\n"
+#~ "\"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Prokrastoperiodo anta� starti defa�ltan sistemon: Elektas la nombron\n"
+#~ "da dekonoj de sekundo ke la start�argilo devus atendi anta� starti la\n"
+#~ "unuan sistemon.  �i tiu utilas �e sistemoj kiuj tuj startas de la\n"
+#~ "fiksdisko malanta� ili ebligas la klavaron.  La start�argilo ne atendas "
+#~ "se\n"
+#~ "\"delay\" (prokrastoperiodo) estas ellasita a� estas fiksita al nul.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Grafika re�imo: �i tiu specifas la VGA tekstan re�imon por uzi dum\n"
+#~ "start.  La sekvantaj valoroj estas uzeblaj:\n"
+#~ "    * normala: elektu normalan 80 per 25 tekstan re�imon.\n"
+#~ "    * <numero>: uzu la respondan tekstan re�imon."
 
-#~ msgid "Configure local network"
-#~ msgstr "Konfiguru lokan reton"
+#~ msgid ""
+#~ "SILO is a bootloader for SPARC: it is able to boot\n"
+#~ "either GNU/Linux or any other operating system present on your computer.\n"
+#~ "Normally, these other operating systems are correctly detected and\n"
+#~ "installed. If this is not the case, you can add an entry by hand in this\n"
+#~ "screen. Be careful as to choose the correct parameters.\n"
+#~ "\n"
+#~ "\n"
+#~ "You may also want not to give access to these other operating systems to\n"
+#~ "anyone, in which case you can delete the corresponding entries. But\n"
+#~ "in this case, you will need a boot disk in order to boot them!"
+#~ msgstr ""
+#~ "SILO estas start�argilo por Sparc: �i povas starti a� Linukson a� iun "
+#~ "ajn\n"
+#~ "mastruman sistemon �eestanta �e via komputilo.  Normale, �i tiuj aliaj\n"
+#~ "mastrumaj sistemoj estas �uste detektata kaj instalada.  Se tiel ne "
+#~ "estas,\n"
+#~ "vi povas aldoni enskribon mane per �i tiu ekrano.  Zorgu elekti la "
+#~ "�ustajn\n"
+#~ "parametrojn.\n"
+#~ "\n"
+#~ "\n"
+#~ "Eble vi anka� ne deziras doni atingon al �i tiuj aliaj mastrumaj "
+#~ "sistemoj\n"
+#~ "al iu ajn.  �iokaze vi povas forstreki la respondajn enskribojn.  Sed\n"
+#~ "�iokaze, vi bezonos startdiskon por starti ilin!"
 
-#~ msgid "Disable networking"
-#~ msgstr "Malkapabligu retumon"
+#~ msgid ""
+#~ "SILO main options are:\n"
+#~ "  - Bootloader installation: Indicate where you want to place the\n"
+#~ "information required to boot to GNU/Linux. Unless you know exactly\n"
+#~ "what you are doing, choose \"First sector of drive (MBR)\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Delay before booting default image: Specifies the number in tenths\n"
+#~ "of a second the boot loader should wait before booting the first image.\n"
+#~ "This is useful on systems that immediately boot from the hard disk after\n"
+#~ "enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+#~ "omitted or is set to zero."
+#~ msgstr ""
+#~ "SILO �efaj opcioj estas:\n"
+#~ "  - Instalado de Start�argilo: Indiki kie vi deziras meti la informon\n"
+#~ "bezonata por start GNU/Linukso.  Krom se vi scias specife kion vi faras,\n"
+#~ "elektu \"Unua sektoro de drajvo (MBR)\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Prokrastoperiodo anta� starti defa�ltan sistemon: Elektas la nombron\n"
+#~ "da dekonoj de sekundo ke la start�argilo devus atendi anta� starti la\n"
+#~ "unuan sistemon.  �i tiu utilas �e sistemoj kiuj tuj startas de la\n"
+#~ "fiksdisko malanta� ili ebligas la klavaron.  La start�argilo ne atendas "
+#~ "se\n"
+#~ "\"delay\" (prokrastoperiodo) estas ellasita a� estas fiksita al nul."
 
-#, fuzzy
-#~ msgid "Configure the Internet connection / Configure local Network"
-#~ msgstr "Konektu al la Interreto / Konfiguru lokan Reton"
+#~ msgid ""
+#~ "Now it's time to configure the X Window System, which is the\n"
+#~ "core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
+#~ "you must configure your video card and monitor. Most of these\n"
+#~ "steps are automated, though, therefore your work may only consist\n"
+#~ "of verifying what has been done and accept the settings :)\n"
+#~ "\n"
+#~ "\n"
+#~ "When the configuration is over, X will be started (unless you\n"
+#~ "ask DrakX not to) so that you can check and see if the\n"
+#~ "settings suit you. If they don't, you can come back and\n"
+#~ "change them, as many times as necessary."
+#~ msgstr ""
+#~ "Nun estas tempo por konfiguri la X Fenestra Sistemo, kiu estas la kerno\n"
+#~ "de la GNU/Linuksa GUI (Grafika UzulInterfaco).  Por tiu celo, vi devas\n"
+#~ "konfiguri vian grafikan karton kaj ekranon.  La plejparto de �i tiuj "
+#~ "pa�oj\n"
+#~ "estas a�tomatitaj, tamen, do via laboro eble konsistos en konfirmi kion\n"
+#~ "estis farata kaj akcepti la aran�ojn. :)\n"
+#~ "\n"
+#~ "\n"
+#~ "Kiam la konfigurado estas kompleta, X lan�i�os (krom se vi demandas al\n"
+#~ "DrakX ne fari tion) pro ke vi kontrolu �in la observu se la aran�ojn\n"
+#~ "ta�gas por vi.  Se ne, vi povas reveni kaj �an�i ilin, tiom da tempoj "
+#~ "kiom\n"
+#~ "estas necesa."
 
 #~ msgid ""
-#~ "Local networking has already been configured.\n"
-#~ "Do you want to:"
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
 #~ msgstr ""
-#~ "Loka Reto jam estas konfigurita.\n"
-#~ "�u vi deziras:"
+#~ "Se iu misas en la X-a konfigura�o, uzu �i tiujn opciojn por �uste "
+#~ "konfiguri\n"
+#~ "la X Fenestran Sistemon."
 
-#, fuzzy
-#~ msgid "Reconfigure using wizard..."
-#~ msgstr "Mi konfiguras..."
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "Se vi preferas uzi grafikan saluton, elektu \"Jes\".  Aliokaze, elektu "
+#~ "\"Ne\"."
 
-#~ msgid "Multimedia"
-#~ msgstr "Plurmedia"
+#~ msgid ""
+#~ "Your system is going to reboot.\n"
+#~ "\n"
+#~ "After rebooting, your new Mandrake Linux system will load automatically.\n"
+#~ "If you want to boot into another existing operating system, please read\n"
+#~ "the additional instructions."
+#~ msgstr ""
+#~ "Via sistemo restartos.\n"
+#~ "\n"
+#~ "Post restartado, via nova Linuks-Mandrejka sistemo �argi�os a�tomate.  Se "
+#~ "vi\n"
+#~ "deziras starti en alian ekzistanta mastruman sistemon, bonvole legu la\n"
+#~ "pluan instrukcion."
 
-#~ msgid "Sciences"
-#~ msgstr "Sciencoj"
+#~ msgid "Czech (Programmers)"
+#~ msgstr "�e�a (Programistoj)"
 
-#~ msgid "KDE"
-#~ msgstr "KDE"
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "Slovaka (Programistoj)"
 
-#~ msgid "Gnome"
-#~ msgstr "Gnome"
+#~ msgid "Write /etc/fstab"
+#~ msgstr "Skribu /etc/fstab"
 
-#~ msgid "Internet Tools"
-#~ msgstr "Interretiloj"
+#~ msgid "Restore from file"
+#~ msgstr "Resta�ru de dosiero"
 
-#~ msgid "Development C/C++"
-#~ msgstr "Programado C/C++"
+#~ msgid "Save in file"
+#~ msgstr "Konservu en dosiero"
 
-#~ msgid "Configure timezone"
-#~ msgstr "Konfiguru horzonon"
+#~ msgid "Restore from floppy"
+#~ msgstr "Resta�ru de disketo"
 
-#~ msgid "Configure printer"
-#~ msgstr "Konfiguru printilon"
+#~ msgid "Format all"
+#~ msgstr "Formatu �ion"
 
-#, fuzzy
-#~ msgid "Network adaptater 1 (eth0):"
-#~ msgstr "Reta Printilo (ingo)"
+#~ msgid "After formatting all partitions,"
+#~ msgstr "Post formatado de �iuj subdisko,"
 
-#~ msgid "(may cause data corruption)"
-#~ msgstr "(eble ka�zos koruptadon de dateno)"
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "�iuj datenoj sur tiuj subdisko estos perdata"
 
-#~ msgid "Use hard drive optimisations?"
-#~ msgstr "Uzu drajvajn optimumiga�ojn?"
+#~ msgid "Reload"
+#~ msgstr "Re�argu"
 
-#~ msgid "Enable num lock at startup"
-#~ msgstr "Ebligu la \"Num Lock\"-an klavon je startado"
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr "�u vi deziras krei a�toinstalan disketon por replikado de Linukso?"
 
-#~ msgid "Confirm Password"
-#~ msgstr "Konfirmu Pasvorton"
+#~ msgid "ADSL configuration"
+#~ msgstr "ADSL Konfigura�o"
 
 #, fuzzy
-#~ msgid "default"
-#~ msgstr "Defa�lta"
-
-#~ msgid "What is your system used for?"
-#~ msgstr "Por kio vi uzos vian komputilon?"
-
-#~ msgid "Select the size you want to install"
-#~ msgstr "Elektu la grandecon kiu vi deziras instali"
-
-#~ msgid "Use diskdrake"
-#~ msgstr "Uzu diskdrake"
-
-#~ msgid "Customized"
-#~ msgstr "Akomodata"
-
 #~ msgid ""
-#~ "Are you sure you are an expert? \n"
-#~ "You will be allowed to make powerful but dangerous things here.\n"
-#~ "\n"
-#~ "You will be asked questions such as: ``Use shadow file for passwords?'',\n"
-#~ "are you ready to answer that kind of questions?"
+#~ "With a remote CUPS server, you do not have to configure\n"
+#~ "any printer here; printers will be automatically detected\n"
+#~ "unless you have a server on a different network; in the\n"
+#~ "latter case, you have to give the CUPS server IP address\n"
+#~ "and optionally the port number."
 #~ msgstr ""
-#~ "�u vi certas ke vi estas spertulo?\n"
-#~ "�i tio permesos al vi fari potencajn sed dan�erajn agojn.\n"
-#~ "\n"
-#~ "Mi demandos demandojn kiel: ``�u vi deziras `Uzi ombran dosieron por\n"
-#~ "pasvortoj?'', �u vi pretas respondi al tiu speco de demando?\""
-
-#~ msgid "Use shadow file"
-#~ msgstr "Uzu ombran dosieron"
+#~ "Kun malproksima CUPS servilo, vi ne devas konfiguri iun printilon\n"
+#~ "�i tie; printiloj estos a�tomate dektektataj.  Se vi havas dubojn,\n"
+#~ "elektu \"Malproksima CUPS servilo\"."
 
-#~ msgid "shadow"
-#~ msgstr "ombro"
-
-#~ msgid "MD5"
-#~ msgstr "MD5"
+#, fuzzy
+#~ msgid "Remote queue name missing!"
+#~ msgstr "Malproksima printvico"
 
-#~ msgid "Use MD5 passwords"
-#~ msgstr "Uzu MD5-ajn pasvortojn"
+#, fuzzy
+#~ msgid "Command line"
+#~ msgstr "Domajna nomo"
 
-#~ msgid "Search"
-#~ msgstr "Ser�u"
+#, fuzzy
+#~ msgid "Modify printer"
+#~ msgstr "Neniu printilo"
 
-#~ msgid "Package"
-#~ msgstr "Paka�o"
+#, fuzzy
+#~ msgid "start it"
+#~ msgstr "limigu"
 
-#~ msgid "Text"
-#~ msgstr "Teksto"
+#, fuzzy
+#~ msgid "Network Monitoring"
+#~ msgstr "ISDN-a Konfigura�on"
 
-#~ msgid "Tree"
-#~ msgstr "Arbo"
+#, fuzzy
+#~ msgid "Profile "
+#~ msgstr "muntado malsukcesis: "
 
-#~ msgid "Sort by"
-#~ msgstr "Ordigu la�"
+#~ msgid "Sending Speed:"
+#~ msgstr "Sendrapideco: "
 
-#~ msgid "Category"
-#~ msgstr "Kategorio"
+#~ msgid "Receiving Speed:"
+#~ msgstr "Ricevrapideco: "
 
-#~ msgid "See"
-#~ msgstr "Vidu"
+#, fuzzy
+#~ msgid "Connection Time: "
+#~ msgstr "Speco de konekto"
 
-#~ msgid "Installed packages"
-#~ msgstr "Instalitaj paka�oj"
+#~ msgid "Connecting to Internet "
+#~ msgstr "Konektas al la Interreto"
 
-#~ msgid "Available packages"
-#~ msgstr "Haveblaj paka�oj"
+#, fuzzy
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "Malkonektas el la Interreto"
 
-#~ msgid "Show only leaves"
-#~ msgstr "Montru nur foliojn"
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "Malkonektado el la Interreto malsukcesis."
 
-#~ msgid "Expand all"
-#~ msgstr "Etendu �ion"
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "Malkonektado el la Interreto finis."
 
-#~ msgid "Collapse all"
-#~ msgstr "Maletendu �ion"
+#, fuzzy
+#~ msgid "Connection complete."
+#~ msgstr "Nomo de konekto"
 
-#~ msgid "Add location of packages"
-#~ msgstr "Aldonu lokon de paka�oj"
+#, fuzzy
+#~ msgid "Color configuration"
+#~ msgstr "Konfigura�on"
 
-#~ msgid "Update location"
-#~ msgstr "�isdatigu lokon"
+#~ msgid "sent: "
+#~ msgstr "sendita(j): "
 
-#~ msgid "Remove"
-#~ msgstr "Forigu"
+#~ msgid "received: "
+#~ msgstr "ricevita(j): "
 
-#~ msgid "Find Package"
-#~ msgstr "Trovu paka�on"
+#~ msgid "Connect"
+#~ msgstr "Konektu"
 
-#~ msgid "Find Package containing file"
-#~ msgstr "Trovu Paka�on kiu enhavas dosieron"
+#~ msgid "Disconnect"
+#~ msgstr "Malkonektu"
 
-#~ msgid "Toggle between Installed and Available"
-#~ msgstr "�altu inter Instalita kaj Havebla"
+#~ msgid "/File/_New"
+#~ msgstr "/Dosiero/_Nova"
 
-#~ msgid "Uninstall"
-#~ msgstr "Malinstalu"
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
 
-#~ msgid "Choose package to install"
-#~ msgstr "Elektu paka�on por instali"
+#~ msgid "/File/_Open"
+#~ msgstr "/Dosiero/_Malfermu"
 
-#~ msgid "Checking dependencies"
-#~ msgstr "Kontrolas dependa�ojn"
+#~ msgid "<control>O"
+#~ msgstr "<control>M"
 
-#~ msgid "Wait"
-#~ msgstr "Atendu"
+#~ msgid "/File/_Save"
+#~ msgstr "/Dosiero/_Savu"
 
-#~ msgid "The following packages are going to be uninstalled"
-#~ msgstr "La sekvaj paka�oj estos malinstalataj"
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
 
-#~ msgid "Uninstalling the RPMs"
-#~ msgstr "Malinstalas la RPM-ajn dosierojn"
+#~ msgid "/File/Save _As"
+#~ msgstr "/Dosiero/Savu _Kiel"
 
-#~ msgid "Regexp"
-#~ msgstr "Regula Esprimo"
+#~ msgid "/File/-"
+#~ msgstr "/Dosiero/-"
 
-#~ msgid "Which package are looking for"
-#~ msgstr "Kiun paka�on vi ser�as?"
+#~ msgid "/_Options"
+#~ msgstr "/_Opcioj"
 
-#~ msgid "%s not found"
-#~ msgstr "%s ne trovita"
+#~ msgid "/Options/Test"
+#~ msgstr "/Opcioj/Provu"
 
-#~ msgid "No match"
-#~ msgstr "Neniu egala�on"
+#~ msgid "/_Help"
+#~ msgstr "/_Helpo"
 
-#~ msgid "No more match"
-#~ msgstr "Neniuj pluaj egala�oj"
+#~ msgid "/Help/_About..."
+#~ msgstr "/Helpo/_Pri..."
 
-#~ msgid ""
-#~ "rpmdrake is currently in ``low memory'' mode.\n"
-#~ "I'm going to relaunch rpmdrake to allow searching files"
-#~ msgstr ""
-#~ "rpmdrake estas nune en la re�imo de ``nesufi�a-memoro''.\n"
-#~ "Mi restartos rpmdrake por permesi ser�i dosierojn."
+#, fuzzy
+#~ msgid "Default Runlevel"
+#~ msgstr "Defa�lta"
 
-#~ msgid "Which file are you looking for?"
-#~ msgstr "Kiun dosieron vi ser�as?"
+#~ msgid "Europe"
+#~ msgstr "E�ropo"
 
-#~ msgid "What are looking for?"
-#~ msgstr "Kion vi ser�as?"
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
 
-#~ msgid "Give a name (eg: `extra', `commercial')"
-#~ msgstr "Donu nomon (ekz-e `ekstra', `komerca')"
+#~ msgid "Remove queue"
+#~ msgstr "Malinstalu printvicon"
 
-#~ msgid "Directory"
-#~ msgstr "Dosierujo"
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "Mi ne povas kompreni la enhavon de la konfigurodosiero."
 
-#~ msgid "No cdrom available (nothing in /mnt/cdrom)"
-#~ msgstr "Neniu KD-ROMo havebla (neniu en /mnt/cdrom)"
+#~ msgid "Adapter"
+#~ msgstr "Adaptilo"
 
-#~ msgid "URL of the directory containing the RPMs"
-#~ msgstr "URL por la dosierujo kiu enhavas la RPM-ajn dosierojn"
+#, fuzzy
+#~ msgid "Disable network"
+#~ msgstr "Malebligu"
 
-#~ msgid ""
-#~ "For FTP and HTTP, you need to give the location for hdlist\n"
-#~ "It must be relative to the URL above"
-#~ msgstr ""
-#~ "Por FTP kaj HTTP, vi bezonas doni la lokon por hdlist-o.\n"
-#~ "�i devas esti relativa al la supra URL-o."
+#, fuzzy
+#~ msgid "Enable network"
+#~ msgstr "Ebligu"
 
-#~ msgid "Please submit the following information"
-#~ msgstr "Bonvole liveru la sekvantan informon"
+#, fuzzy
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "Konfiguru interretan konekta�on"
 
-#~ msgid "%s is already in use"
-#~ msgstr "%s estas jam uzata"
+#~ msgid "Choose"
+#~ msgstr "Elektu"
 
-#~ msgid "Updating the RPMs base"
-#~ msgstr "�isdatigas la bazon de RPM-aj dosieroj"
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr "Vi povas specifi rekte la URI por atingi la printilon per CUPS."
 
-#~ msgid "Going to remove entry %s"
-#~ msgstr "Forigos enskribon %s"
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "Jes, printu Askian provpa�on"
 
-#~ msgid "Finding leaves"
-#~ msgstr "Trovas foliojn"
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "Jes, printu PostSkriban provpa�on"
 
-#~ msgid "Finding leaves takes some time"
-#~ msgstr "Trovi foliojn bezonas iom da tempo"
+#~ msgid "Paper Size"
+#~ msgstr "Papergrandeco"
 
-#~ msgid "I have found an ISDN Card:\n"
-#~ msgstr "Mi trovis ISDN-an Karton:\n"
+#~ msgid "Eject page after job?"
+#~ msgstr "El�etu pa�on post tasko?"
 
-#~ msgid "France"
-#~ msgstr "Francujo"
+#~ msgid "Uniprint driver options"
+#~ msgstr "Uniprint-aj pelilaj opcioj"
 
-#~ msgid "Other countries"
-#~ msgstr "Aliaj landoj"
+#~ msgid "Color depth options"
+#~ msgstr "Kolorprofunecaj opcioj"
 
-#~ msgid "In which country are you located ?"
-#~ msgstr "En kiu lando vi estas?"
+#~ msgid "Print text as PostScript?"
+#~ msgstr "Printu tekston kiel PostScripto?"
 
-#~ msgid "Alcatel modem"
-#~ msgstr "Alcatel modemo"
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Riparu �tuparan tekston?"
 
-#~ msgid "ECI modem"
-#~ msgstr "ECI modemo"
+#~ msgid "Number of pages per output pages"
+#~ msgstr "Nombro de pa�oj en eliga pa�o"
 
-#~ msgid ""
-#~ "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+#~ msgid "Right/Left margins in points (1/72 of inch)"
 #~ msgstr ""
-#~ "Se via ADSL modemo estas Alcatel-a, elektu \"Alcatel\".  Aliokaze, elektu "
-#~ "\"ECI\"."
-
-#~ msgid "don't use pppoe"
-#~ msgstr "ne uzu pppoe"
+#~ "Dekstra/Maldrekstra mar�enoj en punktoj (1/72 de colo, proksimume 1/3 mm)"
 
-#~ msgid "mandatory"
-#~ msgstr "deviga(j)"
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr ""
+#~ "Supra/Malsupra mar�enoj en punktoj (1/72 de colo, proksimume 1/3 mm)"
 
-#~ msgid "interesting"
-#~ msgstr "interesa(j)"
+#~ msgid "Extra GhostScript options"
+#~ msgstr "Aldonaj GhostScript-aj opcioj"
 
-#~ msgid "i18n (important)"
-#~ msgstr "i18n (grava(j))"
+#~ msgid "Extra Text options"
+#~ msgstr "Aldonaj Tekstaj opcioj"
 
-#~ msgid "i18n (very nice)"
-#~ msgstr "i18n (tre agrabla(j))"
+#~ msgid "Reverse page order"
+#~ msgstr "Inversigu ordon de pa�oj"
 
-#~ msgid "i18n (nice)"
-#~ msgstr "i18n (agrabla(j))"
+#~ msgid "CUPS starting"
+#~ msgstr "CUPS startas"
 
-#~ msgid "Which serial port is your mouse connected to?"
-#~ msgstr "Al kiu seria pordo estas via muso konektata?"
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Elektu Malproksiman Printilan Konekton"
 
-#~ msgid "KDE, QT, Gnome, GTK+"
-#~ msgstr "KDE, QT, Gnome, GTK+"
+#~ msgid ""
+#~ "Every printer need a name (for example lp).\n"
+#~ "Other parameters such as the description of the printer or its location\n"
+#~ "can be defined. What name should be used for this printer and\n"
+#~ "how is the printer connected?"
+#~ msgstr ""
+#~ "�iuj printilo bezonas nomon (ekzemple lp).\n"
+#~ "Aliaj parametroj, ekzemple la priskribon de la printilo a� �ian lokon\n"
+#~ "vi povas difini.  Kiu nomo devus uzata por �i tiu printilo kaj kiel\n"
+#~ "�i estas konektata?"
 
-#~ msgid "Python, Perl, libraries, tools"
-#~ msgstr "Python, Perl, bibliotekoj, iloj"
+#~ msgid ""
+#~ "Every print queue (which print jobs are directed to) needs a\n"
+#~ "name (often lp) and a spool directory associated with it. What\n"
+#~ "name and directory should be used for this queue and how is the printer "
+#~ "connected?"
+#~ msgstr ""
+#~ "�iuj printvico (al kiu printajn taskojn estas direktata) bezonas nomon\n"
+#~ "(ofte lp) kaj fonan eneligan dosierujon asociata kun �i.  Kiu nomo kaj\n"
+#~ "dosierujo devus uzata por �i tiu printvico?"
 
-#~ msgid "Czech"
-#~ msgstr "�e�a"
+#~ msgid "Name of queue"
+#~ msgstr "Nomo de printvico"
 
-#~ msgid "Slovakian"
-#~ msgstr "Slovaka"
+#~ msgid "Spool directory"
+#~ msgstr "Fona eneliga dosierujo"
diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po
index da06cc26d..927cf908f 100644
--- a/perl-install/share/po/et.po
+++ b/perl-install/share/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-02 17:16+0200\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
 "PO-Revision-Date: 1999-10-28 19:54+0200\n"
 "Last-Translator: Riho Kurg <rx@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -13,25 +13,25 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
+#: ../../Xconfigurator.pm_.c:231
+msgid "Configure all heads independently"
 msgstr "Seadista k�ik monitorid s�ltumatult"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
 msgstr "Kasuta Xinerama laiendusi"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr "Seadista ainult kaart \"%s\" (%s)"
 
 #
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
 msgstr "Mitme monitori seadistamine"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:239
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
@@ -39,33 +39,33 @@ msgstr ""
 "S�steemis on v�imalik kasutada mitut monitori.\n"
 "Mida Te soovite teha?"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "Graafikakaart"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "Valige graafikakaart"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "Valige X server"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "X server"
 msgstr "X server"
 
-#: ../../Xconfigurator.pm_.c:309 ../../Xconfigurator.pm_.c:316
-#: ../../Xconfigurator.pm_.c:366
+#: ../../Xconfigurator.pm_.c:307 ../../Xconfigurator.pm_.c:313
+#: ../../Xconfigurator.pm_.c:363 ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s"
 msgstr "XFree86 %s"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:310
 msgid "Which configuration of XFree do you want to have?"
 msgstr "Millise XFree konfiguratsiooni soovite kasutada?"
 
-#: ../../Xconfigurator.pm_.c:324
+#: ../../Xconfigurator.pm_.c:321
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -74,17 +74,18 @@ msgstr ""
 "Teie videokaardi 3D graafikakiirendit saab kasutada vaid koos XFree %s-ga.\n"
 "XFree %s toetab Teie videokaarti ja v�ib omada paremat 2D tuge."
 
-#: ../../Xconfigurator.pm_.c:326 ../../Xconfigurator.pm_.c:359
+#: ../../Xconfigurator.pm_.c:323 ../../Xconfigurator.pm_.c:356
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with XFree %s."
 msgstr "Teie kaardi 3D graafikakiirendit toetab XFree %s."
 
-#: ../../Xconfigurator.pm_.c:328 ../../Xconfigurator.pm_.c:361
+#: ../../Xconfigurator.pm_.c:325 ../../Xconfigurator.pm_.c:358
+#: ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s with 3D hardware acceleration"
 msgstr "XFree %s koos 3D graafikakiirendi toega"
 
-#: ../../Xconfigurator.pm_.c:336 ../../Xconfigurator.pm_.c:350
+#: ../../Xconfigurator.pm_.c:333 ../../Xconfigurator.pm_.c:347
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -93,12 +94,12 @@ msgstr ""
 "Teie videokaardi 3D graafikakiirendit saab kasutada koos XFree %s-ga.\n"
 "SEE ON AGA EKSPERIMENTAALNE JA V�IB OLLA EBASTABIILNE."
 
-#: ../../Xconfigurator.pm_.c:338 ../../Xconfigurator.pm_.c:352
+#: ../../Xconfigurator.pm_.c:335 ../../Xconfigurator.pm_.c:349
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "XFree %s koos EKSPERIMENTAALSE 3D kiirendi toega"
 
-#: ../../Xconfigurator.pm_.c:347
+#: ../../Xconfigurator.pm_.c:344
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -109,27 +110,31 @@ msgstr ""
 "SEE ON AGA EKSPERIMENTAALNE JA V�IB OLLA EBASTABIILNE.\n"
 "Teie kaarti toetab ka XFree %s, millel on ehk parem 2D tugi."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "XFree s�tted"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "Valige graafikam�lu suurus"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "Valige X server"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "Valige monitor"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:483
+#: ../../Xconfigurator.pm_.c:519
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -149,39 +154,39 @@ msgstr ""
 "suurem kui Teie monitor v�imaldab. Vastasel juhul v�ib Teie monitor h�vida.\n"
 "Kui kahtlete, valige pigem v�iksem v��rtus."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Realaotussagedus"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Ekraaniuuendussagedus"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "Monitor ei ole seadistatud"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "Graafikakaart ei ole veel seatud"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "Kuvatihedus ei ole veel seatud"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "Kas soovite seadistusi proovida?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Hoiatus: testimine v�ib Teie arvuti peatada"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Proovime seadistusi"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -189,152 +194,156 @@ msgstr ""
 "\n"
 "proovige m�nd parameetrit muuta"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "Tekkis mingi viga:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "J�tkub %d sekundi p�rast"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "Kas see on �ige?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "Tekkis mingi viga, proovige m�nd parameetrit muuta"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Kuvatihedus"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "Valige kuvatihedus ja v�rvis�gavus"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Graafikakaart: %s"
 
-#: ../../Xconfigurator.pm_.c:734
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 server: %s"
 
-#: ../../Xconfigurator.pm_.c:750 ../../standalone/draknet_.c:280
-#: ../../standalone/draknet_.c:283
+#: ../../Xconfigurator.pm_.c:829 ../../printerdrake.pm_.c:1885
+#: ../../standalone/draknet_.c:298 ../../standalone/draknet_.c:301
 msgid "Expert Mode"
 msgstr "Ekspertresiim"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "N�ita k�ike"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Kuvatihedused"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Klaviatuuriasetus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Hiire t��p: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Hiire port: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1333
+#: ../../Xconfigurator.pm_.c:1440
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1334
+#: ../../Xconfigurator.pm_.c:1441
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Realaotussagedus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Ekraanisagedus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Graafikakaart: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Graafikakaart: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Videom�lu: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "V�rvis�gavus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Kuvatihedus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1342
+#: ../../Xconfigurator.pm_.c:1450
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 server: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1343
+#: ../../Xconfigurator.pm_.c:1451
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "XFree86 juhtprogramm: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "Valmistume X-i seadistamiseks"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "Mida Te soovite teha?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "Muuda monitori"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "Muuda graafikakaardi"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "Muuda serveri parameetreid"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "Muuda kuvatihedust"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "N�ita lisainfot"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "Proovi veel"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "V�lju"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -348,20 +357,20 @@ msgstr ""
 "%s"
 
 # c-format
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Muudatuste aktiveerimiseks k�ivitage %s uuesti"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Palun v�ljuge ja vajutage siis Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "X stardib n��d"
 
-#: ../../Xconfigurator.pm_.c:1447
+#: ../../Xconfigurator.pm_.c:1556
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -414,214 +423,225 @@ msgid "8 MB"
 msgstr "8 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
+#, fuzzy
+msgid "16 MB"
+msgstr "1 MB"
+
+#: ../../Xconfigurator_consts.pm_.c:113
+#, fuzzy
+msgid "32 MB"
+msgstr "2 MB"
+
+#: ../../Xconfigurator_consts.pm_.c:114
+#, fuzzy
+msgid "64 MB or more"
 msgstr "16 MB v�i rohkem"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "VGA, 640x400 sagedusel 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "SVGA, 800x600 sagedusel 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514-�hilduv, 1024x768, 87 Hz vahelej�tuga "
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "SVGA, 1024x768, 87 Hz vahelej�tuga, 800x600, 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "SVGA, 800x600 sagedusel 60 Hz, 640x480 sagedusel 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "SVGA, 1024x768 sagedusel 60 Hz, 800x600 sagedusel 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "K�rgsageduslik SVGA, 1024x768, 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:127
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Mitmesageduslik, 1280x1024 sagedusel 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:128
+#: ../../Xconfigurator_consts.pm_.c:130
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Mitmesageduslik, 1280x1024 sagedusel 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:129
+#: ../../Xconfigurator_consts.pm_.c:131
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Mitmesageduslik, 1280x1024 sagedusel 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Kuvatihedus saab olla 1600x1200 sagedusel 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Kuvatihedus saab olla 1600x1200 sagedusel 76 Hz"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124
+#: ../../any.pm_.c:96 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Partitsiooni algusesse"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124 ../../any.pm_.c:197
+#: ../../any.pm_.c:96 ../../any.pm_.c:121 ../../any.pm_.c:194
 msgid "First sector of drive (MBR)"
 msgstr "Ketta algusesse (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "SILO installimine"
 
-#: ../../any.pm_.c:104 ../../any.pm_.c:117
+#: ../../any.pm_.c:101 ../../any.pm_.c:114
 msgid "Where do you want to install the bootloader?"
 msgstr "Kuhu soovite alglaaduri installida"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "LILO/grub installimine"
 
-#: ../../any.pm_.c:128 ../../any.pm_.c:142
+#: ../../any.pm_.c:125 ../../any.pm_.c:139
 msgid "SILO"
 msgstr "SILO"
 
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:127
 msgid "LILO with text menu"
 msgstr "LILO tekstiresiimis"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "LILO graafikaresiimis"
 
-#: ../../any.pm_.c:134
+#: ../../any.pm_.c:131
 msgid "Grub"
 msgstr "Grub"
 
-#: ../../any.pm_.c:138
+#: ../../any.pm_.c:135
 msgid "Boot from DOS/Windows (loadlin)"
 msgstr "Laadimine DOS/Windowsist (loadlin)"
 
-#: ../../any.pm_.c:140 ../../any.pm_.c:142
+#: ../../any.pm_.c:137 ../../any.pm_.c:139
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: ../../any.pm_.c:148 ../../any.pm_.c:180
+#: ../../any.pm_.c:145 ../../any.pm_.c:177
 msgid "Bootloader main options"
 msgstr "Alglaaduri peas�tted"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
 msgstr "Eelistatav alglaadur"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "Alglaaduri peas�tted"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "Alglaadimisseade"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (ei t��ta vanema BIOSi korral)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Kompaktne"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "kompaktne"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Graafikamood"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "Ooteaeg alglaadimisel"
 
-#: ../../any.pm_.c:160 ../../any.pm_.c:741
-#: ../../install_steps_interactive.pm_.c:904 ../../netconnect.pm_.c:629
-#: ../../printerdrake.pm_.c:98 ../../printerdrake.pm_.c:132
-#: ../../standalone/draknet_.c:569
+#: ../../any.pm_.c:157 ../../any.pm_.c:730
+#: ../../install_steps_interactive.pm_.c:938 ../../network/modem.pm_.c:46
+#: ../../printerdrake.pm_.c:402 ../../printerdrake.pm_.c:481
+#: ../../standalone/draknet_.c:603
 msgid "Password"
 msgstr "Salas�na"
 
-#: ../../any.pm_.c:161 ../../any.pm_.c:742
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../any.pm_.c:158 ../../any.pm_.c:731
+#: ../../install_steps_interactive.pm_.c:939
 msgid "Password (again)"
 msgstr "Salas�na (uuesti)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Piira k�surea suvandeid"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "piiratud"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "Puhasta /tmp igal laadimisel"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Kui vaja, t�psusta RAM suurust (leitud %d MB)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "V�imalda mitut profiili"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Anna m�lu suurus megabaitides"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "S�te ``Piira k�surea suvandeid'' on ilma salas�nata mittekasutatav"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "Please try again"
 msgstr "Palun proovige veel"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "The passwords do not match"
 msgstr "Salas�nad ei klapi"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
 msgstr "Initsialiseerimisteade"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr "Open Firmware viivitus"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
 msgstr "Ajapiirang kerneli laadimisel"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
 msgstr "CD-lt laadimine lubatud?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr "OF laadimine lubatud?"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 msgid "Default OS?"
 msgstr "Vaikimisi OS?"
 
-#: ../../any.pm_.c:210
+#: ../../any.pm_.c:207
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -629,146 +649,145 @@ msgstr ""
 "Praegu on kasutusel sellised kirjed.\n"
 "Te v�ite neid lisada ning olemasolevaid muuta."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "Lisa"
 
-#: ../../any.pm_.c:220 ../../any.pm_.c:729 ../../diskdrake.pm_.c:46
-#: ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217 ../../any.pm_.c:718 ../../diskdrake.pm_.c:161
+#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:1846
+#: ../../printerdrake.pm_.c:1847 ../../printerdrake.pm_.c:1904
+#: ../../printerdrake.pm_.c:1948
 msgid "Done"
 msgstr "Tehtud"
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:217
 #, fuzzy
 msgid "Modify"
 msgstr "Modifitseeri RAIDi"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "Millisele sektorile soovite seda t�sta?"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Other OS (SunOS...)"
 msgstr "Muu OS (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "Muu OS (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "Muu OS (windows...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "Laadefail"
 
-#: ../../any.pm_.c:253 ../../any.pm_.c:264
+#: ../../any.pm_.c:247 ../../any.pm_.c:258
 msgid "Root"
 msgstr "Juur"
 
-#: ../../any.pm_.c:254 ../../any.pm_.c:283
+#: ../../any.pm_.c:248 ../../any.pm_.c:277
 msgid "Append"
 msgstr "Lisada"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "Read-write"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "Tabel"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "Ebaturvaline"
 
-#: ../../any.pm_.c:274 ../../any.pm_.c:279 ../../any.pm_.c:282
+#: ../../any.pm_.c:268 ../../any.pm_.c:273 ../../any.pm_.c:276
 msgid "Label"
 msgstr "T�his"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: ../../any.pm_.c:284
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
 msgstr "Initrd suurus"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
 msgstr "NoVideo"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "Eemalda kirje"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "T�hi kirjet�his ei ole lubatud"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "Selline t�his on juba kasutusel"
 
-#: ../../any.pm_.c:317
-msgid "What type of partitioning?"
-msgstr "Mis t��pi partitsioonid teete?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Leiti %s %s liidest"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "On Teil veel kaarte?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Kas Teil on ikka m�ni %s liides?"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
-#: ../../printerdrake.pm_.c:237
+#: ../../any.pm_.c:601 ../../any.pm_.c:760 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "No"
 msgstr "Ei"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
+#: ../../any.pm_.c:601 ../../any.pm_.c:759 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "Yes"
 msgstr "Jah"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "Info riistvara kohta"
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:648
+#: ../../any.pm_.c:637
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "Installime juhtprogrammil %s kaardile %s"
 
-#: ../../any.pm_.c:649
+#: ../../any.pm_.c:638
 #, c-format
 msgid "(module %s)"
 msgstr "(moodul %s)"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:660
+#: ../../any.pm_.c:649
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Millist %s juhtprogrammi peaksime proovima?"
 
-#: ../../any.pm_.c:668
+#: ../../any.pm_.c:657
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -784,20 +803,20 @@ msgstr ""
 "m��ratleda v�i lasta juhtprogrammil ise Teie arvutit kompida? V�ib juhtuda,\n"
 "et see viib arvuti segadusse kuid ei tohiks mingit j��vat kahju teha."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "Proovida niisama"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "M��rake parameetrid"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "N��d v�ite moodulile %s parameetreid m��rata"
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -808,11 +827,11 @@ msgstr ""
 "Parameetrid on vormingus \"nimi=v��rtus nimi2=v��rtus2 ...\".\n"
 "N�iteks: \"io=0x300 irq=7\""
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Mooduli parameetrid:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -821,33 +840,33 @@ msgstr ""
 "Moodule %s laadimine ei �nnestunud.\n"
 "Kas soovite proovida parameetreid muuta?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(juba lisatud %s)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "Salas�na on liiga lihtne"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "Palun andke kasutajatunnus"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Kasutajatunnus tohib sisaldada ainult v�ikesi t�hti, numbreid, - ja _"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "See kasutajatunnus on juba lisatud"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "Lisa kasutaja"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -856,54 +875,67 @@ msgstr ""
 "Sisesta kasutaja\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Kasutaja �ige"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "P�risnimi"
 
-#: ../../any.pm_.c:740 ../../printerdrake.pm_.c:97
-#: ../../printerdrake.pm_.c:131
+#: ../../any.pm_.c:729 ../../printerdrake.pm_.c:401
+#: ../../printerdrake.pm_.c:480
 msgid "User name"
 msgstr "Kasutajatunnus"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "K�surida"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "Ikoon"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:756
 msgid "Autologin"
 msgstr "Vaikimisi sisenemine"
 
-#: ../../any.pm_.c:767
+#: ../../any.pm_.c:757
+#, fuzzy
 msgid ""
 "I can set up your computer to automatically log on one user.\n"
-"If you don't want to use this feature, click on the cancel button."
+"Do you want to use this feature?"
 msgstr ""
 "Teie arvutit saab seada vaikimisi kasutaja sisenemisele.\n"
 "Kui Te seda ei soovi, valige <Katkesta>"
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "Valige uus vaikimisi kasutaja :"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "Valige palun k�ivitatav aknahaldur:"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "Palun valige kasutatav keel"
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr "Teisi keeli saab valida p�rast installimist"
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "K�ik"
+
 # NOTE: this message will be displayed at boot time; that is
 # only the ascii charset will be available on most machines
 # so use only 7bit for this message (and do transliteration or
 # leave it in English, as it is the best for your language)
 # 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:262 ../../bootloader.pm_.c:608
+#: ../../bootloader.pm_.c:259
 #, c-format
 msgid ""
 "Welcome to %s the operating system chooser!\n"
@@ -928,51 +960,56 @@ msgstr ""
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:809
+#: ../../bootloader.pm_.c:835
 msgid "Welcome to GRUB the operating system chooser!"
 msgstr "Tere tulemast! Laadimisel aitab Teid GRUB!"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:812
+#: ../../bootloader.pm_.c:838
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
 msgstr "Kasutage valiku tegemiseks %c ja %c klahve"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:815
+#: ../../bootloader.pm_.c:841
 msgid "Press enter to boot the selected OS, 'e' to edit the"
 msgstr "Enter laeb Teie valiku, 'e' laseb muuta"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:818
+#: ../../bootloader.pm_.c:844
 msgid "commands before booting, or 'c' for a command-line."
 msgstr "suvandeid enne laadimist ja 'c' veel enam."
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:821
+#: ../../bootloader.pm_.c:847
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr "Valik laetakse automaatselt %d sekundi jooksul"
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
 msgstr "/boot on liiga t�is"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
 #. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:918
+#: ../../bootloader.pm_.c:951
 msgid "Desktop"
 msgstr "T��laud"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:920
+#: ../../bootloader.pm_.c:953
 msgid "Start Menu"
 msgstr "Startmen��"
 
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "Kuhu soovite alglaaduri installida"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
 msgstr "selle kohta (veel) abi ei saa.\n"
@@ -985,68 +1022,40 @@ msgstr "Alglaaduri stiil"
 msgid "/_File"
 msgstr "/_Fail"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/Fail/_Uus"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/Fail/_Ava"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>O"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/Fail/_Salvesta"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>S"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/Fail/Salvesta _Kui"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/Fail/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/Fail/_V�lju"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_Eelistused"
+#: ../../bootlook.pm_.c:91
+msgid "NewStyle Categorizing Monitor"
+msgstr "NewStyle kategoriseeritud j�lgimine"
+
+#: ../../bootlook.pm_.c:92
+msgid "NewStyle Monitor"
+msgstr "NewStyle j�lgimine"
 
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Eelistused/Test"
+#: ../../bootlook.pm_.c:93
+msgid "Traditional Monitor"
+msgstr "Tavaline j�lgimine"
 
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/_Abi"
+#: ../../bootlook.pm_.c:94
+msgid "Traditional Gtk+ Monitor"
+msgstr "Traditsiooniline Gtk+ j�lgimine"
 
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/Abi/_Misv�rk"
+#: ../../bootlook.pm_.c:95
+msgid "Launch Aurora at boot time"
+msgstr "K�ivita alglaadimisel Aurora"
 
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "Seadista"
+#: ../../bootlook.pm_.c:100
+#, fuzzy
+msgid "Lilo/grub mode"
+msgstr "Valimisviis"
 
-#: ../../bootlook.pm_.c:114
+#: ../../bootlook.pm_.c:102
 #, fuzzy, c-format
 msgid ""
 "You are currently using %s as Boot Manager.\n"
@@ -1058,454 +1067,657 @@ msgstr ""
 "\n"
 "Valige Abimehe k�ivitamiseks ``OK''"
 
-#: ../../bootlook.pm_.c:121
-#, fuzzy
-msgid "Lilo/grub mode"
-msgstr "Valimisviis"
-
-#: ../../bootlook.pm_.c:131
-msgid "NewStyle Categorizing Monitor"
-msgstr "NewStyle kategoriseeritud j�lgimine"
-
-#: ../../bootlook.pm_.c:134
-msgid "NewStyle Monitor"
-msgstr "NewStyle j�lgimine"
-
-#: ../../bootlook.pm_.c:137
-msgid "Traditional Monitor"
-msgstr "Tavaline j�lgimine"
-
-#: ../../bootlook.pm_.c:140
-msgid "Traditional Gtk+ Monitor"
-msgstr "Traditsiooniline Gtk+ j�lgimine"
-
-#: ../../bootlook.pm_.c:144
-msgid "Launch Aurora at boot time"
-msgstr "K�ivita alglaadimisel Aurora"
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "Seadista"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
 msgstr "Alglaadimismood"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "T��mood"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr "K�ivita X-Windows alglaadimisel"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr "Ei taha automaatselt siseneda"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr ""
 "Jah, soovin automaatset sisselogimist sellele (kasutajale, keskkonnale)"
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "T��mood"
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "Vaikimisi"
-
-#: ../../bootlook.pm_.c:236 ../../standalone/draknet_.c:88
-#: ../../standalone/draknet_.c:120 ../../standalone/draknet_.c:184
-#: ../../standalone/draknet_.c:302 ../../standalone/draknet_.c:396
-#: ../../standalone/draknet_.c:473 ../../standalone/draknet_.c:509
-#: ../../standalone/draknet_.c:617
+#: ../../bootlook.pm_.c:155 ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:140 ../../standalone/draknet_.c:208
+#: ../../standalone/draknet_.c:320 ../../standalone/draknet_.c:433
+#: ../../standalone/draknet_.c:507 ../../standalone/draknet_.c:543
+#: ../../standalone/draknet_.c:644
 msgid "OK"
 msgstr "OK"
 
-#: ../../bootlook.pm_.c:238 ../../install_steps_gtk.pm_.c:576
-#: ../../interactive.pm_.c:114 ../../interactive.pm_.c:269
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:357
-#: ../../my_gtk.pm_.c:360 ../../my_gtk.pm_.c:617
-#: ../../standalone/drakgw_.c:639 ../../standalone/draknet_.c:95
-#: ../../standalone/draknet_.c:127 ../../standalone/draknet_.c:295
-#: ../../standalone/draknet_.c:485 ../../standalone/draknet_.c:631
-#: ../../standalone/tinyfirewall_.c:63
+#: ../../bootlook.pm_.c:156 ../../install_steps_gtk.pm_.c:516
+#: ../../interactive.pm_.c:122 ../../interactive.pm_.c:286
+#: ../../interactive.pm_.c:308 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:416 ../../my_gtk.pm_.c:419 ../../my_gtk.pm_.c:716
+#: ../../printerdrake.pm_.c:1158 ../../standalone/drakgw_.c:648
+#: ../../standalone/draknet_.c:115 ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:313 ../../standalone/draknet_.c:519
+#: ../../standalone/draknet_.c:658 ../../standalone/tinyfirewall_.c:63
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "ei saa lugeda faili /etc/inittab: $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "ei saa lugeda faili /etc/sysconfig/autologin: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "ei saa lugeda faili /etc/inittab: %s"
 
-#: ../../bootlook.pm_.c:435 ../../standalone/drakboot_.c:47
+#: ../../bootlook.pm_.c:336 ../../standalone/drakboot_.c:47
 msgid "Installation of LILO failed. The following error occured:"
 msgstr "LILO installimine eba�nnestus. Tekkis j�rgnev viga:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Tekita"
-
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "�henda lahti"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Kustuta"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "KB"
 
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "Vorminda"
+#: ../../common.pm_.c:93 ../../install_steps_graphical.pm_.c:287
+#: ../../install_steps_graphical.pm_.c:334
+msgid "MB"
+msgstr "MB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:653
-msgid "Resize"
-msgstr "Muuda suurust"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr "TB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "T��p"
+#: ../../common.pm_.c:109
+#, c-format
+msgid "%d minutes"
+msgstr "%d minutit"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "�henduspunkt"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 minut"
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "Kirjuta /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekundit"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "Tavakasutaja > Ekspert"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "Palun tehke oma andmetest enne tagavarakoopia"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "Ekspert > Tavakasutaja"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "Lugege hoolega!"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "Taasta failist"
+#: ../../diskdrake.pm_.c:103
+msgid ""
+"If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
+"enough)\n"
+"at the beginning of the disk"
+msgstr ""
+"Kui soovite kasutada aboot-i, j�tke palun ketta algusesse v�hemalt 2048 \n"
+"sektorit vaba ruumi"
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Salvesta faili"
+#: ../../diskdrake.pm_.c:122 ../../diskdrake_interactive.pm_.c:313
+#: ../../diskdrake_interactive.pm_.c:328 ../../install_steps.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:37
+#: ../../install_steps_interactive.pm_.c:310 ../../interactive_http.pm_.c:119
+#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:62
+msgid "Error"
+msgstr "Viga"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "Abimees"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Taasta flopilt"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Uus"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Salvesta flopile"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+#, fuzzy
+msgid "Remote"
+msgstr "Eemalda"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "Kustuta k�ik"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "�henduspunkt"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Vorminda k�ik"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Eelistused"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Paiguta ise"
+#: ../../diskdrake.pm_.c:211 ../../diskdrake.pm_.c:417
+#: ../../diskdrake.pm_.c:534 ../../diskdrake_interactive.pm_.c:353
+#: ../../diskdrake_interactive.pm_.c:488
+msgid "Type"
+msgstr "T��p"
 
-#: ../../diskdrake.pm_.c:59
-msgid "All primary partitions are used"
-msgstr "K�ik primaarsed partitsioonid on kasutusel"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "�henda lahti"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "Partitsioone ei saa enam lisada"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "�henda"
+
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Valige tegevus"
 
-#: ../../diskdrake.pm_.c:59
+#: ../../diskdrake.pm_.c:235
 msgid ""
-"To have more partitions, please delete one to be able to create an extended "
-"partition"
+"You have one big FAT partition\n"
+"(generally used by MicroSoft Dos/Windows).\n"
+"I suggest you first resize that partition\n"
+"(click on it, then click on \"Resize\")"
 msgstr ""
-"Et saada rohkem partitsioone, kustutage palun �ks, et luua laiendatud "
-"partitsioon"
+"Teil on �ks suur FAT partitsioon.\n"
+"(tavaliselt kasutab sellist MS DOS/Windows)\n"
+"Soovitame teil esmalt selle suurust muuta\n"
+"(klikkige ja siis valige \"Muuda\")"
 
-#: ../../diskdrake.pm_.c:61
-msgid "Not enough space for auto-allocating"
-msgstr "Ei ole piisavalt ruumi automaatpaigutuseks"
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Palun valige partitsioon"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Tagasi"
+#: ../../diskdrake.pm_.c:240
+#, fuzzy
+msgid "Please click on a media"
+msgstr "Palun valige partitsioon"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "Kirjuta partitsioonitabel"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "Palun valige partitsioon"
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "Veel.."
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
+
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "�ksikasjad"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Ext2"
 msgstr "ext2"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
+#, fuzzy
+msgid "Journalised FS"
+msgstr "�hendamine eba�nnestus"
+
+#: ../../diskdrake.pm_.c:395
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Swap"
 msgstr "Saaleala"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:396 ../../diskdrake_interactive.pm_.c:952
 msgid "Empty"
 msgstr "T�hi"
 
-#: ../../diskdrake.pm_.c:117 ../../install_steps_gtk.pm_.c:407
-#: ../../mouse.pm_.c:145
+#: ../../diskdrake.pm_.c:396 ../../install_steps_gtk.pm_.c:373
+#: ../../install_steps_gtk.pm_.c:433 ../../mouse.pm_.c:161
+#: ../../services.pm_.c:161
 msgid "Other"
 msgstr "Muu"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "Failis�steemi t��bid: "
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "�ksikasjad"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Tekita"
 
-#: ../../diskdrake.pm_.c:147
-msgid ""
-"You have one big FAT partition\n"
-"(generally used by MicroSoft Dos/Windows).\n"
-"I suggest you first resize that partition\n"
-"(click on it, then click on \"Resize\")"
-msgstr ""
-"Teil on �ks suur FAT partitsioon.\n"
-"(tavaliselt kasutab sellist MS DOS/Windows)\n"
-"Soovitame teil esmalt selle suurust muuta\n"
-"(klikkige ja siis valige \"Muuda\")"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Kasutage pigem ``%s''"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Palun tehke oma andmetest enne tagavarakoopia"
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Kustuta"
 
-#: ../../diskdrake.pm_.c:152 ../../diskdrake.pm_.c:170
-#: ../../diskdrake.pm_.c:179 ../../diskdrake.pm_.c:570
-#: ../../diskdrake.pm_.c:592
-msgid "Read carefully!"
-msgstr "Lugege hoolega!"
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Kasutage enne \"�henda lahti\""
 
-#: ../../diskdrake.pm_.c:155
+#: ../../diskdrake.pm_.c:424 ../../diskdrake_interactive.pm_.c:480
+#, c-format
 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"
+"After changing type of partition %s, all data on this partition will be lost"
+msgstr "Partitsiooni %s t��bi muutmisel h�vivad k�ik seal olnud andmed"
+
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Kuhu soovite seadme %s �hendada?"
+
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Mount options"
+msgstr "Mooduli parameetrid:"
+
+#: ../../diskdrake.pm_.c:507
+msgid "Various"
 msgstr ""
-"Kui soovite kasutada aboot-i, j�tke palun ketta algusesse v�hemalt 2048 \n"
-"sektorit vaba ruumi"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "Vaadake ette: see v�ib olla ohtlik."
+#: ../../diskdrake.pm_.c:525
+#, fuzzy
+msgid "Removable media"
+msgstr "CD/flopi/.. auto�hendamine"
 
-#: ../../diskdrake.pm_.c:214 ../../install_steps.pm_.c:72
-#: ../../install_steps_interactive.pm_.c:37
-#: ../../install_steps_interactive.pm_.c:322 ../../standalone/diskdrake_.c:66
-msgid "Error"
-msgstr "Viga"
+#: ../../diskdrake.pm_.c:532
+#, fuzzy
+msgid "Change type"
+msgstr "Muuda partitsiooni t��p"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "�henduspunkt:"
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Mis failis�steemi soovite kasutada?"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Seade: "
+#: ../../diskdrake.pm_.c:564
+msgid "Scanning available nfs shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:569
 #, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "DOS kettat�his: %s (arvatavasti)\n"
+msgid "Scanning available nfs shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:244 ../../diskdrake.pm_.c:251
-#: ../../diskdrake.pm_.c:301
-msgid "Type: "
-msgstr "T��p: "
+#: ../../diskdrake.pm_.c:578 ../../diskdrake.pm_.c:648
+msgid "If the list above doesn't contain the wanted entry, enter it here:"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:248
-msgid "Name: "
-msgstr "Nimi: "
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "Server"
 
-#: ../../diskdrake.pm_.c:253
-#, c-format
-msgid "Start: sector %s\n"
-msgstr "Algus: sektor %s\n"
+#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
+msgid "Shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Size: %s"
-msgstr "Suurus: %s"
+#: ../../diskdrake.pm_.c:615
+msgid "Scanning available samba shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:256
+#: ../../diskdrake.pm_.c:626 ../../diskdrake.pm_.c:639
 #, c-format
-msgid ", %s sectors"
-msgstr ", %s sektorit"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:258
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Silindrid %d kuni %d\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose a partition"
+msgstr "Valige tegevus"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Vormindatud\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose another partition"
+msgstr "Looge uus partitsioon"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "Vormindamata\n"
+#: ../../diskdrake_interactive.pm_.c:188
+#, fuzzy
+msgid "Exit"
+msgstr "ext2"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "�hendatud\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "Tavakasutaja > Ekspert"
 
-#: ../../diskdrake.pm_.c:262
-#, c-format
-msgid "RAID md%s\n"
-msgstr "RAID md%s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to normal mode"
+msgstr "Ekspert > Tavakasutaja"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "loopback fail(id): %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Tagasi"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Partitsioonilt toimub alglaadimine\n"
-"    (MS-DOS-i, mitte lilo jaoks)\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "J�tkate ikkagi?"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "Tase %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "L�peta ilma salvestamata"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "�hiku suurus %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "L�petate ilma partitsioonitabelit salvestamata?"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "RAID-kettad %s\n"
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Kas soovite seadistusi proovida?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "loopback faili nimi: %s"
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Paiguta ise"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "Kustuta k�ik"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "Veel.."
+
+#: ../../diskdrake_interactive.pm_.c:250
+#, fuzzy
+msgid "Hard drive information"
+msgstr "Meili informatsioon"
+
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "Not enough space for auto-allocating"
+msgstr "Ei ole piisavalt ruumi automaatpaigutuseks"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "K�ik primaarsed partitsioonid on kasutusel"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "Partitsioone ei saa enam lisada"
+
+#: ../../diskdrake_interactive.pm_.c:275
 msgid ""
-"\n"
-"Chances are, this partition is\n"
-"a Driver partition, you should\n"
-"probably leave it alone.\n"
+"To have more partitions, please delete one to be able to create an extended "
+"partition"
 msgstr ""
-"\n"
-"V�imalik, et on tegemist\n"
-"juhtpartitsiooniga, parem oleks\n"
-"seda mitte puutuda.\n"
+"Et saada rohkem partitsioone, kustutage palun �ks, et luua laiendatud "
+"partitsioon"
+
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "Kirjuta partitsioonitabel"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "P��sta partitsioonitabel"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "P��sta partitsioonitabel"
+
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "P��sta partitsioonitabel"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "CD/flopi/.. auto�hendamine"
+
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Valige fail"
+
+#: ../../diskdrake_interactive.pm_.c:308
 msgid ""
-"\n"
-"This special Bootstrap\n"
-"partition is for\n"
-"dual-booting your system.\n"
+"The backup partition table has not the same size\n"
+"Still continue?"
 msgstr ""
-"\n"
-"See on eriline, alglaadimisel\n"
-"kasutatav partitsioon, mis\n"
-"v�imaldab mitme operratsioonis�steemi\n"
-"laadimist.\n"
+"Tabeli tagavarakoopia ei ole sama suurusega\n"
+"Soovite j�tkata?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Palun valige partitsioon"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Hoiatus"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Suurus: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Pange t�hi flopi masinasse\n"
+"K�ik andmed sellel h�vivad"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geomeetria: %s silindrit, %s pead, %s sektorit\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "Proovin p��sta partitsioonitabelit"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "LVM-kettad %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+#, fuzzy
+msgid "Detailed information"
+msgstr "Meili informatsioon"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Partitsioonitabeli t��p: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Muuda suurust"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "siinil %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Liiguta"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "�henda"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Vorminda"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Aktiivne"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Lisa RAIDi"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "Eemalda RAIDist"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "Modifitseeri RAIDi"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "Lisa LVMi"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "Eemalda RAIDist"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "Eemalda LVMist"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "Modifitseeri RAIDi"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "Kasuta loopback-ina"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Valige tegevus"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Looge uus partitsioon"
+
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "Algsektor: "
+
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Suurus (MB): "
+
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Failis�steemi t��p: "
+
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "�henduspunkt:"
+
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Eelistus: "
+
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "Vormindan loopback faili %s"
+
+#: ../../diskdrake_interactive.pm_.c:486
+msgid "Change partition type"
+msgstr "Muuda partitsiooni t��p"
+
+#: ../../diskdrake_interactive.pm_.c:491
+msgid "Switching from ext2 to ext3"
+msgstr ""
+
+#: ../../diskdrake_interactive.pm_.c:521
+#, c-format
+msgid "Where do you want to mount loopback file %s?"
+msgstr "Kuhu soovite loopback-faili %s �hendada?"
+
+#: ../../diskdrake_interactive.pm_.c:528
+msgid ""
+"Can't unset mount point as this partition is used for loop back.\n"
+"Remove the loopback first"
+msgstr ""
+"Seda �henduspunkti ei saa eemaldada, kuna partitsioon on kasutusel.\n"
+"loopback-ina. Eemaldage enne loopback"
+
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "Arvutan FAT failis�steemi piire"
+
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "Muudan suurust"
+
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "See partitsioon ei ole muudetav"
+
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "Selle partitsiooni andmetest v�iks olla tagavarakoopia"
+
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr "Partitsiooni %s suuruse muutmisel h�vivad sellel k�ik andmed"
+
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Valige uus suurus"
+
+#: ../../diskdrake_interactive.pm_.c:591
+#, fuzzy
+msgid "New size in MB: "
+msgstr "Suurus (MB): "
+
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Which disk do you want to move it to?"
+msgstr "Millisele kettale soovite seda �mber paigutada?"
+
+#: ../../diskdrake_interactive.pm_.c:632
+msgid "Sector"
+msgstr "Sektor"
+
+#: ../../diskdrake_interactive.pm_.c:633
+msgid "Which sector do you want to move it to?"
+msgstr "Millisele sektorile soovite seda �mber paigutada?"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving"
+msgstr "Paigutan �mber"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving partition..."
+msgstr "Liigutan partitsiooni..."
+
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "Vali olemasolev RAID, millele lisada"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "uus"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "Vali olemasolev LVM, millele lisada"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "LVM nimi?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "Seda partitsiooni ei saa loopback-ina kasutada"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "loopback"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "loopback faili nimi:"
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "P�risnimi"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "See fail on juba loopback-ina kasutusel, valige m�ni muu"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "Fail on juba olemas. Kas kasutan seda?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "seade"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "tase"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "�hiku suurus"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "Vaadake ette: see v�ib olla ohtlik."
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "Mis t��pi partitsioonid teete?"
 
-#: ../../diskdrake.pm_.c:435
+#: ../../diskdrake_interactive.pm_.c:834
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -1517,7 +1729,7 @@ msgstr ""
 "Kui kasutate LILO-t, ei t��ta see sel moel, kui aga ei kasuta, ei ole Teile "
 "ka /boot vajalik"
 
-#: ../../diskdrake.pm_.c:439
+#: ../../diskdrake_interactive.pm_.c:838
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -1528,7 +1740,7 @@ msgstr ""
 "f��siliselt tagapool 1024-t silindrit ja Teil ei ole /boot partitsiooni.\n"
 "Kui plaanite kasutada LILO alglaadurit, lisage kindlasti /boot partitsioon"
 
-#: ../../diskdrake.pm_.c:445
+#: ../../diskdrake_interactive.pm_.c:844
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
 "No bootloader is able to handle this without a /boot partition.\n"
@@ -1538,278 +1750,241 @@ msgstr ""
 "Ilma /boot partitsioonita ei ole v�imalik sellist s�steemi laadida.\n"
 "Lisage kindlasti /boot partitsioon!"
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
-msgid "Use ``%s'' instead"
-msgstr "Kasutage pigem ``%s''"
-
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "Kasutage enne \"�henda lahti\""
-
-#: ../../diskdrake.pm_.c:469 ../../diskdrake.pm_.c:513
-#, c-format
-msgid ""
-"After changing type of partition %s, all data on this partition will be lost"
-msgstr "Partitsiooni %s t��bi muutmisel h�vivad k�ik seal olnud andmed"
-
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "J�tkate ikkagi?"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "L�peta ilma salvestamata"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "L�petate ilma partitsioonitabelit salvestamata?"
-
-#: ../../diskdrake.pm_.c:516
-msgid "Change partition type"
-msgstr "Muuda partitsiooni t��p"
-
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "Mis failis�steemi soovite kasutada?"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "ReiserFS ei ole kasutatav alla 32MB partisioonidel"
-
-#: ../../diskdrake.pm_.c:537
-#, c-format
-msgid "Where do you want to mount loopback file %s?"
-msgstr "Kuhu soovite loopback-faili %s �hendada?"
-
-#: ../../diskdrake.pm_.c:538
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Kuhu soovite seadme %s �hendada?"
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "Ketta %s partitsioonitabel salvestatakse!"
 
-#: ../../diskdrake.pm_.c:542
-msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
-"Remove the loopback first"
-msgstr ""
-"Seda �henduspunkti ei saa eemaldada, kuna partitsioon on kasutusel.\n"
-"loopback-ina. Eemaldage enne loopback"
+#: ../../diskdrake_interactive.pm_.c:868
+msgid "You'll need to reboot before the modification can take place"
+msgstr "Muudatuste j�ustamiseks vajate alglaadimist"
 
-#: ../../diskdrake.pm_.c:561
+#: ../../diskdrake_interactive.pm_.c:879
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Partitsiooni %s vormindamisel h�vivad sellel k�ik andmed"
 
-#: ../../diskdrake.pm_.c:563
+#: ../../diskdrake_interactive.pm_.c:881
 msgid "Formatting"
 msgstr "Vormindan"
 
-#: ../../diskdrake.pm_.c:564
+#: ../../diskdrake_interactive.pm_.c:882
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Vormindan loopback faili %s"
 
-#: ../../diskdrake.pm_.c:565 ../../install_steps_interactive.pm_.c:430
+#: ../../diskdrake_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:419
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Vormindan partitsiooni %s"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "P�rast k�igi partitsioonide vormindamist"
-
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "on k�ik andmed neil partitsioonidel h�vivad"
-
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Liiguta"
-
-#: ../../diskdrake.pm_.c:577
-msgid "Which disk do you want to move it to?"
-msgstr "Millisele kettale soovite seda �mber paigutada?"
-
-#: ../../diskdrake.pm_.c:578
-msgid "Sector"
-msgstr "Sektor"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid eba�nnestus"
 
-#: ../../diskdrake.pm_.c:579
-msgid "Which sector do you want to move it to?"
-msgstr "Millisele sektorile soovite seda �mber paigutada?"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "Ei ole piisavalt ruumi uute partitsioonide jaoks"
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving"
-msgstr "Paigutan �mber"
+#: ../../diskdrake_interactive.pm_.c:895
+#, c-format
+msgid ""
+"Directory %s already contain some data\n"
+"(%s)"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving partition..."
-msgstr "Liigutan partitsiooni..."
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "Ei ole piisavalt ruumi uute partitsioonide jaoks"
 
-#: ../../diskdrake.pm_.c:592
+#: ../../diskdrake_interactive.pm_.c:910
 #, c-format
-msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "Ketta %s partitsioonitabel salvestatakse!"
+msgid "Copying %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:594
-msgid "You'll need to reboot before the modification can take place"
-msgstr "Muudatuste j�ustamiseks vajate alglaadimist"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Kuvatihedus: %s\n"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "Arvutan FAT failis�steemi piire"
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Seade: "
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "Muudan suurust"
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "DOS kettat�his: %s (arvatavasti)\n"
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "See partitsioon ei ole muudetav"
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "T��p: "
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "Selle partitsiooni andmetest v�iks olla tagavarakoopia"
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Nimi: "
 
-#: ../../diskdrake.pm_.c:650
+#: ../../diskdrake_interactive.pm_.c:954
 #, c-format
-msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "Partitsiooni %s suuruse muutmisel h�vivad sellel k�ik andmed"
+msgid "Start: sector %s\n"
+msgstr "Algus: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Valige uus suurus"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Suurus: %s"
 
-#: ../../diskdrake.pm_.c:660 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
-msgid "MB"
-msgstr "MB"
+#: ../../diskdrake_interactive.pm_.c:957
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s sektorit"
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "Looge uus partitsioon"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Silindrid %d kuni %d\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "Algsektor: "
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Vormindatud\n"
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Suurus (MB): "
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "Vormindamata\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Failis�steemi t��p: "
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "�hendatud\n"
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "Eelistus: "
+#: ../../diskdrake_interactive.pm_.c:963
+#, c-format
+msgid "RAID md%s\n"
+msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:798
-msgid "This partition can't be used for loopback"
-msgstr "Seda partitsiooni ei saa loopback-ina kasutada"
+#: ../../diskdrake_interactive.pm_.c:965
+#, fuzzy, c-format
+msgid ""
+"Loopback file(s):\n"
+"   %s\n"
+msgstr "loopback fail(id): %s\n"
 
-#: ../../diskdrake.pm_.c:808
-msgid "Loopback"
-msgstr "loopback"
+#: ../../diskdrake_interactive.pm_.c:966
+msgid ""
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
+msgstr ""
+"Partitsioonilt toimub alglaadimine\n"
+"    (MS-DOS-i, mitte lilo jaoks)\n"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "loopback faili nimi:"
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "Tase %s\n"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "See fail on juba loopback-ina kasutusel, valige m�ni muu"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "�hiku suurus %s\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "Fail on juba olemas. Kas kasutan seda?"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "RAID-kettad %s\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Valige fail"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "loopback faili nimi: %s"
 
-#: ../../diskdrake.pm_.c:876
+#: ../../diskdrake_interactive.pm_.c:975
 msgid ""
-"The backup partition table has not the same size\n"
-"Still continue?"
+"\n"
+"Chances are, this partition is\n"
+"a Driver partition, you should\n"
+"probably leave it alone.\n"
 msgstr ""
-"Tabeli tagavarakoopia ei ole sama suurusega\n"
-"Soovite j�tkata?"
-
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "Hoiatus"
+"\n"
+"V�imalik, et on tegemist\n"
+"juhtpartitsiooniga, parem oleks\n"
+"seda mitte puutuda.\n"
 
-#: ../../diskdrake.pm_.c:885
+#: ../../diskdrake_interactive.pm_.c:978
 msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
 msgstr ""
-"Pange t�hi flopi masinasse\n"
-"K�ik andmed sellel h�vivad"
-
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "Proovin p��sta partitsioonitabelit"
-
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "seade"
-
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "tase"
-
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "�hiku suurus"
+"\n"
+"See on eriline, alglaadimisel\n"
+"kasutatav partitsioon, mis\n"
+"v�imaldab mitme operratsioonis�steemi\n"
+"laadimist.\n"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "Vali olemasolev RAID, millele lisada"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Suurus: %s\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "uus"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geomeetria: %s silindrit, %s pead, %s sektorit\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "Vali olemasolev LVM, millele lisada"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Info: "
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr "LVM nimi?"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM-kettad %s\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "CD/flopi/.. auto�hendamine"
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Partitsioonitabeli t��p: %s\n"
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "P��sta partitsioonitabel"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "siinil %d id %d\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "Laadi uuesti"
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Eelistused: %s"
 
-#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
-#: ../../fs.pm_.c:113
+#: ../../fs.pm_.c:447 ../../fs.pm_.c:457 ../../fs.pm_.c:461 ../../fs.pm_.c:465
+#: ../../fs.pm_.c:469 ../../fs.pm_.c:473
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s vormindamine seadmel %s eba�nnestus"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, 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_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "�hendamine eba�nnestus"
+
+#: ../../fs.pm_.c:588
+#, c-format
+msgid "fsck failed with exit code %d or signal %d"
+msgstr ""
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
 msgid "mount failed: "
 msgstr "�hendamine eba�nnestus: "
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "viga %s lahti �hendamisel: %s"
@@ -1822,40 +1997,43 @@ msgstr "lihtne"
 msgid "server"
 msgstr "server"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "JFS ei ole kasutatav alla 16MB partisioonidel"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "ReiserFS ei ole kasutatav alla 32MB partisioonidel"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "�henduspunktid peavad algama kaldkriipsuga (/)"
 
 # c-format
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "�henduspunktile %s on juba �ks partitsioon m��ratud\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Ring�hendus %s\n"
-
-#: ../../fsedit.pm_.c:285
+#: ../../fsedit.pm_.c:476
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "Te ei saa �henduspunkti %s jaoks LVM loogilist ketast kasutada"
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
 msgstr "See kataloog peab j��ma kokku juurfailis�steemiga"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr "See �henduspunkt vajab t�elist (ext2, reiserfs) failis�steemi\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Seadme %s avamine kirjutamiseks eba�nnestus: %s"
 
-#: ../../fsedit.pm_.c:453
+#: ../../fsedit.pm_.c:681
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
@@ -1863,315 +2041,393 @@ msgstr ""
 "Tekkis viga: failis�steemi loomiseks ei leitud �htki seadet. Palun\n"
 "kontrollige oma riistvara."
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "Teil ei ole �htki partitsiooni!"
 
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr "Valige keel s�steemi installimiseks ja kasutamiseks."
-
-#: ../../help.pm_.c:12
+#: ../../help.pm_.c:13
+msgid ""
+"GNU/Linux is a multiuser system, and this means that each user can have his\n"
+"own preferences, his own files and so on. You can read the ``User Guide''\n"
+"to learn more. But unlike \"root\", which is the administrator, the users\n"
+"you will add here will not be entitled to change anything except their own\n"
+"files and their own configuration. You will have to create at least one\n"
+"regular user for yourself. That account is where you should log in for\n"
+"routine use. Although it is very practical to log in as \"root\" everyday,\n"
+"it may also be very dangerous! The slightest mistake could mean that your\n"
+"system would not work any more. If you make a serious mistake as a regular\n"
+"user, you may only lose some information, but not the entire system.\n"
+"\n"
+"First, you have to enter your real name. This is not mandatory, of course -\n"
+"as you can actually enter whatever you want. DrakX will then take the first\n"
+"word you have entered in the box and will bring it over to the \"User\n"
+"name\". This is the name this particular user will use to log into the\n"
+"system. You can change it. You then have to enter a password here. A\n"
+"non-privileged (regular) user's password is not as crucial as that of\n"
+"\"root\" from a security point of view, but that is no reason to neglect it\n"
+"- after all, your files are at risk.\n"
+"\n"
+"If you click on \"Accept user\", you can then add as many as you want. Add\n"
+"a user for each one of your friends: your father or your sister, for\n"
+"example. When you finish adding all the users you want, select \"Done\".\n"
+"\n"
+"Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
+"for that user (bash by default)."
+msgstr ""
+
+#: ../../help.pm_.c:41
+#, fuzzy
 msgid ""
-"You need to accept the terms of the above license to continue installation.\n"
+"Listed above are the existing Linux partitions detected on your hard drive.\n"
+"You can keep the choices made by the wizard, they are good for most common\n"
+"installs. If you make any changes, you must at least define a root\n"
+"partition (\"/\"). Do not choose too small a partition or you will not be\n"
+"able to install enough software. If you want to store your data on a\n"
+"separate partition, you will also need to create a partition for \"/home\"\n"
+"(only possible if you have more than one Linux partition available).\n"
 "\n"
+"Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"Please click on \"Accept\" if you agree with its terms.\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"
-"Please click on \"Refuse\" if you disagree with its terms. Installation will "
-"end without modifying your current\n"
-"configuration."
-msgstr ""
-"Et installimist j�tkata, peate n�ustuma �laltoodud litsentsitingimustega.\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"
-"Palun valige \"N�us\", kui n�ustute nendega.\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"
-"Palun valige \"Keeldun\", kui ei pea neile tingimistele allumist "
-"v�imalikuks. Installimine l�petatakse, tegemata Teie s�steemis muutusi."
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Valige klaviatuuripaigutus �laltoodud nimekirjast"
-
-#: ../../help.pm_.c:25
-msgid ""
-"If you wish other languages (than the one you choose at\n"
-"beginning of installation) will be available after installation, please "
-"chose\n"
-"them in list above. If you want select all, you just need to select \"All\"."
-msgstr ""
-"Kui soovite, et peale installimist oleks v�imalik kasutada veel erinevaid\n"
-"keeli, valige need �laltoodud nimekirjast. Valik \"K�ik\" lisab toe\n"
-"k�igile keeltele."
-
-#: ../../help.pm_.c:30
-msgid ""
-"Please choose \"Install\" if there are no previous version of Linux-"
-"Mandrake\n"
-"installed or if you wish to use several operating systems.\n"
+" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"\n"
-"Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\n"
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc."
+msgstr ""
+"�lalpool on toodud k�ik Teie k�vakettal olemasolevad Linuxi partitsioonid\n"
+"Vaikimisi on need enamasti �sna m�istlikud. Kui teete nendes muutusi,\n"
+"pidage meeles, et kindlasti vajate juurpartitsiooni (\"/\"). Liiga v�ikeste\n"
+"partitsioonide puhul v�ib tekkida raskusi piisava hulga tarkvara "
+"installimisel\n"
+"Kasutajate jaoks on sageli m�istlik luua eraldi \"/home\" partitsioon.\n"
 "\n"
 "\n"
-"Depend of your knowledge in GNU/Linux, you can choose one of the following "
-"levels to install or update your\n"
-"Linux-Mandrake operating system:\n"
+"Iga partitsiooni juures on toodud abiinfona \"Nimi\" ja \"Mahutavus\".\n"
 "\n"
-"\t* Recommended: if you have never installed a GNU/Linux operating system "
-"choose this. Installation will be\n"
-"\t  be very easy and you will be asked only on few questions.\n"
 "\n"
+"\"Nimi\" koosneb k�vakettat��bist, selle numbrist ja partitsiooni\n"
+"numbrist (n�iteks \"hda1\").\n"
 "\n"
-"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
-"the primary usage (workstation, server,\n"
-"\t  development) of your system. You will need to answer to more questions "
-"than in \"Recommended\" installation\n"
-"\t  class, so you need to know how GNU/Linux works to choose this "
-"installation class.\n"
 "\n"
+"K�vaketta t��p on \"hd\" kui on tegemist IDE kettaga ja \"sd\" kui on\n"
+"tegemist SCSI kettaga.\n"
 "\n"
-"\t* Expert: if you have a good knowledge in GNU/Linux, you can choose this "
-"installation class. As in \"Customized\"\n"
-"\t  installation class, you will be able to choose the primary usage "
-"(workstation, server, development). Be very\n"
-"\t  careful before choose this installation class. You will be able to "
-"perform a higly customized installation.\n"
-"\t  Answer to some questions can be very difficult if you haven't a good "
-"knowledge in GNU/Linux. So, don't choose\n"
-"\t  this installation class unless you know what you are doing."
-msgstr ""
-"Palun valige \"Installimine\" kui Teie arvutis ei ole varasemat Linux-"
-"Mandrake\n"
-"versiooni.\n"
 "\n"
+"K�vaketta number on alati t�ht \"hd\" v�i \"sd\" j�rel. IDE ketastel:\n"
 "\n"
-"Palun valige \"Uuendamine\" kui soovite uuendada varasemat Linux-Mandrake "
-"versiooni.\n"
+"   * \"a\" - esmase IDE kontrolleri �lem,\n"
 "\n"
+"   * \"b\" - esmase IDE kontrolleri alluv,\n"
 "\n"
-"S�ltuvalt Teie GNU/Linuxi alastest teadmistest saate valida erineva tasemega "
-"installi- v�i uuendusmeetodi:\n"
+"   * \"c\" - teisase IDE kontrolleri �lem,\n"
 "\n"
-"\t* Soovituslik: Te ei ole varem GNU/Linuxit installinud. K�ik tehakse "
-"lihtsaks ja esitatakse v�he k�simusi\n"
+"   * \"d\" - teisase IDE kontrolleri alluv.\n"
 "\n"
+"SCSI ketaste puhul on \"a\" esimene, \"b\" teine ja nii edasi."
+
+#: ../../help.pm_.c:72
+msgid ""
+"The Mandrake Linux installation is spread out over several CDROMs. DrakX\n"
+"knows if a selected package is located on another CDROM and will eject the\n"
+"current CD and ask you to insert a different one as required."
+msgstr ""
+
+#: ../../help.pm_.c:77
+msgid ""
+"It is now time to specify which programs you wish to install on your\n"
+"system. There are thousands of packages available for Mandrake Linux, and\n"
+"you are not supposed to know them all by heart.\n"
 "\n"
-"\t* Isetehtud: Olete Linuxiga tuttav ja soovite s�steemi kohandada "
-"vastavalt\n"
-"\t  Teie vajadustele. J�rgmisena saate teha valikud s�ltuvalt Teie arvuti \n"
-"\t  edaspidisest kasutusalast.\n"
+"If you are performing a standard installation from CDROM, you will first be\n"
+"asked to specify the CDs you currently have (in Expert mode only). Check\n"
+"the CD labels and highlight the boxes corresponding to the CDs you have\n"
+"available for installation. Click \"OK\" when you are ready to continue.\n"
 "\n"
+"Packages are sorted in groups corresponding to a particular use of your\n"
+"machine. The groups themselves are sorted into four sections:\n"
 "\n"
-"\t* Ekspert: Te tunnete end GNU/Linux keskkonnas vabalt ja soovite\n"
-"\t  s�steemi, mis sobiks nagu valatult Teie t�psete ootustega.\n"
-"\t  Aga palun, palun: �RGE VALIGE SEDA, KUI TE T�PSELT EI TEA, MIDA TEETE!"
-
-#: ../../help.pm_.c:56
-msgid ""
-"Select:\n"
+" * \"Workstation\": if you plan to use your machine as a workstation, "
+"select\n"
+"one or more of the corresponding groups.\n"
 "\n"
-"  - Customized: If you are familiar enough with GNU/Linux, you may then "
-"choose\n"
-"    the primary usage for your machine. See below for details.\n"
+" * \"Development\": if the machine is to be used for programming, choose "
+"the\n"
+"desired group(s).\n"
 "\n"
+" * \"Server\": finally, if the machine is intended to be a server, you will\n"
+"be able to select which of the most common services you wish to see\n"
+"installed on the machine.\n"
 "\n"
-"  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
-"    perform a highly customized installation. As for a \"Customized\"\n"
-"    installation class, you will be able to select the usage for your "
-"system.\n"
-"    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
-"DOING!"
-msgstr ""
-"Valige:\n"
+" * \"Graphical Environment\": this is where you will choose your preferred\n"
+"graphical environment. At least one must be selected if you want to have a\n"
+"graphical workstation!\n"
 "\n"
-"  - Isetehtud: Olete Linuxiga tuttav ja soovite s�steemi kohandada "
-"vastavalt\n"
-"   Teie vajadustele. J�rgmisena saate teha valikud s�ltuvalt Teie arvuti \n"
-"   edaspidisest kasutusalast.\n"
+"Moving the mouse cursor over a group name will display a short explanatory\n"
+"text about that group.\n"
 "\n"
+"You can check the \"Individual package selection\" box, which is useful if\n"
+"you are familiar with the packages being offered or if you want to have\n"
+"total control over what will be installed.\n"
 "\n"
-"  - Ekspert: Te tunnete end GNU/Linux keskkonnas vabalt ja soovite\n"
-"   s�steemi, mis sobiks nagu valatult Teie t�psete ootustega.\n"
-"   Aga palun, palun: �RGE VALIGE SEDA, KUI TE T�PSELT EI TEA, MIDA TEETE!"
+"If you started the installation in \"Update\" mode, you can unselect all\n"
+"groups to avoid installing any new package. This is useful for repairing or\n"
+"updating an existing system."
+msgstr ""
 
-#: ../../help.pm_.c:68
+#: ../../help.pm_.c:115
 msgid ""
-"You must now define your machine usage. Choices are:\n"
-"\n"
-"\t* Workstation: this the ideal choice if you intend to use your machine "
-"primarily for everyday use, at office or\n"
-"\t  at home.\n"
+"Finally, depending on your choice of whether or not to select individual\n"
+"packages, you will be presented a tree containing all packages classified\n"
+"by groups and subgroups. While browsing the tree, you can select entire\n"
+"groups, subgroups, or individual packages.\n"
 "\n"
+"Whenever you select a package on the tree, a description appears on the\n"
+"right. When your selection is finished, click the \"Install\" button which\n"
+"will then launch the installation process. Depending on the speed of your\n"
+"hardware and the number of packages that need to be installed, it may take\n"
+"a while to complete the process. A time to complete estimate is displayed\n"
+"on the screen to help you gauge if there is sufficient time to enjoy a cup\n"
+"of coffee.\n"
 "\n"
-"\t* Development: if you intend to use your machine primarily for software "
-"development, it is the good choice. You\n"
-"\t  will then have a complete collection of software installed in order to "
-"compile, debug and format source code,\n"
-"\t  or create software packages.\n"
+"!! If a server package has been selected either intentionally or because it\n"
+"was part of a whole group, you will be asked to confirm that you really\n"
+"want those servers to be installed. Under Mandrake Linux, any installed\n"
+"servers are started by default at boot time. Even if they are safe and have\n"
+"no known issues at the time the distribution was shipped, it may happen\n"
+"that security holes are discovered after this version of Mandrake Linux was\n"
+"finalized. If you do not know what a particular service is supposed to do\n"
+"or why it is being installed, then click \"No\". Clicking \"Yes\" will\n"
+"install the listed services and they will be started automatically by\n"
+"default. !!\n"
 "\n"
+"The \"Automatic dependencies\" option simply disables the warning dialog\n"
+"which appears whenever the installer automatically selects a package. This\n"
+"occurs because it has determined that it needs to satisfy a dependency with\n"
+"another package in order to successfully complete the installation.\n"
 "\n"
-"\t* Server: if you intend to use this machine as a server, it is the good "
-"choice. Either a file server (NFS or\n"
-"\t  SMB), a print server (Unix style or Microsoft Windows style), an "
-"authentication server (NIS), a database\n"
-"\t  server and so on. As such, do not expect any gimmicks (KDE, GNOME, etc.) "
-"to be installed."
+"The tiny floppy disc icon at the bottom of the list allows to load the\n"
+"packages list chosen during a previous installation. Clicking on this icon\n"
+"will ask you to insert a floppy disk previously created at the end of\n"
+"another installation. See the second tip of last step on how to create such\n"
+"a floppy."
 msgstr ""
-"N��d m��rake oma arvuti peamne kasutusala. Valikud on:\n"
-"\n"
-"\t* T��jaam: valige, kui kavatsete oma arvutit rakendada igap�evategemiste "
-"tarvis (kontorirakendused,\n"
-"\t  graafika ja muu selline).\n"
+
+#: ../../help.pm_.c:151
+msgid ""
+"If you wish to connect your computer to the Internet or to a local network,\n"
+"please choose the correct option. Please turn on your device before\n"
+"choosing the correct option to let DrakX detect it automatically.\n"
 "\n"
+"Mandrake Linux proposes the configuration of an Internet connection at\n"
+"installation time. Available connections are: traditional modem, ISDN\n"
+"modem, ADSL connection, cable modem, and finally a simple LAN connection\n"
+"(Ethernet).\n"
 "\n"
-"\t* Arendus: installitakse t�iskomplekt vahendeid eri programmeerimiskeelte "
-"kasutamiseks, allikkoodi loomiseks,\n"
-"\t  kompileerimiseks, silumiseks jne.\n"
+"Here, we will not detail each configuration. Simply make sure that you have\n"
+"all the parameters from your Internet Service Provider or system\n"
+"administrator.\n"
 "\n"
+"You can consult the manual chapter about Internet connections for details\n"
+"about the configuration, or simply wait until your system is installed and\n"
+"use the program described there to configure your connection.\n"
 "\n"
-"\t* Server: valige see, kui vajate Linux-Mandrake serverit. Saate serveerida "
-"faile (NFS v�i SMB), printida\n"
-"\t  (Unixi stiilis lp v�i Windowsi SMB), lisaks andmebaasid, veebirakendused "
-"jms. Installimata\n"
-"\t  j�etakse graafiline kasutajaliides (KDE, GNOME...)."
+"If you wish to configure the network later after installation or if you\n"
+"have finished configuring your network connection, click \"Cancel\"."
+msgstr ""
 
-#: ../../help.pm_.c:84
+#: ../../help.pm_.c:172
+#, fuzzy
 msgid ""
-"DrakX will attempt to look for PCI SCSI adapter(s). If DrakX\n"
-"finds an SCSI adapter and knows which driver to use, it will be "
-"automatically\n"
-"installed.\n"
+"You may now choose which services you wish to start at boot time.\n"
 "\n"
+"Here are presented all the services available with the current\n"
+"installation. Review them carefully and uncheck those which are not always\n"
+"needed at boot time.\n"
 "\n"
-"If you have no SCSI adapter, an ISA SCSI adapter or a PCI SCSI adapter that\n"
-"DrakX doesn't recognize, you will be asked if a SCSI adapter is present in "
-"your\n"
-"system. If there is no adapter present, you can click on \"No\". If you "
-"click on\n"
-"\"Yes\", a list of drivers will be presented from which you can select your\n"
-"specific adapter.\n"
+"You can get a short explanatory text about a service by selecting a\n"
+"specific service. However, if you are not sure whether a service is useful\n"
+"or not, it is safer to leave the default behavior.\n"
 "\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."
+msgstr ""
+"N��d saate valida, milliseid teenused peaks s�steemi laadimisel k�ivitama.\n"
 "\n"
-"If you have to manually specify your adapter, DrakX will ask if you want to\n"
-"specify options for it. You should allow DrakX to probe the hardware for "
-"the\n"
-"options. This usually works well.\n"
 "\n"
+"Abiinfo balloonis antakse l�hike kirjeldus iga�he kohta neist.\n"
 "\n"
-"If not, you will need to provide options to the driver. Please review the "
-"User\n"
-"Guide (chapter 3, section \"Collective informations on your hardware) for "
-"hints\n"
-"on retrieving this information from hardware documentation, from the\n"
-"manufacturer's Web site (if you have Internet access) or from Microsoft "
-"Windows\n"
-"(if you have it on your system)."
+"Kui kavatsete oma s�steemi kasutada serverina, olge eriti t�helepanelik:\n"
+"t�en�oliselt ei soovi te k�ivitada mittevajalikke teenuseid."
+
+#: ../../help.pm_.c:188
+msgid ""
+"GNU/Linux manages time in GMT (Greenwich Manage Time) and translates it in\n"
+"local time according to the time zone you selected."
 msgstr ""
-"Esmalt otsib DrakX PCI siini SCSI liideseid. Kui neid leitakse, ja \n"
-"vastav(ad) juhtprogramm(id) on teada, siis laetakse ja installitakse \n"
-"k�ik vajalik automaatselt.\n"
-"\n"
-"\n"
-"Kui Teie SCSI liides kasutab ISA siini v�i kui DrakX ei tea,\n"
-"millist juhtprogrammi kasutada v�i Teil ei ole �ldse SCSI liidest,\n"
-"siis k�sitakse Teilt selle kohta.\n"
-"Kui Teil SCSI liidest t�esti ei ole, vastake \"Ei\". Kui Teil aga siiski\n"
-"on, siis vastake \"Jah\". Seej�rel lastakse Teil nimekirjast sobiv\n"
-"juhtprogramm valida.\n"
+"Linuxil on kombeks hoida sisemist kella Greenwichi (GMT) ajas ja muuta\n"
+"vajadusel s�steemi kella vastavalt Teie valitud ajav��ndile."
+
+#: ../../help.pm_.c:192
+msgid ""
+"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
+"on which all the graphics environments (KDE, Gnome, AfterStep,\n"
+"WindowMaker...) bundled with Mandrake Linux rely. In this section, DrakX\n"
+"will try to configure X automatically.\n"
 "\n"
+"It is extremely rare for it to fail, unless the hardware is very old (or\n"
+"very new). If it succeeds, it will start X automatically with the best\n"
+"resolution possible depending on the size of the monitor. A window will\n"
+"then appear and ask you if you can see it.\n"
 "\n"
-"Kui olete juhtprogrammi v�lja valinud, on Teil v�imalus anda sellele\n"
-"ka parameetreid. Siiski, enamasti l�heb k�ik kenasti ka ilma neid\n"
-"sisestamata: vastavad andmed leiab juhtprogramm ise.\n"
+"If you are doing an \"Expert\" install, you will enter the X configuration\n"
+"wizard. See the corresponding section of the manual for more information\n"
+"about this wizard.\n"
 "\n"
-"Kui automaatne parameetrite otsimine ei t��ta, tutvuge palun l�hemalt\n"
-"oma SCSI liidese dokumentatsiooniga v�i k�sige abi riistvara m��jalt.\n"
-"Vaadake ka User Guide'i (peat�kk 2, l�ik \"Collective informations on your\n"
-"hardware\")\n"
-"Ka samas masinas olev Windows oskab vahel SCSI kohta kasulikku \n"
-"informatsiooni anda."
+"If you can see the message and answer \"Yes\", then DrakX will proceed to\n"
+"the next step. If you cannot see the message, it simply means that the\n"
+"configuration was wrong and the test will automatically end after 10\n"
+"seconds, restoring the screen."
+msgstr ""
 
-#: ../../help.pm_.c:108
+#: ../../help.pm_.c:212
 msgid ""
-"At this point, you need to choose where to install your\n"
-"Linux-Mandrake operating system on your hard drive. If it is empty or if an\n"
-"existing operating system uses all the space available on it, you need to\n"
-"partition it. Basically, partitioning a hard drive consists of logically\n"
-"dividing it to create space to install your new Linux-Mandrake system.\n"
+"The first time you try the X configuration, you may not be very satisfied\n"
+"with its display (screen is too small, shifted left or right...). Hence,\n"
+"even if X starts up correctly, DrakX then asks you if the configuration\n"
+"suits you. It will also propose to change it by displaying a list of valid\n"
+"modes it could find, asking you to select one.\n"
 "\n"
+"As a last resort, if you still cannot get X to work, choose \"Change\n"
+"graphics card\", select \"Unlisted card\", and when prompted on which\n"
+"server you want, choose \"FBDev\". This is a failsafe option which works\n"
+"with any modern graphics card. Then choose \"Test again\" to be sure."
+msgstr ""
+
+#: ../../help.pm_.c:224
+msgid ""
+"Finally, you will be asked whether you want to see the graphical interface\n"
+"at boot. Note this question will be asked even if you chose not to test the\n"
+"configuration. Obviously, you want to answer \"No\" if your machine is to\n"
+"act as a server, or if you were not successful in getting the display\n"
+"configured."
+msgstr ""
+
+#: ../../help.pm_.c:231
+msgid ""
+"The Mandrake Linux CDROM has a built-in rescue mode. You can access it by\n"
+"booting from the CDROM, press the >>F1<< key at boot and type >>rescue<< at\n"
+"the prompt. But in case your computer cannot boot from the CDROM, you\n"
+"should come back to this step for help in at least two situations:\n"
 "\n"
-"Because the effects of the partitioning process are usually irreversible,\n"
-"partitioning can be intimidating and stressful if you are an inexperienced "
-"user.\n"
-"This wizard simplifies this process. Before beginning, please consult the "
-"manual\n"
-"and take your time.\n"
+" * when installing the boot loader, DrakX will rewrite the boot sector "
+"(MBR)\n"
+"of your main disk (unless you are using another boot manager) so that you\n"
+"can start up with either Windows or GNU/Linux (assuming you have Windows in\n"
+"your system). If you need to reinstall Windows, the Microsoft install\n"
+"process will rewrite the boot sector, and then you will not be able to\n"
+"start GNU/Linux!\n"
 "\n"
+" * if a problem arises and you cannot start up GNU/Linux from the hard "
+"disk,\n"
+"this floppy disk will be the only means of starting up GNU/Linux. It\n"
+"contains a fair number of system tools for restoring a system, which has\n"
+"crashed due to a power failure, an unfortunate typing error, a typo in a\n"
+"password, or any other reason.\n"
 "\n"
-"You need at least two partitions. One is for the operating system itself and "
-"the\n"
-"other is for the virtual memory (also called Swap).\n"
+"When you click on this step, you will be asked to enter a disk inside the\n"
+"drive. The floppy disk you will insert must be empty or contain data which\n"
+"you do not need. You will not have to format it since DrakX will rewrite\n"
+"the whole disk."
+msgstr ""
+
+#: ../../help.pm_.c:255
+#, fuzzy
+msgid ""
+"At this point you need to choose where on your hard drive to install your\n"
+"Mandrake Linux operating system. If your hard drive is empty or if an\n"
+"existing operating system is using all the space available, you will need\n"
+"to partition it. Basically, partitioning a hard drive consists of logically\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
+"Because the effects of the partitioning process are usually irreversible,\n"
+"partitioning can be intimidating and stressful if you are an inexperienced\n"
+"user. Fortunately, there is a wizard which simplifies this process. Before\n"
+"beginning, please consult the manual and take your time.\n"
 "\n"
-"If partitions have been already defined (from a previous installation or "
-"from\n"
-"another partitioning tool), you just need choose those to use to install "
-"your\n"
-"Linux system.\n"
+"If you are running the install in Expert mode, you will enter DiskDrake,\n"
+"the Mandrake Linux partitioning tool, which allows you to fine-tune your\n"
+"partitions. See the DiskDrake chapter of the manual. From the installation\n"
+"interface, you can use the wizards as described here by clicking the\n"
+"\"Wizard\" button of the dialog.\n"
 "\n"
+"If partitions have already been defined, either from a previous\n"
+"installation or from another partitioning tool, simply select those to\n"
+"install your Linux system.\n"
 "\n"
-"If partitions haven't been already defined, you need to create them. \n"
-"To do that, use the wizard available above. Depending of your hard drive\n"
-"configuration, several solutions can be available:\n"
+"If partitions are not defined, you will need to create them using the\n"
+"wizard. Depending on your hard drive configuration, several options are\n"
+"available:\n"
 "\n"
-"\t* Use existing partition: the wizard has detected one or more existing "
-"Linux partitions on your hard drive. If\n"
-"\t  you want to keep them, choose this option. \n"
+" * \"Use free space\": this option will simply lead to an automatic\n"
+"partitioning of your blank drive(s). You will not be prompted further.\n"
 "\n"
+" * \"Use existing partition\": the wizard has detected one or more existing\n"
+"Linux partitions on your hard drive. If you want to use them, choose this\n"
+"option.\n"
 "\n"
-"\t* Erase entire disk: if you want delete all data and all partitions "
-"present on your hard drive and replace them by\n"
-"\t  your new Linux-Mandrake system, you can choose this option. Be careful "
-"with this solution, you will not be\n"
-"\t  able to revert your choice after confirmation.\n"
+" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+"installed on your hard drive and takes all the space available on it, you\n"
+"have to create free space for Linux data. To do that, you can delete your\n"
+"Microsoft Windows partition and data (see \"Erase entire disk\" or \"Expert\n"
+"mode\" solutions) or resize your Microsoft Windows partition. Resizing can\n"
+"be performed without the loss of any data. This solution is recommended if\n"
+"you want to use both Mandrake Linux and Microsoft Windows on same computer.\n"
 "\n"
+"   Before choosing this option, please understand that after this "
+"procedure,\n"
+"the size of your Microsoft Windows partition will be smaller than at the\n"
+"present time. You will have less free space under Microsoft Windows to\n"
+"store your data or to install new software.\n"
 "\n"
-"\t* Use the free space on the Windows partition: if Microsoft Windows is "
-"installed on your hard drive and takes\n"
-"\t  all space available on it, you have to create free space for Linux data. "
-"To do that you can delete your\n"
-"\t  Microsoft Windows partition and data (see \"Erase entire disk\" or "
-"\"Expert mode\" solutions) or resize your\n"
-"\t  Microsoft Windows partition. Resizing can be performed without loss of "
-"any data. This solution is\n"
-"\t  recommended if you want use both Linux-Mandrake and Microsoft Windows on "
-"same computer.\n"
+" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
+"present on your hard drive and replace them with your new Mandrake Linux\n"
+"system, choose this option. Be careful with this solution because you will\n"
+"not be able to revert your choice after confirmation.\n"
 "\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"\t  Before choosing this solution, please understand that the size of your "
-"Microsoft\n"
-"\t  Windows partition will be smaller than at present time. It means that "
-"you will have less free space under\n"
-"\t  Microsoft Windows to store your data or install new software.\n"
+" * \"Remove Windows\": this will simply erase everything on the drive and\n"
+"begin fresh, partitioning everything from scratch. All data on your disk\n"
+"will be lost.\n"
 "\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"\t* Expert mode: if you want to partition manually your hard drive, you can "
-"choose this option. Be careful before\n"
-"\t  choosing this solution. It is powerful but it is very dangerous. You can "
-"lose all your data very easily. So,\n"
-"\t  don't choose this solution unless you know what you are doing."
+" * \"Expert mode\": choose this option if you want to manually partition\n"
+"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"can very easily lose all your data. Hence, do not choose this unless you\n"
+"know what you are doing."
 msgstr ""
-"Olete j�udnud punkti, kus peate otsustama, kuhu t�pselt Linux-Mandrake oma\n"
+"Olete j�udnud punkti, kus peate otsustama, kuhu t�pselt Mandrake Linux oma\n"
 "k�vakettal paigaldada. Kui k�vaketas on t�hi v�i kui m�ni muu \n"
 "operatsioonis�steem seda t�ielikult kasutab, on vaja partitsioneerida.\n"
 "Partitsioneerimine on tegevus, mille k�igus tekitatakse kettale loogilised\n"
-"piirkonnad Teie uue Linux-Mandrake s�steemi installimiseks.\n"
+"piirkonnad Teie uue Mandrake Linux s�steemi installimiseks.\n"
 "\n"
 "\n"
 "Kuna partitsioneerimine ei ole p��ratav protsess, siis peab kogemusteta\n"
@@ -2180,7 +2436,7 @@ msgstr ""
 "palun varuga natuke ettevalmistusaega\n"
 "\n"
 "\n"
-"Linux-Mandrake jaoks on Teil vaja v�hemalt kaht partitsiooni. �hele "
+"Mandrake Linux jaoks on Teil vaja v�hemalt kaht partitsiooni. �hele "
 "paigutatakse\n"
 "operatsioonis�steem ise ja teisele luuakse virtuaalm�lu (saaleala e. swap).\n"
 "\n"
@@ -2192,109 +2448,205 @@ msgstr ""
 "Kui partitsioone ei ole varem loodud, peate kasutama �lalttoodud abimeest.\n"
 "Abimees hindab Teie k�vaketast ja pakub j�rgmised valikud:\n"
 "\n"
-"\t* Kasuta olemasolevaid partitsioone: abimees leidis kettalt Linuxi "
+"* Kasuta olemasolevaid partitsioone: abimees leidis kettalt Linuxi "
 "partitsioonid.\n"
-"\t  Kui soovite neid kasutada, valige see.\n"
+"  Kui soovite neid kasutada, valige see.\n"
 "\n"
 "\n"
-"\t* Puhasta kogu ketas: kui soovite alustada Linux-Mandrake installimist "
+"* Puhasta kogu ketas: kui soovite alustada Mandrake Linux installimist "
 "t�iesti t�hjale kettale.\n"
-"\t  T�helepanu: k�ik andmed, mis enne kettal olid, h�vivad!\n"
+"  T�helepanu: k�ik andmed, mis enne kettal olid, h�vivad!\n"
 "\n"
 "\n"
-"\t* Kasuta vaba ruumi Windowsi partitsioonil: kui Microsoft Windows kasutab "
+"* Kasuta vaba ruumi Windowsi partitsioonil: kui Microsoft Windows kasutab "
 "kogu Teie k�vaketta vaba pinna,\n"
-"\t  saate luua lisaruumi Windowsi partitsiooni suuruse muutmisel.\n"
-"\t  Sageli on see m�istlik, kui soovite kasutada ka Windowst.\n"
+"  saate luua lisaruumi Windowsi partitsiooni suuruse muutmisel.\n"
+"  Sageli on see m�istlik, kui soovite kasutada ka Windowst.\n"
 "\n"
-"\t* Asjatundja: kui soovite ise oma k�vaketast jagada, valige see. Nii on "
-"Teil k�ige rohkem v�imalusi,\n"
-"\t  aga ka k�ige rohkem ohtusid! �rge valige seda, kui Te t�pselt ei tea, "
-"mida teete."
+"* Asjatundja: kui soovite ise oma k�vaketast jagada, valige see. Nii on Teil "
+"k�ige rohkem v�imalusi,\n"
+"  aga ka k�ige rohkem ohtusid! �rge valige seda, kui Te t�pselt ei tea, mida "
+"teete."
 
-#: ../../help.pm_.c:160
+#: ../../help.pm_.c:319
 msgid ""
-"At this point, you need to choose what\n"
-"partition(s) to use to install your new Linux-Mandrake system. If "
-"partitions\n"
-"have been already defined (from a previous installation of GNU/Linux or "
-"from\n"
-"another partitioning tool), you can use existing partitions. In other "
-"cases,\n"
-"hard drive partitions must be defined.\n"
+"There you are. Installation is now complete and your GNU/Linux system is\n"
+"ready to use. Just click \"OK\" to reboot the system. You can start\n"
+"GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
+"soon as the computer has booted up again.\n"
 "\n"
+"The \"Advanced\" button (in Expert mode only) shows two more buttons to:\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select "
-"the\n"
-"disk for partitioning by clicking on \"hda\" for the first IDE drive, \"hdb"
-"\" for\n"
-"the second or \"sda\" for the first SCSI drive and so on.\n"
+" * \"generate auto-install floppy\": to create an installation floppy disk\n"
+"which will automatically perform a whole installation without the help of\n"
+"an operator, similar to the installation you just configured.\n"
 "\n"
+"   Note that two different options are available after clicking the button:\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"    * \"Replay\". This is a partially automated install as the partitioning\n"
+"step (and only this one) remains interactive.\n"
 "\n"
-"   * Clear all: this option deletes all partitions available on the selected "
-"hard drive.\n"
+"    * \"Automated\". Fully automated install: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
 "\n"
+"   This feature is very handy when installing a great number of similar\n"
+"machines. See the Auto install section at our web site.\n"
 "\n"
-"   * Auto allocate: this option allows you to automatically create Ext2 and "
-"swap partitions in free space of your\n"
-"     hard drive.\n"
+" * \"Save packages selection\"(*): saves the packages selection as made\n"
+"previously. Then, when doing another installation, insert the floppy inside\n"
+"the driver and run the installation going to the help screen by pressing on\n"
+"the [F1] key, and by issuing >>linux defcfg=\"floppy\"<<.\n"
 "\n"
+"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
+"\"mformat a:\")"
+msgstr ""
+
+#: ../../help.pm_.c:350
+#, fuzzy
+msgid ""
+"Any partitions that have been newly defined must be formatted for use\n"
+"(formatting means creating a file system).\n"
 "\n"
-"   * Rescue partition table: if your partition table is damaged, you can try "
-"to recover it using this option. Please\n"
-"     be careful and remember that it can fail.\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"
-"   * Undo: you can use this option to cancel your changes.\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"
+"any of them.\n"
 "\n"
+"Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
-"   * Reload: you can use this option if you wish to undo all changes and "
-"load your initial partitions table\n"
+"Click on \"Cancel\" if you want to choose another partition for your new\n"
+"Mandrake Linux operating system installation.\n"
 "\n"
+"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
+"for bad blocks on the disc."
+msgstr ""
+"K�ik v�rskelt loodud partitsioonid tuleb enne kasutamist vormindada\n"
+"ehk sinna tuleb luua failis�steemid.\n"
 "\n"
-"   * Wizard: If you wish to use a wizard to partition your hard drive, you "
-"can use this option. It is recommended if\n"
-"     you do not have a good knowledge in partitioning.\n"
 "\n"
+"Samuti v�ib vormindada varem olemas olnud partitsioonid, kui soovite\n"
+"seal leiduvad andmed �ra kustutada.\n"
 "\n"
-"   * Restore from floppy: if you have saved your partition table on a floppy "
-"during a previous installation, you can\n"
-"     recover it using this option.\n"
 "\n"
+"Paneme t�hele, et alati ei ole k�igi vanade partitsioonide vormindamine\n"
+"vajalik.\n"
+"Kindlasti v�ib vormindada partitsioone, kus varem asus \"/\", \"/usr\"\n"
+"v�i \"/var\" aga kasutajate faile sisaldav \"/home\" v�iks j��da\n"
+"alles.\n"
 "\n"
-"   * Save on floppy: if you wish to save your partition table on a floppy to "
-"be able to recover it, you can use this\n"
-"     option. It is strongly recommended to use this option\n"
 "\n"
+"Klikkige \"OK\", kui olete vormindamiseks valmis."
+
+#: ../../help.pm_.c:376
+#, fuzzy
+msgid ""
+"Your new Mandrake Linux operating system is currently being installed.\n"
+"Depending on the number of packages you will be installing and the speed of\n"
+"your computer, this operation could take from a few minutes to a\n"
+"significant amount of time.\n"
+"\n"
+"Please be patient."
+msgstr ""
+"Teie Mandrake Linux s�steemi hakati n��d installima. Selleks v�ib\n"
+"olenevalt Teie poolt valitud pakettide arvust ja Teie arvuti kiirusest\n"
+"kuluda m�nik�mmend minutit.\n"
 "\n"
-"   * Done: when you have finished partitioning your hard drive, use this "
-"option to save your changes.\n"
 "\n"
+"Palun veidi kannatlikkust."
+
+#: ../../help.pm_.c:384
+msgid ""
+"Before continuing you should read carefully the terms of the license. It\n"
+"covers the whole Mandrake Linux distribution, and if you do not agree with\n"
+"all the terms in it, click on the \"Refuse\" button which will immediately\n"
+"terminate the installation. To continue with the installation, click the\n"
+"\"Accept\" button."
+msgstr ""
+
+#: ../../help.pm_.c:391
+msgid ""
+"At this point, it is time to choose the security level desired for the\n"
+"machine. As a rule of thumb, the more exposed the machine is, and the more\n"
+"the data stored in it is crucial, the higher the security level should be.\n"
+"However, a higher security level is generally obtained at the expenses of\n"
+"easiness of use. Refer to the MSEC chapter of the ``Reference Manual'' to\n"
+"get more information about the meaning of these levels.\n"
 "\n"
-"For information, you can reach any option using the keyboard: navigate "
-"trough the partitions using Tab and Up/Down arrows.\n"
+"If you do not know what to choose, keep the default option."
+msgstr ""
+
+#: ../../help.pm_.c:401
+#, fuzzy
+msgid ""
+"At this point, you need to choose what partition(s) will be used for the\n"
+"installation of your Mandrake Linux system. If partitions have been already\n"
+"defined, either from a previous installation of GNU/Linux or from 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"
+" * \"Clear all\": this option deletes all partitions on the selected hard\n"
+"drive.\n"
+"\n"
+" * \"Auto allocate\": this option allows you to automatically create Ext2\n"
+"and swap partitions in free space of your hard drive.\n"
+"\n"
+" * \"Rescue partition table\": if your partition table is damaged, you can\n"
+"try to recover it using this option. Please be careful and remember that it\n"
+"can fail.\n"
+"\n"
+" * \"Undo\": use this option to cancel your changes.\n"
+"\n"
+" * \"Reload\": you can use this option if you wish to undo all changes and\n"
+"load your initial partitions table.\n"
+"\n"
+" * \"Wizard\": 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 knowledge of\n"
+"partitioning.\n"
+"\n"
+" * \"Restore from floppy\": this option will allow you to restore a\n"
+"previously saved partition table from floppy disk.\n"
+"\n"
+" * \"Save to floppy\": saves the partition table to a floppy. Useful for\n"
+"later partition-table recovery if necessary. It is strongly recommended to\n"
+"perform this step.\n"
+"\n"
+" * \"Done\": when you have finished partitioning your hard drive, this will\n"
+"save your changes back to disc.\n"
+"\n"
+"Note: you can reach any option using the keyboard. Navigate through the\n"
+"partitions using [Tab] and [Up/Down] arrows.\n"
 "\n"
 "When a partition is selected, you can use:\n"
 "\n"
-"           * Ctrl-c to create a new partition (when a empty partition is "
-"selected)\n"
+" * Ctrl-c to create a new partition (when an empty partition is selected);\n"
 "\n"
-"           * Ctrl-d to delete a partition\n"
+" * Ctrl-d to delete a partition;\n"
 "\n"
-"           * Ctrl-m to set the mount point\n"
-"           \n"
+" * Ctrl-m to set the mount point.\n"
 "\n"
-"           \n"
-"If you are installing on a PPC Machine, you will want to create a small HFS "
-"'bootstrap' partition of at least 1MB for use\n"
-"by the yaboot bootloader. If you opt to make the partition a bit larger, say "
-"50MB, you may find it a useful place to store \n"
-"a spare kernel and ramdisk image for emergency boot situations."
+"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"
+"boot loader. If you opt to make the partition a bit larger, say 50MB, you\n"
+"may find it a useful place to store a spare kernel and ramdisk images for\n"
+"emergency boot situations."
 msgstr ""
-"N��d peate valima partitsiooni(d), kuhu soovite Linux-Mandrake installida.\n"
+"N��d peate valima partitsiooni(d), kuhu soovite Mandrake Linux installida.\n"
 "\n"
 "Partitsioon on loogiliselt eraldatud k�vaketta piirkond, mille suurust\n"
 "ei ole v�imalik hiljem, t��tavas s�steemis enam muuta. Samuti h�vivad\n"
@@ -2353,155 +2705,41 @@ msgstr ""
 "\n"
 "           * Ctrl-m �henduspunkti seadmine"
 
-#: ../../help.pm_.c:224
+#: ../../help.pm_.c:460
+#, fuzzy
 msgid ""
-"Above are listed the existing Linux partitions detected on\n"
-"your hard drive. You can keep choices make by the wizard, they are good for "
-"a\n"
-"common usage. If you change these choices, you must at least define a root\n"
-"partition (\"/\"). Don't choose a too little partition or you will not be "
-"able\n"
-"to install enough software. If you want store your data on a separate "
-"partition,\n"
-"you need also to choose a \"/home\" (only possible if you have more than "
-"one\n"
-"Linux partition available).\n"
-"\n"
+"More than one Microsoft Windows partition has been detected on your hard\n"
+"drive. Please choose the one you want resize in order to install your new\n"
+"Mandrake Linux operating system.\n"
 "\n"
-"For information, each partition is listed as follows: \"Name\", \"Capacity"
-"\".\n"
+"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
+"\"Capacity\".\n"
 "\n"
-"\n"
-"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\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 type\" is \"hd\" if your hard drive is an IDE hard drive and "
-"\"sd\"\n"
-"if it is an SCSI hard drive.\n"
-"\n"
-"\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE "
+"\"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"
-"\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc..."
-msgstr ""
-"�lalpool on toodud k�ik Teie k�vakettal olemasolevad Linuxi partitsioonid\n"
-"Vaikimisi on need enamasti �sna m�istlikud. Kui teete nendes muutusi,\n"
-"pidage meeles, et kindlasti vajate juurpartitsiooni (\"/\"). Liiga v�ikeste\n"
-"partitsioonide puhul v�ib tekkida raskusi piisava hulga tarkvara "
-"installimisel\n"
-"Kasutajate jaoks on sageli m�istlik luua eraldi \"/home\" partitsioon.\n"
-"\n"
-"\n"
-"Iga partitsiooni juures on toodud abiinfona \"Nimi\" ja \"Mahutavus\".\n"
-"\n"
-"\n"
-"\"Nimi\" koosneb k�vakettat��bist, selle numbrist ja partitsiooni\n"
-"numbrist (n�iteks \"hda1\").\n"
-"\n"
-"\n"
-"K�vaketta t��p on \"hd\" kui on tegemist IDE kettaga ja \"sd\" kui on\n"
-"tegemist SCSI kettaga.\n"
-"\n"
-"\n"
-"K�vaketta number on alati t�ht \"hd\" v�i \"sd\" j�rel. IDE ketastel:\n"
-"\n"
-"   * \"a\" - esmase IDE kontrolleri �lem,\n"
-"\n"
-"   * \"b\" - esmase IDE kontrolleri alluv,\n"
-"\n"
-"   * \"c\" - teisase IDE kontrolleri �lem,\n"
-"\n"
-"   * \"d\" - teisase IDE kontrolleri alluv.\n"
-"\n"
-"SCSI ketaste puhul on \"a\" esimene, \"b\" teine ja nii edasi."
-
-#: ../../help.pm_.c:258
-msgid ""
-"Choose the hard drive you want to erase to install your\n"
-"new Linux-Mandrake partition. Be careful, all data present on it will be "
-"lost\n"
-"and will not be recoverable."
-msgstr ""
-"Valige k�vaketas, mida soovite Linux-Mandrake installimiseks puhastada\n"
-"Ettevaatust, k�ik sellel leiduvad andmed h�vitatakse ja ei ole enam\n"
-"taastatavad."
-
-#: ../../help.pm_.c:263
-msgid ""
-"Click on \"OK\" if you want to delete all data and\n"
-"partitions present on this hard drive. Be careful, after clicking on \"OK\", "
-"you\n"
-"will not be able to recover any data and partitions present on this hard "
-"drive,\n"
-"including any Windows data.\n"
-"\n"
-"\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
-"partitions present on this hard drive."
-msgstr ""
-"Valige \"OK\" kui soovite kustutada k�ik sellel kettal asuvad "
-"partitsioonid.\n"
-"Ettevaatust, peale \"OK\" klikkimist ei ole enam v�imalik sellelt kettalt\n"
-"andmeid taastada.\n"
-"\n"
-"\n"
-"Katkestamiseks valige \"Katkesta\"."
-
-#: ../../help.pm_.c:273
-msgid ""
-"More than one Microsoft Windows partition have been\n"
-"detected on your hard drive. Please choose the one you want resize to "
-"install\n"
-"your new Linux-Mandrake operating system.\n"
-"\n"
-"\n"
-"For information, each partition is listed as follow; \"Linux name\", "
-"\"Windows\n"
-"name\" \"Capacity\".\n"
-"\n"
-"\"Linux name\" is coded as follow: \"hard drive type\", \"hard drive number"
-"\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
-"\n"
-"\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and \"sd"
-"\"\n"
-"if it is an SCSI hard drive.\n"
-"\n"
-"\n"
-"\"Hard drive number\" is always a letter putted after \"hd\" or \"sd\". With "
-"IDE 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"
+" * \"a\" means \"master hard drive on the primary IDE controller\",\n"
 "\n"
-"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
+" * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
-"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc.\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 "
-"disk\n"
-"or partition is called \"C:\")."
+"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"disk or partition is called \"C:\")."
 msgstr ""
 "Teie arvuti k�vakettal on rohkem kui �ks Microsoft Windows partitsioon.\n"
-"Palun valige v�lja see, mille suurust soovite Linux-Mandrake jaoks muuta.\n"
+"Palun valige v�lja see, mille suurust soovite Mandrake Linux jaoks muuta.\n"
 "\n"
 "\n"
 "Teie abistamiseks on iga partitsioonidel n�idatud \"Nimi Linuxis\", \"Nimi "
@@ -2531,733 +2769,219 @@ msgstr ""
 "\"Nimi Windowsis\" on t�ht, millega Microsoft Windows vastavat seadet\n"
 "t�histab."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:491
 msgid "Please be patient. This operation can take several minutes."
 msgstr "Palun natuke kannatust. Selleks v�ib kuluda m�nigi minut."
 
-#: ../../help.pm_.c:309
+#: ../../help.pm_.c:494
+#, fuzzy
 msgid ""
-"Any partitions that have been newly defined must be\n"
-"formatted for use (formatting meaning creating a filesystem).\n"
-"\n"
+"DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
+"installation or if you want to have greater control (\"Expert\"). You also\n"
+"have the choice of performing a new install or an upgrade of an existing\n"
+"Mandrake Linux system. Clicking \"Install\" will completely wipe out the\n"
+"old system. Select \"Upgrade\" if you are upgrading or repairing an\n"
+"existing system.\n"
 "\n"
-"At this time, you may wish to reformat some already existing partitions to "
-"erase\n"
-"the data they contain. If you wish do that, please also select the "
-"partitions\n"
-"you want to format.\n"
+"Please choose \"Install\" if there are no previous version of Mandrake\n"
+"Linux installed or if you wish to boot between various operating systems.\n"
 "\n"
+"Please choose \"Update\" if you wish to update or repair an already\n"
+"installed version of Mandrake Linux.\n"
 "\n"
-"Please note that it is not necessary to reformat all pre-existing "
-"partitions.\n"
-"You must reformat the partitions containing the operating system (such as \"/"
-"\",\n"
-"\"/usr\" or \"/var\") but do you no have to reformat partitions containing "
-"data\n"
-"that you wish to keep (typically /home).\n"
+"Depending on your knowledge of GNU/Linux, please choose one of the\n"
+"following to install or update your Mandrake Linux operating system:\n"
 "\n"
+" * Recommended: choose this if you have never installed a GNU/Linux\n"
+"operating system. The installation will be very easy and you will only be\n"
+"asked a few questions.\n"
 "\n"
-"Please be careful selecting partitions, after formatting, all data will be\n"
-"deleted and you will not be able to recover any of them.\n"
-"\n"
+" * Expert: if you have a good knowledge of GNU/Linux, you can choose this\n"
+"installation class. The expert installation will allow you to perform a\n"
+"highly customized installation. Answering some of the questions can be\n"
+"difficult if you do not have a good knowledge of GNU/Linux so do not choose\n"
+"this unless you know what you are doing."
+msgstr ""
+"Palun valige \"Installimine\" kui Teie arvutis ei ole varasemat Mandrake "
+"Linux\n"
+"versiooni.\n"
 "\n"
-"Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
+"Palun valige \"Uuendamine\" kui soovite uuendada varasemat Mandrake Linux "
+"versiooni.\n"
 "\n"
-"Click on \"Cancel\" if you want to choose other partitions to install your "
-"new\n"
-"Linux-Mandrake operating system."
-msgstr ""
-"K�ik v�rskelt loodud partitsioonid tuleb enne kasutamist vormindada\n"
-"ehk sinna tuleb luua failis�steemid.\n"
 "\n"
+"S�ltuvalt Teie GNU/Linuxi alastest teadmistest saate valida erineva tasemega "
+"installi- v�i uuendusmeetodi:\n"
 "\n"
-"Samuti v�ib vormindada varem olemas olnud partitsioonid, kui soovite\n"
-"seal leiduvad andmed �ra kustutada.\n"
+"* Soovituslik: Te ei ole varem GNU/Linuxit installinud. K�ik tehakse "
+"lihtsaks ja esitatakse v�he k�simusi\n"
 "\n"
 "\n"
-"Paneme t�hele, et alati ei ole k�igi vanade partitsioonide vormindamine\n"
-"vajalik.\n"
-"Kindlasti v�ib vormindada partitsioone, kus varem asus \"/\", \"/usr\"\n"
-"v�i \"/var\" aga kasutajate faile sisaldav \"/home\" v�iks j��da\n"
-"alles.\n"
+"* Isetehtud: Olete Linuxiga tuttav ja soovite s�steemi kohandada vastavalt\n"
+"  Teie vajadustele. J�rgmisena saate teha valikud s�ltuvalt Teie arvuti \n"
+"  edaspidisest kasutusalast.\n"
 "\n"
 "\n"
-"Klikkige \"OK\", kui olete vormindamiseks valmis."
+"* Ekspert: Te tunnete end GNU/Linux keskkonnas vabalt ja soovite\n"
+"  s�steemi, mis sobiks nagu valatult Teie t�psete ootustega.\n"
+"  Aga palun, palun: �RGE VALIGE SEDA, KUI TE T�PSELT EI TEA, MIDA TEETE!"
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:521
 msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
-"\n"
+"Normally, DrakX selects the right keyboard for you (depending on the\n"
+"language you have chosen) and you will not even see this step. However, you\n"
+"might not have a keyboard that corresponds exactly to your language: for\n"
+"example, if you are an English speaking Swiss person, you may still want\n"
+"your keyboard to be a Swiss keyboard. Or if you speak English but are\n"
+"located in Quebec, you may find yourself in the same situation. In both\n"
+"cases, you will have to go back to this installation step and select an\n"
+"appropriate keyboard from the list.\n"
 "\n"
-"DrakX will then check whether you have enough room to install them all. If "
-"not,\n"
-"it will warn you about it. If you want to go on anyway, it will proceed onto "
-"the\n"
-"installation of all selected groups but will drop some packages of lesser\n"
-"interest. At the bottom of the list you can select the option \n"
-"\"Individual package selection\"; in this case you will have to browse "
-"through\n"
-"more than 1000 packages..."
+"Click on the \"More\" button to be presented with the complete list of\n"
+"supported keyboards."
 msgstr ""
-"N��d v�ite valida paketigruppe installimiseks v�i uuendamiseks\n"
-"\n"
-"\n"
-"DrakX kontrollib, kas Teil on ikka piisavalt vaba ruumi nende k�igi jaoks.\n"
-"kui mitte, hoiatab ta Teid. Kui Te hoiatusest ei hooli j�etakse "
-"automaatselt\n"
-"k�rvale v�hemolulised paketid.\n"
-"Nimekirja l�pus saate valida \"Valik paketthaaval\"; sel juhul aga peate\n"
-"l�bi sirvima �le 1000 �ksiku paketi..."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:534
 msgid ""
-"You can now choose individually all the packages you\n"
-"wish to install.\n"
-"\n"
-"\n"
-"You can expand or collapse the tree by clicking on options in the left "
-"corner of\n"
-"the packages window.\n"
-"\n"
-"\n"
-"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
-"\"Toggle flat and group sorted\".\n"
+"Please choose your preferred language for installation and system usage.\n"
 "\n"
+"Clicking on the \"Advanced\" button will allow you to select other\n"
+"languages to be installed on your workstation. Selecting other languages\n"
+"will install the language-specific files for system documentation and\n"
+"applications. For example, if you will host users from Spain on your\n"
+"machine, select English as the main language in the tree view and in the\n"
+"Advanced section click on the grey star corresponding to \"Spanish|Spain\".\n"
 "\n"
-"If you want not to be warned on dependencies, click on \"Automatic\n"
-"dependencies\". If you do this, note that unselecting one package may "
-"silently\n"
-"unselect several other packages which depend on it."
+"Note that multiple languages may be installed. Once you have selected any\n"
+"additional locales click the \"OK\" button to continue."
 msgstr ""
-"N��d saate pakette �kshaaval installimiseks valida\n"
-"\n"
-"\n"
-"Paketipuud saate avada ja sulgeda vasakpoolses nurgas asuvatest nuppudest."
 
-#: ../../help.pm_.c:364
+#: ../../help.pm_.c:547
 msgid ""
-"If you have all the CDs in the list above, click Ok. If you have\n"
-"none of those CDs, click Cancel. If only some CDs are missing, unselect "
-"them,\n"
-"then click Ok."
-msgstr ""
-"Kui Teil on olemas k�ik �laltoodud CD-d, klikkige <OK>.\n"
-"Kui Teil ei ole �htki neist, klikkige <Katkesta>.\n"
-"Kui puuduvad m�ned CD-d, j�tke m�rgituks vaid olemasolevad ja siis <OK>."
-
-#: ../../help.pm_.c:369
-msgid ""
-"Your new Linux-Mandrake operating system is currently being\n"
-"installed. This operation should take a few minutes (it depends on size you\n"
-"choose to install and the speed of your computer).\n"
+"By default, DrakX assumes you have a two-button mouse and will set it up\n"
+"for third-button emulation. DrakX will automatically know whether it is a\n"
+"PS/2, serial or USB mouse.\n"
 "\n"
+"If you wish to specify a different type of mouse select the appropriate\n"
+"type from the list provided.\n"
 "\n"
-"Please be patient."
+"If you choose a mouse other than the default you will be presented with a\n"
+"mouse test screen. Use the buttons and wheel to verify that the settings\n"
+"are good. If the mouse is not working correctly press the space bar or\n"
+"RETURN to \"Cancel\" and choose again."
 msgstr ""
-"Teie Linux-Mandrake s�steemi hakati n��d installima. Selleks v�ib\n"
-"olenevalt Teie poolt valitud pakettide arvust ja Teie arvuti kiirusest\n"
-"kuluda m�nik�mmend minutit.\n"
-"\n"
-"\n"
-"Palun veidi kannatlikkust."
 
-#: ../../help.pm_.c:377
-msgid ""
-"You can now test your mouse. Use buttons and wheel to verify\n"
-"if settings are good. If not, you can click on \"Cancel\" to choose another\n"
-"driver."
-msgstr ""
-"N��d saate oma hiirt testida. Kasutage nii nuppe kui ratast. Kui tundub\n"
-"midagi valesti olevat, klikkige <Katkesta> uue juhtprogrammi valimiseks."
-
-#: ../../help.pm_.c:382
+#: ../../help.pm_.c:560
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1\n"
-"port under MS Windows is named ttyS0 under GNU/Linux."
+"Please select the correct port. For example, the COM1 port under MS Windows\n"
+"is named ttyS0 under GNU/Linux."
 msgstr ""
 "Palun valige �ige port. N�iteks MS Windows-i COM1 kannab GNU/Linuxis\n"
 "nime ttyS0."
 
-#: ../../help.pm_.c:386
-msgid ""
-"If you wish to connect your computer to the Internet or\n"
-"to a local network please choose the correct option. Please turn on your "
-"device\n"
-"before choosing the correct option to let DrakX detect it automatically.\n"
-"\n"
-"\n"
-"If you do not have any connection to the Internet or a local network, "
-"choose\n"
-"\"Disable networking\".\n"
-"\n"
-"\n"
-"If you wish to configure the network later after installation or if you "
-"have\n"
-"finished to configure your network connection, choose \"Done\"."
-msgstr ""
-"Kui soovite oma arvuti �hendada Internetti v�i kohtv�rku, tehke palun\n"
-"�ige valik. V�lise seadme korrektseks tuvastamiseks on vajalik, et see "
-"oleks\n"
-"sisse l�litatud ja arvutiga �hendatud\n"
-"\n"
-"\n"
-"Kui Te ei soovi v�rgu�hendust kasutada, valige \"Keela v�rgu�hendus\".\n"
-"\n"
-"\n"
-"Kui soovite v�rgu�henduse seadistada hiljem, valige \"Tehtud\"."
-
-#: ../../help.pm_.c:399
-msgid ""
-"No modem has been detected. Please select the serial port on which it is "
-"plugged.\n"
+#: ../../help.pm_.c:564
+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 one authorized to make updates, add users,\n"
+"change the overall system configuration, and so on. In short, \"root\" can\n"
+"do everything! That is why you must choose a password that is difficult to\n"
+"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
+"choose not to enter a password, but we strongly advise you against this if\n"
+"only for one reason: do not think that because you booted GNU/Linux that\n"
+"your other operating systems are safe from mistakes. Since \"root\" can\n"
+"overcome all limitations and unintentionally erase all data on partitions\n"
+"by carelessly accessing the partitions themselves, it is important for it\n"
+"to be difficult to become \"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 too\n"
+"easy to compromise a system.\n"
 "\n"
-"For information, the first serial port (called \"COM1\" under Microsoft\n"
-"Windows) is called \"ttyS0\" under Linux."
-msgstr ""
-"Modemit ei leitud. Palun valige seerialport, kuhu see on �hendatud.\n"
+"However, please do not make the password too long or complicated because\n"
+"you must be able to remember it without too much effort.\n"
 "\n"
+"The password will not be displayed on screen as you type it in. Hence, you\n"
+"will have to type the password twice to reduce the chance of a typing\n"
+"error. If you do happen to make the same typing error twice, this\n"
+"\"incorrect\" password will have to be used the first time you connect.\n"
 "\n"
-"Igaks juhuks: esimese seerialpordi (\"COM1\" Microsoft Windowsis) nimi\n"
-"on GNU/Linux s�steemis \"ttyS0\"."
-
-#: ../../help.pm_.c:406
-msgid ""
-"You may now enter dialup options. If you don't know\n"
-"or are not sure what to enter, the correct informations can be obtained "
-"from\n"
-"your Internet Service Provider. If you do not enter the DNS (name server)\n"
-"information here, this information will be obtained from your Internet "
-"Service\n"
-"Provider at connection time."
-msgstr ""
-"Sisestage sissehelistamiskeskuse andmed. Kui Te neid ei tea\n"
-"v�i kahtlete, saate oma teenusepakkujalt (ISP-l) kindlasti abi.\n"
-"N�iteks info nimeserveri (DNS) kohta saab tavaliselt �henduse\n"
-"loomise ajal automaatselt"
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-"Kui Teil on v�line modem, siis l�litage see palun n��d sisse, et DrakX saaks "
-"seda tuvastada."
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "Palun l�litage modem sisse ja valige nimekirjast �ige."
-
-#: ../../help.pm_.c:419
-msgid ""
-"If you are not sure if informations above are\n"
-"correct or if you don't know or are not sure what to enter, the correct\n"
-"informations can be obtained from your Internet Service Provider. If you do "
-"not\n"
-"enter the DNS (name server) information here, this information will be "
-"obtained\n"
-"from your Internet Service Provider at connection time."
-msgstr ""
-"Kui Te ei ole kindlad, et �laltoodud informatsioon vastab t�ele\n"
-"v�i Te ei tea, mida sisestada, k�sige abi oma internetiteenuse pakkujalt\n"
-"(ISP-lt). N�iteks info nimeserveri (DNS) kohta saab tavaliselt �henduse\n"
-"loomise ajal automaatselt"
-
-#: ../../help.pm_.c:426
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, the correct informations can be\n"
-"obtained from your Internet Service Provider."
-msgstr ""
-"N��d sisestage oma arvuti nimi, kui see on vajalik. Kui kahtlete, siis "
-"peaksite k�sima lisainformatsiooni oma ISP k�est."
-
-#: ../../help.pm_.c:431
-msgid ""
-"You may now configure your network device.\n"
+"In expert mode, you will be asked if you will be connecting to an\n"
+"authentication server, like NIS or LDAP.\n"
 "\n"
-"   * IP address: if you don't know or are not sure what to enter, ask your "
+"If your network uses LDAP (or NIS) protocol for authentication, select\n"
+"\"LDAP\" (or \"NIS\") as authentication. If you do not know, ask your\n"
 "network administrator.\n"
-"     You should not enter an IP address if you select the option \"Automatic "
-"IP\" below.\n"
-"\n"
-"   * Netmask: \"255.255.255.0\" is generally a good choice. If you don't "
-"know or are not sure what to enter,\n"
-"     ask your network administrator.\n"
-"\n"
-"   * Automatic IP: if your network uses BOOTP or DHCP protocol, select this "
-"option. If selected, no value is needed in\n"
-"    \"IP address\". If you don't know or are not sure if you need to select "
-"this option, ask your network administrator."
-msgstr ""
-"V�rguliidese seadistamiseks on vajalik:\n"
-"\n"
-"   * IP-aadress: kui Te seda ei teha, k�sige oma v�rguhaldurilt v�i\n"
-"internetiteenuse pakkujalt (ISP).\n"
-"\n"
-"   * V�rgumask: \"255.255.255.0\" on tavaliselt sobiv. Igaks juhuks v�ite\n"
-"v�rguhalduri v�i ISP k�est �le k�sida.\n"
-"\n"
-"   * Automaatne IP: Kui Teie v�rgus on kasutusel BOOTP v�i DHCP.\n"
-"Selle valimisel ei pea v�lja \"IP-aadress\" t�itma. Kui kahtlete\n"
-"k�sige j�llegi oma v�rguhaldurilt v�i ISP-lt."
-
-#: ../../help.pm_.c:443
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, ask your network administrator."
-msgstr ""
-"Kui Teie v�rgus on kasutusel NIS, valige \"Kasuta NIS-i\". Kahtluse korral\n"
-"k�sige v�rguhaldurilt."
-
-#: ../../help.pm_.c:447
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, leave blank."
-msgstr ""
-"Kui vaja, sisestage oma s�steemi nimi. Kui Teil ei\n"
-"ole �htki head m�tet, j�tke see rida t�hjaks"
-
-#: ../../help.pm_.c:451
-msgid ""
-"You may now enter dialup options. If you're not sure what to enter, the\n"
-"correct information can be obtained from your ISP."
-msgstr ""
-"N��d sisestage oma sissehelistamisteenuse pakkuja andmed. Kui ei ole "
-"kindel,\n"
-"mida kuhu sisestada, k�sige oma ISP k�est �le."
-
-#: ../../help.pm_.c:455
-msgid ""
-"If you will use proxies, please configure them now. If you don't know if\n"
-"you should use proxies, ask your network administrator or your ISP."
-msgstr ""
-"Kui peate kasutama vahendajaid (tulem��ri vms), seadistage need n��d. Kui\n"
-"kahtlete, on abiks v�rguhaldur v�i ISP"
-
-#: ../../help.pm_.c:459
-msgid ""
-"You can install cryptographic package if your internet connection has been\n"
-"set up correctly. First choose a mirror where you wish to download packages "
-"and\n"
-"after that select the packages to install.\n"
-"\n"
-"\n"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
-msgstr ""
-"Kr�ptopakette saate installida p�rast Interneti�henduse seadistamist.\n"
-"Esmalt valige peegel, kust soovite pakette alla laadida ja seej�rel\n"
-"valige paketid.\n"
-"\n"
-"\n"
-"M�rkus: kr�ptopakettide valimisel peate arvesse v�tma ka v�imalikke\n"
-"�iguslikke piiranguid oma asukohamaal."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "N��d saate valida ajav��tme vastavalt oma asukohale."
-
-#: ../../help.pm_.c:471
-msgid ""
-"GNU/Linux manages time in GMT (Greenwich Manage\n"
-"Time) and translates it in local time according to the time zone you have\n"
-"selected.\n"
-"\n"
-"\n"
-"If you use Microsoft Windows on this computer, choose \"No\"."
-msgstr ""
-"Linuxil on kombeks hoida sisemist kella Greenwichi (GMT) ajas ja muuta\n"
-"vajadusel s�steemi kella vastavalt Teie valitud ajav��ndile.\n"
-"\n"
-"Kui kasutate selles arvutis ka Windowsi, valige \"Ei\"."
-
-#: ../../help.pm_.c:479
-msgid ""
-"You may now choose which services you want to start at boot time.\n"
-"\n"
-"\n"
-"When your mouse comes over an item, a small balloon help will popup which\n"
-"describes the role of the service.\n"
-"\n"
-"\n"
-"Be very careful in this step if you intend to use your machine as a server: "
-"you\n"
-"will probably want not to start any services that you don't need. Please\n"
-"remember that several services can be dangerous if they are enable on a "
-"server.\n"
-"In general, select only the services that you really need."
-msgstr ""
-"N��d saate valida, milliseid teenused peaks s�steemi laadimisel k�ivitama.\n"
-"\n"
-"\n"
-"Abiinfo balloonis antakse l�hike kirjeldus iga�he kohta neist.\n"
-"\n"
-"Kui kavatsete oma s�steemi kasutada serverina, olge eriti t�helepanelik:\n"
-"t�en�oliselt ei soovi te k�ivitada mittevajalikke teenuseid."
-
-#: ../../help.pm_.c:492
-msgid ""
-"You can configure a local printer (connected to your computer) or remote\n"
-"printer (accessible via a Unix, Netware or Microsoft Windows network)."
-msgstr ""
-"Teil on v�imalus seadistada kas kohalik (Teie arvutiga �hendatud) v�i\n"
-"v�rguprinter (Unix, Netware v�i Microsoft Windows v�rgus)"
-
-#: ../../help.pm_.c:496
-msgid ""
-"If you wish to be able to print, please choose one printing system between\n"
-"CUPS and LPR.\n"
-"\n"
-"\n"
-"CUPS is a new, powerful and flexible printing system for Unix systems (CUPS\n"
-"means \"Common Unix Printing System\"). It is the default printing system "
-"in\n"
-"Linux-Mandrake.\n"
-"\n"
-"\n"
-"LPR is the old printing system used in previous Linux-Mandrake "
-"distributions.\n"
-"\n"
-"\n"
-"If you don't have printer, click on \"None\"."
-msgstr ""
-"Kui soovite vahetevahel printida, valige palun selleks sobiv meetod, CUPS\n"
-"v�i LPR.\n"
-"\n"
-"\n"
-"CUPS on uus, v�imas ja paindlik printimiss�steem Unix keskkonnas (CUPS -\n"
-"Common Unix Printing System). Linux-Mandrake kasutab vaikimisi seda.\n"
-"\n"
-"\n"
-"LPR on vanem meetod, mis oli kasutusel ka eelmistest Linux-Mandrake\n"
-"distributsioonides.\n"
-"\n"
-"\n"
-"Kui Teil ei olegi printerit, valige \"Ei soovi\"."
-
-#: ../../help.pm_.c:511
-msgid ""
-"GNU/Linux can deal with many types of printer. Each of these types requires\n"
-"a different setup.\n"
-"\n"
-"\n"
-"If your printer is physically connected to your computer, select \"Local\n"
-"printer\".\n"
-"\n"
-"\n"
-"If you want to access a printer located on a remote Unix machine, select\n"
-"\"Remote printer\".\n"
-"\n"
-"\n"
-"If you want to access a printer located on a remote Microsoft Windows "
-"machine\n"
-"(or on Unix machine using SMB protocol), select \"SMB/Windows 95/98/NT\"."
-msgstr ""
-"GNU/Linux oskab toimetada mitut t��pi printeritega. Iga�ht neist "
-"seadistatakse\n"
-"erinevalt.\n"
-"\n"
-"\n"
-"Kui Teie printer on f��siliselt arvutiga �hendatud, valige \"Kohalik printer"
-"\"\n"
-"\n"
-"\n"
-"Kui soovite kasutada v�rguprinterit Unix serveril, valige \"V�rguprinter\".\n"
-"\n"
-"\n"
-"Kui soovite kasutada v�rguprinteri Windows serveril (v�i muidu �le SMB\n"
-"protokolli), valige  \"SMB/Windows 95/98/NT\"."
-
-#: ../../help.pm_.c:527
-msgid ""
-"Please turn on your printer before continuing to let DrakX detect it.\n"
-"\n"
-"You have to enter some informations here.\n"
-"\n"
-"\n"
-"   * Name of printer: the print spooler uses \"lp\" as default printer name. "
-"So, you must have a printer named \"lp\".\n"
-"     If you have only one printer, you can use several names for it. You "
-"just need to separate them by a pipe\n"
-"     character (a \"|\"). So, if you prefer a more meaningful name, you have "
-"to put it first, eg: \"My printer|lp\".\n"
-"     The printer having \"lp\" in its name(s) will be the default printer.\n"
-"\n"
-"\n"
-"   * Description: this is optional but can be useful if several printers are "
-"connected to your computer or if you allow\n"
-"     other computers to access to this printer.\n"
-"\n"
-"\n"
-"   * Location: if you want to put some information on your\n"
-"     printer location, put it here (you are free to write what\n"
-"     you want, for example \"2nd floor\").\n"
-msgstr ""
-"Palun l�litage oma printer sisse ja laske DrakX-il seda tuvastade.\n"
-"\n"
-"Samuti on vaja sisestada lisainformatsiooni:\n"
-"\n"
-"\n"
-"   * Printeri nimi: spuuler kasutab vaikimisi printerit \"lp\". Seega peab "
-"Teil olema v�hemalt �he printeri nimi \"lp\".\n"
-"     Kui Teil ongi ainult �ks printer, saate sellele anda ka mitu nime. "
-"Nimed peavad olema eraldatud s�mboliga \"|\"\n"
-"     Seega, kui soovite, et nimel oleks ka mingi t�hendus, kirjutage nimeks "
-"midagi niisugust: \"Minu printer|lp\".\n"
-"     Printer, mille nimede hulgas on \"lp\", saab olema Teie s�steemi jaoks "
-"vaikimisi printeriks.\n"
-"\n"
-"\n"
-"  * Kirjeldus: see ei ole kohustuslik, kuid v�ib osutuda vajalikuks, kui "
-"Teil on n�iteks mitu kohalikku printerit ja soovite neid v�rgus v�lja "
-"jagada\n"
-"\n"
-"\n"
-"  * Asukoht: kui soovite anda t�iendavat informatsiooni printeri asukohast\n"
-"    N�iteks: \"Teise korruse keskel\".\n"
-
-#: ../../help.pm_.c:548
-msgid ""
-"You need to enter some informations here.\n"
-"\n"
-"\n"
-"   * Name of queue: the print spooler uses \"lp\" as default printer name. "
-"So, you need have a printer named \"lp\".\n"
-"    If you have only one printer, you can use several names for it. You just "
-"need to separate them by a pipe\n"
-"    character (a \"|\"). So, if you prefer to have a more meaningful name, "
-"you have to put it first, eg: \"My printer|lp\".\n"
-"    The printer having \"lp\" in its name(s) will be the default printer.\n"
-"\n"
-"  \n"
-"   * Spool directory: it is in this directory that printing jobs are stored. "
-"Keep the default choice\n"
-"     if you don't know what to use\n"
-"\n"
-"\n"
-"   * Printer Connection: If your printer is physically connected to your "
-"computer, select \"Local printer\".\n"
-"     If you want to access a printer located on a remote Unix machine, "
-"select \"Remote lpd printer\".\n"
-"\n"
-"\n"
-"     If you want to access a printer located on a remote Microsoft Windows "
-"machine (or on Unix machine using SMB\n"
-"     protocol), select \"SMB/Windows 95/98/NT\".\n"
-"\n"
-"\n"
-"     If you want to acces a printer located on NetWare network, select "
-"\"NetWare\".\n"
-msgstr ""
-"N��d on vaja lisainformatsiooni.\n"
-"\n"
-"\n"
-"   * Printeri nimi: spuuler kasutab vaikimisi printerit \"lp\". Seega peab "
-"Teil olema v�hemalt �he printeri nimi \"lp\".\n"
-"     Kui Teil ongi ainult �ks printer, saate sellele anda ka mitu nime. "
-"Nimed peavad olema eraldatud s�mboliga \"|\"\n"
-"     Seega, kui soovite, et nimel oleks ka mingi t�hendus, kirjutage nimeks "
-"midagi niisugust: \"Minu printer|lp\".\n"
-"     Printer, mille nimede hulgas on \"lp\", saab olema Teie s�steemi jaoks "
-"vaikimisi printeriks.\n"
-"\n"
-"\n"
-"  * Spuulkataloog: kataloog, kus spuuler hoiab ajutisi faile enne "
-"printimist. Seda ei ole soovitav muuta.\n"
-"\n"
-"\n"
-"  * Printeri �hendusviis: Kui Teie printer on f��siliselt Teie arvuti "
-"k�ljes, valige \"Kohalik printer\".\n"
-"    Kui soovite kasutada printerit UNIX serveri k�ljes, valige \"lpd "
-"printserver\".\n"
-"\n"
 "\n"
-"   Kui soovite kasutada printerit Microsoft Windows v�rgus (v�i SMB "
-"serveril) valige \"SMB/Windows 95/98/NT\".\n"
-"\n"
-"\n"
-"   Kui soovite kasutada NetWare serveril asuvat printerit, valige \"NetWare"
-"\".\n"
-
-#: ../../help.pm_.c:573
-msgid ""
-"Your printer has not been detected. Please enter the name of the device on\n"
-"which it is connected.\n"
-"\n"
-"\n"
-"For information, most printers are connected on the first parallel port. "
-"This\n"
-"one is called \"/dev/lp0\" under GNU/Linux and \"LPT1\" under Microsoft "
-"Windows."
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"Teie printerit ei �nnestunud tuvastada. Palun abistavat infot v�imaliku\n"
-"�henduspistiku kohta.\n"
-"\n"
-"\n"
-"Enamasti on printer �hendatud esimesse paralleelporti. GNU/Linuxis on selle\n"
-"nimeks \"/dev/lp0\" ja Microsoft Windowsis \"LPT1\"."
-
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "Valige printer �laltoodud nimekirjast."
-
-#: ../../help.pm_.c:584
-msgid ""
-"Please select the right options according to your printer.\n"
-"Please see its documentation if you don't know what choose here.\n"
-"\n"
-"\n"
-"You will be able to test your configuration in next step and you will be "
-"able to modify it if it doesn't work as you want."
-msgstr ""
-"Palun valige oma printerile sobivad s�tted.\n"
-"Abi saate ilmselt ka printeri dokumentatsioonist.\n"
-"\n"
-"\n"
-"J�rgmisel sammul saate oma seadistusi testida ja soovi korral muuta, kui "
-"midagi ei t��ta nagu vaja."
 
-#: ../../help.pm_.c:591
+#: ../../help.pm_.c:600
 msgid ""
-"You can now enter the root password for your Linux-Mandrake system.\n"
-"The password must be entered twice to verify that both password entries are "
-"identical.\n"
-"\n"
-"\n"
-"Root is the system's administrator and is the only user allowed to modify "
-"the\n"
-"system configuration. Therefore, choose this password carefully. \n"
-"Unauthorized use of the root account can be extemely dangerous to the "
-"integrity\n"
-"of the system, its data and other system connected to it.\n"
-"\n"
-"\n"
-"The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. It should never be written down.\n"
+"LILO and GRUB are boot loaders for GNU/Linux. This stage, normally, is\n"
+"totally automated. In fact, DrakX analyzes the disk boot sector and acts\n"
+"accordingly, depending on what it finds here:\n"
 "\n"
+" * if Windows boot sector is found, it will replace it with a GRUB/LILO "
+"boot\n"
+"sector. Hence, you will be able to load either GNU/Linux or another OS;\n"
 "\n"
-"Do not make the password too long or complicated, though: you must be able "
-"to\n"
-"remember it without too much effort."
-msgstr ""
-"N��d peate sisestama s�steemi juurkasutaja (root) parooli. Et v�hendada\n"
-"eksimisv�imalust, tehke seda kaks korda.\n"
+" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
+"one;\n"
 "\n"
+"If in doubt, DrakX will display a dialog with various options.\n"
 "\n"
-"Juurkasutaja on s�steemi t�htsaim kasutaja ja ainuke, kes tohib teha\n"
-"muudatusi s�steemi s�tetesse. Seep�rast valige juurkasutaja parooli erilise\n"
-"hoolega.\n"
+" * \"Boot loader to use\": you have three choices:\n"
 "\n"
-"Hea salas�na peaks olema kombinatsioon t�htedest ja numbritest \n"
-"ning v�hemalt 8 m�rki pikk. �rge *kunagi* kirjutage oma parooli �les!\n"
+"    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
+"interface.\n"
 "\n"
+"    * \"GRUB\": if you prefer GRUB (text menu).\n"
 "\n"
-"Samas ei peaks see olema liiga pikk ja keeruline meelde j�tmiseks."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"Turvalisema s�steemi saamiseks peaksite valima \"Kasuta varjutatud \n"
-"paroolifaili\" ja \"Kasuta parooli kaitsmiseks MD5 algoritmi\"."
-
-#: ../../help.pm_.c:613
-msgid ""
-"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
-"network administrator."
-msgstr ""
-"Kui Teie v�rgus on kasutusel NIS, valige \"Kasuta NIS-i\". Kahtluse korral\n"
-"k�sige v�rguhaldurilt."
-
-#: ../../help.pm_.c:617
-msgid ""
-"You may now create one or more \"regular\" user account(s), as\n"
-"opposed to the \"privileged\" user account, root. You can create\n"
-"one or more account(s) for each person you want to allow to use\n"
-"the computer. Note that each user account will have its own\n"
-"preferences (graphical environment, program settings, etc.)\n"
-"and its own \"home directory\", in which these preferences are\n"
-"stored.\n"
+"    * \"LILO with text menu\": if you prefer LILO with its text menu "
+"interface.\n"
 "\n"
+" * \"Boot device\": in most cases, you will not change the default\n"
+"(\"/dev/hda\"), but if you prefer, the boot loader can be installed on the\n"
+"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\").\n"
 "\n"
-"First of all, create an account for yourself! Even if you will be the only "
-"user\n"
-"of the machine, you may NOT connect as root for daily use of the system: "
-"it's a\n"
-"very high security risk. Making the system unusable is very often a typo "
-"away.\n"
+" * \"Delay before booting the default image\": when rebooting the computer,\n"
+"this is the delay granted to the user to choose - in the boot loader menu,\n"
+"another boot entry than the default one.\n"
 "\n"
+"!! Beware that if you choose not to install a boot loader (by selecting\n"
+"\"Cancel\" here), you must ensure that you have a way to boot your Mandrake\n"
+"Linux system! Also be sure you know what you do before changing any of the\n"
+"options. !!\n"
 "\n"
-"Therefore, you should connect to the system using the user account\n"
-"you will have created here, and login as root only for administration\n"
-"and maintenance purposes."
-msgstr ""
-"N��d saate luua �he v�i rohkem \"tavakasutaja\" kontot. ��rmiselt soovitav\n"
-"on luua igale arvuti kasutajale eraldi konto(d). Sel viisi saab iga "
-"kasutaja\n"
-"valida ise endale sobiva graafilise keskkonna kujunduse ja programmide "
-"s�tted.\n"
-"K�ik kasutaja failid saavad hoitud ja kaitstud tema isiklikus "
-"kodukataloogis.\n"
+"Clicking the \"Advanced\" button in this dialog will offer many advanced\n"
+"options, which are reserved to the expert user.\n"
 "\n"
+"Mandrake Linux installs its own boot loader, which will let you boot either\n"
+"GNU/Linux or any other operating systems which you have on your system.\n"
 "\n"
-"Esmalt looge konto iseendale, ka siis kui olete s�steemi ainuke kasutaja.\n"
-"�rge tehke oma igap�evatoimetusi juurkasutajana, suurendades sel viisil\n"
-"turvariski! Vale juurkasutaja n�puliigutus v�ib s�steemi kergesti\n"
-"kasutusk�lbmatuks muuta!\n"
-"\n"
-"\n"
-"Juurkasutaja �igused on ainult administreerimiseks ja hoolduseks,\n"
-"k�ike muud tehke palun tavakasutajana"
-
-#: ../../help.pm_.c:636
-msgid ""
-"Creating a boot disk is strongly recommended. If you can't\n"
-"boot your computer, it's the only way to rescue your system without\n"
-"reinstalling it."
-msgstr ""
-"Alglaadimisketta loomine on ��rmiselt soovitatav. Kui peaks kunagi\n"
-"tekkima probleeme s�steemi laadimisel, v�i alglaadmisketas olla Teie\n"
-"ainuke p��setee uue installimise k�rval."
-
-#: ../../help.pm_.c:641
-msgid ""
-"You need to indicate where you wish\n"
-"to place the information required to boot to GNU/Linux.\n"
-"\n"
-"\n"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"N��d peate valima, milliselt kettaosalt soovite GNU/Linuxit laadida.\n"
-"\n"
-"Valige \"K�vaketta esimene sektor (MBR)\", kui ei tea t�pselt, mida\n"
-"teha."
-
-#: ../../help.pm_.c:649
-msgid ""
-"Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
-" (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+"If there is another operating system installed on your machine, it will be\n"
+"automatically added to the boot menu. Here, you can choose to fine-tune the\n"
+"existing options. Double-clicking on an existing entry allows you to change\n"
+"its parameters or remove it; \"Add\" creates a new entry; and \"Done\" goes\n"
+"on to the next installation step."
 msgstr ""
-"Tavaline valik on \"/dev/hda\" (esimese IDE kanali master), kui Te ei\n"
-"tea t�pselt, et tahate teisiti teha."
 
-#: ../../help.pm_.c:653
+#: ../../help.pm_.c:647
+#, fuzzy
 msgid ""
-"LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
+"LILO (the LInux LOader) and GRUB are boot loaders: they are able to boot\n"
 "either GNU/Linux or any other operating system present on your computer.\n"
 "Normally, these other operating systems are correctly detected and\n"
 "installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
-"\n"
+"screen. Be careful to choose the correct parameters.\n"
 "\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
+"You may also not want to give access to these other operating systems to\n"
+"anyone. In which case, you can delete the corresponding entries. But then,\n"
+"you will need a boot disk in order to boot those other operating systems!"
 msgstr ""
 "LILO (ehk LInux LOader) ja Grub on alglaadurid: nad v�imaldavad laadida\n"
 "kas GNU/Linuxi v�i m�ne muu Teie arvutis olevad operatsioonis�steemi.\n"
@@ -3265,167 +2989,153 @@ msgstr ""
 "ka alglaadur. Kui Teil aga ei ole �nne, tuleb parameetrid seada\n"
 "k�sitsi. Olge sel juhul hoolas valima �iged."
 
-#: ../../help.pm_.c:665
+#: ../../help.pm_.c:658
+#, fuzzy
 msgid ""
-"LILO and grub main options are:\n"
-"  - Boot device: Sets the name of the device (e.g. a hard disk\n"
-"partition) that contains the boot sector. Unless you know specifically\n"
-"otherwise, choose \"/dev/hda\".\n"
-"\n"
-"\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero.\n"
-"\n"
-"\n"
-"  - Video mode: This specifies the VGA text mode that should be selected\n"
-"when booting. The following values are available: \n"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\n"
 "\n"
-"    * normal: select normal 80x25 text mode.\n"
-"\n"
-"    * <number>:  use the corresponding text mode.\n"
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
+msgstr ""
+"N��d peate valima, milliselt kettaosalt soovite GNU/Linuxit laadida.\n"
 "\n"
+"Valige \"K�vaketta esimene sektor (MBR)\", kui ei tea t�pselt, mida\n"
+"teha."
+
+#: ../../help.pm_.c:665
+msgid ""
+"Here we select a printing system for your computer to use. Other OSes may\n"
+"offer you one, but Mandrake offers three.\n"
 "\n"
-"  - Clean \"/tmp\" at each boot: if you want delete all files and "
-"directories\n"
-"stored in \"/tmp\" when you boot your system, select this option.\n"
+" * \"pdq\" - which means ``print, don't queue'', is the choice if you have "
+"a\n"
+"direct connection to your printer and you want to be able to panic out of\n"
+"printer jams, and you do not have any networked printers. It will handle\n"
+"only very simple network cases and is somewhat slow for networks. Pick\n"
+"\"pdq\" if this is your maiden voyage to GNU/Linux. You can change your\n"
+"choices after install by running PrinterDrake from the Mandrake Control\n"
+"Center and clicking the expert button.\n"
+"\n"
+" * \"CUPS\" - ``Common Unix Printing System'' is excellent at printing to\n"
+"your local printer and also halfway round the planet. It is simple and can\n"
+"act like a server or a client for the ancient \"lpd\" printing system, so\n"
+"it is compatible with the systems that went before. It can do many tricks,\n"
+"but the basic setup is almost as easy as \"pdq\". If you need this to\n"
+"emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
+"graphical front-ends for printing or choosing printer options.\n"
+"\n"
+" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
+"approximately the same things the others can do, but it will print to\n"
+"printers mounted on a Novell Network, because it supports IPX protocol, and\n"
+"it can print directly to shell commands. If you have need of Novell or\n"
+"printing to commands without using a separate pipe construct, use lprNG.\n"
+"Otherwise, CUPS is preferable as it is simpler and better at working over\n"
+"networks."
+msgstr ""
+
+#: ../../help.pm_.c:693
+#, fuzzy
+msgid ""
+"DrakX is now detecting any IDE devices present in your computer. It will\n"
+"also scan for one or more PCI SCSI card(s) on your system. If a SCSI card\n"
+"is found DrakX will automatically install the appropriate driver.\n"
 "\n"
+"Because hardware detection will sometimes not detect a piece of hardware\n"
+"DrakX will ask you to confirm if a PCI SCSI card is present. Click \"Yes\"\n"
+"if you know that there is a SCSI card installed in your machine. You will\n"
+"be presented a list of SCSI cards to choose from. Click \"No\" if you have\n"
+"no SCSI hardware. If you are unsure you can check the list of hardware\n"
+"detected in your machine by selecting \"See hardware info\" and clicking\n"
+"\"OK\". Examine the list of hardware and then click on the \"OK\" button to\n"
+"return to the SCSI interface question.\n"
 "\n"
-"  - Precise RAM if needed: unfortunately, there is no standard method to ask "
-"the\n"
-"BIOS about the amount of RAM present in your computer. As consequence, Linux "
-"may\n"
-"fail to detect your amount of RAM correctly. If this is the case, you can\n"
-"specify the correct amount or RAM here. Please note that a difference of 2 "
-"or 4\n"
-"MB between detected memory and memory present in your system is normal."
+"If you have to manually specify your adapter, DrakX will ask if you want to\n"
+"specify options for it. You should allow DrakX to probe the hardware for\n"
+"the card-specific options that the hardware needs to initialize. This\n"
+"usually works well.\n"
+"\n"
+"If DrakX is not able to probe for the options that need to be passed, you\n"
+"will need to manually provide options to the driver. Please review the\n"
+"``User Guide'' (chapter 3, section \"Collecting information on your\n"
+"hardware\") for hints on retrieving the parameters required from hardware\n"
+"documentation, from the manufacturer's web site (if you have Internet\n"
+"access) or from Microsoft Windows (if you used this hardware with Windows\n"
+"on your system)."
 msgstr ""
-"LILO ja grub-i peamised suvandid on:\n"
-"  - Alglaadimisseade: m��ratakse k�vaketas v�i partitsioon, kus asub\n"
-"alglaadimissektor. Kui Te just t�pselt ei tea, mida teete,\n"
-"\"/dev/hda\".\n"
-"\n"
-"\n"
-"  - Ooteaeg alglaadimisel: m��ratakse ooteaeg sekundik�mnendikes enne\n"
-"vaikimisi laadimist.\n"
-"\n"
+"Esmalt otsib DrakX PCI siini SCSI liideseid. Kui neid leitakse, ja \n"
+"vastav(ad) juhtprogramm(id) on teada, siis laetakse ja installitakse \n"
+"k�ik vajalik automaatselt.\n"
 "\n"
-"  - Graafikamood: m��ratakse VGA tekstmood s�steemi laadimisel. V�imalikud\n"
-"on j�rgmised valikud:\n"
 "\n"
-"    * normal: tavaline 80x25 tekstimood\n"
+"Kui Teie SCSI liides kasutab ISA siini v�i kui DrakX ei tea,\n"
+"millist juhtprogrammi kasutada v�i Teil ei ole �ldse SCSI liidest,\n"
+"siis k�sitakse Teilt selle kohta.\n"
+"Kui Teil SCSI liidest t�esti ei ole, vastake \"Ei\". Kui Teil aga siiski\n"
+"on, siis vastake \"Jah\". Seej�rel lastakse Teil nimekirjast sobiv\n"
+"juhtprogramm valida.\n"
 "\n"
-"    * <number>:  numbrile vastav tekstimood.  - Puhasta /tmp alglaadimisel: "
-"kui soovite kustutada s�steemi alglaadimisel,\n"
-"valige see\n"
 "\n"
+"Kui olete juhtprogrammi v�lja valinud, on Teil v�imalus anda sellele\n"
+"ka parameetreid. Siiski, enamasti l�heb k�ik kenasti ka ilma neid\n"
+"sisestamata: vastavad andmed leiab juhtprogramm ise.\n"
 "\n"
-"  - T�psust RAM hulk kui vajalik: kahjuks ei ole �htki standardset meetodit "
-"Teie\n"
-"arvutis leiduva operatiivm�lu (RAM) koguse �raarvamiseks. Kui siinkohal on "
-"eksimine\n"
-"2 v�i 4 MB, siis ei maksa sellele v�ga t�helepanu p��rata."
+"Kui automaatne parameetrite otsimine ei t��ta, tutvuge palun l�hemalt\n"
+"oma SCSI liidese dokumentatsiooniga v�i k�sige abi riistvara m��jalt.\n"
+"Vaadake ka User Guide'i (peat�kk 2, l�ik \"Collective informations on your\n"
+"hardware\")\n"
+"Ka samas masinas olev Windows oskab vahel SCSI kohta kasulikku \n"
+"informatsiooni anda."
 
-#: ../../help.pm_.c:697
+#: ../../help.pm_.c:720
+#, fuzzy
 msgid ""
-"Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able\n"
-"to boot either GNU/Linux, MacOS, or MacOSX, if present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
-"\n"
+"You can add additional entries for yaboot, either for other operating\n"
+"systems, alternate kernels, or for an emergency boot image.\n"
 "\n"
-"Yaboot main options are:\n"
+"For other OS's, the entry consists only of a label and the root partition.\n"
 "\n"
+"For Linux, there are a few possible options:\n"
 "\n"
-"  - Init Message: A simple text message that is displayed before the boot\n"
-"prompt.\n"
+" * Label: this is simply the name you will have to type at the yaboot "
+"prompt\n"
+"to select this boot option.\n"
 "\n"
+" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
+"or a variation of vmlinux with an extension.\n"
 "\n"
-"  - Boot Device: Indicate where you want to place the information required "
-"to \n"
-"boot to GNU/Linux. Generally, you will have setup a bootstrap partition "
-"earlier \n"
-"to hold this information.\n"
+" * Root: the \"root\" device or \"/\" for your Linux installation.\n"
 "\n"
+" * Append: on Apple hardware, the kernel append option is used quite often\n"
+"to assist in initializing video hardware, or to enable keyboard mouse\n"
+"button emulation for the often lacking 2nd and 3rd mouse buttons on a stock\n"
+"Apple mouse. The following are some examples:\n"
 "\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"
+"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"hda=autotune\n"
 "\n"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-"  - Kernel Boot Timeout: This timeout is similar to the LILO boot delay.  "
-"After \n"
-"selecting Linux, you will have this delay in 0.1 seconds before your "
-"default\n"
-"kernel description is selected.\n"
+" * 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 4,096 bytes. If you\n"
+"need to allocate a large ramdisk, this option can be used.\n"
 "\n"
-"  - Enable CD Boot?: Checking this option will allow you to choose 'C' for "
-"CD at\n"
-"the first boot prompt.\n"
+" * Read-write: normally the \"root\" partition is initially brought up in\n"
+"read-only, to allow a file system check before the system becomes \"live\".\n"
+"Here, you can override 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"
-"  - Enable OF Boot?: Checking this option will allow you to choose 'N' for "
-"Open\n"
-"Firmware at the first boot prompt.\n"
-"\n"
-"\n"
-"  - Default OS: You can select which OS will boot by default when the Open "
-"Firmware \n"
-"Delay expires."
+" * Default: selects this entry as being the default Linux selection,\n"
+"selectable by just pressing ENTER at the yaboot prompt. This entry will\n"
+"also be highlighted with a \"*\", if you press [Tab] to see the boot\n"
+"selections."
 msgstr ""
-"Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able\n"
-"to boot either GNU/Linux, MacOS, or MacOSX, if present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
-"\n"
-"\n"
-"Yaboot main options are:\n"
-"\n"
-"\n"
-"  - Init Message: A simple text message that is displayed before the boot\n"
-"prompt.\n"
-"\n"
-"\n"
-"  - Boot Device: Indicate where you want to place the information required "
-"to \n"
-"boot to GNU/Linux. Generally, you will have setup a bootstrap partition "
-"earlier \n"
-"to hold this information.\n"
-"\n"
-"\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"
-"\n"
-"  - Kernel Boot Timeout: This timeout is similar to the LILO boot delay.  "
-"After \n"
-"selecting Linux, you will have this delay in 0.1 seconds before your "
-"default\n"
-"kernel description is selected.\n"
-"\n"
-"\n"
-"  - Enable CD Boot?: Checking this option will allow you to choose 'C' for "
-"CD at\n"
-"the first boot prompt.\n"
-"\n"
-"\n"
-"  - Enable OF Boot?: Checking this option will allow you to choose 'N' for "
-"Open\n"
-"Firmware at the first boot prompt.\n"
-"\n"
-"\n"
-"  - Default OS: You can select which OS will boot by default when the Open "
-"Firmware \n"
-"Delay expires."
-
-#: ../../help.pm_.c:738
-msgid ""
 "You can add additional entries for yaboot, either for other operating "
 "systems,\n"
 "alternate kernels, or for an emergency boot image.\n"
@@ -3460,10 +3170,10 @@ msgid ""
 "are some examples:\n"
 "\n"
 "\n"
-"\t\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
 "hda=autotune\n"
 "\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
+"\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
 "\n"
 "\n"
 " \n"
@@ -3495,263 +3205,160 @@ msgid ""
 "pressing ENTER at the yaboot prompt.  This entry will also be highlighted "
 "with a '*', if you\n"
 "press TAB to see the boot selections."
-msgstr ""
-"You can add additional entries for yaboot, either for other operating "
-"systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"\n"
-"For other OS's - the entry consists only of a label and the root partition.\n"
+
+#: ../../help.pm_.c:765
+#, fuzzy
+msgid ""
+"Yaboot is a boot loader for NewWorld MacIntosh hardware. It is able to boot\n"
+"either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
+"these other operating systems are correctly detected and installed. If this\n"
+"is not the case, you can add an entry by hand in this screen. Be careful as\n"
+"to choose the correct parameters.\n"
 "\n"
+"Yaboot's main options are:\n"
 "\n"
-"For Linux, there are a few possible options: \n"
+" * Init Message: a simple text message that is displayed before the boot\n"
+"prompt.\n"
 "\n"
+" * Boot Device: indicate where you want to place the information required "
+"to\n"
+"boot to GNU/Linux. Generally, you setup a bootstrap partition earlier to\n"
+"hold this information.\n"
 "\n"
-"  - Label: This is simply the name will type at the yaboot prompt to select "
-"this \n"
-"boot option.\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 before your\n"
+"default kernel description is selected.\n"
 "\n"
-"  - Image: This would be the name of the kernel to boot.  Typically vmlinux "
-"or\n"
-"a variation of vmlinux with an extension.\n"
+" * 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 "
+"Open\n"
+"Firmware at the first boot prompt.\n"
 "\n"
-"  - Root: The root device or '/' for your Linux installation.\n"
-"\n"
+" * Default OS: you can select which OS will boot by default when the Open\n"
+"Firmware Delay expires."
+msgstr ""
+"Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able\n"
+"to boot either GNU/Linux, MacOS, or MacOSX, if present on your computer.\n"
+"Normally, these other operating systems are correctly detected and\n"
+"installed. If this is not the case, you can add an entry by hand in this\n"
+"screen. Be careful as to choose the correct parameters.\n"
 "\n"
-"  \n"
-"  - Append: On Apple hardware, the kernel append option is used quite often "
-"to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button "
-"emulation\n"
-"for the often lacking 2nd and 3rd mouse buttons on a stock Apple mouse.  The "
-"following \n"
-"are some examples:\n"
 "\n"
+"Yaboot main options are:\n"
 "\n"
-"\t\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
-"hda=autotune\n"
 "\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
+"  - Init Message: A simple text message that is displayed before the boot\n"
+"prompt.\n"
 "\n"
 "\n"
-" \n"
-"  - Initrd: This option can be used either to load initial modules, before "
-"the boot \n"
-"device is available, or to load a ramdisk image for an emergency boot "
-"situation.\n"
+"  - Boot Device: Indicate where you want to place the information required "
+"to \n"
+"boot to GNU/Linux. Generally, you will have setup a bootstrap partition "
+"earlier \n"
+"to hold this information.\n"
 "\n"
 "\n"
-"  - Initrd-size: The default ramdisk size is generally 4096 bytes.  If you "
-"should need\n"
-"to allocate a large ramdisk, this option can be used.\n"
+"  - 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"
 "\n"
-"  - Read-write: Normally the 'root' partition is initially brought up read-"
-"only, to allow\n"
-"a filesystem check before the system becomes 'live'.  You can override this "
-"option here.\n"
+"  - Kernel Boot Timeout: This timeout is similar to the LILO boot delay.  "
+"After \n"
+"selecting Linux, you will have this delay in 0.1 seconds before your "
+"default\n"
+"kernel description is selected.\n"
 "\n"
 "\n"
-"  - NoVideo: Should the Apple video hardware prove to be exceptionally "
-"problematic, you can\n"
-"select this option to boot in 'novideo' mode, with native framebuffer "
-"support.\n"
+"  - Enable CD Boot?: Checking this option will allow you to choose 'C' for "
+"CD at\n"
+"the first boot prompt.\n"
 "\n"
 "\n"
-"  - Default: Selects this entry as being the default Linux selection, "
-"selectable by just\n"
-"pressing ENTER at the yaboot prompt.  This entry will also be highlighted "
-"with a '*', if you\n"
-"press TAB to see the boot selections."
-
-#: ../../help.pm_.c:793
-msgid ""
-"SILO is a bootloader for SPARC: it is able to boot\n"
-"either GNU/Linux or any other operating system present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
+"  - Enable OF Boot?: Checking this option will allow you to choose 'N' for "
+"Open\n"
+"Firmware at the first boot prompt.\n"
 "\n"
 "\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
-msgstr ""
-"SILO on alglaadur SPARC arhitektuurile: see v�imaldab laadida\n"
-"kas GNU/Linuxi v�i m�ne muu Teie arvutis oleva operatsioonis�steemi.\n"
-"Tavaliselt tuvastakse teised operatsioonis�steemid �igesti ja seadista-\n"
-"takse ka alglaadur. Kui Teil aga ei ole �nne, tuleb parameetrid seada\n"
-"k�sitsi. Olge sel juhul hoolas valima �iged."
+"  - Default OS: You can select which OS will boot by default when the Open "
+"Firmware \n"
+"Delay expires."
 
-#: ../../help.pm_.c:805
+#: ../../help.pm_.c:798
 msgid ""
-"SILO main options are:\n"
-"  - Bootloader installation: Indicate where you want to place the\n"
-"information required to boot to GNU/Linux. Unless you know exactly\n"
-"what you are doing, choose \"First sector of drive (MBR)\".\n"
-"\n"
+"Here are presented various parameters concerning your machine. Depending on\n"
+"your installed hardware, you may - or not, see the following entries:\n"
 "\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero."
-msgstr ""
-"SILO peamised suvandid on:\n"
-"  - Alglaaduri paigaldus: m��ratakse k�vaketas v�i partitsioon, kus soovite\n"
-"hoida GNU/Linuxi laadimiseks vajalikku infot. Kui Te just t�pselt ei tea,\n"
-"mida teete, valige \"K�vaketta esimene sektor (MBR)\".\n"
+" * \"Mouse\": mouse check the current mouse configuration and click on the\n"
+"button to change it if necessary.\n"
 "\n"
+" * \"Keyboard\": keyboard check the current keyboard map configuration and\n"
+"click on the button to change that if necessary.\n"
 "\n"
-"  - Ooteaeg alglaadimisel: m��ratakse aeg sekundik�mnendikes enne vaikimisi\n"
-"laadimist."
-
-#: ../../help.pm_.c:818
-msgid ""
-"Now it's time to configure the X Window System, which is the\n"
-"core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
-"you must configure your video card and monitor. Most of these\n"
-"steps are automated, though, therefore your work may only consist\n"
-"of verifying what has been done and accept the settings :)\n"
+" * \"Timezone\": time zoneDrakX, by default, guesses your time zone from "
+"the\n"
+"language you have chosen. But here again, as for the choice of a keyboard,\n"
+"you may not be in the country for which the chosen language should\n"
+"correspond. Hence, you may need to click on the \"Timezone\" button in\n"
+"order to configure the clock according to the time zone you are in.\n"
 "\n"
+" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
+"configuration wizard.\n"
 "\n"
-"When the configuration is over, X will be started (unless you\n"
-"ask DrakX not to) so that you can check and see if the\n"
-"settings suit you. If they don't, you can come back and\n"
-"change them, as many times as necessary."
-msgstr ""
-"On aeg konfigureerida \"X Window System\" ehk lihtsalt X. X on\n"
-"GNU/Linuxi graafilise kasutajaliidese s�da. Sel eesm�rgil peame koos\n"
-"seadistama Teie graafikakaardi ja monitori. Enamus sellest protsessist\n"
-"on automatiseeritud ja Teie �lesandeks on ainult DrakX-i\n"
-"valikutega n�ustuda (v�i mitte :))\n"
+" * \"Sound card\": if a sound card is detected on your system, it is\n"
+"displayed here. No modification possible at installation time.\n"
 "\n"
+" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
+"here. No modification possible at installation time.\n"
 "\n"
-"Kui saame seadistamisega hakkama, k�ivitakse X (kui Te ei anna\n"
-"eraldi k�sku mitte nii teha)."
-
-#: ../../help.pm_.c:831
-msgid ""
-"If something is wrong in X configuration, use these options to correctly\n"
-"configure the X Window System."
+" * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
+"displayed here. You can click on the button to change the parameters\n"
+"associated to it."
 msgstr ""
-"Kui midagi on X-i seadistustega valesti, saab siinkohal v�imalikke vigu\n"
-"parandada."
 
-#: ../../help.pm_.c:835
-msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
-msgstr ""
-"Kui eelistate graafilist s�steemi sisenemist, valige \"Jah\". Konsoolimoodi\n"
-"eelistamisel valige \"Ei\"."
-
-#: ../../help.pm_.c:839
+#: ../../help.pm_.c:827
+#, fuzzy
 msgid ""
-"You can choose a security level for your system. Please refer to the manual "
-"for complete\n"
-"  information. Basically, if you don't know what to choose, keep the default "
-"option.\n"
+"Choose the hard drive you want to erase to install your new Mandrake Linux\n"
+"partition. Be careful, all data present on it will be lost and will not be\n"
+"recoverable!"
 msgstr ""
-"N��d saate valida oma s�steemis kasutatava turvataseme. Palun vaadake "
-"lisainfot selle kohta ka\n"
-" kasutajajuhendist. �ldiselt, kui Te ei tea, mida teete, j�tke siia "
-"vaikimisi valik.\n"
+"Valige k�vaketas, mida soovite Mandrake Linux installimiseks puhastada\n"
+"Ettevaatust, k�ik sellel leiduvad andmed h�vitatakse ja ei ole enam\n"
+"taastatavad."
 
-#: ../../help.pm_.c:844
+#: ../../help.pm_.c:832
+#, fuzzy
 msgid ""
-"Your system is going to reboot.\n"
+"Click on \"OK\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
 "\n"
-"After rebooting, your new Linux Mandrake system will load automatically.\n"
-"If you want to boot into another existing operating system, please read\n"
-"the additional instructions."
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
-"Teie s�steem sooritab alglaadimise.\n"
+"Valige \"OK\" kui soovite kustutada k�ik sellel kettal asuvad "
+"partitsioonid.\n"
+"Ettevaatust, peale \"OK\" klikkimist ei ole enam v�imalik sellelt kettalt\n"
+"andmeid taastada.\n"
 "\n"
-"Taask�ivitumisel laaditakse Teie uus Linux Mandrake s�steem automaatselt.\n"
-"Kui soovite laadida m�nd muud operatsioonis�steemi, lugege palun\n"
-"lisainformatsiooni."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Valige sobiv keel"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Valige paigaldusmeetod"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "K�vaketta leidmine"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Hiire seadmine"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Klaviatuuri valik"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
-msgstr "Turvalisus"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Failis�steemid"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Vormindamine"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Pakettide valik"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "S�steemi installimine"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "Juurkasutaja salas�na"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Tavakasutaja"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "V�rgus�tted"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-msgstr "Kokkuv�te"
-
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Teenuste s�tted"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Loo alglaadimisflopi"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Alglaaduri s�tted"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Seadista X"
+"\n"
+"Katkestamiseks valige \"Katkesta\"."
 
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "V�lju programmist"
+#: ../../install2.pm_.c:114
+#, c-format
+msgid ""
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
+msgstr ""
 
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3766,20 +3373,20 @@ msgid ""
 "Do you really want to install these servers?\n"
 msgstr ""
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
 msgstr "�ldlevi kasutamine on ilma NIS domeenita v�imatu"
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Pane FAT formaadis flopi seadmesse %s"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
 msgstr "See flopi ei ole FAT formaadis"
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -3787,30 +3394,20 @@ msgstr ""
 "Et kasutada seda paketivalikut, alustage installimist k�sureaga \"linux "
 "defcfg=floppy\""
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "Viga faili $f lugemisel"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "Viga faili %s lugemisel"
 
-#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:310
-#: ../../interactive.pm_.c:99 ../../interactive.pm_.c:114
-#: ../../interactive.pm_.c:269 ../../interactive_newt.pm_.c:166
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:356
-#: ../../my_gtk.pm_.c:617 ../../my_gtk.pm_.c:640
+#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:325
+#: ../../interactive.pm_.c:107 ../../interactive.pm_.c:122
+#: ../../interactive.pm_.c:286 ../../interactive.pm_.c:308
+#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:170
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:415
+#: ../../my_gtk.pm_.c:716 ../../my_gtk.pm_.c:738
 msgid "Ok"
 msgstr "OK"
 
-#: ../../install_gtk.pm_.c:423
-msgid "Please test the mouse"
-msgstr "Palun testige hiirt"
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "Hiire aktiveerimiseks"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "KEERUTAGE RATTAKEST!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -3820,7 +3417,7 @@ msgstr ""
 "Osa teie riistvarast n�uab tarnijapoolseid juhtprogramme.\n"
 "Informatsiooni nende kohta saate: %s"
 
-#: ../../install_interactive.pm_.c:41
+#: ../../install_interactive.pm_.c:44
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -3830,11 +3427,11 @@ msgstr ""
 "Selleks looge uus partitsioon (v�i valige �ks olemasolevatest).\n"
 "Siis valige tegevus \"�henduspunkt\" ja seadke see kui '/'"
 
-#: ../../install_interactive.pm_.c:46 ../../install_steps_graphical.pm_.c:259
+#: ../../install_interactive.pm_.c:49 ../../install_steps_graphical.pm_.c:259
 msgid "You must have a swap partition"
 msgstr "Teil peab olema saaleala"
 
-#: ../../install_interactive.pm_.c:47 ../../install_steps_graphical.pm_.c:261
+#: ../../install_interactive.pm_.c:50 ../../install_steps_graphical.pm_.c:261
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -3844,55 +3441,60 @@ msgstr ""
 "\n"
 "J�tkate ikkagi?"
 
-#: ../../install_interactive.pm_.c:68
+#: ../../install_interactive.pm_.c:53 ../../install_steps.pm_.c:165
+#, fuzzy
+msgid "You must have a FAT partition mounted in /boot/efi"
+msgstr "Teil peab olema saaleala"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Kasuta vaba ruumi"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "Ei ole piisavalt ruumi uute partitsioonide jaoks"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "Kasuta olemasolevat partitsiooni"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "Kasutatavat partitsiooni ei leitud"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "Kasuta Windowsi partitsiooni loopback-ina"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Millisele partitsioonile soovite installida Linux4Win?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "Valige suurused"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "Juurpartitsiooni suurus (MB): "
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "Saaleala suurus (MB): "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "Kasuta vaba ruumi Windowsi partitsioonil"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "Mis partitsiooni soovite muuta?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "Arvutan Windowsi failis�steemi piire"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -3901,12 +3503,12 @@ msgstr ""
 "FAT partitsiooni suurust ei �nnestu muuta, \n"
 "ilmnes selline viga: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "Teie Windowsi partitsioon on fragmenteerunud, palun kasutada 'defrag'-i"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -3923,52 +3525,52 @@ msgstr ""
 "scandisk-i, defrag-i ja tehke tagavarakoopia.\n"
 "Kui olete oma otsuses kindel, vajutage OK."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "Kui palju ruumi j�tate Windowsi jaoks?"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "Partitsioon %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Suuruse muutmine eba�nnestus: %s"
 
-#: ../../install_interactive.pm_.c:145
+#: ../../install_interactive.pm_.c:154
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
 msgstr "Sobivat FAT partitsiooni ei leitud (ei ole piisavalt ruumi)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "T�hjenda kogu ketas"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "Eemalda Windows(TM)"
 
-#: ../../install_interactive.pm_.c:154
+#: ../../install_interactive.pm_.c:163
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "Teil on rohkem kui �ks k�vaketas, millisele neis installite Linuxi?"
 
-#: ../../install_interactive.pm_.c:157
+#: ../../install_interactive.pm_.c:166
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "Kettal %s h�vivad K�IK partitsioonid ja andmed"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 msgstr "Partitsioneerin ise"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "Kasuta fdisk-i"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -3977,28 +3579,28 @@ msgstr ""
 "N��d saate partitsioneerida %s k�vaketta\n"
 "Kui olete valmis, salvestage k�suga 'w'"
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
 msgstr "Teil ei ole piisavalt vaba ruumi Windowsi partitsioonil"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
 msgstr "Installimiseks ei ole �ldse ruumi"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX kettajagamise abimees leidis sellised lahendused:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Ketta jagamine eba�nnestus: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "K�ivitame v�rguliidesed"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "Seiskame v�rguliidesed"
 
@@ -4010,12 +3612,12 @@ msgstr ""
 "Tekkis mingi viga, aga seda ei suuda programm ise klaarida.\n"
 "J�tkake omal vastutusel."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "�henduspunkt %s on m��ratud topelt"
 
-#: ../../install_steps.pm_.c:385
+#: ../../install_steps.pm_.c:384
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
@@ -4026,16 +3628,16 @@ 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_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "See ongi %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "Flopiseade ei ole k�ttesaadav"
 
-#: ../../install_steps_auto_install.pm_.c:51
+#: ../../install_steps_auto_install.pm_.c:77
 #: ../../install_steps_stdio.pm_.c:23
 #, c-format
 msgid "Entering step `%s'\n"
@@ -4049,32 +3651,32 @@ msgstr "Valige paigalduse maht"
 msgid "Total size: "
 msgstr "Suurus kokku: "
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:437
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:387
 #, c-format
 msgid "Version: %s\n"
 msgstr "Versioon: %s\n"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:438
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:388
 #, c-format
 msgid "Size: %d KB\n"
 msgstr "Suurus: %d kB\n"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:337
-#: ../../install_steps_interactive.pm_.c:520
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:509
 msgid "Choose the packages you want to install"
 msgstr "Valige paketid installimiseks"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:340
+#: ../../install_steps_graphical.pm_.c:465 ../../interactive_gtk.pm_.c:571
 msgid "Info"
 msgstr "Info"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:345
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:457
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Install"
 msgstr "Installimine"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:558
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:497
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Installing"
 msgstr "Installin"
 
@@ -4082,7 +3684,7 @@ msgstr "Installin"
 msgid "Please wait, "
 msgstr "Palun oodake, "
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:570
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:510
 msgid "Time remaining "
 msgstr "Aega j��nud "
 
@@ -4091,21 +3693,21 @@ msgid "Total time "
 msgstr "Aega kokku "
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "Valmistun installimiseks"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:618
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:558
 #, c-format
 msgid "Installing package %s"
 msgstr "Paketi %s installimine"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
+#: ../../install_steps_gtk.pm_.c:646
 msgid "Go on anyway?"
 msgstr "Ikkagi edasi?"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
 msgid "There was an error ordering packages:"
 msgstr "Pakettide tellimisel tekkis viga:"
 
@@ -4113,10 +3715,10 @@ msgstr "Pakettide tellimisel tekkis viga:"
 msgid "Use existing configuration for X11?"
 msgstr "Kasutada olemasolevat X-i seadistust?"
 
-#: ../../install_steps_gtk.pm_.c:142
+#: ../../install_steps_gtk.pm_.c:148
 msgid ""
 "Your system is low on resource. You may have some problem installing\n"
-"Linux-Mandrake. If that occurs, you can try a text install instead. For "
+"Mandrake Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -4124,17 +3726,21 @@ msgstr ""
 "Kui nii juhtub, proovige palun tekstip�hjalist paigaldust. Selleks \n"
 "vajutaga laadimisel F1 ja sisestage 'text'"
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Installi klass"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "Palun valige �ks j�rgnevatest paigaldusklassidest"
 
-#: ../../install_steps_gtk.pm_.c:222
+#: ../../install_steps_gtk.pm_.c:228
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr "Teie poolt valitud gruppide kogusuurus on umbes %d MB.\n"
 
-#: ../../install_steps_gtk.pm_.c:224
+#: ../../install_steps_gtk.pm_.c:230
 #, c-format
 msgid ""
 "If you wish to install less than this size,\n"
@@ -4148,7 +3754,7 @@ msgstr ""
 "Madalama protsendi puhul installitakse vaid k�ige t�htsamad paketid;\n"
 "100%% t�hendab k�ige valitud pakettide installimist."
 
-#: ../../install_steps_gtk.pm_.c:229
+#: ../../install_steps_gtk.pm_.c:235
 #, fuzzy, c-format
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
@@ -4163,83 +3769,67 @@ msgstr ""
 "Kui soovite sellest v�hem, valige v�iksem protsent ja installimisele\n"
 "kuuluvad vaid olulisemad paketid."
 
-#: ../../install_steps_gtk.pm_.c:235
+#: ../../install_steps_gtk.pm_.c:241
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "T�psemalt saate valida j�rgmisel sammul"
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "Installitavate pakettide protsent"
 
-#: ../../install_steps_gtk.pm_.c:285 ../../install_steps_interactive.pm_.c:599
+#: ../../install_steps_gtk.pm_.c:291 ../../install_steps_interactive.pm_.c:619
 msgid "Package Group Selection"
 msgstr "Paketigruppide valik"
 
-#: ../../install_steps_gtk.pm_.c:305 ../../install_steps_interactive.pm_.c:614
+#: ../../install_steps_gtk.pm_.c:320 ../../install_steps_interactive.pm_.c:634
 msgid "Individual package selection"
 msgstr "Valik paketthaaval"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr "N�ita automaatselt valitud pakette"
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "Ava puu"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Sule puu"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Sorteeritud v�i sorteerimata"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Suurus kokku: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Vigane pakett"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nimi: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "T�htsus: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Suurus kokku: %d / %d MB"
-
-#: ../../install_steps_gtk.pm_.c:467
+#: ../../install_steps_gtk.pm_.c:411
 msgid ""
 "You can't select this package as there is not enough space left to install it"
 msgstr "Seda paketti ei saa valida, kettaruumi ei ole paigalsuseks piisavalt"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "Installimiseks on valitud j�rgmised paketid"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "Eemaldamiseks on valitud j�rgmised paketid"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "Seda paketti ei saa (mitte) valida"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "See pakett on kohustuslik"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
 msgstr "See pakett on juba installitud"
 
-#: ../../install_steps_gtk.pm_.c:507
+#: ../../install_steps_gtk.pm_.c:447
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -4247,24 +3837,43 @@ msgstr ""
 "Selle paketi peaks uuendame\n"
 "Olete kindel, et Te ei vali seda?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Selle paketi peate valima, sest selle uuendamine on kohustuslik"
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr "N�ita automaatselt valitud pakette"
+
+#: ../../install_steps_gtk.pm_.c:460
+#, fuzzy
+msgid "Load/Save on floppy"
+msgstr "Salvesta flopile"
+
+#: ../../install_steps_gtk.pm_.c:461
+#, fuzzy
+msgid "Updating package selection"
+msgstr "Salvest paketivalik"
+
+#: ../../install_steps_gtk.pm_.c:466
+#, fuzzy
+msgid "Minimal install"
+msgstr "Eemaldamine"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "Oletan"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
 msgstr "Palun oodake, valmistun installimiseks"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d paketti"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -4324,15 +3933,15 @@ msgstr ""
 "respective authors and are protected by intellectual property and \n"
 "copyright laws applicable to software programs.\n"
 
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Accept"
 msgstr "N�us"
 
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Refuse"
 msgstr "Keeldun"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4346,7 +3955,7 @@ msgstr ""
 "Palun sisestage CD pealdisega \"%s\" lugejasse ja vajutage <OK>.\n"
 "Kui teil s�herdust ei ole, vajutage <Katkesta>"
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "Pakettide installimisel tekkis viga:"
 
@@ -4354,34 +3963,21 @@ msgstr "Pakettide installimisel tekkis viga:"
 msgid "An error occurred"
 msgstr "Tekkis mingi viga"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "Palun valige kasutatav keel"
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr "Teisi keeli saab valida p�rast installimist"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "K�ik"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "L�ppkasutaja litsentsileping"
 
-#: ../../install_steps_interactive.pm_.c:87
+#: ../../install_steps_interactive.pm_.c:72
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Linux-"
-"Mandrake distribution \n"
+"The operating system and the different components available in the Mandrake "
+"Linux 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 Linux-Mandrake distribution.\n"
+"system and the different components of the Mandrake Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4435,7 +4031,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 Linux-Mandrake sites  which are prohibited or restricted in some "
+"from one of Mandrake Linux 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"
@@ -4472,7 +4068,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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
 "MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -4495,13 +4091,13 @@ msgstr ""
 "\n"
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Linux-"
-"Mandrake distribution \n"
+"The operating system and the different components available in the Mandrake "
+"Linux 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 Linux-Mandrake distribution.\n"
+"system and the different components of the Mandrake Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4555,7 +4151,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 Linux-Mandrake sites  which are prohibited or restricted in some "
+"from one of Mandrake Linux 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"
@@ -4592,7 +4188,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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
 "MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -4611,103 +4207,99 @@ msgstr ""
 "Paris - France.\n"
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 
-#: ../../install_steps_interactive.pm_.c:182
-#: ../../install_steps_interactive.pm_.c:822
+#: ../../install_steps_interactive.pm_.c:168
+#: ../../install_steps_interactive.pm_.c:871
 #: ../../standalone/keyboarddrake_.c:28
 msgid "Keyboard"
 msgstr "Klaviatuur"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "Palun valige klaviatuuriasetus"
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
 msgstr "V�imalike klaviatuuride t�ielik nimekiri"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Installi klass"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "Millist installi klassi Te soovite"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
 msgstr "Installimine/Uuendus"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
 msgstr "On see installimine v�i taastamine?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Soovituslik"
 
-#: ../../install_steps_interactive.pm_.c:215
-#: ../../install_steps_interactive.pm_.c:218
+#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:204
 msgid "Expert"
 msgstr "Ekspert"
 
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Update"
 msgstr "Uuendus"
 
-#: ../../install_steps_interactive.pm_.c:238 ../../standalone/mousedrake_.c:41
+#: ../../install_steps_interactive.pm_.c:224 ../../standalone/mousedrake_.c:48
 msgid "Please, choose the type of your mouse."
 msgstr "Palun valige hiire t��p"
 
-#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:57
+#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
 msgid "Mouse Port"
 msgstr "Hiire port"
 
-#: ../../install_steps_interactive.pm_.c:245 ../../standalone/mousedrake_.c:58
+#: ../../install_steps_interactive.pm_.c:231 ../../standalone/mousedrake_.c:65
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Millisesse seerialporti on Teie hiir �hendatud?"
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
 msgstr "Nuppude teesklemine"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
 msgstr "Teeskle 2 hiirenupp"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
 msgstr "Teeskle 3 hiirenuppu"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "PCMCIA kaartide seadmine..."
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "Configuring IDE"
 msgstr "IDE seadistamine"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:295
+#: ../../install_steps_interactive.pm_.c:281
 msgid "no available partitions"
 msgstr "ei leia partitsioone"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
 msgstr "Otsin partitsioonidelt �henduspunkte"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "Valige �henduspunktid"
 
-#: ../../install_steps_interactive.pm_.c:323
+#: ../../install_steps_interactive.pm_.c:311
 #, c-format
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
@@ -4723,7 +4315,7 @@ msgstr ""
 "(Viga oli selline: %s)\n"
 "Kas olete n�us partitsioonide kaotamisega?\n"
 
-#: ../../install_steps_interactive.pm_.c:336
+#: ../../install_steps_interactive.pm_.c:324
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
@@ -4731,77 +4323,118 @@ msgstr ""
 "DiskDrake ei saanud partitsioonitabeli lugemisega hakkama.\n"
 "J�tkate omal vastutusel!"
 
-#: ../../install_steps_interactive.pm_.c:361
+#: ../../install_steps_interactive.pm_.c:340
+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_.c:349
+#, fuzzy
+msgid "No root partition found to perform an upgrade"
+msgstr "Juurpartitsiooni ei leitud"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "Juurpartitsioon"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
 msgstr "Millisel partitsioonil hoiate juurkataloogi (/)?"
 
-#: ../../install_steps_interactive.pm_.c:376
+#: ../../install_steps_interactive.pm_.c:365
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "Partitsioonitabeli s�ilitamiseks vajate alglaadimist"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "Valige partitsioonid, mida soovite vormindada"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "Blokkide kontroll?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "Vormindan partitsioone"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Loon ja vormindan faili %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Saaleala on installimiseks liiga v�ike, palun lisage"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "Otsin k�ttesaadavaid pakette"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "Otsin uuendatavaid pakette"
 
-#: ../../install_steps_interactive.pm_.c:461
+#: ../../install_steps_interactive.pm_.c:450
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr "Teie k�vakettal ei ole piisavalt vaba ruumi (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "T�ielik (%d MB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "Minimaalne (%d MB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Soovitatav (%d MB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "Isetehtud"
 
-#: ../../install_steps_interactive.pm_.c:585
+#: ../../install_steps_interactive.pm_.c:522
+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_.c:525
+#, fuzzy
+msgid "Load from floppy"
+msgstr "Taasta flopilt"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Loading from floppy"
+msgstr "Taasta flopilt"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Package selection"
+msgstr "Paketigruppide valik"
+
+#: ../../install_steps_interactive.pm_.c:532
+#, fuzzy
+msgid "Insert a floppy containing package selection"
+msgstr "Pane flopi seadmesse %s"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Salvesta flopile"
+
+#: ../../install_steps_interactive.pm_.c:605
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:650
+#: ../../install_steps_interactive.pm_.c:670
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -4811,12 +4444,12 @@ msgstr ""
 "Kui Teil ei ole �htki neist, klikkige <Katkesta>.\n"
 "Kui puuduvad m�ned CD-d, m�rkige vaid olemasolevad ja siis <OK>."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD pealdisega \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -4825,11 +4458,21 @@ msgstr ""
 "Paketi %s installimine\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "Paigaldusj�rgsed s�tted"
 
-#: ../../install_steps_interactive.pm_.c:718
+#: ../../install_steps_interactive.pm_.c:719
+#, fuzzy, c-format
+msgid "Please insert the Boot floppy used in drive %s"
+msgstr "Pane flopi seadmesse %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, fuzzy, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "Pange palun t�hi flopi seadmesse %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -4897,93 +4540,140 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:750
+#: ../../install_steps_interactive.pm_.c:782
 msgid "Choose a mirror from which to get the packages"
 msgstr "Valige peegel, millelt lugeda pakettide nimekiri"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Proovin lugeda peeglilt pakettide nimekirja"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "Palun valige paketid installimiseks"
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "Millises ajav��tmes asute?"
 
-#: ../../install_steps_interactive.pm_.c:778
-msgid "Is your hardware clock set to GMT?"
+#: ../../install_steps_interactive.pm_.c:813
+#, fuzzy
+msgid "Hardware clock set to GMT"
 msgstr "Kas Teie arvuti sisekell on seatud GMT ajale?"
 
-#: ../../install_steps_interactive.pm_.c:806 ../../printer.pm_.c:22
-#: ../../printerdrake.pm_.c:415
+#: ../../install_steps_interactive.pm_.c:814
+msgid "Automatic time synchronization (using NTP)"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:821
+#, fuzzy
+msgid "NTP Server"
+msgstr "NIS server:"
+
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
 msgstr "CUPS printserver"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "Printerit ei ole"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Kokkuv�te"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
 msgstr "Hiir"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr "Ajav��de"
 
-#: ../../install_steps_interactive.pm_.c:824 ../../printerdrake.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:873 ../../printerdrake.pm_.c:1773
+#: ../../printerdrake.pm_.c:1844
 msgid "Printer"
 msgstr "Printer"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:875
 msgid "ISDN card"
 msgstr "ISDN kaart"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
 msgstr "Helikaart"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr "TV kaart"
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "Millist printimiss�steemi soovite kasutada?"
+#: ../../install_steps_interactive.pm_.c:917
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:945
+msgid "LDAP"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:918
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:954
+#, fuzzy
+msgid "NIS"
+msgstr "Kasuta NIS-i"
+
+#: ../../install_steps_interactive.pm_.c:919
+#: ../../install_steps_interactive.pm_.c:941
+#, fuzzy
+msgid "Local files"
+msgstr "Kohalik printer"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "Juurkasutaja salas�na"
+
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Salas�na puudub"
 
-#: ../../install_steps_interactive.pm_.c:901
+#: ../../install_steps_interactive.pm_.c:935
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "Salas�na on liiga lihtne (peaks olema v�hemalt %d t�hem�rki)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "Kasuta NIS-i"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Autentimisviis"
+
+#: ../../install_steps_interactive.pm_.c:949
+#, fuzzy
+msgid "Authentication LDAP"
+msgstr "Autentimisviis"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "NIS YP"
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:951
+#, fuzzy
+msgid "LDAP Server"
+msgstr "NIS server:"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
+#: ../../install_steps_interactive.pm_.c:957
+#, fuzzy
+msgid "Authentication NIS"
 msgstr "NIS autentimine"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "NIS domeen"
 
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:959
 msgid "NIS Server"
 msgstr "NIS server:"
 
-#: ../../install_steps_interactive.pm_.c:951
+#: ../../install_steps_interactive.pm_.c:994
 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 "
@@ -5011,19 +4701,19 @@ msgstr ""
 "Alglaadimisketta loomiseks asetage flopi esimesse seadmesse ning vajutage\n"
 "\"Ok\"."
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Esimene flopiseade"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Teine flopiseade"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "J�ta vahele"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:1017
 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 "
@@ -5044,32 +4734,40 @@ msgstr ""
 "failis�steemiga peaks mingi �nnetus juhtuma. Hoidke end ja Teid hoiab\n"
 "ka Jumal!"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "Flopiseade ei ole k�ttesaadav"
 
-#: ../../install_steps_interactive.pm_.c:987
+#: ../../install_steps_interactive.pm_.c:1030
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Vali flopiseade, mida kasutad alglaadimisketta tegemiseks"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Pane flopi seadmesse %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "Loome alglaadimisketta"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "Alglaaduri s�tted"
 
-#: ../../install_steps_interactive.pm_.c:1010
+#: ../../install_steps_interactive.pm_.c:1055
+msgid ""
+"You appear to have an OldWorld or Unknown\n"
+" machine, the yaboot bootloader will not work for you.\n"
+"The install will continue, but you'll\n"
+" need to use BootX to boot your machine"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:1060
 msgid "Do you want to use aboot?"
 msgstr "Soovite aboot-i kasutada?"
 
-#: ../../install_steps_interactive.pm_.c:1013
+#: ../../install_steps_interactive.pm_.c:1063
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -5077,16 +4775,22 @@ msgstr ""
 "Viga aboot-i installimisel, \n"
 "kas forseerida, riskides esimese partitsiooni h�vinguga?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "Alglaaduri s�tted"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Alglaaduri installimine eba�nnestus. Tekkis j�rgnev viga:"
 
-#: ../../install_steps_interactive.pm_.c:1030
+#: ../../install_steps_interactive.pm_.c:1084
+#, fuzzy, 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 $of_boot,\\\\:tbxi\n"
+" setenv boot-device %s,\\\\:tbxi\n"
 " Then type: shut-down\n"
 "At your next boot you should see the bootloader prompt."
 msgstr ""
@@ -5097,37 +4801,34 @@ msgstr ""
 " Then type: shut-down\n"
 "At your next boot you should see the bootloader prompt."
 
-#: ../../install_steps_interactive.pm_.c:1038 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1092 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "Madal"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Keskmine"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "K�rge"
 
-#: ../../install_steps_interactive.pm_.c:1044 ../../standalone/draksec_.c:49
+#: ../../install_steps_interactive.pm_.c:1098 ../../standalone/draksec_.c:62
 msgid "Choose security level"
 msgstr "Valige turvatase"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr "Kas soovite luua kiirpaigaldusflopi (abiks korduval paigaldusel)?"
-
-#: ../../install_steps_interactive.pm_.c:1082
+#: ../../install_steps_interactive.pm_.c:1134
+#: ../../standalone/drakautoinst_.c:80
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Pange palun t�hi flopi seadmesse %s"
 
-#: ../../install_steps_interactive.pm_.c:1096
-#: ../../install_steps_interactive.pm_.c:1128
+#: ../../install_steps_interactive.pm_.c:1138
+#: ../../standalone/drakautoinst_.c:82
 msgid "Creating auto install floppy"
 msgstr "Loon kiirpaigaldusflopi"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5137,32 +4838,32 @@ msgstr ""
 "\n"
 "Olete kindel, et v�ljute programmist?"
 
-#: ../../install_steps_interactive.pm_.c:1167
+#: ../../install_steps_interactive.pm_.c:1160
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
-"For information on fixes which are available for this release of Linux-"
-"Mandrake,\n"
-"consult the Errata available from http://www.linux-mandrake.com/.\n"
+"For information on fixes which are available for this release of Mandrake "
+"Linux,\n"
+"consult the Errata available from http://www.mandrakelinux.com/.\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Linux-Mandrake User's Guide."
+"install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
 "�nnitlen, installimine on edukalt l�petatud.\n"
 "V�tke palun v�lja flopi ja/v�i CD ja vajutage Enter alglaadimiseks.\n"
 "\n"
 "Informatsiooni selle distributsiooni paranduste kohta (Errata) saab\n"
-"Linux-Mandrake kodulehek�ljelt http://www.linux-mandrake.com/.\n"
+"Mandrake Linux kodulehek�ljelt http://www.mandrakelinux.com/.\n"
 "\n"
 "Abi s�steemi edasiseks konfigureerimiseks saab eelk�ige dokumendist\n"
-"\"Official Linux-Mandrake User's Guide\""
+"\"Official Mandrake Linux User's Guide\""
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
 msgstr "Loo kiirpaigaldusflopi"
 
-#: ../../install_steps_interactive.pm_.c:1181
+#: ../../install_steps_interactive.pm_.c:1174
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -5175,40 +4876,57 @@ msgstr ""
 "\n"
 "V�ite valida ka lihtsalt installi kordamise.\n"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "Automaatne"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
 msgstr "Korda"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 msgstr "Salvest paketivalik"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Linux-Mandrake installimine %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "Mandrake Linux installimine %s"
 
-#: ../../install_steps_newt.pm_.c:33
+#: ../../install_steps_newt.pm_.c:34
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr " <Tab>/<Alt-Tab> v�ljade vahel  | <Space> valib | <F12> j�rgmine samm "
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
 msgstr "kdesu puudub"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "Valige tegevus"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr "Edasij�udnud"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "Palun oodake"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Ava puu"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Sule puu"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Sorteeritud v�i sorteerimata"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -5234,267 +4952,291 @@ msgstr "Teie valik? (vaikimisi %s)"
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Teie valik? (vaikimisi %s, `none' - ei midagi)"
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "T�ehhi (QWERTZ)"
 
-#: ../../keyboard.pm_.c:125 ../../keyboard.pm_.c:138 ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:141 ../../keyboard.pm_.c:155 ../../keyboard.pm_.c:180
 msgid "German"
 msgstr "Saksa"
 
-#: ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:142
 msgid "Dvorak"
 msgstr "DVORAK"
 
-#: ../../keyboard.pm_.c:127 ../../keyboard.pm_.c:164
+#: ../../keyboard.pm_.c:143 ../../keyboard.pm_.c:186
 msgid "Spanish"
 msgstr "Hispaania"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "Soome"
 
-#: ../../keyboard.pm_.c:129 ../../keyboard.pm_.c:139 ../../keyboard.pm_.c:166
+#: ../../keyboard.pm_.c:145 ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:188
 msgid "French"
 msgstr "Prantsuse"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
 msgstr "Norra"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "Poola"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "Vene"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "Rootsi"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "Briti"
 
-#: ../../keyboard.pm_.c:134 ../../keyboard.pm_.c:137 ../../keyboard.pm_.c:204
+#: ../../keyboard.pm_.c:152 ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:237
 msgid "US keyboard"
 msgstr "US"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+#, fuzzy
+msgid "Albanian"
+msgstr "Iraani"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "Armeenia (vanem)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "Armeenia (tr�kimasin)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "Armeenia (foneetiline)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "Aserbaid�aani (ladina)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Aserbaid�aani (kirillitsa)"
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "Belgia"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "Bulgaaria"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "Brasiilia (ABNT-2)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Valgevene"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "�veitsi (Saksa asetus)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "�veitsi (Prantsuse asetus)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "T�ehhi (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr "T�ehhi (programmeerijad)"
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "Saksa (ilma sammuta)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "Taani"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:183
 msgid "Dvorak (US)"
 msgstr "DVORAK (US)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:184
 msgid "Dvorak (Norwegian)"
 msgstr "DVORAK (Norra)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Gruusia (vene)"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Gruusia (ladina)"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "Kreeka"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "Ungari"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Kroaadi"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "Iisraeli"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "Iisraeli foneetiline"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Iraani"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "Islandi"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "Itaalia"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "Jaapani 106 klahviga"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
 msgstr "Korea"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "Ladina-Ameerika"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr "Makedoonia"
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "Hollandi"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Leedu AZERTY (vanem)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Leedu AZERTY (uuem)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Leedu numbrireaga QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Leedu foneetiline QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "Asukoht"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Makedoonia"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "Hollandi"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Poola (QWERTY)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Poola (QWERTZ)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "Portugali"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "Kanada (Quebec)"
 
-#: ../../keyboard.pm_.c:193
-msgid "Russian (Yawerty)"
+#: ../../keyboard.pm_.c:217
+#, fuzzy
+msgid "Romanian (qwertz)"
 msgstr "Vene (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "Rootsi"
+#: ../../keyboard.pm_.c:218
+#, fuzzy
+msgid "Romanian (qwerty)"
+msgstr "Vene (Yawerty)"
 
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:220
+msgid "Russian (Yawerty)"
+msgstr "Vene (Yawerty)"
+
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "Sloveenia"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "Slovaki (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "Slovaki (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr "Slovaki (programmeerijad)"
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "Aserbaid�aani (kirillitsa)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Tai"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "Tai"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "T�rgi (\"F\" mudel)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "T�rgi (\"Q\" mudel)"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ukraina"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "US (rahvusvaheline)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnami numbrireaga QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
+#: ../../keyboard.pm_.c:240
+#, fuzzy
+msgid "Yugoslavian (latin)"
 msgstr "Jugoslaavia (koos kirillitsaga)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Ring�hendus %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr "Eemalda enne kettar�hmad (logical volumes)\n"
 
@@ -5606,170 +5348,222 @@ msgstr "ei soovi"
 msgid "No mouse"
 msgstr "Hiirt ei ole"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Palun testige hiirt"
+
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "Hiire aktiveerimiseks"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "KEERUTAGE RATTAKEST!"
+
+#: ../../my_gtk.pm_.c:380
+msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:415
 msgid "Finish"
 msgstr "L�peta"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "J�rgmine ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
 msgstr "<- Eelmine"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "Kas see on sobiv?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Interneti s�tted"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Loo interneti�hendus"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "Kas soovite oma interneti�hendust proovida?"
+#: ../../network/adsl.pm_.c:20
+msgid ""
+"The most common way to connect with adsl is pppoe.\n"
+"Some connections use pptp, a few ones use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"K�ige tavalisem �hendusviis ADSL jaoks on pppoe.\n"
+"M�nel juhul aga kasutatakse pptp-d, harva dhcp-d.\n"
+"Kui Te ei tea, kasutage pppoe-d"
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "Testime Teie �hendust..."
+#: ../../network/adsl.pm_.c:22
+msgid "Alcatel speedtouch usb"
+msgstr ""
 
-#: ../../netconnect.pm_.c:154 ../../standalone/draknet_.c:196
-msgid "The system is now connected to Internet."
-msgstr "S�steem on n��d Internetti �hendatud"
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "dhcp"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr "Turvakaalutlusel katkestan n��d �henduse."
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "pppoe"
 
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "pptp"
+
+#: ../../network/ethernet.pm_.c:37
 msgid ""
-"The system doesn't seem to be connected to internet.\n"
-"Try to reconfigure your connection."
+"Which dhcp client do you want to use?\n"
+"Default is dhcpcd"
 msgstr ""
-"Paistab, et s�steem ei ole Internetti �hendatud.\n"
-"Palun seadistage �hendus uuesti."
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "V�rgu s�tted"
-
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
-msgid "ISDN Configuration"
-msgstr "ISDN s�tted"
+"Mis DHCP klienti soovite kasutada?\n"
+"Vaikimisi on dhcpcd"
 
-#: ../../netconnect.pm_.c:222
+#: ../../network/ethernet.pm_.c:88
 msgid ""
-"Select your provider.\n"
-" If it's not in the list, choose Unlisted"
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
-"Vali oma teenusepakkuja.\n"
-" Kui see ei ole nimekirjas, vali Tundmatu"
+"�htki v�rgukaarti ei �nnestunud tuvastada\n"
+"Seega ei saa ka sellist �hendust seadistada."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Interneti�henduse s�tted"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Valige v�rguliides"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Palun t�ida allpool olev v�li"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+"Palun valige, millist v�rguliidest soovite interneti�henduse jaoks kasutada"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "Kaardi IRQ"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "v�rgukaarti ei leitud"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "Kaardi m�lu (DMA)"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "V�rguseadistused"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "Kaardi IO"
+#: ../../network/ethernet.pm_.c:203
+msgid ""
+"Please enter your host name if you know it.\n"
+"Some DHCP servers require the hostname to work.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''."
+msgstr ""
+"Palun sisestage oma masina nimi.\n"
+"Seda n�uavad ka m�ned DHCP serverid.\n"
+"Masina nimi peab olema esitatud t�iskujul,\n"
+"nagu ``minumasin.minufirma.ee''."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "Kaardi IO_0"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "Masinanimi"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "Kaardi IO_1"
+#: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
+#: ../../network/netconnect.pm_.c:91 ../../network/netconnect.pm_.c:105
+#: ../../network/netconnect.pm_.c:154 ../../network/netconnect.pm_.c:164
+#: ../../network/netconnect.pm_.c:190 ../../network/netconnect.pm_.c:213
+#: ../../network/netconnect.pm_.c:221
+msgid "Network Configuration Wizard"
+msgstr "V�rgu s�tete abimees"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "Teie telefoninumber"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "V�line ISDN modem"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Teenusepakkuja tunnus (n�iteks minuisp.ee)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Sisemine ISDN kaart"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "Sissehelistamiskeskuse number"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "Millist ISDN �hendust kasutate?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "Teenusepakkuja DNS 1"
+#: ../../network/isdn.pm_.c:45
+msgid ""
+"Which ISDN configuration do you prefer?\n"
+"\n"
+"* The Old configuration uses isdn4net. It contains powerfull\n"
+"  tools, but is tricky to configure, and not standard.\n"
+"\n"
+"* The New configuration is easier to understand, more\n"
+"  standard, but with less tools.\n"
+"\n"
+"We recommand the light configuration.\n"
+msgstr ""
 
-#: ../../netconnect.pm_.c:248
-msgid "Provider dns 2"
-msgstr "Teenuspakkuja DNS 2"
+#
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "New configuration (isdn-light)"
+msgstr "Leitud tulem��ri s�tted!"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "Valimisviis"
+#
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "Old configuration (isdn4net)"
+msgstr "Leitud tulem��ri s�tted!"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Kasutajatunnus"
+#: ../../network/isdn.pm_.c:169 ../../network/isdn.pm_.c:187
+#: ../../network/isdn.pm_.c:197 ../../network/isdn.pm_.c:204
+#: ../../network/isdn.pm_.c:214
+msgid "ISDN Configuration"
+msgstr "ISDN s�tted"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Salas�na"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Vali oma teenusepakkuja.\n"
+" Kui see ei ole nimekirjas, vali Tundmatu"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Euroopa"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "Laadimisprotokoll"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol (EDSS1)"
 msgstr "Euroopa (EDSS1)"
 
-#: ../../netconnect.pm_.c:263
-msgid "Rest of the world"
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
+msgid "Protocol for the rest of the world"
 msgstr "�lej��nud maailm"
 
-#: ../../netconnect.pm_.c:263
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
 msgid ""
-"Rest of the world \n"
+"Protocol for the rest of the world \n"
 " no D-Channel (leased lines)"
 msgstr ""
 "�lej��nud maailm \n"
 " ilma D-kanalita"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Mis protokolli soovite kasutada?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Mis t��pi kaart Teil on?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "Ei tea"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../netconnect.pm_.c:284
+#: ../../network/isdn.pm_.c:205
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -5782,19 +5576,19 @@ msgstr ""
 "Kui Teil on PCMCIA kaart, peaksite Te ise teadma selle IRQ ning IO "
 "v��rtusi.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "Katkesta"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "J�tka"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "Milline on Teie ISDN kaart?"
 
-#: ../../netconnect.pm_.c:314
+#: ../../network/isdn.pm_.c:234
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
@@ -5802,107 +5596,59 @@ msgstr ""
 "Leidsin k�ll PCI ISDN kaardi, kui selle t��p on tundmatu. Palun valige �ks "
 "PCI kaart j�rgmisel sammul."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "PCI ISDN kaarti ei leitud. Palun valige �ks j�rgmisel sammul."
 
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"�htki v�rgukaarti ei �nnestunud tuvastada\n"
-"Seega ei saa ka sellist �hendust seadistada."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "Valige v�rguliides"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr ""
-"Palun valige, millist v�rguliidest soovite interneti�henduse jaoks kasutada"
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "V�rguliides"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"Kas olete n�us?"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "N��d taask�ivitan v�rguliidese:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "ADSL s�tted"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "Kas soovite luua �henduse juba alglaadimisel?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Millisesse seerialporti on Teie modem �hendatud?"
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "DialUp parameetrid"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "�henduse nimi"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "Sissehelistamiskeskuse number"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "Kasutajakonto"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "Autentimisviis"
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
+msgid "CHAP"
+msgstr "CHAP"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Script-based"
 msgstr "Skriptip�hine"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Terminalip�hine"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Domeeninimi"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
 msgstr "Esimene nimeserver (soovituslik)"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 msgid "Second DNS Server (optional)"
 msgstr "Teine nimeserver (soovituslik)"
 
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr "Kas olete valmis v�rguliidese $netc->{NET_DEVICE} taask�ivitamiseks?"
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -5910,7 +5656,7 @@ msgstr ""
 "\n"
 "Saate �henduse katkestada v�i uuesti seadistada."
 
-#: ../../netconnect.pm_.c:745 ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:33 ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can reconfigure your connection."
@@ -5918,11 +5664,11 @@ msgstr ""
 "\n"
 "Saate seadistada �henduse uuesti."
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "Hetkel olete Internetiga �hendatud."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -5930,99 +5676,53 @@ msgstr ""
 "\n"
 "Saate �henduda Internetti v�i seadistada �hendus uuesti."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "Hetkel ei ole Te Internetti �hendatud."
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "Loo interneti�hendus"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "Katkesta interneti�hendus"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Seadista v�rgu�hendus (kohtv�rk v�i Internet)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Interneti�henduse seadistamine"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "V�rgu s�tete abimees"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "V�line ISDN modem"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Sisemine ISDN kaart"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "Millist ISDN �hendust kasutate?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Loo interneti�hendus"
-
-#: ../../netconnect.pm_.c:834
-msgid ""
-"The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few ones use dhcp.\n"
-"If you don't know, choose 'use pppoe'"
-msgstr ""
-"K�ige tavalisem �hendusviis ADSL jaoks on pppoe.\n"
-"M�nel juhul aga kasutatakse pptp-d, harva dhcp-d.\n"
-"Kui Te ei tea, kasutage pppoe-d"
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "dhcp"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "pppoe"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "pptp"
-
-#: ../../netconnect.pm_.c:846
-#, c-format
-msgid "I'm about to restart the network device %s. Do you agree?"
-msgstr "Kas olete valmis v�rguliidese %s taask�ivitamiseks?"
-
-#: ../../netconnect.pm_.c:883
-msgid ""
-"Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
+#: ../../network/netconnect.pm_.c:96
+#, fuzzy, c-format
+msgid "We are now going to configure the %s connection."
 msgstr ""
-"Mis DHCP klienti soovite kasutada?\n"
-"Vaikimisi on dhcpcd"
-
-#: ../../netconnect.pm_.c:900
-msgid "Network configuration"
-msgstr "V�rgus�tted"
-
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "Kas soovite v�rgu�hendust taask�ivitada?"
+"\n"
+"Saate �henduse katkestada v�i uuesti seadistada."
 
-#: ../../netconnect.pm_.c:904
+#: ../../network/netconnect.pm_.c:105
 #, fuzzy, c-format
 msgid ""
-"A problem occured while restarting the network: \n"
 "\n"
-"%s"
-msgstr "Kas soovite v�rgu�hendust taask�ivitada?"
+"\n"
+"\n"
+"We are now going to configure the %s connection.\n"
+"\n"
+"\n"
+"Press OK to continue."
+msgstr ""
+"\n"
+"Saate �henduse katkestada v�i uuesti seadistada."
+
+#: ../../network/netconnect.pm_.c:129 ../../network/netconnect.pm_.c:243
+#: ../../network/netconnect.pm_.c:255 ../../network/tools.pm_.c:56
+msgid "Network Configuration"
+msgstr "V�rgu s�tted"
 
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6033,7 +5733,7 @@ msgstr ""
 "Kui soovite neid seadistusi s�ilitada, valige OK, muidu katkestage ja saate "
 "seadistada uuesti.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -6045,72 +5745,111 @@ msgstr ""
 "N��d hakkame interneti�hendust seadistama.\n"
 "Kui Te ei soovi automaatset tuvastamist siis j�tke see m�rkimata.\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "Valige profiil, mida seadistada"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
 msgstr "Kasuta automaattuvastust"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "Otsin printerit..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr "Tavaline modemi�hendus"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
 msgstr "leiti port %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
 msgstr "ISDN �hendus"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr "tuvastati %s"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "DSL (v�i ADSL) �hendus"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+#, fuzzy
+msgid "ADSL connection"
+msgstr "LAN �hendus"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
 msgstr "leiti liidesel %s"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "Kaabli�hendus"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+#, fuzzy
+msgid "cable connection detected"
+msgstr "Kaabli�hendus"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
 msgstr "LAN �hendus"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr "v�rgukaart(i) leiti �les"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "Kuidas soovite luua interneti�hendust?"
+#: ../../network/netconnect.pm_.c:190
+#, fuzzy
+msgid "Choose the connection you want to configure"
+msgstr "Valige kasutatav vahend"
+
+#: ../../network/netconnect.pm_.c:214
+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_.c:215
+#, fuzzy
+msgid "Internet connection"
+msgstr "Interneti�henduse jagamine"
+
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "Kas soovite luua �henduse juba alglaadimisel?"
+
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "V�rgus�tted"
 
-#: ../../netconnect.pm_.c:1004
+#: ../../network/netconnect.pm_.c:240
+msgid "The network needs to be restarted"
+msgstr ""
+
+#: ../../network/netconnect.pm_.c:243
+#, fuzzy, c-format
+msgid ""
+"A problem occured while restarting the network: \n"
+"\n"
+"%s"
+msgstr "Kas soovite v�rgu�hendust taask�ivitada?"
+
+#: ../../network/netconnect.pm_.c:247
 msgid ""
-"Congratulation, The network and internet configuration is finished.\n"
+"Congratulations, the network and internet configuration is finished.\n"
 "\n"
-"The configuration will now be applied to your system."
+"The configuration will now be applied to your system.\n"
 msgstr ""
 "�nnitleme, v�rgundus ja interneti�hendus on seadistatud.\n"
 "\n"
-"S�tted salvestatakse n��d."
+"S�tted salvestatakse n��d.\n"
 
-#: ../../netconnect.pm_.c:1007
+#: ../../network/netconnect.pm_.c:250
 msgid ""
 "After that is done, we recommend you to restart your X\n"
 "environnement to avoid hostname changing problem."
@@ -6118,31 +5857,7 @@ msgstr ""
 "Soovitame taask�ivitada ka X keskkonna, et v�ltida v�imalikke\n"
 "masinanime muutmisest tingitud probleeme."
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "v�rgukaarti ei leitud"
-
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "V�rguseadistused"
-
-#: ../../network.pm_.c:278
-msgid ""
-"Please enter your host name if you know it.\n"
-"Some DHCP servers require the hostname to work.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''."
-msgstr ""
-"Palun sisestage oma masina nimi.\n"
-"Seda n�uavad ka m�ned DHCP serverid.\n"
-"Masina nimi peab olema esitatud t�iskujul,\n"
-"nagu ``minumasin.minufirma.ee''."
-
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "Masinanimi"
-
-#: ../../network.pm_.c:319
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -6152,7 +5867,7 @@ msgstr ""
 "HOIATUS: See seade on juba seadistatud Interneti jaoks.\n"
 "Valige lihtsalt OK, et s�tteid mitte muuta."
 
-#: ../../network.pm_.c:324
+#: ../../network/network.pm_.c:288
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
@@ -6162,38 +5877,38 @@ msgstr ""
 "K�ik read tuleb sisestada IP-aadressi kujul\n"
 "(N�iteks 12.34.56.78)"
 
-#: ../../network.pm_.c:333 ../../network.pm_.c:334
+#: ../../network/network.pm_.c:297 ../../network/network.pm_.c:298
 #, c-format
 msgid "Configuring network device %s"
 msgstr "Seadistame v�rgukaardi %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr " (juhtprogramm $module)"
+#: ../../network/network.pm_.c:298
+#, c-format
+msgid " (driver %s)"
+msgstr " (juhtprogramm %s)"
 
-#: ../../network.pm_.c:336 ../../standalone/draknet_.c:231
-#: ../../standalone/draknet_.c:427
+#: ../../network/network.pm_.c:300 ../../standalone/draknet_.c:255
+#: ../../standalone/draknet_.c:461
 msgid "IP address"
 msgstr "IP-aadress"
 
-#: ../../network.pm_.c:337 ../../standalone/draknet_.c:428
+#: ../../network/network.pm_.c:301 ../../standalone/draknet_.c:462
 msgid "Netmask"
 msgstr "V�rgu mask"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "(bootp/dhcp)"
 msgstr "(bootp/dhcp)"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "Automatic IP"
 msgstr "Automaatne IP"
 
-#: ../../network.pm_.c:359 ../../printerdrake.pm_.c:102
-#: ../../printerdrake.pm_.c:425
+#: ../../network/network.pm_.c:323 ../../printerdrake.pm_.c:406
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-aadress peab olema formaadis 1.2.3.4"
 
-#: ../../network.pm_.c:388
+#: ../../network/network.pm_.c:351
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -6205,43 +5920,150 @@ msgstr ""
 "nagu ``minumasin.minufirma.ee''.\n"
 "Kui Teil on vaikimisi l��s, siis sisestage ka selle IP-aadress"
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "Nimeserver"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
 msgstr "Vaikel��s"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "L��sipoolne seade"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Vahendajate s�tted"
 
-#: ../../network.pm_.c:408
+#: ../../network/network.pm_.c:372
 msgid "HTTP proxy"
 msgstr "HTTP vahendaja"
 
-#: ../../network.pm_.c:409
+#: ../../network/network.pm_.c:373
 msgid "FTP proxy"
 msgstr "FTP vahendaja"
 
-#: ../../network.pm_.c:412
+#: ../../network/network.pm_.c:374
+msgid "Track network card id (usefull for laptops)"
+msgstr ""
+
+#: ../../network/network.pm_.c:377
 msgid "Proxy should be http://..."
 msgstr "Vahendaja peab olema kujul http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "Vahendaja peab olema kujul ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Interneti s�tted"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Kas soovite oma interneti�hendust proovida?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "Testime Teie �hendust..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "S�steem on n��d Internetti �hendatud"
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr "Turvakaalutlusel katkestan n��d �henduse."
+
+#: ../../network/tools.pm_.c:51 ../../standalone/draknet_.c:220
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr ""
+"Paistab, et s�steem ei ole Internetti �hendatud.\n"
+"Palun seadistage �hendus uuesti."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Interneti�henduse s�tted"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Palun t�ida allpool olev v�li"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "Kaardi IRQ"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "Kaardi m�lu (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "Kaardi IO"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "Kaardi IO_0"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "Kaardi IO_1"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "Teie telefoninumber"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Teenusepakkuja tunnus (n�iteks minuisp.ee)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "Sissehelistamiskeskuse number"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "DNS 1 (v�ib j�tta t�hjaks)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "DNS 2 (v�ib j�tta t�hjaks)"
+
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "Klaviatuuri valik"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "Valimisviis"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+#, fuzzy
+msgid "Connection speed"
+msgstr "�henduse t��p: "
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "�henduse t��p: "
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Kasutajatunnus"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Salas�na"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
 msgstr "Sellel platformil ei saa laiendatud partitsiooni luua"
 
-#: ../../partition_table.pm_.c:581
+#: ../../partition_table.pm_.c:640
 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 "
@@ -6251,26 +6073,21 @@ msgstr ""
 "Ainuke lahendus on nihutada primaarset partitsiooni, et auk satuks "
 "laiendatud partitsioonide k�rvale"
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "Viga faili %s lugemisel"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Taastamine failist %s eba�nnestus: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "K�lbmatu tagavarakoopia"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Viga faili %s kirjutamisel"
 
-#: ../../partition_table_raw.pm_.c:161
+#: ../../partition_table_raw.pm_.c:154
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
@@ -6300,49 +6117,213 @@ msgstr "kena"
 msgid "maybe"
 msgstr "v�ib olla"
 
-#: ../../printer.pm_.c:20
+#: ../../printer.pm_.c:23
+msgid "CUPS - Common Unix Printing System"
+msgstr ""
+
+#: ../../printer.pm_.c:24
+msgid "LPRng - LPR New Generation"
+msgstr ""
+
+#: ../../printer.pm_.c:25
+msgid "LPD - Line Printer Daemon"
+msgstr ""
+
+#: ../../printer.pm_.c:26
+msgid "PDQ - Print, Don't Queue"
+msgstr ""
+
+#: ../../printer.pm_.c:32
+msgid "CUPS"
+msgstr ""
+
+#: ../../printer.pm_.c:33
+msgid "LPRng"
+msgstr ""
+
+#: ../../printer.pm_.c:34
+msgid "LPD"
+msgstr ""
+
+#: ../../printer.pm_.c:35
+msgid "PDQ"
+msgstr ""
+
+#: ../../printer.pm_.c:40
 msgid "Local printer"
 msgstr "Kohalik printer"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "V�rguprinter"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
+#: ../../printer.pm_.c:42
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "CUPS printserver"
+
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "lpd printserver"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "V�rguprinter (socket)"
 
-#: ../../printer.pm_.c:25
-msgid "SMB/Windows 95/98/NT"
+#: ../../printer.pm_.c:45
+#, fuzzy
+msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:26
-msgid "NetWare"
-msgstr "NetWare"
+#: ../../printer.pm_.c:46
+#, fuzzy
+msgid "Printer on NetWare server"
+msgstr "Printserver:"
 
-#: ../../printer.pm_.c:27 ../../printerdrake.pm_.c:158
-#: ../../printerdrake.pm_.c:160
-msgid "Printer Device URI"
+#: ../../printer.pm_.c:47
+#, fuzzy
+msgid "Enter a printer device URI"
 msgstr "Printeri seadme URI"
 
-#: ../../printerdrake.pm_.c:19
+#: ../../printer.pm_.c:48
+msgid "Pipe job into a command"
+msgstr ""
+
+#: ../../printer.pm_.c:418 ../../printer.pm_.c:839
+#: ../../printerdrake.pm_.c:1227 ../../printerdrake.pm_.c:2023
+msgid "Unknown model"
+msgstr ""
+
+#: ../../printer.pm_.c:546 ../../printerdrake.pm_.c:790
+msgid "Raw printer (No driver)"
+msgstr ""
+
+#: ../../printer.pm_.c:693
+#, fuzzy, c-format
+msgid "(on %s)"
+msgstr "(moodul %s)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "Vali printeri �hendusviis"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "Kuidas on see printer �hendatud?"
+
+#: ../../printerdrake.pm_.c:25
+#, fuzzy
+msgid ""
+"\n"
+"Printers on remote CUPS servers you do not have to configure\n"
+"here; these printers will be automatically detected. Please\n"
+"select \"Printer on remote CUPS server\" in this case."
+msgstr ""
+"Kui v�rgus on CUPS server, siis ei ole Teil vaja siin\n"
+"printereid seadistada, need leitakse automaatselt.\n"
+"Kui kahtlete, valige \"CUPS printserver\"."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+msgid "None"
+msgstr "Ei soovi"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Valige uus vaikimisi kasutaja :"
+
+#: ../../printerdrake.pm_.c:105
+msgid ""
+"With remote CUPS servers, you do not have to configure any \n"
+"printer here; CUPS servers inform your machine automatically\n"
+"about their printers. All printers known to your machine\n"
+"currently are listed in the \"Default printer\" field. Choose\n"
+"the default printer for your machine there and click the\n"
+"\"Apply/Re-read printers\" button. Click the same button to\n"
+"refresh the list (it can take up to 30 seconds after the start\n"
+"of CUPS until all remote printers are visible).\n"
+"When your CUPS server is in a different network, you have to \n"
+"give the CUPS server IP address and optionally the port number\n"
+"to get the printer information from the server, otherwise leave\n"
+"these fields blank."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:117
+msgid ""
+"\n"
+"Normally, CUPS is automatically configured according to your\n"
+"network environment, so that you can access the printers on the\n"
+"CUPS servers in your local network. If this does not work \n"
+"correctly, turn off \"Automatic CUPS configuration\" and edit\n"
+"your file /etc/cups/cupsd.conf manually. Do not forget to restart\n"
+"CUPS afterwards (command: \"service cups restart\")."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:124 ../../printerdrake.pm_.c:1290
+#: ../../printerdrake.pm_.c:1294 ../../printerdrake.pm_.c:1295
+#: ../../printerdrake.pm_.c:1296 ../../printerdrake.pm_.c:2011
+#, fuzzy
+msgid "Close"
+msgstr "Hiir"
+
+#: ../../printerdrake.pm_.c:125
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "V�rguprinter"
+
+#: ../../printerdrake.pm_.c:129
+#, fuzzy
+msgid "The IP address should look like 192.168.1.20"
+msgstr "IP-aadress peab olema formaadis 1.2.3.4"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "Pordi number peab olema ikkagi number"
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+#, fuzzy
+msgid "Default printer"
+msgstr "Kohalik printer"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "CUPS serveri IP"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Port"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "Alglaaduri stiil"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "Otsin printerit..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "Proovin porte"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Leiti printer, nimega \"%s\" "
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Otse �hendatud printer"
 
-#: ../../printerdrake.pm_.c:53
+#: ../../printerdrake.pm_.c:256
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -6350,37 +6331,60 @@ msgstr ""
 "Mis porti on Teie printer �hendatud? \n"
 "(paneme t�hele, et /dev/lp0 on sama mis LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Printeri seade"
 
-#: ../../printerdrake.pm_.c:74
+#: ../../printerdrake.pm_.c:261
+msgid "Device/file name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:274 ../../printerdrake.pm_.c:698
+#: ../../printerdrake.pm_.c:786
+#, fuzzy
+msgid "Reading printer database ..."
+msgstr "Loetakse CUPS juhtprogramme"
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "V�rguprinteri s�tted"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:313
+#, fuzzy
 msgid ""
-"To use a remote lpd print queue, you need to supply\n"
-"the hostname of the printer server and the queue name\n"
-"on that server which jobs should be placed in."
+"To use a remote lpd printer, you need to supply\n"
+"the hostname of the printer server and the printer name\n"
+"on that server."
 msgstr ""
 "Et kasutada teise masina lpd printerit, peate sisestama\n"
 "printserveri nime ja prindij�rjekorra nime, mida soovite\n"
 "serveril kasutada."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
+msgstr "Printserveri nimi:"
+
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "V�rguprinter"
+
+#: ../../printerdrake.pm_.c:320
+#, fuzzy
+msgid "Remote host name missing!"
 msgstr "Printserveri nimi:"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Prindij�rjekorra nimi"
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "Printserveri nimi:"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) printeri s�tted"
 
-#: ../../printerdrake.pm_.c:89
+#: ../../printerdrake.pm_.c:393
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -6393,29 +6397,37 @@ msgstr ""
 "printserveri IP-aadressi, samuti ka serveri poolt jagatava printeri\n"
 "nime ning serveri poolt aktsepteeritud kasutajatunnuse, salas�na ja t��grupi"
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "SMB serveri nimi"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "SMB serveri IP"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "Jagatav printer"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "T��grupp"
 
-#: ../../printerdrake.pm_.c:124
+#: ../../printerdrake.pm_.c:410
+msgid "Either the server name or the server's IP must be given!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:414
+msgid "Samba share name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:473
 msgid "NetWare Printer Options"
 msgstr "NetWare printeri s�tted"
 
-#: ../../printerdrake.pm_.c:125
+#: ../../printerdrake.pm_.c:474
 msgid ""
-"To print to a NetWare printer, you need to provide the\n"
+"To print on a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
 "TCP/IP hostname!) as well as the print queue name for the printer you\n"
 "wish to access and any applicable user name and password."
@@ -6424,59 +6436,228 @@ msgstr ""
 "nime (NB! See v�ib olla erinev tema TCP/IP nimest!) samuti nagu ka\n"
 "prindij�rjekorra nime serveril ning kasutajatunnuse ja salas�na"
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Printserver:"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "Prindij�rjekorra nimi:"
 
-#: ../../printerdrake.pm_.c:142
+#: ../../printerdrake.pm_.c:484
+msgid "NCP server name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:488
+msgid "NCP queue name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:527
 msgid "Socket Printer Options"
 msgstr "Pistikprinteri s�tted"
 
-#: ../../printerdrake.pm_.c:143
+#: ../../printerdrake.pm_.c:528
+#, fuzzy
 msgid ""
 "To print to a socket printer, you need to provide the\n"
-"hostname of the printer and optionally the port number."
+"host name of the printer and optionally the port number.\n"
+"On HP JetDirect servers the port number is usually 9100,\n"
+"on other servers it can vary. See the manual of your\n"
+"hardware."
 msgstr ""
 "Sisestage palun printeri masinanimi ja v�imaluse\n"
 "korral pordi number"
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
 msgstr "Printeri nimi"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Port"
+#: ../../printerdrake.pm_.c:537
+#, fuzzy
+msgid "Printer host name missing!"
+msgstr "Printeri nimi"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "V�ite anda ette ka URI, mille j�rgi CUPS printeri leiab."
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "Printeri seadme URI"
+
+#: ../../printerdrake.pm_.c:567
+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 ""
+
+#: ../../printerdrake.pm_.c:582
+msgid "A valid URI must be entered!"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
+#: ../../printerdrake.pm_.c:682
+msgid ""
+"Every printer needs a name (for example lp).\n"
+"The Description and Location fields do not need \n"
+"to be filled in. They are comments for the users."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:685
+msgid "Name of printer"
+msgstr "Printeri nimi"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Kirjeldus"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Asukoht"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "Loetakse CUPS juhtprogramme"
+
+#: ../../printerdrake.pm_.c:793
+#, fuzzy
+msgid "Printer model selection"
+msgstr "Printeri �hendusviis"
+
+#: ../../printerdrake.pm_.c:794
+#, fuzzy
+msgid "Which printer model do you have?"
 msgstr "Mis t��pi printer see on?"
 
-#: ../../printerdrake.pm_.c:204 ../../printerdrake.pm_.c:305
-msgid "Do you want to test printing?"
+#: ../../printerdrake.pm_.c:866
+#, fuzzy
+msgid "OKI winprinter configuration"
+msgstr "Interneti s�tted"
+
+#: ../../printerdrake.pm_.c:867
+msgid ""
+"You are configuring an OKI laser winprinter. These printers\n"
+"use a very special communication protocol and therefore they\n"
+"work only when connected to the first parallel port. When\n"
+"your printer is connected to another port or to a print\n"
+"server box please connect the printer to the first parallel\n"
+"port before you print a test page. Otherwise the printer\n"
+"will not work. Your connection type setting will be ignored\n"
+"by the driver."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:916 ../../printerdrake.pm_.c:946
+#, fuzzy
+msgid "Lexmark inkjet configuration"
+msgstr "Interneti s�tted"
+
+#: ../../printerdrake.pm_.c:917
+msgid ""
+"The inkjet printer drivers provided by Lexmark only support\n"
+"local printers, no printers on remote machines or print server\n"
+"boxes. Please connect your printer to a local port or\n"
+"configure it on the machine where it is connected to."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:947
+msgid ""
+"To be able to print with your Lexmark inkjet and this\n"
+"configuration, you need the inkjet printer drivers\n"
+"provided by Lexmark (http://www.lexmark.com/). Go to\n"
+"the US site and click on the \"Drivers\" button. Then\n"
+"choose your model and afterwards \"Linux\" as\n"
+"operating system. The drivers come as RPM packages\n"
+"or shell scripts with interactive graphical installation.\n"
+"You do not need to do this configuration by the\n"
+"graphical frontends. Cancel directly after the license\n"
+"agreement. Then print printhead alignment pages with\n"
+"\"lexmarkmaintain\" and adjust the head alignment\n"
+"settings with this program."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1079
+msgid ""
+"Printer default settings\n"
+"You should make sure that the page size and the\n"
+"ink type (if available) are set correctly. Note\n"
+"that with a very high printout quality printing\n"
+"can get substantially slower."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1090
+#, c-format
+msgid "Option %s must be an integer number!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1094
+#, c-format
+msgid "Option %s must be a number!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1099
+#, c-format
+msgid "Option %s out of range!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1136
+#, fuzzy, c-format
+msgid ""
+"Do you want to set this printer (\"%s\")\n"
+"as the default printer?"
 msgstr "Kas soovite seadistusi proovida?"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "Proovin porte"
+
+#: ../../printerdrake.pm_.c:1153
+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\n"
+"and on laser printers with too low memory it can even not come out.\n"
+"In most cases it is enough to print the standard test page."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1158
+#, fuzzy
+msgid "No test pages"
+msgstr "Jah, tr�ki m�lemad testlehek�ljed"
+
+#: ../../printerdrake.pm_.c:1159
+#, fuzzy
+msgid "Print"
+msgstr "Printer"
+
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "Standardt��riistad"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "Tr�kitakse testlehek�lg(i)..."
+
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "Tr�kitakse testlehek�lg(i)..."
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "Tr�kitakse testlehek�lg(i)..."
 
-#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:324
-#, c-format
+#: ../../printerdrake.pm_.c:1200
+#, fuzzy, c-format
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
+"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"
-"Does it work properly?"
 msgstr ""
 "Testlehek�lg on saadetus tr�kideemonile.\n"
 "N��d v�ib minna natuke aega.\n"
@@ -6485,11 +6666,11 @@ msgstr ""
 "\n"
 "Kas tulemust on juba n�ha?"
 
-#: ../../printerdrake.pm_.c:218 ../../printerdrake.pm_.c:328
+#: ../../printerdrake.pm_.c:1204
+#, fuzzy
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Does it work properly?"
+"Test page(s) have been sent to the printer.\n"
+"It may take some time before the printer starts.\n"
 msgstr ""
 "Testlehek�lg on saadetud tr�kideemonile.\n"
 "N��d v�ib minna natuke aega.\n"
@@ -6498,226 +6679,596 @@ msgstr ""
 "\n"
 "Kas tulemust on juba n�ha?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "Jah, tr�ki ASCII testlehek�lg"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "Jah, tr�ki PostSript testlehek�lg"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Printerit ei ole"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "Jah, tr�ki m�lemad testlehek�ljed"
+#: ../../printerdrake.pm_.c:1237
+#, 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 "
+"\"qtcups <file>\". The graphical tools allow you to choose the printer and "
+"to modify the option settings easily.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:243
-msgid "Configure Printer"
-msgstr "Sea printer"
+#: ../../printerdrake.pm_.c:1239
+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 ""
 
-#: ../../printerdrake.pm_.c:273
-msgid "Printer options"
+#: ../../printerdrake.pm_.c:1242 ../../printerdrake.pm_.c:1254
+#: ../../printerdrake.pm_.c:1266
+#, 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 ""
+
+#: ../../printerdrake.pm_.c:1244 ../../printerdrake.pm_.c:1284
+msgid ""
+"To get a list of the options available for the current printer read either "
+"the list shown below or click on the \"Print option list\" button.\n"
+"\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1249 ../../printerdrake.pm_.c:1261
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\".\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1251 ../../printerdrake.pm_.c:1263
+#: ../../printerdrake.pm_.c:1275
+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 ""
+
+#: ../../printerdrake.pm_.c:1256 ../../printerdrake.pm_.c:1268
+msgid ""
+"To get a list of the options available for the current printer click on the "
+"\"Print option list\" button.\n"
+"\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1273
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\" or \"%s <file>\".\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1277
+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 ""
+
+#: ../../printerdrake.pm_.c:1281
+#, 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 ""
+
+#: ../../printerdrake.pm_.c:1292
+#, fuzzy, c-format
+msgid "Printing on the printer \"%s\""
+msgstr "Seiskame v�rguliidesed"
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
 msgstr "Otse �hendatud printeri s�tted"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Paberi suurus"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+#, fuzzy
+msgid "Reading printer data ..."
+msgstr "Loetakse CUPS juhtprogramme"
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "T�� l�petamisel v�ljasta kogu leht?"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "Interneti s�tted"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Kas optimiseerime k�vaketast?"
+#: ../../printerdrake.pm_.c:1339
+#, c-format
+msgid ""
+"You can copy the printer configuration which you have done \n"
+"for the spooler %s to %s, your current spooler. All the\n"
+"configuration data (printer name, description, location, \n"
+"connection type, and default option settings) is overtaken,\n"
+"but jobs will not be transferred.\n"
+"Not all queues can be transferred due to the following \n"
+"reasons:\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:281
-msgid "Color depth options"
-msgstr "Mooduli parameetrid:"
+#: ../../printerdrake.pm_.c:1347
+msgid ""
+"CUPS does not support printers on Novell servers or printers\n"
+"sending the data into a free-formed command.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:283
-msgid "Print text as PostScript?"
-msgstr "Tr�kkida tekst PostScriptina?"
+#: ../../printerdrake.pm_.c:1350
+msgid ""
+"PDQ only supports local printers, remote LPD printers, and\n"
+"Socket/TCP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:285
-msgid "Fix stair-stepping text?"
-msgstr "Paranda trepitud tekst?"
+#: ../../printerdrake.pm_.c:1353
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:287
-msgid "Number of pages per output pages"
-msgstr "Lehek�lgi �hel paberil"
+#: ../../printerdrake.pm_.c:1355
+msgid ""
+"In addition, queues not created with this program or\n"
+"\"foomatic-configure\" cannot be transferred."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:288
-msgid "Right/Left margins in points (1/72 of inch)"
-msgstr "Lehe laiuse m�rgid punktides (1/72 tollile)"
+#: ../../printerdrake.pm_.c:1357
+msgid ""
+"\n"
+"Also printers configured with the PPD files provided by\n"
+"their manufacturers or with native CUPS drivers can not be\n"
+"transferred."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:289
-msgid "Top/Bottom margins in points (1/72 of inch)"
-msgstr "Lehe k�rguse m�rgid punktides (1/72 tollile)"
+#: ../../printerdrake.pm_.c:1360
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:291
-msgid "Extra GhostScript options"
-msgstr "Lisa GhostScript parameetrid"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "Lisa teksti parameetrid"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "Viimane leht enne"
+#: ../../printerdrake.pm_.c:1377
+#, 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 ""
 
-#: ../../printerdrake.pm_.c:345
-msgid "Would you like to configure a printer?"
-msgstr "Kas soovite printerit seadistada?"
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr "Printeri nimi tohib sisaldada vaid t�hti, numbreid ja alakriipsu"
 
-#: ../../printerdrake.pm_.c:351
+#: ../../printerdrake.pm_.c:1390
+#, c-format
 msgid ""
-"Here are the following print queues.\n"
-"You can add some more or change the existing ones."
+"The printer \"%s\" already exists,\n"
+"do you really want to overwrite its configuration?"
 msgstr ""
-"Kirjeldatud on j�rgnevad prindij�rjekorrad.\n"
-"Te v�ite neid lisada ning olemasolevaid muuta."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "CUPS k�ivitatakse"
+#: ../../printerdrake.pm_.c:1398
+#, fuzzy
+msgid "New printer name"
+msgstr "Printerit ei ole"
+
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1412
+#, c-format
+msgid ""
+"You have transferred your former default printer (\"%s\"),\n"
+"Should it be also the default printer under the\n"
+"new printing system %s?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:370
-msgid "Reading CUPS drivers database..."
+#: ../../printerdrake.pm_.c:1423
+#, fuzzy
+msgid "Refreshing printer data ..."
 msgstr "Loetakse CUPS juhtprogramme"
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "Vali printeri �hendusviis"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+#, fuzzy
+msgid "Configuration of a remote printer"
+msgstr "Sea printer"
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "Kuidas on see printer �hendatud?"
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "Testime Teie �hendust..."
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "Vali v�rguprinteri �hendusviis"
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "V�rgus�tted"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "Monitor ei ole seadistatud"
+
+#: ../../printerdrake.pm_.c:1456
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected.\n"
-"In case of doubt, select \"Remote CUPS server\"."
+"You are going to configure a remote printer. This needs working\n"
+"network access, but your network is not configured yet. If you\n"
+"go on without network configuration, you will not be able to use\n"
+"the printer which you are configuring now. How do you want \n"
+"to proceed?"
 msgstr ""
-"Kui v�rgus on CUPS server, siis ei ole Teil vaja siin\n"
-"printereid seadistada, need leitakse automaatselt.\n"
-"Kui kahtlete, valige \"CUPS printserver\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "V�rguseadistused"
+
+#: ../../printerdrake.pm_.c:1496
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected\n"
-"unless you have a server on a different network; in the\n"
-"latter case, you have to give the CUPS server IP address\n"
-"and optionally the port number."
+"The network configuration done during the installation \n"
+"cannot be started now. Please check whether the network\n"
+"gets accessable after booting your system and correct the\n"
+"configuration using the Mandrake Control Center, section\n"
+"\"Network & Internet\"/\"Connection\", and afterwards set\n"
+"up the printer, also using the Mandrake Control Center,\n"
+"section \"Hardware\"/\"Printer\""
 msgstr ""
-"Kui v�rgus on CUPS server, siis ei ole Teil vaja siin\n"
-"printereid seadistada, need leitakse automaatselt.\n"
-"Kui server asub kuskil kaugemal, peate sisestama CUPS serveri\n"
-"IP-aadress ning soovitavalt ka pordi numbri."
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "CUPS serveri IP"
+#: ../../printerdrake.pm_.c:1503
+msgid ""
+"The network access was not running and could not be \n"
+"started. Please check your configuration and your \n"
+"hardware. Then try to configure your remote printer\n"
+"again."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:429
-msgid "Port number should be numeric"
-msgstr "Pordi number peab olema ikkagi number"
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
+msgstr "Millist printimiss�steemi soovite kasutada?"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "Eemalda prindij�rjekord"
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "K�rge"
 
-#: ../../printerdrake.pm_.c:454
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Paranoiline"
+
+#: ../../printerdrake.pm_.c:1549
+#, c-format
+msgid "Installing a printing system in the %s security level"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1550
+#, c-format
 msgid ""
-"Name of printer should contains only letters, numbers and the underscore"
-msgstr "Printeri nimi tohib sisaldada vaid t�hti, numbreid ja alakriipsu"
+"You are about to install the printing system %s on\n"
+"a system running in the %s security level.\n"
+"\n"
+"This printing system runs a daemon (background process)\n"
+"which waits for print jobs and handles them. This daemon\n"
+"is also accessable by remote machines through the network\n"
+"and so it is a possible point for attacks. Therefore only\n"
+"a few selected daemons are started by default in this\n"
+"security level.\n"
+"\n"
+"Do you really want to configure printing on this\n"
+"machine?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:461
+#: ../../printerdrake.pm_.c:1584
+#, fuzzy
+msgid "Starting the printing system at boot time"
+msgstr "Millist printimiss�steemi soovite kasutada?"
+
+#: ../../printerdrake.pm_.c:1585
+#, c-format
 msgid ""
-"Every printer need a name (for example lp).\n"
-"Other parameters such as the description of the printer or its location\n"
-"can be defined. What name should be used for this printer and\n"
-"how is the printer connected?"
+"The printing system (%s) will not be started automatically\n"
+"when the machine is booted.\n"
+"\n"
+"It is possible that the automatic starting was turned off \n"
+"by changing to a higher security level, because the printing\n"
+"system is a potential point for attacks.\n"
+"\n"
+"Do you want to have the automatic starting of the printing\n"
+"system turned on again?"
 msgstr ""
-"Masinal v�ib olla mitu printerit, millest iga�ks vajab nime\n"
-"(sageli lp) ja printkataloogi. Millist nime peaks kasutama\n"
-"kasutama selle printeri puhul ja kuidas see on �hendatud?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Printeri nimi"
+#: ../../printerdrake.pm_.c:1612 ../../printerdrake.pm_.c:1644
+#: ../../printerdrake.pm_.c:1671 ../../printerdrake.pm_.c:1701
+#: ../../printerdrake.pm_.c:1778
+msgid "Checking installed software..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:466
-msgid "Description"
-msgstr "Kirjeldus"
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Asukoht"
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1727
+#, fuzzy
+msgid "Select Printer Spooler"
+msgstr "Vali printeri �hendusviis"
+
+#: ../../printerdrake.pm_.c:1728
+#, fuzzy
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Millist printimiss�steemi soovite kasutada?"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Printeri s�tted"
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Otse �hendatud printeri s�tted"
+
+#: ../../printerdrake.pm_.c:1815
+#, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "Loetakse CUPS juhtprogramme"
+
+#: ../../printerdrake.pm_.c:1845
+#, fuzzy
+msgid "Would you like to configure printing?"
+msgstr "Kas soovite printerit seadistada?"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr ""
 
-#: ../../printerdrake.pm_.c:482
+#: ../../printerdrake.pm_.c:1879
 msgid ""
-"Every print queue (which print jobs are directed to) needs a\n"
-"name (often lp) and a spool directory associated with it. What\n"
-"name and directory should be used for this queue and how is the printer "
-"connected?"
+"The following printers are configured.\n"
+"Click on one of them to modify it or\n"
+"to get information about it or on \n"
+"\"Add Printer\" to add a new printer."
 msgstr ""
-"Masinal v�ib olla mitu prindij�rjekorda, millest iga�ks vajab nime\n"
-"(sageli lp) ja spuulkataloogi (ajutiste failide jaoks). Millist nime\n"
-"ja kataloogi peaks kasutama selle printeri puhul ja kuidas see on �hendatud?"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "Printeri nimi"
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "Tavakasutus"
+
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Vaikimisi)"
+
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "CUPS printserver"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "CUPS printserver"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+#, fuzzy
+msgid "Add printer"
+msgstr "Printerit ei ole"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "Kas soovite seadistusi proovida?"
+
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "Interneti s�tted"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "Spuulkataloog"
+#: ../../printerdrake.pm_.c:2004
+#, c-format
+msgid ""
+"Printer %s: %s %s\n"
+"What do you want to modify on this printer?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
+#: ../../printerdrake.pm_.c:2012
+msgid "Do it!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+#, fuzzy
+msgid "Printer connection type"
+msgstr "Interneti�henduse jagamine"
+
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
 msgstr "Printeri �hendusviis"
 
-#: ../../raid.pm_.c:33
+#: ../../printerdrake.pm_.c:2018 ../../printerdrake.pm_.c:2081
+msgid "Printer manufacturer, model, driver"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2019 ../../printerdrake.pm_.c:2082
+msgid "Printer manufacturer, model"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2028 ../../printerdrake.pm_.c:2092
+msgid "Set this printer as the default"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2029 ../../printerdrake.pm_.c:2097
+#, fuzzy
+msgid "Print test pages"
+msgstr "Tr�kitakse testlehek�lg(i)..."
+
+#: ../../printerdrake.pm_.c:2030 ../../printerdrake.pm_.c:2099
+msgid "Know how to print with this printer"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2031 ../../printerdrake.pm_.c:2101
+#, fuzzy
+msgid "Remove printer"
+msgstr "V�rguprinter"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "Loetakse CUPS juhtprogramme"
+
+#: ../../printerdrake.pm_.c:2096
+#, c-format
+msgid "The printer \"%s\" is set as the default printer now."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2103
+#, fuzzy, c-format
+msgid "Do you really want to remove the printer \"%s\"?"
+msgstr "Kas soovite v�rgu�hendust taask�ivitada?"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "Loetakse CUPS juhtprogramme"
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+#, fuzzy
+msgid "Proxy configuration"
+msgstr "Vahendajate s�tted"
+
+#: ../../proxy.pm_.c:30
+msgid ""
+"Welcome to the proxy configuration utility.\n"
+"\n"
+"Here, you'll be able to set up your http and ftp proxies\n"
+"with or without login and password\n"
+msgstr ""
+
+#: ../../proxy.pm_.c:38
+msgid ""
+"Please fill in the http proxy informations\n"
+"Leave it blank if you don't want an http proxy"
+msgstr ""
+
+#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
+msgid "URL"
+msgstr ""
+
+#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
+#, fuzzy
+msgid "port"
+msgstr "Port"
+
+#: ../../proxy.pm_.c:44
+#, fuzzy
+msgid "Url should begin with 'http:'"
+msgstr "Vahendaja peab olema kujul http://..."
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+#, fuzzy
+msgid "The port part should be numeric"
+msgstr "Pordi number peab olema ikkagi number"
+
+#: ../../proxy.pm_.c:59
+msgid ""
+"Please fill in the ftp proxy informations\n"
+"Leave it blank if you don't want an ftp proxy"
+msgstr ""
+
+#: ../../proxy.pm_.c:65
+#, fuzzy
+msgid "Url should begin with 'ftp:'"
+msgstr "Vahendaja peab olema kujul ftp://..."
+
+#: ../../proxy.pm_.c:79
+msgid ""
+"Please enter proxy login and password, if any.\n"
+"Leave it blank if you don't want login/passwd"
+msgstr ""
+
+#: ../../proxy.pm_.c:80
+#, fuzzy
+msgid "login"
+msgstr "Vaikimisi sisenemine"
+
+#: ../../proxy.pm_.c:82
+#, fuzzy
+msgid "password"
+msgstr "Salas�na"
+
+#: ../../proxy.pm_.c:84
+#, fuzzy
+msgid "re-type password"
+msgstr "Salas�na puudub"
+
+#: ../../proxy.pm_.c:88
+#, fuzzy
+msgid "The passwords don't match. Try again!"
+msgstr "Salas�nad ei klapi"
+
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Juba vormindatud RAID-ile (md%d) ei saa partitsiooni lisada"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "Ei saa kirjutada faili $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "Ei saa kirjutada faili %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid eba�nnestus"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid eba�nnestus (puudub 'raidtools'?)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Ei ole piisavalt partitsiooni RAID-%d jaoks\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
 msgstr ""
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
 msgstr ""
 "Anacron k�ivitab programme perioodiliselt analoogiliselt cron-ile.\n"
 "Kasutage seda juhul kui Teie arvuti ei t��ta 24h."
 
-#: ../../services.pm_.c:18
+#: ../../services.pm_.c:17
 msgid ""
 "apmd is used for monitoring batery status and logging it via syslog.\n"
 "It can also be used for shutting down the machine when the battery is low."
@@ -6725,7 +7276,7 @@ msgstr ""
 "apmd on kasutusel p�hiliselt s�learvutites, akude t�ituvuse j�lgimiseks.\n"
 "Samuti suudab see aku t�hjenemisel s�steemi viisakalt maha v�tta."
 
-#: ../../services.pm_.c:20
+#: ../../services.pm_.c:19
 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."
@@ -6733,7 +7284,7 @@ msgstr ""
 "Laseb k�ivitada �hekordseid k�ske etteantud ajal v�i ootab s�steemi\n"
 "koormuse laskumist k�su k�ivitamiseks piisavale tasemele."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:21
 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 "
@@ -6744,7 +7295,7 @@ msgstr ""
 "k�ivitamiseks. Vixie cron sisaldab lisaks veel turvalisust ja kasutus-\n"
 "mugavust t�stvaid omadusi. Soovitav s�steemile mis t��tab 24h"
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:24
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -6754,13 +7305,13 @@ msgstr ""
 "GPM annab v�imaluse kasutada hiirt ka tekstikonsoolil. Lisaks tavalisele\n"
 "l�ikamisele/kleepimisele saab kasutada ka men��s�steeme."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr ""
 
-#: ../../services.pm_.c:30
+#: ../../services.pm_.c:29
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -6768,7 +7319,7 @@ msgstr ""
 "Apache on maailma juhtiv veebiserveri programm. T�en�oliselt\n"
 "ka v�imsaim."
 
-#: ../../services.pm_.c:32
+#: ../../services.pm_.c:31
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -6780,13 +7331,13 @@ msgstr ""
 "Interneti \"superserver\", nimega inetd laseb k�ivitada mitmeid v�rgu-\n"
 "teenustel, nagu telnet, ftp, rsh, rlogin jne."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:35
 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_.c:38
+#: ../../services.pm_.c:37
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -6795,35 +7346,35 @@ msgstr ""
 "See programm laeb s�steemi k�ivitumisel klaviatuuripaigutuse vastavalt\n"
 "failis /etc/sysconfig/keyboard kirjeldatule."
 
-#: ../../services.pm_.c:41
+#: ../../services.pm_.c:40
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
 msgstr ""
 
-#: ../../services.pm_.c:43
+#: ../../services.pm_.c:42
 msgid "Automatic detection and configuration of hardware at boot."
 msgstr ""
 
-#: ../../services.pm_.c:44
+#: ../../services.pm_.c:43
 msgid ""
 "Linuxconf will sometimes arrange to perform various tasks\n"
 "at boot-time to maintain the system configuration."
 msgstr ""
 
-#: ../../services.pm_.c:46
+#: ../../services.pm_.c:45
 msgid ""
 "lpd is the print daemon required for lpr to work properly. It is\n"
 "basically a server that arbitrates print jobs to printer(s)."
 msgstr "lpd on tr�kideemon, ilma selleta ei ole v�imalik printida."
 
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:47
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
 msgstr ""
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:49
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -6831,7 +7382,7 @@ msgstr ""
 "named (BIND) on kasutusel nimeserverites, mis teenindavad DNS\n"
 "hierarhiat, t�lkimaks nimesid IP-aadressideks"
 
-#: ../../services.pm_.c:52
+#: ../../services.pm_.c:51
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -6839,13 +7390,13 @@ msgstr ""
 "�hendab ja lahutab k�iki v�rgufailis�steeme (nii NFS, SMB\n"
 "kui ka NCP)"
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
 msgstr "Aktiveerib s�steemi laadimisel Teile vajalikud v�rguliidesed."
 
-#: ../../services.pm_.c:56
+#: ../../services.pm_.c:55
 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"
@@ -6854,7 +7405,7 @@ msgstr ""
 "NFS on UNIXi keskkonna standardne failijaotusprotokoll. See programm t�idab\n"
 "NFS serveri funktsioone, ja konfigureeritakse failis /etc/exports."
 
-#: ../../services.pm_.c:59
+#: ../../services.pm_.c:58
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -6862,17 +7413,17 @@ msgstr ""
 "NFS on UNIXi keskkonna standardne failijaotusprotokoll. See programm t�idab\n"
 "NFS failide lukustamise funktsioone. Vajalik serveerimisel."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
 msgstr ""
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
 msgstr ""
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:63
 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 "
@@ -6882,7 +7433,7 @@ msgstr ""
 "PCMCIA tugi on tavaliselt vajalik s�learvutitele v�rgu- ja modemiliideste\n"
 "lisamiseks."
 
-#: ../../services.pm_.c:67
+#: ../../services.pm_.c:66
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -6892,7 +7443,7 @@ msgstr ""
 "portmapper haldab RPC �hendusi, mida kasutavad NFS ja NIS. Neil \n"
 "serveritel on see h�davajalik."
 
-#: ../../services.pm_.c:70
+#: ../../services.pm_.c:69
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -6900,7 +7451,7 @@ msgstr ""
 "Postfix on meili transpordiagent, see t�hendab programm, mis\n"
 "toimetab meili �hest masinast teise."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -6908,13 +7459,13 @@ msgstr ""
 "Salvestab ja taastab juhuarvude genereerimiseks vajaliku s�steemse\n"
 "entroopiasalve."
 
-#: ../../services.pm_.c:74
+#: ../../services.pm_.c:73
 msgid ""
 "Assign raw devices to block devices (such as hard drive\n"
 "partitions), for the use of applications such as Oracle"
 msgstr ""
 
-#: ../../services.pm_.c:76
+#: ../../services.pm_.c:75
 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"
@@ -6923,7 +7474,7 @@ msgstr ""
 "routed on RIP deemon, mis vahetab selle protokolli alusel marsruutimis-\n"
 "infot. Kui Teil on RIP kasutusel, on vajalik ka routed."
 
-#: ../../services.pm_.c:79
+#: ../../services.pm_.c:78
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -6931,7 +7482,7 @@ msgstr ""
 "rstat protokoll laseb �le v�rgu saada informatsiooni s�steemi\n"
 "t�� kohta. Ettevaatust!"
 
-#: ../../services.pm_.c:81
+#: ../../services.pm_.c:80
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -6939,7 +7490,7 @@ msgstr ""
 "rusers protokoll laseb �le v�rgu saada informatsiooni s�steemi\n"
 "kasutajate kohta. Ettevaatust!"
 
-#: ../../services.pm_.c:83
+#: ../../services.pm_.c:82
 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)."
@@ -6947,43 +7498,81 @@ msgstr ""
 "rwho protokoll laseb �le v�rgu saada informatsiooni s�steemi\n"
 "kasutajate kohta. Ettevaatust!"
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:84
 #, fuzzy
 msgid "Launch the sound system on your machine"
 msgstr "K�ivita X-Windows alglaadimisel"
 
-#: ../../services.pm_.c:86
+#: ../../services.pm_.c:85
 msgid ""
 "Syslog is the facility by which many daemons use to log messages\n"
 "to various system log files.  It is a good idea to always run syslog."
 msgstr "syslog-i kaudu toimub s�steemis toimiva logimine. Vajalik!"
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
 msgstr ""
 
-#: ../../services.pm_.c:89
+#: ../../services.pm_.c:88
 #, fuzzy
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
 msgstr "Stardib X fondiserveri, selleta X ei k�ivitu."
 
-#: ../../services.pm_.c:118
+#: ../../services.pm_.c:114 ../../services.pm_.c:156
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Valige, millised teenused tuleks alglaadimisel k�ivitada"
 
+#: ../../services.pm_.c:126
+#, fuzzy
+msgid "Printing"
+msgstr "Printer"
+
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "Internet"
+
+#: ../../services.pm_.c:130
+msgid "File sharing"
+msgstr ""
+
+#: ../../services.pm_.c:132
+#, fuzzy
+msgid "System"
+msgstr "T��mood"
+
 #: ../../services.pm_.c:137
+#, fuzzy
+msgid "Remote Administration"
+msgstr "V�rguprinteri s�tted"
+
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Server, Andmebaasid"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+#, fuzzy
+msgid "Services"
+msgstr "seade"
+
+#: ../../services.pm_.c:198
 msgid "running"
 msgstr "k�imas"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 msgid "stopped"
 msgstr "peatatud"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr "Teenused ja deemonid"
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
@@ -6991,11 +7580,16 @@ msgstr ""
 "Selle teenuse kohta ei oska\n"
 "lisainformatsiooni anda."
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 msgid "On boot"
 msgstr "Alglaadimisel"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "Paketi %s installimine"
+
+#: ../../standalone/diskdrake_.c:63
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
 "I'll try to go on blanking bad partitions"
@@ -7003,15 +7597,66 @@ msgstr ""
 "Partitsioonitabel on loetamatu, liiga rikutud DrakX-i jaoks :(\n"
 "Proovin loetamatud kirjed puhastada"
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+#, fuzzy
+msgid "Error!"
+msgstr "Viga"
+
+#: ../../standalone/drakautoinst_.c:45
+#, c-format
+msgid "I can't find needed image file `%s'."
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:47
+#, fuzzy
+msgid "Auto Install Configurator"
+msgstr "Paigaldusj�rgsed s�tted"
+
+#: ../../standalone/drakautoinst_.c:48
+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"
+"Do you want to continue?"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:70
+#, fuzzy
+msgid "Automatic Steps Configuration"
+msgstr "Alglaaduri stiil"
+
+#: ../../standalone/drakautoinst_.c:71
+msgid ""
+"Please choose for each step whether it will replay like your install, or it "
+"will be manual"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:112 ../../standalone/drakgw_.c:599
+msgid "Congratulations!"
+msgstr "�nnitleme!"
+
+#: ../../standalone/drakautoinst_.c:113
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:36 ../../standalone/drakgw_.c:181
 msgid "Internet Connection Sharing"
 msgstr "Interneti�henduse jagamine"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Interneti�henduse jagamine t��tab"
 
-#: ../../standalone/drakgw_.c:119
+#: ../../standalone/drakgw_.c:120
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
@@ -7023,31 +7668,31 @@ msgstr ""
 "\n"
 "Mida Te soovite teha?"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "keela"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr "t�hista"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
 msgstr "seadista uuesti"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
 msgstr "Peaten serverid..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "Interneti�hendust n��d enam ei jagata"
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Interneti�hendust hetkel ei jagata"
 
-#: ../../standalone/drakgw_.c:144
+#: ../../standalone/drakgw_.c:145
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -7059,27 +7704,19 @@ msgstr ""
 "\n"
 "Mida Te soovite teha?"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "luba"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
 msgstr "K�ivitan serverid..."
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "Interneti�henduse jagamine n��d t��tab"
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "S�tete fail ei ole arusaadav."
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr "Tundmatu s�ttefaili"
-
-#: ../../standalone/drakgw_.c:181
+#: ../../standalone/drakgw_.c:182
 #, fuzzy
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -7093,21 +7730,21 @@ msgstr ""
 "\n"
 "M�rkus: kohtv�rgu (LAN) jaoks on vajalik eraldi v�rgukaardi olemasolu."
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Liides %s (kasutab moodulit %s)"
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:209
 #, c-format
 msgid "Interface %s"
 msgstr "Liides %s"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:217
 msgid "No network adapter on your system!"
 msgstr "Teie s�steemis ei ole v�rgukaarti!"
 
-#: ../../standalone/drakgw_.c:217
+#: ../../standalone/drakgw_.c:218
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
@@ -7116,6 +7753,10 @@ msgstr ""
 "riistvara s�tteseadjat."
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "V�rguliides"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7130,7 +7771,7 @@ msgstr ""
 "\n"
 "Kohtv�rgu s�tted seotakse selle liidesga."
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
@@ -7138,22 +7779,23 @@ msgstr ""
 "Palun valige millist v�rguliidest soovite kasutada kohtv�rgu\n"
 "jaoks."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
 "Hoiatan, v�rguliides on juba seadistatud. J�rgnevalt seadistame selle uuesti."
 
-#: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
-msgstr "V�imalik kohtv�rgu aadressi konflikt $_ konfiguratsioonis!\n"
+#: ../../standalone/drakgw_.c:254
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr "V�imalik kohtv�rgu aadressi konflikt %s konfiguratsioonis!\n"
 
 #
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "Leitud tulem��ri s�tted!"
 
-#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:263 ../../standalone/drakgw_.c:269
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
@@ -7161,23 +7803,20 @@ msgstr ""
 "Hoiatus! Leiti olemasolevad tulem��ri s�tted. T�en�oliselt peaksite need "
 "hiljem �le vaatame."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "Seadistan..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "H��lestan skriptid, installin tarkvara, k�ivitan serverid..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "Probleemid paketi $_ installimisel"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "�nnitleme!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Probleemid paketi %s installimisel"
 
-#: ../../standalone/drakgw_.c:591
+#: ../../standalone/drakgw_.c:600
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
@@ -7187,24 +7826,24 @@ msgstr ""
 "N��d saate interneti�hendust jagada teistele kohtv�rgu arvutitele, kasutades "
 "neil automaatset konfigureerimist (DHCP)"
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
 msgstr "Interneti�henduse jagamine on juba seadistatud aga hetkel keelatud."
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
 msgstr ""
 "Interneti�henduse jagamine on juba seadistatud ja see on praegu aktiivne."
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "Interneti�henduse jagamist ei ole kunagi seadistatud"
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
 msgstr "Interneti jagamise seadistamine"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, fuzzy, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -7219,84 +7858,83 @@ msgstr ""
 "\n"
 "Valige Abimehe k�ivitamiseks ``OK''"
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "V�rgus�tted (%d liidest)"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:539
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 msgid "Profile: "
 msgstr "Profiil: "
 
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:94
 msgid "Del profile..."
 msgstr "Kustuta profiil..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr "Profiil kustutamiseks:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "Uus profiil..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "Loodava profiili nimi:"
+#: ../../standalone/draknet_.c:134
+msgid ""
+"Name of the profile to create (the new profile is created as a copy of the "
+"current one) :"
+msgstr ""
 
-#: ../../standalone/draknet_.c:140
+#: ../../standalone/draknet_.c:160
 msgid "Hostname: "
 msgstr "Masinanimi: "
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "Interneti�hendus"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
 msgstr "T��p: "
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "Vaikel��s:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Interface:"
 msgstr "Liides:"
 
-#: ../../standalone/draknet_.c:168
+#: ../../standalone/draknet_.c:192
 msgid "Status:"
 msgstr "Olek:"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:122 ../../standalone/net_monitor_.c:224
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 msgid "Connected"
 msgstr "�hendatud"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:83 ../../standalone/net_monitor_.c:122
-#: ../../standalone/net_monitor_.c:224
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 msgid "Not connected"
 msgstr "Ei ole �hendatud"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
 msgstr "�henda..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Disconnect..."
 msgstr "Lahuta..."
 
-#: ../../standalone/draknet_.c:191
+#: ../../standalone/draknet_.c:215
 #, fuzzy
 msgid "Starting your connection..."
 msgstr "Testime Teie �hendust..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
 msgstr "Sulgeme n��d �henduse..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7308,120 +7946,115 @@ msgstr ""
 "/etc/sysconfig/network-scripts/net_cnx_down\n"
 "juurkasutajana."
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
 msgstr "S�steem on n��d Internetist lahutatud."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "Seadiste interneti�hendus..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "LAN s�tted"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "V�rgukaart"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "Juhtprogramm"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "Liides"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+#, fuzzy
+msgid "State"
+msgstr "Olek:"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "Seadista kohtv�rk (LAN) ..."
 
-#: ../../standalone/draknet_.c:283
-msgid "Normal Mode"
-msgstr "Tavakasutus"
+#: ../../standalone/draknet_.c:279
+msgid "Click here to launch the wizard ->"
+msgstr ""
 
-#: ../../standalone/draknet_.c:288
+#: ../../standalone/draknet_.c:306
 msgid "Apply"
 msgstr "Rakenda"
 
-#: ../../standalone/draknet_.c:307
+#: ../../standalone/draknet_.c:325
 msgid "Please Wait... Applying the configuration"
 msgstr "Palun oodake... Rakendan seadistusi"
 
-#: ../../standalone/draknet_.c:391
+#: ../../standalone/draknet_.c:428
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 
-#: ../../standalone/draknet_.c:415
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
 msgstr "LAN s�tted"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "V�rgukaart %s: %s"
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
 msgstr "Laadimisprotokoll"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
 msgstr "K�ivitub laadimisel"
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
 msgstr "DHCP klient"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Disable"
-msgstr "Keela"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "activate now"
+msgstr "Aktiivne"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "Luba"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "desactivate now"
+msgstr "Aktiivne"
 
-#: ../../standalone/draknet_.c:504
+#: ../../standalone/draknet_.c:538
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
 msgstr ""
 
-#: ../../standalone/draknet_.c:528
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
 msgstr "Interneti�henduse seadistamine"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "Interneti�henduse seadistamine"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "�henduse t��p: "
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "Parameetrid"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "DNS 1 (v�ib j�tta t�hjaks)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "DNS 2 (v�ib j�tta t�hjaks)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "V�rgukaart"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "DHCP klient"
 
@@ -7483,15 +8116,30 @@ msgstr ""
 "S�steem on t�ielikult suletud. V�rgust kasutamine on v�imalik ainult\n"
 "spetsiaalselt loodud juurdep��suteid kasutades."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "Turvataseme seadmine"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "Valige X server"
+
+#: ../../standalone/draksec_.c:68
+msgid ""
+"A library which defends against buffer overflow and format string attacks."
+msgstr ""
+
+#: ../../standalone/draksec_.c:72
 msgid "Setting security level"
 msgstr "Turvataseme seadmine"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
 msgstr "Juhtimiskeskus"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "Valige kasutatav vahend"
 
@@ -7519,90 +8167,14 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "Ei saa kiiruuendust alustada !!!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "ei leitud: serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "Teeskleme keskmist hiirenuppu?"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "Palun testige hiirt"
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-#, fuzzy
-msgid "Network Monitoring"
-msgstr "V�rgus�tted"
-
-#: ../../standalone/net_monitor_.c:56
-msgid "Statistics"
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:59
-msgid "Sending Speed: "
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:61
-msgid "Receiving Speed: "
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:66
-#, fuzzy
-msgid "Close"
-msgstr "Hiir"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Connecting to Internet "
-msgstr "Loo interneti�hendus"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Disconnecting from Internet "
-msgstr "Katkesta interneti�hendus"
-
-#: ../../standalone/net_monitor_.c:114
-#, fuzzy
-msgid "Disconnection from Internet failed."
-msgstr "Katkesta interneti�hendus"
-
-#: ../../standalone/net_monitor_.c:115
-#, fuzzy
-msgid "Disconnection from Internet complete."
-msgstr "Katkesta interneti�hendus"
-
-#: ../../standalone/net_monitor_.c:117
-#, fuzzy
-msgid "Connection complete."
-msgstr "�henduse nimi"
-
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:222
-#, fuzzy
-msgid "Connect"
-msgstr "�hendatud"
-
-#: ../../standalone/net_monitor_.c:222
-#, fuzzy
-msgid "Disconnect"
-msgstr "Lahuta..."
-
 #
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
@@ -7634,11 +8206,79 @@ msgstr ""
 "\n"
 "Valige 'Seadista', selle seadistamiseks n��d"
 
-#: ../../tinyfirewall.pm_.c:10
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "Valige sobiv keel"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Valige paigaldusmeetod"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "K�vaketta leidmine"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Hiire seadmine"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Klaviatuuri valik"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "Turvalisus"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Failis�steemid"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Vormindamine"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Pakettide valik"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "S�steemi installimine"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "Tavakasutaja"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "V�rgus�tted"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Teenuste s�tted"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Loo alglaadimisflopi"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Alglaaduri s�tted"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Seadista X"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "V�lju programmist"
+
+#: ../../tinyfirewall.pm_.c:9
 msgid ""
 "tinyfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Linux Mandrake machine.\n"
+"This configures a personal firewall for this Mandrake Linux machine.\n"
 "For a powerful dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -7648,7 +8288,7 @@ msgstr ""
 "Kui vajate v�imsat tulem��ri, vaadake palun\n"
 "spetsiaalset MandrakeSecurity Firewall distributsiooni."
 
-#: ../../tinyfirewall.pm_.c:15
+#: ../../tinyfirewall.pm_.c:14
 msgid ""
 "We'll now ask you questions about which services you'd like to allow\n"
 "the Internet to connect to.  Please think carefully about these\n"
@@ -7666,7 +8306,7 @@ msgstr ""
 "juhuks tulem��ri taha. Hiljem on Teil soovi korral vaba voli k�ike\n"
 "uuesti lubada."
 
-#: ../../tinyfirewall.pm_.c:22
+#: ../../tinyfirewall.pm_.c:21
 msgid ""
 "Are you running a web server on this machine that you need the whole\n"
 "Internet to see? If you are running a webserver that only needs to be\n"
@@ -7678,7 +8318,7 @@ msgstr ""
 "siin EI.\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:27
+#: ../../tinyfirewall.pm_.c:26
 msgid ""
 "Are you running a name server on this machine? If you didn't set one\n"
 "up to give away IP and zone information to the whole Internet, please\n"
@@ -7689,7 +8329,7 @@ msgstr ""
 "siis vastake palun ei.\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:32
+#: ../../tinyfirewall.pm_.c:31
 msgid ""
 "Do you want to allow incoming Secure Shell (ssh) connections? This\n"
 "is a telnet-replacement that you might use to login. If you're using\n"
@@ -7702,7 +8342,7 @@ msgstr ""
 "kuna sel teel on lihtsate vahenditega v�imalik v�rgus paroole varastada.\n"
 "SSH korral on �hendus kr�ptitud ja pealtkuulamine praktiliselt v�listatud."
 
-#: ../../tinyfirewall.pm_.c:37
+#: ../../tinyfirewall.pm_.c:36
 msgid ""
 "Do you want to allow incoming telnet connections?\n"
 "This is horribly unsafe, as we explained in the previous screen. We\n"
@@ -7713,7 +8353,7 @@ msgstr ""
 "See on t�eliselt ebaturvaline, vastake siin palun Ei ja kasutage\n"
 "telneti asemel SSH-d.\n"
 
-#: ../../tinyfirewall.pm_.c:42
+#: ../../tinyfirewall.pm_.c:41
 msgid ""
 "Are you running an FTP server here that you need accessible to the\n"
 "Internet? If you are, we strongly recommend that you only use it for\n"
@@ -7725,7 +8365,7 @@ msgstr ""
 "muul juhul tekib j�lle paroolide varastamise oht, sest FTP ei tunne\n"
 "kr�ptimist.\n"
 
-#: ../../tinyfirewall.pm_.c:47
+#: ../../tinyfirewall.pm_.c:46
 msgid ""
 "Are you running a mail server here? If you're sending you \n"
 "messages through pine, mutt or any other text-based mail client,\n"
@@ -7736,7 +8376,7 @@ msgstr ""
 "palju turvalisem siia tulem� ette panna.\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:52
+#: ../../tinyfirewall.pm_.c:51
 msgid ""
 "Are you running a POP or IMAP server here? This would\n"
 "be used to host non-web-based mail accounts for people via \n"
@@ -7746,7 +8386,7 @@ msgstr ""
 "Kas vajate sellel masinal POP v�i IMAP serverit?\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:57
+#: ../../tinyfirewall.pm_.c:56
 msgid ""
 "You appear to be running a 2.2 kernel.  If your network IP\n"
 "is automatically set by a computer in your home or office \n"
@@ -7756,7 +8396,7 @@ msgstr ""
 "Teil on kasutusel 2.2 kernel. Kui IP aadress antakse Teie arvutile\n"
 "d�naamiliselt, siis peaks seda siinkohal lubama.\n"
 
-#: ../../tinyfirewall.pm_.c:62
+#: ../../tinyfirewall.pm_.c:61
 msgid ""
 "Is your computer getting time syncronized to another computer?\n"
 "Mostly, this is used by medium-large Unix/Linux organizations\n"
@@ -7767,7 +8407,7 @@ msgstr ""
 "Kas see arvuti kuulub v�rku, millest masinad s�nkroniseerivad\n"
 "omavahel kellaaega? T�en�oliselt v�ite selle rahulikult keelata."
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
@@ -7779,159 +8419,175 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, fuzzy, c-format
 msgid "Can't open %s: %s\n"
 msgstr "V�rgukaart %s: %s"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, fuzzy, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "Seadme %s avamine kirjutamiseks eba�nnestus: %s"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Mitmete protokollide, sealhulgas ssh kliendid"
+msgid "Web/FTP"
+msgstr "Server, Veeb/FTP"
 
 #: ../../share/compssUsers:999
-msgid "Development"
-msgstr "Arendus"
+msgid "Network Computer (client)"
+msgstr "V�rguarvuti (klient)"
 
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "T��jaam"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS, SMB, SSH server, vahendaja (proxy)"
 
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Tulem��r/marsruuter"
+msgid "Office"
+msgstr "Kontor"
 
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Isikliku info haldamine"
+msgid "Gnome Workstation"
+msgstr "Gnome t��jaam"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimeedia - Graafika"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Suhtlus Palmi v�i Visoriga"
 
 #: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "Internet"
+msgid "Workstation"
+msgstr "T��jaam"
 
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "V�rguarvuti (klient)"
+msgid "Firewall/Router"
+msgstr "Tulem��r/marsruuter"
+
+#: ../../share/compssUsers:999
+msgid "Domain Name and Network Information Server"
+msgstr ""
+
+#: ../../share/compssUsers:999
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Kontoriprogrammid: tekstit��tlus (kword, abiword), tabelarvutus (kspread, "
+"gnumeric), PDF eelvaade jne"
 
 #: ../../share/compssUsers:999
 msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr "Audio-v�rgid: mp3 ja midi, mikserid jms"
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Interneti t��jaam"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Raamatud ja Howto-d Linux ja vabavara kohta"
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Kontor"
+msgid "KDE Workstation"
+msgstr "KDE t��jaam"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimeedia t��jaam"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm jt"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr "Komplekt programme meili ja uudiste lugemiseks ning veebi brausimiseks"
+msgid "Multimedia - Video"
+msgstr "Multimeedia - Video"
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C ja C++ arendusteegid, programmid ja p�isefailid"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
+msgid "Database"
+msgstr "Server, Andmebaasid"
+
+#: ../../share/compssUsers:999
+msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Isiklike finantside haldusvahendid"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Vahendid lihtsamaks s�steemi administreerimiseks"
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
+msgid "Multimedia - Sound"
+msgstr "Multimeedia - Heli"
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS, SMB, SSH server, vahendaja (proxy)"
+msgid "Utilities"
+msgstr "Utiliidid"
 
 #: ../../share/compssUsers:999
 msgid "Documentation"
 msgstr "Dokumentatsioon"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm jt"
+msgid "Console Tools"
+msgstr "Konsooliprogrammid"
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Utiliidid"
+msgid "Postfix mail server, Inn news server"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS"
+msgid "Internet station"
+msgstr "Interneti t��jaam"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Graafiline keskkond"
+msgid "Multimedia station"
+msgstr "Multimeedia t��jaam"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimeedia - Heli"
+#, fuzzy
+msgid "Configuration"
+msgstr "LAN s�tted"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Meelelahutus: arcade, boards, strategy jne"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Veel graafilisi t��laudu (Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Video esitamine ja redigeerimine"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop Environment, graafiline t��keskkond ja rida seonduvaid rakendusi"
 
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsooliprogrammid"
+msgid "Graphical Environment"
+msgstr "Graafiline keskkond"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Heli ja video esitamine ja redigeerimine"
+msgid "Development"
+msgstr "Arendus"
 
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Teadust��jaam"
+msgid "Apache, Pro-ftpd"
+msgstr "Apache ja Pro-ftpd"
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editorid, shellid, terminalid, failihaldus"
+msgid "Tools to create and burn CD's"
+msgstr "Vahendid CD-de kirjutamiseks"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Raamatud ja Howto-d Linux ja vabavara kohta"
+msgid "Office Workstation"
+msgstr "Kontori t��jaam"
 
 #: ../../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 "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm jne"
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr ""
+msgid "Graphics programs such as The Gimp"
+msgstr "Graafikaprogrammid nagu Gimp"
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "M�ngud"
+msgid "DNS/NIS "
+msgstr "DNS/NIS"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimeedia - Video"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C ja C++ arendusteegid, programmid ja p�isefailid"
 
 #: ../../share/compssUsers:999
 #, fuzzy
@@ -7939,126 +8595,1279 @@ msgid "Network Computer server"
 msgstr "Failiserver"
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Graafikaprogrammid nagu Gimp"
+msgid "Mail/Groupware/News"
+msgstr "Server, Meil/grupit��/uudised"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Kontori t��jaam"
+msgid "Game station"
+msgstr "M�nguvahend"
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"K Desktop Environment, graafiline t��keskkond ja rida seonduvaid rakendusi"
+msgid "Video players and editors"
+msgstr "Video esitamine ja redigeerimine"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Veel graafilisi t��laudu (Gnome, IceWM)"
+msgid "Multimedia - Graphics"
+msgstr "Multimeedia - Graafika"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Vahendid CD-de kirjutamiseks"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Meelelahutus: arcade, boards, strategy jne"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimeedia - CD kirjutamine"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr "Komplekt programme meili ja uudiste lugemiseks ning veebi brausimiseks"
 
 #: ../../share/compssUsers:999
 msgid "Archiving, emulators, monitoring"
 msgstr "Arhiveerimine, emuleerimine, monitoorimine"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Server, Andmebaasid"
+msgid "Personal Finance"
+msgstr "Isiklikud finantsid"
 
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Kontoriprogrammid: tekstit��tlus (kword, abiword), tabelarvutus (kspread, "
-"gnumeric), PDF eelvaade jne"
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "Graafiline t��keskkond koos kasutajas�bralike rakendustega"
 
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Server, Veeb/FTP"
+msgid "Clients for different protocols including ssh"
+msgstr "Mitmete protokollide, sealhulgas ssh kliendid"
 
 #: ../../share/compssUsers:999
-msgid "Server"
-msgstr "Server"
+#, fuzzy
+msgid "Internet gateway"
+msgstr "Interneti�hendus"
 
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Isiklikud finantsid"
+msgid "Sound and video playing/editing programs"
+msgstr "Heli ja video esitamine ja redigeerimine"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Seadistused"
+msgid "Other Graphical Desktops"
+msgstr "Muud graafilised t��lauad"
 
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE t��jaam"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editorid, shellid, terminalid, failihaldus"
 
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Muud graafilised t��lauad"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Isiklike finantside haldusvahendid"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache ja Pro-ftpd"
+msgid "Games"
+msgstr "M�ngud"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Server, Meil/grupit��/uudised"
+msgid "Personal Information Management"
+msgstr "Isikliku info haldamine"
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome t��jaam"
+msgid "Multimedia - CD Burning"
+msgstr "Multimeedia - CD kirjutamine"
 
 #: ../../share/compssUsers:999
+msgid "Scientific Workstation"
+msgstr "Teadust��jaam"
+
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "ei saa lugeda faili /etc/sysconfig/autologin: %s"
+
+#~ msgid "Do you want to restart the network"
+#~ msgstr "Kas soovite v�rgu�hendust taask�ivitada?"
+
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "Kas olete n�us?"
+
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "N��d taask�ivitan v�rguliidese:\n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "Kas olete valmis v�rguliidese %s taask�ivitamiseks?"
+
 #, fuzzy
-msgid "Internet gateway"
-msgstr "Interneti�hendus"
+#~ msgid ""
+#~ "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
+#~ "(primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+#~ msgstr ""
+#~ "Tavaline valik on \"/dev/hda\" (esimese IDE kanali master), kui Te ei\n"
+#~ "tea t�pselt, et tahate teisiti teha."
 
-#: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Suhtlus Palmi v�i Visoriga"
+#, fuzzy
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "Kirjeldatud on j�rgnevad prindij�rjekorrad.\n"
+#~ "Te v�ite neid lisada ning olemasolevaid muuta."
 
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "M�nguvahend"
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "�henduse t��p: "
 
-#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm jne"
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "Valige uus vaikimisi kasutaja :"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Vahendid lihtsamaks s�steemi administreerimiseks"
+#, fuzzy
+#~ msgid "Test the mouse here."
+#~ msgstr "Palun testige hiirt"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ msgstr "Valige keel s�steemi installimiseks ja kasutamiseks."
+
+#~ msgid ""
+#~ "You need to accept the terms of the above license to continue "
+#~ "installation.\n"
+#~ "\n"
+#~ "\n"
+#~ "Please click on \"Accept\" if you agree with its terms.\n"
+#~ "\n"
+#~ "\n"
+#~ "Please click on \"Refuse\" if you disagree with its terms. Installation "
+#~ "will end without modifying your current\n"
+#~ "configuration."
+#~ msgstr ""
+#~ "Et installimist j�tkata, peate n�ustuma �laltoodud "
+#~ "litsentsitingimustega.\n"
+#~ "\n"
+#~ "\n"
+#~ "Palun valige \"N�us\", kui n�ustute nendega.\n"
+#~ "\n"
+#~ "\n"
+#~ "Palun valige \"Keeldun\", kui ei pea neile tingimistele allumist "
+#~ "v�imalikuks. Installimine l�petatakse, tegemata Teie s�steemis muutusi."
+
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr "Valige klaviatuuripaigutus �laltoodud nimekirjast"
+
+#~ msgid ""
+#~ "If you wish other languages (than the one you choose at\n"
+#~ "beginning of installation) will be available after installation, please "
+#~ "chose\n"
+#~ "them in list above. If you want select all, you just need to select \"All"
+#~ "\"."
+#~ msgstr ""
+#~ "Kui soovite, et peale installimist oleks v�imalik kasutada veel "
+#~ "erinevaid\n"
+#~ "keeli, valige need �laltoodud nimekirjast. Valik \"K�ik\" lisab toe\n"
+#~ "k�igile keeltele."
+
+#~ msgid ""
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Customized: If you are familiar enough with GNU/Linux, you may then "
+#~ "choose\n"
+#~ "    the primary usage for your machine. See below for details.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
+#~ "    perform a highly customized installation. As for a \"Customized\"\n"
+#~ "    installation class, you will be able to select the usage for your "
+#~ "system.\n"
+#~ "    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
+#~ "DOING!"
+#~ msgstr ""
+#~ "Valige:\n"
+#~ "\n"
+#~ "  - Isetehtud: Olete Linuxiga tuttav ja soovite s�steemi kohandada "
+#~ "vastavalt\n"
+#~ "   Teie vajadustele. J�rgmisena saate teha valikud s�ltuvalt Teie "
+#~ "arvuti \n"
+#~ "   edaspidisest kasutusalast.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Ekspert: Te tunnete end GNU/Linux keskkonnas vabalt ja soovite\n"
+#~ "   s�steemi, mis sobiks nagu valatult Teie t�psete ootustega.\n"
+#~ "   Aga palun, palun: �RGE VALIGE SEDA, KUI TE T�PSELT EI TEA, MIDA TEETE!"
+
+#~ msgid ""
+#~ "You must now define your machine usage. Choices are:\n"
+#~ "\n"
+#~ "* Workstation: this the ideal choice if you intend to use your machine "
+#~ "primarily for everyday use, at office or\n"
+#~ "  at home.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Development: if you intend to use your machine primarily for software "
+#~ "development, it is the good choice. You\n"
+#~ "  will then have a complete collection of software installed in order to "
+#~ "compile, debug and format source code,\n"
+#~ "  or create software packages.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Server: if you intend to use this machine as a server, it is the good "
+#~ "choice. Either a file server (NFS or\n"
+#~ "  SMB), a print server (Unix style or Microsoft Windows style), an "
+#~ "authentication server (NIS), a database\n"
+#~ "  server and so on. As such, do not expect any gimmicks (KDE, GNOME, "
+#~ "etc.) to be installed."
+#~ msgstr ""
+#~ "N��d m��rake oma arvuti peamne kasutusala. Valikud on:\n"
+#~ "\n"
+#~ "* T��jaam: valige, kui kavatsete oma arvutit rakendada igap�evategemiste "
+#~ "tarvis (kontorirakendused,\n"
+#~ "  graafika ja muu selline).\n"
+#~ "\n"
+#~ "\n"
+#~ "* Arendus: installitakse t�iskomplekt vahendeid eri programmeerimiskeelte "
+#~ "kasutamiseks, allikkoodi loomiseks,\n"
+#~ "  kompileerimiseks, silumiseks jne.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Server: valige see, kui vajate Mandrake Linux serverit. Saate "
+#~ "serveerida faile (NFS v�i SMB), printida\n"
+#~ "  (Unixi stiilis lp v�i Windowsi SMB), lisaks andmebaasid, "
+#~ "veebirakendused jms. Installimata\n"
+#~ "  j�etakse graafiline kasutajaliides (KDE, GNOME...)."
+
+#~ msgid ""
+#~ "You may now select the group of packages you wish to\n"
+#~ "install or upgrade.\n"
+#~ "\n"
+#~ "\n"
+#~ "DrakX will then check whether you have enough room to install them all. "
+#~ "If not,\n"
+#~ "it will warn you about it. If you want to go on anyway, it will proceed "
+#~ "onto the\n"
+#~ "installation of all selected groups but will drop some packages of "
+#~ "lesser\n"
+#~ "interest. At the bottom of the list you can select the option \n"
+#~ "\"Individual package selection\"; in this case you will have to browse "
+#~ "through\n"
+#~ "more than 1000 packages..."
+#~ msgstr ""
+#~ "N��d v�ite valida paketigruppe installimiseks v�i uuendamiseks\n"
+#~ "\n"
+#~ "\n"
+#~ "DrakX kontrollib, kas Teil on ikka piisavalt vaba ruumi nende k�igi "
+#~ "jaoks.\n"
+#~ "kui mitte, hoiatab ta Teid. Kui Te hoiatusest ei hooli j�etakse "
+#~ "automaatselt\n"
+#~ "k�rvale v�hemolulised paketid.\n"
+#~ "Nimekirja l�pus saate valida \"Valik paketthaaval\"; sel juhul aga peate\n"
+#~ "l�bi sirvima �le 1000 �ksiku paketi..."
+
+#~ msgid ""
+#~ "You can now choose individually all the packages you\n"
+#~ "wish to install.\n"
+#~ "\n"
+#~ "\n"
+#~ "You can expand or collapse the tree by clicking on options in the left "
+#~ "corner of\n"
+#~ "the packages window.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you prefer to see packages sorted in alphabetic order, click on the "
+#~ "icon\n"
+#~ "\"Toggle flat and group sorted\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you want not to be warned on dependencies, click on \"Automatic\n"
+#~ "dependencies\". If you do this, note that unselecting one package may "
+#~ "silently\n"
+#~ "unselect several other packages which depend on it."
+#~ msgstr ""
+#~ "N��d saate pakette �kshaaval installimiseks valida\n"
+#~ "\n"
+#~ "\n"
+#~ "Paketipuud saate avada ja sulgeda vasakpoolses nurgas asuvatest nuppudest."
+
+#~ msgid ""
+#~ "If you have all the CDs in the list above, click Ok. If you have\n"
+#~ "none of those CDs, click Cancel. If only some CDs are missing, unselect "
+#~ "them,\n"
+#~ "then click Ok."
+#~ msgstr ""
+#~ "Kui Teil on olemas k�ik �laltoodud CD-d, klikkige <OK>.\n"
+#~ "Kui Teil ei ole �htki neist, klikkige <Katkesta>.\n"
+#~ "Kui puuduvad m�ned CD-d, j�tke m�rgituks vaid olemasolevad ja siis <OK>."
+
+#~ msgid ""
+#~ "If you wish to connect your computer to the Internet or\n"
+#~ "to a local network please choose the correct option. Please turn on your "
+#~ "device\n"
+#~ "before choosing the correct option to let DrakX detect it automatically.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you do not have any connection to the Internet or a local network, "
+#~ "choose\n"
+#~ "\"Disable networking\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you wish to configure the network later after installation or if you "
+#~ "have\n"
+#~ "finished to configure your network connection, choose \"Done\"."
+#~ msgstr ""
+#~ "Kui soovite oma arvuti �hendada Internetti v�i kohtv�rku, tehke palun\n"
+#~ "�ige valik. V�lise seadme korrektseks tuvastamiseks on vajalik, et see "
+#~ "oleks\n"
+#~ "sisse l�litatud ja arvutiga �hendatud\n"
+#~ "\n"
+#~ "\n"
+#~ "Kui Te ei soovi v�rgu�hendust kasutada, valige \"Keela v�rgu�hendus\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Kui soovite v�rgu�henduse seadistada hiljem, valige \"Tehtud\"."
+
+#~ msgid ""
+#~ "No modem has been detected. Please select the serial port on which it is "
+#~ "plugged.\n"
+#~ "\n"
+#~ "\n"
+#~ "For information, the first serial port (called \"COM1\" under Microsoft\n"
+#~ "Windows) is called \"ttyS0\" under Linux."
+#~ msgstr ""
+#~ "Modemit ei leitud. Palun valige seerialport, kuhu see on �hendatud.\n"
+#~ "\n"
+#~ "\n"
+#~ "Igaks juhuks: esimese seerialpordi (\"COM1\" Microsoft Windowsis) nimi\n"
+#~ "on GNU/Linux s�steemis \"ttyS0\"."
+
+#~ msgid ""
+#~ "You may now enter dialup options. If you don't know\n"
+#~ "or are not sure what to enter, the correct informations can be obtained "
+#~ "from\n"
+#~ "your Internet Service Provider. If you do not enter the DNS (name "
+#~ "server)\n"
+#~ "information here, this information will be obtained from your Internet "
+#~ "Service\n"
+#~ "Provider at connection time."
+#~ msgstr ""
+#~ "Sisestage sissehelistamiskeskuse andmed. Kui Te neid ei tea\n"
+#~ "v�i kahtlete, saate oma teenusepakkujalt (ISP-l) kindlasti abi.\n"
+#~ "N�iteks info nimeserveri (DNS) kohta saab tavaliselt �henduse\n"
+#~ "loomise ajal automaatselt"
+
+#~ msgid ""
+#~ "If your modem is an external modem, please turn on it now to let DrakX "
+#~ "detect it automatically."
+#~ msgstr ""
+#~ "Kui Teil on v�line modem, siis l�litage see palun n��d sisse, et DrakX "
+#~ "saaks seda tuvastada."
+
+#~ msgid "Please turn on your modem and choose the correct one."
+#~ msgstr "Palun l�litage modem sisse ja valige nimekirjast �ige."
+
+#~ msgid ""
+#~ "If you are not sure if informations above are\n"
+#~ "correct or if you don't know or are not sure what to enter, the correct\n"
+#~ "informations can be obtained from your Internet Service Provider. If you "
+#~ "do not\n"
+#~ "enter the DNS (name server) information here, this information will be "
+#~ "obtained\n"
+#~ "from your Internet Service Provider at connection time."
+#~ msgstr ""
+#~ "Kui Te ei ole kindlad, et �laltoodud informatsioon vastab t�ele\n"
+#~ "v�i Te ei tea, mida sisestada, k�sige abi oma internetiteenuse pakkujalt\n"
+#~ "(ISP-lt). N�iteks info nimeserveri (DNS) kohta saab tavaliselt �henduse\n"
+#~ "loomise ajal automaatselt"
+
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, the correct informations can "
+#~ "be\n"
+#~ "obtained from your Internet Service Provider."
+#~ msgstr ""
+#~ "N��d sisestage oma arvuti nimi, kui see on vajalik. Kui kahtlete, siis "
+#~ "peaksite k�sima lisainformatsiooni oma ISP k�est."
+
+#~ msgid ""
+#~ "You may now configure your network device.\n"
+#~ "\n"
+#~ "   * IP address: if you don't know or are not sure what to enter, ask "
+#~ "your network administrator.\n"
+#~ "     You should not enter an IP address if you select the option "
+#~ "\"Automatic IP\" below.\n"
+#~ "\n"
+#~ "   * Netmask: \"255.255.255.0\" is generally a good choice. If you don't "
+#~ "know or are not sure what to enter,\n"
+#~ "     ask your network administrator.\n"
+#~ "\n"
+#~ "   * Automatic IP: if your network uses BOOTP or DHCP protocol, select "
+#~ "this option. If selected, no value is needed in\n"
+#~ "    \"IP address\". If you don't know or are not sure if you need to "
+#~ "select this option, ask your network administrator."
+#~ msgstr ""
+#~ "V�rguliidese seadistamiseks on vajalik:\n"
+#~ "\n"
+#~ "   * IP-aadress: kui Te seda ei teha, k�sige oma v�rguhaldurilt v�i\n"
+#~ "internetiteenuse pakkujalt (ISP).\n"
+#~ "\n"
+#~ "   * V�rgumask: \"255.255.255.0\" on tavaliselt sobiv. Igaks juhuks "
+#~ "v�ite\n"
+#~ "v�rguhalduri v�i ISP k�est �le k�sida.\n"
+#~ "\n"
+#~ "   * Automaatne IP: Kui Teie v�rgus on kasutusel BOOTP v�i DHCP.\n"
+#~ "Selle valimisel ei pea v�lja \"IP-aadress\" t�itma. Kui kahtlete\n"
+#~ "k�sige j�llegi oma v�rguhaldurilt v�i ISP-lt."
+
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, ask your network administrator."
+#~ msgstr ""
+#~ "Kui Teie v�rgus on kasutusel NIS, valige \"Kasuta NIS-i\". Kahtluse "
+#~ "korral\n"
+#~ "k�sige v�rguhaldurilt."
+
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, leave blank."
+#~ msgstr ""
+#~ "Kui vaja, sisestage oma s�steemi nimi. Kui Teil ei\n"
+#~ "ole �htki head m�tet, j�tke see rida t�hjaks"
 
-#~ msgid "GB"
-#~ msgstr "GB"
+#~ msgid ""
+#~ "You may now enter dialup options. If you're not sure what to enter, the\n"
+#~ "correct information can be obtained from your ISP."
+#~ msgstr ""
+#~ "N��d sisestage oma sissehelistamisteenuse pakkuja andmed. Kui ei ole "
+#~ "kindel,\n"
+#~ "mida kuhu sisestada, k�sige oma ISP k�est �le."
 
-#~ msgid "KB"
-#~ msgstr "KB"
+#~ msgid ""
+#~ "If you will use proxies, please configure them now. If you don't know if\n"
+#~ "you should use proxies, ask your network administrator or your ISP."
+#~ msgstr ""
+#~ "Kui peate kasutama vahendajaid (tulem��ri vms), seadistage need n��d. "
+#~ "Kui\n"
+#~ "kahtlete, on abiks v�rguhaldur v�i ISP"
 
-#~ msgid "TB"
-#~ msgstr "TB"
+#~ msgid ""
+#~ "You can install cryptographic package if your internet connection has "
+#~ "been\n"
+#~ "set up correctly. First choose a mirror where you wish to download "
+#~ "packages and\n"
+#~ "after that select the packages to install.\n"
+#~ "\n"
+#~ "\n"
+#~ "Note you have to select mirror and cryptographic packages according\n"
+#~ "to your legislation."
+#~ msgstr ""
+#~ "Kr�ptopakette saate installida p�rast Interneti�henduse seadistamist.\n"
+#~ "Esmalt valige peegel, kust soovite pakette alla laadida ja seej�rel\n"
+#~ "valige paketid.\n"
+#~ "\n"
+#~ "\n"
+#~ "M�rkus: kr�ptopakettide valimisel peate arvesse v�tma ka v�imalikke\n"
+#~ "�iguslikke piiranguid oma asukohamaal."
 
-#~ msgid "%d minutes"
-#~ msgstr "%d minutit"
+#~ msgid "You can now select your timezone according to where you live."
+#~ msgstr "N��d saate valida ajav��tme vastavalt oma asukohale."
 
-#~ msgid "1 minute"
-#~ msgstr "1 minut"
+#~ msgid ""
+#~ "You can configure a local printer (connected to your computer) or remote\n"
+#~ "printer (accessible via a Unix, Netware or Microsoft Windows network)."
+#~ msgstr ""
+#~ "Teil on v�imalus seadistada kas kohalik (Teie arvutiga �hendatud) v�i\n"
+#~ "v�rguprinter (Unix, Netware v�i Microsoft Windows v�rgus)"
 
-#~ msgid "%d seconds"
-#~ msgstr "%d sekundit"
+#~ msgid ""
+#~ "If you wish to be able to print, please choose one printing system "
+#~ "between\n"
+#~ "CUPS and LPR.\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS is a new, powerful and flexible printing system for Unix systems "
+#~ "(CUPS\n"
+#~ "means \"Common Unix Printing System\"). It is the default printing system "
+#~ "in\n"
+#~ "Mandrake Linux.\n"
+#~ "\n"
+#~ "\n"
+#~ "LPR is the old printing system used in previous Mandrake Linux "
+#~ "distributions.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you don't have printer, click on \"None\"."
+#~ msgstr ""
+#~ "Kui soovite vahetevahel printida, valige palun selleks sobiv meetod, "
+#~ "CUPS\n"
+#~ "v�i LPR.\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS on uus, v�imas ja paindlik printimiss�steem Unix keskkonnas (CUPS -\n"
+#~ "Common Unix Printing System). Mandrake Linux kasutab vaikimisi seda.\n"
+#~ "\n"
+#~ "\n"
+#~ "LPR on vanem meetod, mis oli kasutusel ka eelmistest Mandrake Linux\n"
+#~ "distributsioonides.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kui Teil ei olegi printerit, valige \"Ei soovi\"."
+
+#~ msgid ""
+#~ "GNU/Linux can deal with many types of printer. Each of these types "
+#~ "requires\n"
+#~ "a different setup.\n"
+#~ "\n"
+#~ "\n"
+#~ "If your printer is physically connected to your computer, select \"Local\n"
+#~ "printer\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you want to access a printer located on a remote Unix machine, select\n"
+#~ "\"Remote printer\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you want to access a printer located on a remote Microsoft Windows "
+#~ "machine\n"
+#~ "(or on Unix machine using SMB protocol), select \"SMB/Windows 95/98/NT\"."
+#~ msgstr ""
+#~ "GNU/Linux oskab toimetada mitut t��pi printeritega. Iga�ht neist "
+#~ "seadistatakse\n"
+#~ "erinevalt.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kui Teie printer on f��siliselt arvutiga �hendatud, valige \"Kohalik "
+#~ "printer\"\n"
+#~ "\n"
+#~ "\n"
+#~ "Kui soovite kasutada v�rguprinterit Unix serveril, valige \"V�rguprinter"
+#~ "\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Kui soovite kasutada v�rguprinteri Windows serveril (v�i muidu �le SMB\n"
+#~ "protokolli), valige  \"SMB/Windows 95/98/NT\"."
+
+#~ msgid ""
+#~ "Please turn on your printer before continuing to let DrakX detect it.\n"
+#~ "\n"
+#~ "You have to enter some informations here.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Name of printer: the print spooler uses \"lp\" as default printer "
+#~ "name. So, you must have a printer named \"lp\".\n"
+#~ "     If you have only one printer, you can use several names for it. You "
+#~ "just need to separate them by a pipe\n"
+#~ "     character (a \"|\"). So, if you prefer a more meaningful name, you "
+#~ "have to put it first, eg: \"My printer|lp\".\n"
+#~ "     The printer having \"lp\" in its name(s) will be the default "
+#~ "printer.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Description: this is optional but can be useful if several printers "
+#~ "are connected to your computer or if you allow\n"
+#~ "     other computers to access to this printer.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Location: if you want to put some information on your\n"
+#~ "     printer location, put it here (you are free to write what\n"
+#~ "     you want, for example \"2nd floor\").\n"
+#~ msgstr ""
+#~ "Palun l�litage oma printer sisse ja laske DrakX-il seda tuvastade.\n"
+#~ "\n"
+#~ "Samuti on vaja sisestada lisainformatsiooni:\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Printeri nimi: spuuler kasutab vaikimisi printerit \"lp\". Seega "
+#~ "peab Teil olema v�hemalt �he printeri nimi \"lp\".\n"
+#~ "     Kui Teil ongi ainult �ks printer, saate sellele anda ka mitu nime. "
+#~ "Nimed peavad olema eraldatud s�mboliga \"|\"\n"
+#~ "     Seega, kui soovite, et nimel oleks ka mingi t�hendus, kirjutage "
+#~ "nimeks midagi niisugust: \"Minu printer|lp\".\n"
+#~ "     Printer, mille nimede hulgas on \"lp\", saab olema Teie s�steemi "
+#~ "jaoks vaikimisi printeriks.\n"
+#~ "\n"
+#~ "\n"
+#~ "  * Kirjeldus: see ei ole kohustuslik, kuid v�ib osutuda vajalikuks, kui "
+#~ "Teil on n�iteks mitu kohalikku printerit ja soovite neid v�rgus v�lja "
+#~ "jagada\n"
+#~ "\n"
+#~ "\n"
+#~ "  * Asukoht: kui soovite anda t�iendavat informatsiooni printeri "
+#~ "asukohast\n"
+#~ "    N�iteks: \"Teise korruse keskel\".\n"
+
+#~ msgid ""
+#~ "You need to enter some informations here.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Name of queue: the print spooler uses \"lp\" as default printer "
+#~ "name. So, you need have a printer named \"lp\".\n"
+#~ "    If you have only one printer, you can use several names for it. You "
+#~ "just need to separate them by a pipe\n"
+#~ "    character (a \"|\"). So, if you prefer to have a more meaningful "
+#~ "name, you have to put it first, eg: \"My printer|lp\".\n"
+#~ "    The printer having \"lp\" in its name(s) will be the default "
+#~ "printer.\n"
+#~ "\n"
+#~ "  \n"
+#~ "   * Spool directory: it is in this directory that printing jobs are "
+#~ "stored. Keep the default choice\n"
+#~ "     if you don't know what to use\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Printer Connection: If your printer is physically connected to your "
+#~ "computer, select \"Local printer\".\n"
+#~ "     If you want to access a printer located on a remote Unix machine, "
+#~ "select \"Remote lpd printer\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     If you want to access a printer located on a remote Microsoft "
+#~ "Windows machine (or on Unix machine using SMB\n"
+#~ "     protocol), select \"SMB/Windows 95/98/NT\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     If you want to acces a printer located on NetWare network, select "
+#~ "\"NetWare\".\n"
+#~ msgstr ""
+#~ "N��d on vaja lisainformatsiooni.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Printeri nimi: spuuler kasutab vaikimisi printerit \"lp\". Seega "
+#~ "peab Teil olema v�hemalt �he printeri nimi \"lp\".\n"
+#~ "     Kui Teil ongi ainult �ks printer, saate sellele anda ka mitu nime. "
+#~ "Nimed peavad olema eraldatud s�mboliga \"|\"\n"
+#~ "     Seega, kui soovite, et nimel oleks ka mingi t�hendus, kirjutage "
+#~ "nimeks midagi niisugust: \"Minu printer|lp\".\n"
+#~ "     Printer, mille nimede hulgas on \"lp\", saab olema Teie s�steemi "
+#~ "jaoks vaikimisi printeriks.\n"
+#~ "\n"
+#~ "\n"
+#~ "  * Spuulkataloog: kataloog, kus spuuler hoiab ajutisi faile enne "
+#~ "printimist. Seda ei ole soovitav muuta.\n"
+#~ "\n"
+#~ "\n"
+#~ "  * Printeri �hendusviis: Kui Teie printer on f��siliselt Teie arvuti "
+#~ "k�ljes, valige \"Kohalik printer\".\n"
+#~ "    Kui soovite kasutada printerit UNIX serveri k�ljes, valige \"lpd "
+#~ "printserver\".\n"
+#~ "\n"
+#~ "\n"
+#~ "   Kui soovite kasutada printerit Microsoft Windows v�rgus (v�i SMB "
+#~ "serveril) valige \"SMB/Windows 95/98/NT\".\n"
+#~ "\n"
+#~ "\n"
+#~ "   Kui soovite kasutada NetWare serveril asuvat printerit, valige "
+#~ "\"NetWare\".\n"
+
+#~ msgid ""
+#~ "Your printer has not been detected. Please enter the name of the device "
+#~ "on\n"
+#~ "which it is connected.\n"
+#~ "\n"
+#~ "\n"
+#~ "For information, most printers are connected on the first parallel port. "
+#~ "This\n"
+#~ "one is called \"/dev/lp0\" under GNU/Linux and \"LPT1\" under Microsoft "
+#~ "Windows."
+#~ msgstr ""
+#~ "Teie printerit ei �nnestunud tuvastada. Palun abistavat infot v�imaliku\n"
+#~ "�henduspistiku kohta.\n"
+#~ "\n"
+#~ "\n"
+#~ "Enamasti on printer �hendatud esimesse paralleelporti. GNU/Linuxis on "
+#~ "selle\n"
+#~ "nimeks \"/dev/lp0\" ja Microsoft Windowsis \"LPT1\"."
+
+#~ msgid "You must now select your printer in the above list."
+#~ msgstr "Valige printer �laltoodud nimekirjast."
+
+#~ msgid ""
+#~ "Please select the right options according to your printer.\n"
+#~ "Please see its documentation if you don't know what choose here.\n"
+#~ "\n"
+#~ "\n"
+#~ "You will be able to test your configuration in next step and you will be "
+#~ "able to modify it if it doesn't work as you want."
+#~ msgstr ""
+#~ "Palun valige oma printerile sobivad s�tted.\n"
+#~ "Abi saate ilmselt ka printeri dokumentatsioonist.\n"
+#~ "\n"
+#~ "\n"
+#~ "J�rgmisel sammul saate oma seadistusi testida ja soovi korral muuta, kui "
+#~ "midagi ei t��ta nagu vaja."
+
+#~ msgid ""
+#~ "You can now enter the root password for your Mandrake Linux system.\n"
+#~ "The password must be entered twice to verify that both password entries "
+#~ "are identical.\n"
+#~ "\n"
+#~ "\n"
+#~ "Root is the system's administrator and is the only user allowed to modify "
+#~ "the\n"
+#~ "system configuration. Therefore, choose this password carefully. \n"
+#~ "Unauthorized use of the root account can be extemely dangerous to the "
+#~ "integrity\n"
+#~ "of the system, its data and other system connected to it.\n"
+#~ "\n"
+#~ "\n"
+#~ "The password should be a mixture of alphanumeric characters and at least "
+#~ "8\n"
+#~ "characters long. It should never be written down.\n"
+#~ "\n"
+#~ "\n"
+#~ "Do not make the password too long or complicated, though: you must be "
+#~ "able to\n"
+#~ "remember it without too much effort."
+#~ msgstr ""
+#~ "N��d peate sisestama s�steemi juurkasutaja (root) parooli. Et v�hendada\n"
+#~ "eksimisv�imalust, tehke seda kaks korda.\n"
+#~ "\n"
+#~ "\n"
+#~ "Juurkasutaja on s�steemi t�htsaim kasutaja ja ainuke, kes tohib teha\n"
+#~ "muudatusi s�steemi s�tetesse. Seep�rast valige juurkasutaja parooli "
+#~ "erilise\n"
+#~ "hoolega.\n"
+#~ "\n"
+#~ "Hea salas�na peaks olema kombinatsioon t�htedest ja numbritest \n"
+#~ "ning v�hemalt 8 m�rki pikk. �rge *kunagi* kirjutage oma parooli �les!\n"
+#~ "\n"
+#~ "\n"
+#~ "Samas ei peaks see olema liiga pikk ja keeruline meelde j�tmiseks."
+
+#~ msgid ""
+#~ "You may now create one or more \"regular\" user account(s), as\n"
+#~ "opposed to the \"privileged\" user account, root. You can create\n"
+#~ "one or more account(s) for each person you want to allow to use\n"
+#~ "the computer. Note that each user account will have its own\n"
+#~ "preferences (graphical environment, program settings, etc.)\n"
+#~ "and its own \"home directory\", in which these preferences are\n"
+#~ "stored.\n"
+#~ "\n"
+#~ "\n"
+#~ "First of all, create an account for yourself! Even if you will be the "
+#~ "only user\n"
+#~ "of the machine, you may NOT connect as root for daily use of the system: "
+#~ "it's a\n"
+#~ "very high security risk. Making the system unusable is very often a typo "
+#~ "away.\n"
+#~ "\n"
+#~ "\n"
+#~ "Therefore, you should connect to the system using the user account\n"
+#~ "you will have created here, and login as root only for administration\n"
+#~ "and maintenance purposes."
+#~ msgstr ""
+#~ "N��d saate luua �he v�i rohkem \"tavakasutaja\" kontot. ��rmiselt "
+#~ "soovitav\n"
+#~ "on luua igale arvuti kasutajale eraldi konto(d). Sel viisi saab iga "
+#~ "kasutaja\n"
+#~ "valida ise endale sobiva graafilise keskkonna kujunduse ja programmide "
+#~ "s�tted.\n"
+#~ "K�ik kasutaja failid saavad hoitud ja kaitstud tema isiklikus "
+#~ "kodukataloogis.\n"
+#~ "\n"
+#~ "\n"
+#~ "Esmalt looge konto iseendale, ka siis kui olete s�steemi ainuke "
+#~ "kasutaja.\n"
+#~ "�rge tehke oma igap�evatoimetusi juurkasutajana, suurendades sel viisil\n"
+#~ "turvariski! Vale juurkasutaja n�puliigutus v�ib s�steemi kergesti\n"
+#~ "kasutusk�lbmatuks muuta!\n"
+#~ "\n"
+#~ "\n"
+#~ "Juurkasutaja �igused on ainult administreerimiseks ja hoolduseks,\n"
+#~ "k�ike muud tehke palun tavakasutajana"
+
+#~ msgid ""
+#~ "Creating a boot disk is strongly recommended. If you can't\n"
+#~ "boot your computer, it's the only way to rescue your system without\n"
+#~ "reinstalling it."
+#~ msgstr ""
+#~ "Alglaadimisketta loomine on ��rmiselt soovitatav. Kui peaks kunagi\n"
+#~ "tekkima probleeme s�steemi laadimisel, v�i alglaadmisketas olla Teie\n"
+#~ "ainuke p��setee uue installimise k�rval."
+
+#~ msgid ""
+#~ "LILO and grub main options are:\n"
+#~ "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
+#~ "partition) that contains the boot sector. Unless you know specifically\n"
+#~ "otherwise, choose \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Delay before booting default image: Specifies the number in tenths\n"
+#~ "of a second the boot loader should wait before booting the first image.\n"
+#~ "This is useful on systems that immediately boot from the hard disk after\n"
+#~ "enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+#~ "omitted or is set to zero.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Video mode: This specifies the VGA text mode that should be selected\n"
+#~ "when booting. The following values are available: \n"
+#~ "\n"
+#~ "    * normal: select normal 80x25 text mode.\n"
+#~ "\n"
+#~ "    * <number>:  use the corresponding text mode.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Clean \"/tmp\" at each boot: if you want delete all files and "
+#~ "directories\n"
+#~ "stored in \"/tmp\" when you boot your system, select this option.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Precise RAM if needed: unfortunately, there is no standard method to "
+#~ "ask the\n"
+#~ "BIOS about the amount of RAM present in your computer. As consequence, "
+#~ "Linux may\n"
+#~ "fail to detect your amount of RAM correctly. If this is the case, you "
+#~ "can\n"
+#~ "specify the correct amount or RAM here. Please note that a difference of "
+#~ "2 or 4\n"
+#~ "MB between detected memory and memory present in your system is normal."
+#~ msgstr ""
+#~ "LILO ja grub-i peamised suvandid on:\n"
+#~ "  - Alglaadimisseade: m��ratakse k�vaketas v�i partitsioon, kus asub\n"
+#~ "alglaadimissektor. Kui Te just t�pselt ei tea, mida teete,\n"
+#~ "\"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Ooteaeg alglaadimisel: m��ratakse ooteaeg sekundik�mnendikes enne\n"
+#~ "vaikimisi laadimist.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Graafikamood: m��ratakse VGA tekstmood s�steemi laadimisel. "
+#~ "V�imalikud\n"
+#~ "on j�rgmised valikud:\n"
+#~ "\n"
+#~ "    * normal: tavaline 80x25 tekstimood\n"
+#~ "\n"
+#~ "    * <number>:  numbrile vastav tekstimood.  - Puhasta /tmp "
+#~ "alglaadimisel: kui soovite kustutada s�steemi alglaadimisel,\n"
+#~ "valige see\n"
+#~ "\n"
+#~ "\n"
+#~ "  - T�psust RAM hulk kui vajalik: kahjuks ei ole �htki standardset "
+#~ "meetodit Teie\n"
+#~ "arvutis leiduva operatiivm�lu (RAM) koguse �raarvamiseks. Kui siinkohal "
+#~ "on eksimine\n"
+#~ "2 v�i 4 MB, siis ei maksa sellele v�ga t�helepanu p��rata."
+
+#~ msgid ""
+#~ "SILO is a bootloader for SPARC: it is able to boot\n"
+#~ "either GNU/Linux or any other operating system present on your computer.\n"
+#~ "Normally, these other operating systems are correctly detected and\n"
+#~ "installed. If this is not the case, you can add an entry by hand in this\n"
+#~ "screen. Be careful as to choose the correct parameters.\n"
+#~ "\n"
+#~ "\n"
+#~ "You may also want not to give access to these other operating systems to\n"
+#~ "anyone, in which case you can delete the corresponding entries. But\n"
+#~ "in this case, you will need a boot disk in order to boot them!"
+#~ msgstr ""
+#~ "SILO on alglaadur SPARC arhitektuurile: see v�imaldab laadida\n"
+#~ "kas GNU/Linuxi v�i m�ne muu Teie arvutis oleva operatsioonis�steemi.\n"
+#~ "Tavaliselt tuvastakse teised operatsioonis�steemid �igesti ja seadista-\n"
+#~ "takse ka alglaadur. Kui Teil aga ei ole �nne, tuleb parameetrid seada\n"
+#~ "k�sitsi. Olge sel juhul hoolas valima �iged."
+
+#~ msgid ""
+#~ "SILO main options are:\n"
+#~ "  - Bootloader installation: Indicate where you want to place the\n"
+#~ "information required to boot to GNU/Linux. Unless you know exactly\n"
+#~ "what you are doing, choose \"First sector of drive (MBR)\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Delay before booting default image: Specifies the number in tenths\n"
+#~ "of a second the boot loader should wait before booting the first image.\n"
+#~ "This is useful on systems that immediately boot from the hard disk after\n"
+#~ "enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+#~ "omitted or is set to zero."
+#~ msgstr ""
+#~ "SILO peamised suvandid on:\n"
+#~ "  - Alglaaduri paigaldus: m��ratakse k�vaketas v�i partitsioon, kus "
+#~ "soovite\n"
+#~ "hoida GNU/Linuxi laadimiseks vajalikku infot. Kui Te just t�pselt ei "
+#~ "tea,\n"
+#~ "mida teete, valige \"K�vaketta esimene sektor (MBR)\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Ooteaeg alglaadimisel: m��ratakse aeg sekundik�mnendikes enne "
+#~ "vaikimisi\n"
+#~ "laadimist."
+
+#~ msgid ""
+#~ "Now it's time to configure the X Window System, which is the\n"
+#~ "core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
+#~ "you must configure your video card and monitor. Most of these\n"
+#~ "steps are automated, though, therefore your work may only consist\n"
+#~ "of verifying what has been done and accept the settings :)\n"
+#~ "\n"
+#~ "\n"
+#~ "When the configuration is over, X will be started (unless you\n"
+#~ "ask DrakX not to) so that you can check and see if the\n"
+#~ "settings suit you. If they don't, you can come back and\n"
+#~ "change them, as many times as necessary."
+#~ msgstr ""
+#~ "On aeg konfigureerida \"X Window System\" ehk lihtsalt X. X on\n"
+#~ "GNU/Linuxi graafilise kasutajaliidese s�da. Sel eesm�rgil peame koos\n"
+#~ "seadistama Teie graafikakaardi ja monitori. Enamus sellest protsessist\n"
+#~ "on automatiseeritud ja Teie �lesandeks on ainult DrakX-i\n"
+#~ "valikutega n�ustuda (v�i mitte :))\n"
+#~ "\n"
+#~ "\n"
+#~ "Kui saame seadistamisega hakkama, k�ivitakse X (kui Te ei anna\n"
+#~ "eraldi k�sku mitte nii teha)."
+
+#~ msgid ""
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
+#~ msgstr ""
+#~ "Kui midagi on X-i seadistustega valesti, saab siinkohal v�imalikke vigu\n"
+#~ "parandada."
+
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "Kui eelistate graafilist s�steemi sisenemist, valige \"Jah\". "
+#~ "Konsoolimoodi\n"
+#~ "eelistamisel valige \"Ei\"."
+
+#~ msgid ""
+#~ "You can choose a security level for your system. Please refer to the "
+#~ "manual for complete\n"
+#~ "  information. Basically, if you don't know what to choose, keep the "
+#~ "default option.\n"
+#~ msgstr ""
+#~ "N��d saate valida oma s�steemis kasutatava turvataseme. Palun vaadake "
+#~ "lisainfot selle kohta ka\n"
+#~ " kasutajajuhendist. �ldiselt, kui Te ei tea, mida teete, j�tke siia "
+#~ "vaikimisi valik.\n"
+
+#~ msgid ""
+#~ "Your system is going to reboot.\n"
+#~ "\n"
+#~ "After rebooting, your new Mandrake Linux system will load automatically.\n"
+#~ "If you want to boot into another existing operating system, please read\n"
+#~ "the additional instructions."
+#~ msgstr ""
+#~ "Teie s�steem sooritab alglaadimise.\n"
+#~ "\n"
+#~ "Taask�ivitumisel laaditakse Teie uus Mandrake Linux s�steem "
+#~ "automaatselt.\n"
+#~ "Kui soovite laadida m�nd muud operatsioonis�steemi, lugege palun\n"
+#~ "lisainformatsiooni."
+
+#~ msgid "Czech (Programmers)"
+#~ msgstr "T�ehhi (programmeerijad)"
+
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "Slovaki (programmeerijad)"
+
+#~ msgid "Name of the profile to create:"
+#~ msgstr "Loodava profiili nimi:"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "Kirjuta /etc/fstab"
+
+#~ msgid "Restore from file"
+#~ msgstr "Taasta failist"
+
+#~ msgid "Save in file"
+#~ msgstr "Salvesta faili"
+
+#~ msgid "Restore from floppy"
+#~ msgstr "Taasta flopilt"
+
+#~ msgid "Format all"
+#~ msgstr "Vorminda k�ik"
+
+#~ msgid "After formatting all partitions,"
+#~ msgstr "P�rast k�igi partitsioonide vormindamist"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "on k�ik andmed neil partitsioonidel h�vivad"
+
+#~ msgid "Reload"
+#~ msgstr "Laadi uuesti"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr "Kas soovite luua kiirpaigaldusflopi (abiks korduval paigaldusel)?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "ADSL s�tted"
+
+#~ msgid ""
+#~ "With a remote CUPS server, you do not have to configure\n"
+#~ "any printer here; printers will be automatically detected\n"
+#~ "unless you have a server on a different network; in the\n"
+#~ "latter case, you have to give the CUPS server IP address\n"
+#~ "and optionally the port number."
+#~ msgstr ""
+#~ "Kui v�rgus on CUPS server, siis ei ole Teil vaja siin\n"
+#~ "printereid seadistada, need leitakse automaatselt.\n"
+#~ "Kui server asub kuskil kaugemal, peate sisestama CUPS serveri\n"
+#~ "IP-aadress ning soovitavalt ka pordi numbri."
+
+#~ msgid "Remote queue"
+#~ msgstr "Prindij�rjekorra nimi"
+
+#, fuzzy
+#~ msgid "Remote queue name missing!"
+#~ msgstr "Prindij�rjekorra nimi"
+
+#, fuzzy
+#~ msgid "Command line"
+#~ msgstr "Domeeninimi"
+
+#, fuzzy
+#~ msgid "Modify printer"
+#~ msgstr "Printerit ei ole"
+
+#, fuzzy
+#~ msgid "start it"
+#~ msgstr "piiratud"
+
+#, fuzzy
+#~ msgid "Network Monitoring"
+#~ msgstr "V�rgus�tted"
+
+#~ msgid "Profile "
+#~ msgstr "Profiil "
+
+#, fuzzy
+#~ msgid "Connection Time: "
+#~ msgstr "�henduse t��p: "
+
+#, fuzzy
+#~ msgid "Connecting to Internet "
+#~ msgstr "Loo interneti�hendus"
+
+#, fuzzy
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "Katkesta interneti�hendus"
+
+#, fuzzy
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "Katkesta interneti�hendus"
+
+#, fuzzy
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "Katkesta interneti�hendus"
+
+#, fuzzy
+#~ msgid "Connection complete."
+#~ msgstr "�henduse nimi"
+
+#, fuzzy
+#~ msgid "Color configuration"
+#~ msgstr "Seadistused"
+
+#, fuzzy
+#~ msgid "average"
+#~ msgstr "r�mps"
+
+#, fuzzy
+#~ msgid "Connect"
+#~ msgstr "�hendatud"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "Lahuta..."
+
+#~ msgid "/File/_New"
+#~ msgstr "/Fail/_Uus"
+
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Fail/_Ava"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>O"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/Fail/_Salvesta"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Fail/Salvesta _Kui"
+
+#~ msgid "/File/-"
+#~ msgstr "/Fail/-"
+
+#~ msgid "/_Options"
+#~ msgstr "/_Eelistused"
+
+#~ msgid "/Options/Test"
+#~ msgstr "/Eelistused/Test"
+
+#~ msgid "/_Help"
+#~ msgstr "/_Abi"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/Abi/_Misv�rk"
+
+#, fuzzy
+#~ msgid "Default Runlevel"
+#~ msgstr "Vaikimisi"
+
+#~ msgid "Europe"
+#~ msgstr "Euroopa"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#~ msgid "Remove queue"
+#~ msgstr "Eemalda prindij�rjekord"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "S�tete fail ei ole arusaadav."
+
+#~ msgid "Unrecognized config file"
+#~ msgstr "Tundmatu s�ttefaili"
+
+#~ msgid "Adapter"
+#~ msgstr "V�rgukaart"
+
+#~ msgid "Disable network"
+#~ msgstr "Keela v�rgu�hendus"
+
+#, fuzzy
+#~ msgid "Enable network"
+#~ msgstr "Keela v�rgu�hendus"
+
+#~ msgid ""
+#~ "You can now test your mouse. Use buttons and wheel to verify\n"
+#~ "if settings are good. If not, you can click on \"Cancel\" to choose "
+#~ "another\n"
+#~ "driver."
+#~ msgstr ""
+#~ "N��d saate oma hiirt testida. Kasutage nii nuppe kui ratast. Kui tundub\n"
+#~ "midagi valesti olevat, klikkige <Katkesta> uue juhtprogrammi valimiseks."
+
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "DSL (v�i ADSL) �hendus"
+
+#, fuzzy
+#~ msgid "Choose"
+#~ msgstr "Hiir"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr "V�ite anda ette ka URI, mille j�rgi CUPS printeri leiab."
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "Jah, tr�ki ASCII testlehek�lg"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "Jah, tr�ki PostSript testlehek�lg"
+
+#~ msgid "Paper Size"
+#~ msgstr "Paberi suurus"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "T�� l�petamisel v�ljasta kogu leht?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "Kas optimiseerime k�vaketast?"
+
+#~ msgid "Color depth options"
+#~ msgstr "Mooduli parameetrid:"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "Tr�kkida tekst PostScriptina?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Paranda trepitud tekst?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "Lehek�lgi �hel paberil"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "Lehe laiuse m�rgid punktides (1/72 tollile)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "Lehe k�rguse m�rgid punktides (1/72 tollile)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "Lisa GhostScript parameetrid"
+
+#~ msgid "Extra Text options"
+#~ msgstr "Lisa teksti parameetrid"
+
+#~ msgid "Reverse page order"
+#~ msgstr "Viimane leht enne"
+
+#~ msgid "CUPS starting"
+#~ msgstr "CUPS k�ivitatakse"
+
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Vali v�rguprinteri �hendusviis"
+
+#~ msgid ""
+#~ "Every printer need a name (for example lp).\n"
+#~ "Other parameters such as the description of the printer or its location\n"
+#~ "can be defined. What name should be used for this printer and\n"
+#~ "how is the printer connected?"
+#~ msgstr ""
+#~ "Masinal v�ib olla mitu printerit, millest iga�ks vajab nime\n"
+#~ "(sageli lp) ja printkataloogi. Millist nime peaks kasutama\n"
+#~ "kasutama selle printeri puhul ja kuidas see on �hendatud?"
+
+#~ msgid ""
+#~ "Every print queue (which print jobs are directed to) needs a\n"
+#~ "name (often lp) and a spool directory associated with it. What\n"
+#~ "name and directory should be used for this queue and how is the printer "
+#~ "connected?"
+#~ msgstr ""
+#~ "Masinal v�ib olla mitu prindij�rjekorda, millest iga�ks vajab nime\n"
+#~ "(sageli lp) ja spuulkataloogi (ajutiste failide jaoks). Millist nime\n"
+#~ "ja kataloogi peaks kasutama selle printeri puhul ja kuidas see on "
+#~ "�hendatud?"
+
+#~ msgid "Name of queue"
+#~ msgstr "Printeri nimi"
+
+#~ msgid "Spool directory"
+#~ msgstr "Spuulkataloog"
+
+#~ msgid "Disable"
+#~ msgstr "Keela"
+
+#~ msgid "Enable"
+#~ msgstr "Luba"
+
+#, fuzzy
+#~ msgid "Light configuration"
+#~ msgstr "LAN s�tted"
+
+#~ msgid "Provider dns 1"
+#~ msgstr "Teenusepakkuja DNS 1"
+
+#~ msgid "Provider dns 2"
+#~ msgstr "Teenuspakkuja DNS 2"
+
+#, fuzzy
+#~ msgid "fsck failed: "
+#~ msgstr "�hendamine eba�nnestus: "
+
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "Turvalisema s�steemi saamiseks peaksite valima \"Kasuta varjutatud \n"
+#~ "paroolifaili\" ja \"Kasuta parooli kaitsmiseks MD5 algoritmi\"."
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "Kui Teie v�rgus on kasutusel NIS, valige \"Kasuta NIS-i\". Kahtluse "
+#~ "korral\n"
+#~ "k�sige v�rguhaldurilt."
+
+#~ msgid "yellow pages"
+#~ msgstr "NIS YP"
+
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "Kuidas soovite luua interneti�hendust?"
 
 #~ msgid "Configure..."
 #~ msgstr "Seadista..."
@@ -8073,9 +9882,6 @@ msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
 #~ msgid "Opening your connection..."
 #~ msgstr "Testime Teie �hendust..."
 
-#~ msgid "Standard tools"
-#~ msgstr "Standardt��riistad"
-
 #, fuzzy
 #~ msgid "Configuration de Lilo/Grub"
 #~ msgstr "Seadistused: Lisa asukoht"
@@ -8212,9 +10018,6 @@ msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
 #~ msgid "Internet/Network access"
 #~ msgstr "Interneti�hendus"
 
-#~ msgid "Mail information"
-#~ msgstr "Meili informatsioon"
-
 #~ msgid "Firewall Configuration Wizard"
 #~ msgstr "V�rgu s�tete abimees"
 
@@ -8299,15 +10102,9 @@ msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
 #~ "\n"
 #~ "J�tkamisel olen sunnitud Teie %s keskkonna seiskama"
 
-#~ msgid "eth$_"
-#~ msgstr "eth$_"
-
 #~ msgid "loopback"
 #~ msgstr "loopback"
 
-#~ msgid "None"
-#~ msgstr "Ei soovi"
-
 #~ msgid "Which bootloader(s) do you want to use?"
 #~ msgstr "Millist alglaadurit soovite kasutada?"
 
@@ -8329,9 +10126,6 @@ msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
 #~ msgid "Configure local network"
 #~ msgstr "Kohtv�rgu seadistamine"
 
-#~ msgid "Disable networking"
-#~ msgstr "Keela v�rgu�hendus"
-
 #~ msgid "Configure the Internet connection / Configure local Network"
 #~ msgstr "Seadista interneti�hendus / Seadista kohtv�rk"
 
@@ -8382,9 +10176,6 @@ msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
 #~ msgid "Configure timezone"
 #~ msgstr "Ajav��tme m��ramine"
 
-#~ msgid "Configure printer"
-#~ msgstr "Printeri s�tted"
-
 #~ msgid "Network adaptater 1 (eth0):"
 #~ msgstr "Esimene v�rguliides (eth0)"
 
@@ -8492,9 +10283,6 @@ msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
 #~ msgid "Update location"
 #~ msgstr "Uuenda asukoht"
 
-#~ msgid "Remove"
-#~ msgstr "Eemalda"
-
 #~ msgid "Find Package"
 #~ msgstr "Leia pakett"
 
@@ -8504,9 +10292,6 @@ msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
 #~ msgid "Toggle between Installed and Available"
 #~ msgstr "Installitud/Saadaval"
 
-#~ msgid "Uninstall"
-#~ msgstr "Eemaldamine"
-
 #~ msgid "Choose package to install"
 #~ msgstr "Valige pakett installimiseks"
 
@@ -8705,7 +10490,7 @@ msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
 #~ "Choose \"Install\" if there are no previous versions of GNU/Linux\n"
 #~ "installed, or if you wish to use multiple distributions or versions.\n"
 #~ "\n"
-#~ "Choose \"Rescue\" if you wish to rescue a version of Linux-Mandrake "
+#~ "Choose \"Rescue\" if you wish to rescue a version of Mandrake Linux "
 #~ "already installed.\n"
 #~ "\n"
 #~ "\n"
@@ -8751,7 +10536,7 @@ msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
 
 #~ msgid ""
 #~ "At this point, you may choose what partition(s) to use to install\n"
-#~ "your Linux-Mandrake system if they have been already defined (from a\n"
+#~ "your Mandrake Linux system if they have been already defined (from a\n"
 #~ "previous install of GNU/Linux or from another partitioning tool). In "
 #~ "other\n"
 #~ "cases, hard drive partitions must be defined. This operation consists of\n"
@@ -8791,7 +10576,7 @@ msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
 #~ "\n"
 #~ "- Ctrl-m  to set the mount point\n"
 #~ msgstr ""
-#~ "N��d peaksite valima partitsioon(id) Linux-Mandrake installimiseks\n"
+#~ "N��d peaksite valima partitsioon(id) Mandrake Linux installimiseks\n"
 #~ "kui need on juba varem kettale defineeritud. Kui Te varem ei ole oma\n"
 #~ "k�vaketast Linuxi jaoks partitsioneerinud, saate seda j�rgmises etapis\n"
 #~ "teha. Partitsioneerimine t�hendab f��silise ketta jaotamist loogiliselt\n"
@@ -8896,7 +10681,7 @@ msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
 #~ "hardware.\n"
 #~ "\n"
 #~ "\n"
-#~ "If you install a Linux-Mandrake system on a machine which is part\n"
+#~ "If you install a Mandrake Linux system on a machine which is part\n"
 #~ "of an already existing network, the network administrator will\n"
 #~ "have given you all necessary information (IP address, network\n"
 #~ "submask or netmask for short, and hostname). If you're setting\n"
@@ -8924,7 +10709,7 @@ msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
 #~ "juhul peate p��rduma kaardi m��ja poole.\n"
 #~ "\n"
 #~ "\n"
-#~ "Kui installite Linux-Mandrake s�steemi masinale, mis on osake juba "
+#~ "Kui installite Mandrake Linux s�steemi masinale, mis on osake juba "
 #~ "t��tavast\n"
 #~ "kohtv�rgust, annab v�rgu haldaja Teile kogu vajaliku informatsiooni (IP-\n"
 #~ "aadressi, alamv�rgu maski ja masina nime). Kui seate �les oma privaatset\n"
@@ -9129,9 +10914,6 @@ msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
 #~ msgid "nfs mount failed"
 #~ msgstr "NFS �hendamine eba�nnestus"
 
-#~ msgid "CHAP"
-#~ msgstr "CHAP"
-
 #~ msgid "Socket"
 #~ msgstr "Pistik"
 
@@ -9213,18 +10995,18 @@ msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
 #~ msgid "Network:"
 #~ msgstr "V�rgu mask:"
 
-#~ msgid "Internet Connection Sharing - setup of $device"
-#~ msgstr "Interneti�henduse jagamine - liides $device"
+#~ msgid "Internet Connection Sharing - setup of %s"
+#~ msgstr "Interneti�henduse jagamine - liides %s"
 
 #~ msgid ""
 #~ "The following interface is about to be configured:\n"
 #~ "\n"
-#~ "$interface\n"
+#~ "%s\n"
 #~ "\n"
 #~ msgstr ""
 #~ "Seatakse s�tted j�rgmisele v�rguliidesele:\n"
 #~ "\n"
-#~ "$interface\n"
+#~ "%s\n"
 #~ "\n"
 
 #
@@ -9276,9 +11058,6 @@ msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
 #~ msgid "%s: This is not a root partition, please select another one."
 #~ msgstr "%s: See ei ole juurpartitsioon, palun valige m�ni muu."
 
-#~ msgid "No root partition found"
-#~ msgstr "Juurpartitsiooni ei leitud"
-
 #~ msgid "Please choose a partition to use as your root partition."
 #~ msgstr "Millist partitsiooni soovite kasutada juurkataloogi jaoks?"
 
@@ -9406,9 +11185,6 @@ msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
 #~ msgid "useless"
 #~ msgstr "kasutu"
 
-#~ msgid "garbage"
-#~ msgstr "r�mps"
-
 #~ msgid ""
 #~ "Some true type fonts from windows have been found on your computer.\n"
 #~ "Do you want to use them? Be sure you have the right to use them under "
diff --git a/perl-install/share/po/eu.po b/perl-install/share/po/eu.po
index 44df115da..de12b3f2f 100644
--- a/perl-install/share/po/eu.po
+++ b/perl-install/share/po/eu.po
@@ -1,37 +1,38 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # Copyright (c) 1999 MandrakeSoft
-# Joseba Bidaurrazaga van Dierdonck <jepibi-san@ej-gv.es>, 1999-2000.
+# Joseba Bidaurrazaga van Dierdonck <jbv@euskalnet.net>, 1999-2001.
+# I�igo Salvador Azurmendi <xalba@euskalnet.net>, 2001
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-02 17:16+0200\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
 "PO-Revision-Date: 1999-12-20 11:28+0100\n"
-"Last-Translator: Joseba Bidaurrazaga van Dierdonck <jepibi-san@ej-gv.es>\n"
+"Last-Translator: Joseba Bidaurrazaga van Dierdonck <jbv@ej-gv.es>\n"
 "Language-Team: Euskara <linux-eu@chanae.alphanet.ch>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
+#: ../../Xconfigurator.pm_.c:231
+msgid "Configure all heads independently"
 msgstr "Konfiguratu buru guztiak banan-banan"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
 msgstr "Erabili Xinerama estentsioa"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr "Konfiguratu bakarrik \"%s\" (%s) txartela"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
 msgstr "Buru-anitz konfigurazioa"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:239
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
@@ -39,33 +40,33 @@ msgstr ""
 "Zure sistemak buru anitzezko konfigurazioaz balia daiteke.\n"
 "Zer egin nahi duzu?"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "Grafikoen txartela"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "Hautatu grafikoen txartela"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "Hautatu X zerbitzaria"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "X server"
 msgstr "X zerbitzaria"
 
-#: ../../Xconfigurator.pm_.c:309 ../../Xconfigurator.pm_.c:316
-#: ../../Xconfigurator.pm_.c:366
+#: ../../Xconfigurator.pm_.c:307 ../../Xconfigurator.pm_.c:313
+#: ../../Xconfigurator.pm_.c:363 ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s"
 msgstr "XFree %s"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:310
 msgid "Which configuration of XFree do you want to have?"
 msgstr "XFree-ren zein konfigurazio izan nahi duzu?"
 
-#: ../../Xconfigurator.pm_.c:324
+#: ../../Xconfigurator.pm_.c:321
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -75,17 +76,18 @@ msgstr ""
 "XFree %s-ek zure txartela onar lezake, honek dena den, 2D-tan hobeto lan "
 "egin lezake."
 
-#: ../../Xconfigurator.pm_.c:326 ../../Xconfigurator.pm_.c:359
+#: ../../Xconfigurator.pm_.c:323 ../../Xconfigurator.pm_.c:356
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with XFree %s."
 msgstr "Zure txartelak harware bidezko 3D azelerazioa onar lezake XFree %s-z"
 
-#: ../../Xconfigurator.pm_.c:328 ../../Xconfigurator.pm_.c:361
+#: ../../Xconfigurator.pm_.c:325 ../../Xconfigurator.pm_.c:358
+#: ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s with 3D hardware acceleration"
 msgstr "XFree %s hardwarearen 3D azelerazioaz"
 
-#: ../../Xconfigurator.pm_.c:336 ../../Xconfigurator.pm_.c:350
+#: ../../Xconfigurator.pm_.c:333 ../../Xconfigurator.pm_.c:347
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -94,12 +96,12 @@ msgstr ""
 "Zure txartelak 3D azelerazioa izan lezake XFree %s-z.\n"
 "KASU: EXPERIMENTAZIOAN DAGOEN ONARPENA DA ETA KONPUTAGAILUA IZOZTU LEZAKE."
 
-#: ../../Xconfigurator.pm_.c:338 ../../Xconfigurator.pm_.c:352
+#: ../../Xconfigurator.pm_.c:335 ../../Xconfigurator.pm_.c:349
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "XFree %s harware bidezko 3D azelerazioaz; EXPERIMENTALA"
 
-#: ../../Xconfigurator.pm_.c:347
+#: ../../Xconfigurator.pm_.c:344
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -112,27 +114,31 @@ msgstr ""
 "XFree %s-ek zure txartela onar lezake, honek dena den, 2D-tan hobeto lan "
 "egin lezake."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr "Xpmac (pantailaren instalazio gidaria)"
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "XFree-ren konfigurazioa"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "Hatatu zure grafikoen txartelerako memoriaren tamaina"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "Hautatu zerbitzariarentzako aukerak"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "Hautatu monitorea"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Monitor"
 msgstr "Monitorea"
 
-#: ../../Xconfigurator.pm_.c:483
+#: ../../Xconfigurator.pm_.c:519
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -155,39 +161,39 @@ msgstr ""
 "OSO GARRANTZITSUA da: monitorea kaltetudezakezu.\n"
 " Dudatan bazaude izan kontserbakorra."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Freskatze horizontalaren maiztasuna"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Freskatze bertikalaren maiztasuna"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "Monitorea konfiguratu gabe"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "Grafikoen txartela konfiguratu gabe oraindik"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "Oraindik erresoluzioak hautatu gabe"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "Konfigurazioa frogatu nahi duzu?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Kasu: txartel grafiko honen saiakerak konputagailua izoztu lezake"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Frogatu konfigurazioa"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -195,152 +201,156 @@ msgstr ""
 "\n"
 "saia zaitez beste parametruez"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "Errorea gertatu da:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d segundu barru irtengo naiz"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "Zuzenak dira hautuak?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "Errorea gertatu da, saia zaitez zenbait parametro aldatuz"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Erresoluzioa"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "Hautatu erresoluzioa eta kolore sakontasuna"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Grafikoen txartela: %s"
 
-#: ../../Xconfigurator.pm_.c:734
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 zerbitzaria: %s"
 
-#: ../../Xconfigurator.pm_.c:750 ../../standalone/draknet_.c:280
-#: ../../standalone/draknet_.c:283
+#: ../../Xconfigurator.pm_.c:829 ../../printerdrake.pm_.c:1885
+#: ../../standalone/draknet_.c:298 ../../standalone/draknet_.c:301
 msgid "Expert Mode"
 msgstr "Aditu Modua"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "Erakutsi dena"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Erresoluzioak"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Teklatuaren itxura: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Sagu mota: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Saguaren tresna (device): %s\n"
 
-#: ../../Xconfigurator.pm_.c:1333
+#: ../../Xconfigurator.pm_.c:1440
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitorea: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1334
+#: ../../Xconfigurator.pm_.c:1441
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitorearen HorizSync: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitorearen VertRefresh: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafikoen txartela: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Grafikoen txartela: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Memoria grafikoa: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Kolore sakontasuna: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Erresoluzioa: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1342
+#: ../../Xconfigurator.pm_.c:1450
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 zerbitzaria: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1343
+#: ../../Xconfigurator.pm_.c:1451
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "XFree86 gidaria: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "X-Windows-en konfigurazioa prestatzen"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "Zer egin nahi duzu?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "Aldatu monitorea"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "Aldatu grafikoen txartela"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "Aldatu zerbitzariaren aukerak"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "Aldatu erresoluzioa"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "Erakutsi informazioa"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "Saia zaitez berriro"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "Irten"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -353,20 +363,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Mesedez, log egin berriro %s-n aldaketak indarrean sartzeko"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Mesedez log out egin eta gero Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "X abiatzerakoan"
 
-#: ../../Xconfigurator.pm_.c:1447
+#: ../../Xconfigurator.pm_.c:1556
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -404,7 +414,7 @@ msgstr "512 kB"
 
 #: ../../Xconfigurator_consts.pm_.c:108
 msgid "1 MB"
-msgstr "1 Mb"
+msgstr "1 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:109
 msgid "2 MB"
@@ -412,223 +422,231 @@ msgstr "2 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:110
 msgid "4 MB"
-msgstr "4 Mb"
+msgstr "4 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:111
 msgid "8 MB"
-msgstr "8 Mb"
+msgstr "8 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
-msgstr "16 MB edo gehiago"
+msgid "16 MB"
+msgstr "16 MB"
+
+#: ../../Xconfigurator_consts.pm_.c:113
+msgid "32 MB"
+msgstr "32 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:114
+msgid "64 MB or more"
+msgstr "64 MB edo gehiago"
+
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "VGA standarra, 640x480 60 Hz-tan"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 56 Hz-tan"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr ""
 "8514arekin bat datorrena, 1024x768 87 Hz-tan txirikordatuak (ez 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "Super VGA, 1024x768 87 Hz-tan txirikordatua, 800x600 56 Hz-tan"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "Extended Super VGA, 800x600 60 Hz-tan, 640x480 72 Hz-tan"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "Non-Interlaced SVGA, 1024x768 60 Hz-tan, 800x600 72 Hz-tan"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Frekuentzia handiko SVGA, 1024x768 70 Hz-tan"
 
-#: ../../Xconfigurator_consts.pm_.c:127
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "1280x1024 60 Hz-tan egin lezakeen frekuentzia anitzekoa"
 
-#: ../../Xconfigurator_consts.pm_.c:128
+#: ../../Xconfigurator_consts.pm_.c:130
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "1280x1024 74 Hz-tan egin lezakeen frekuentzia anitzekoa"
 
-#: ../../Xconfigurator_consts.pm_.c:129
+#: ../../Xconfigurator_consts.pm_.c:131
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "1280x1024 76 Hz-tan egin lezakeen frekuentzia anitzekoa"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "1600x1200 70 Hz-tan egin lezakeen pantaila"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "1600x1200 76 Hz-tan egin lezakeen pantaila"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124
+#: ../../any.pm_.c:96 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Boot partizioaren lehenengo sektorea"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124 ../../any.pm_.c:197
+#: ../../any.pm_.c:96 ../../any.pm_.c:121 ../../any.pm_.c:194
 msgid "First sector of drive (MBR)"
 msgstr "Diskoaren lehenengo sektorea (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "SILOren instalazioa"
 
-#: ../../any.pm_.c:104 ../../any.pm_.c:117
+#: ../../any.pm_.c:101 ../../any.pm_.c:114
 msgid "Where do you want to install the bootloader?"
 msgstr "Non instalatu nahi duzu abiarazlea?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "LILO/grub Instalazioa"
 
-#: ../../any.pm_.c:128 ../../any.pm_.c:142
+#: ../../any.pm_.c:125 ../../any.pm_.c:139
 msgid "SILO"
-msgstr ""
+msgstr "SILO"
 
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:127
 msgid "LILO with text menu"
-msgstr ""
+msgstr "LILO textu menuarekin"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
-msgstr ""
+msgstr "LILO menu grafikoarekin"
 
-#: ../../any.pm_.c:134
+#: ../../any.pm_.c:131
 msgid "Grub"
-msgstr ""
+msgstr "Grub"
 
-#: ../../any.pm_.c:138
+#: ../../any.pm_.c:135
 msgid "Boot from DOS/Windows (loadlin)"
-msgstr ""
+msgstr "Abiatu DOS/Windows-etik (loadlin)"
 
-#: ../../any.pm_.c:140 ../../any.pm_.c:142
+#: ../../any.pm_.c:137 ../../any.pm_.c:139
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: ../../any.pm_.c:148 ../../any.pm_.c:180
+#: ../../any.pm_.c:145 ../../any.pm_.c:177
 msgid "Bootloader main options"
 msgstr "Abiarazlearen aukera nagusiak"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
 msgstr "Erabiltzeko abiarazlea"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "Abiarazlearen instalazioa"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "Abiarzsteko unitatea"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (ez dabil BIOS zaharretan"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Trinkoa"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "trinkoa"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Bideo modua"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "Imagina arrunta abiarazteko itxaron denbora"
 
-#: ../../any.pm_.c:160 ../../any.pm_.c:741
-#: ../../install_steps_interactive.pm_.c:904 ../../netconnect.pm_.c:629
-#: ../../printerdrake.pm_.c:98 ../../printerdrake.pm_.c:132
-#: ../../standalone/draknet_.c:569
+#: ../../any.pm_.c:157 ../../any.pm_.c:730
+#: ../../install_steps_interactive.pm_.c:938 ../../network/modem.pm_.c:46
+#: ../../printerdrake.pm_.c:402 ../../printerdrake.pm_.c:481
+#: ../../standalone/draknet_.c:603
 msgid "Password"
 msgstr "Pasahitza"
 
-#: ../../any.pm_.c:161 ../../any.pm_.c:742
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../any.pm_.c:158 ../../any.pm_.c:731
+#: ../../install_steps_interactive.pm_.c:939
 msgid "Password (again)"
 msgstr "Pasahitza (berriz)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Komando lerroaren aukerak murriztu"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "murriztu"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "Abiarazte bakoitzean /tmp garbitu"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Behar izanez gero RAM tamaina zehatza(%d MB aurkituta)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "Gaitu multi profilak"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Ram tamaina Mb-etan"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Aukera ``Komando lerroaren aukerak murriztu'' ezin erabili pasahitz gabe"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "Please try again"
 msgstr "Mesedez saia zaitez berriro"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "The passwords do not match"
 msgstr "Pasahitza ez dator bat"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
 msgstr "Init mezua"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr "Open Firmwarearen atzerapena"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
 msgstr "Kernelaren abiaratzea denboraz landa"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
 msgstr "CDtik abiarazgai?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr "OFz abiarazgai?"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 msgid "Default OS?"
 msgstr "Jatorrizko SEa?"
 
-#: ../../any.pm_.c:210
+#: ../../any.pm_.c:207
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -636,145 +654,144 @@ msgstr ""
 "Hemen daude sarrera desberdinak.\n"
 "Zenbait gehitu edo daudenak aldatu ditzakezu."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "Gehitu"
 
-#: ../../any.pm_.c:220 ../../any.pm_.c:729 ../../diskdrake.pm_.c:46
-#: ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217 ../../any.pm_.c:718 ../../diskdrake.pm_.c:161
+#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:1846
+#: ../../printerdrake.pm_.c:1847 ../../printerdrake.pm_.c:1904
+#: ../../printerdrake.pm_.c:1948
 msgid "Done"
 msgstr "Eginda"
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:217
 msgid "Modify"
 msgstr "Aldatu"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "Zelako sarrera mota gehitu nahi duzu"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Other OS (SunOS...)"
 msgstr "Beste OS (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "Beste OS (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "Beste OS (windows..."
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "Imagina"
 
-#: ../../any.pm_.c:253 ../../any.pm_.c:264
+#: ../../any.pm_.c:247 ../../any.pm_.c:258
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:254 ../../any.pm_.c:283
+#: ../../any.pm_.c:248 ../../any.pm_.c:277
 msgid "Append"
 msgstr "Jarraitu (Append)"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "Irakur-idatz"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "Taula"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "Unsafe"
 
-#: ../../any.pm_.c:274 ../../any.pm_.c:279 ../../any.pm_.c:282
+#: ../../any.pm_.c:268 ../../any.pm_.c:273 ../../any.pm_.c:276
 msgid "Label"
 msgstr "Etiketa"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "Jatorrizkoa"
 
-#: ../../any.pm_.c:284
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
 msgstr "Initrd-tamaina"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
 msgstr "VideorikEZ"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "Ezabatu sarrera"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "Etiketa kentzea ez dau onartzen"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "Etiketa hau dagoeneko erabilia"
 
-#: ../../any.pm_.c:317
-msgid "What type of partitioning?"
-msgstr "Zein partizio mota?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "%s %s inteface-ak aurkituta"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "Besterik daukazu?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "%s interface-rik duzu?"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
-#: ../../printerdrake.pm_.c:237
+#: ../../any.pm_.c:601 ../../any.pm_.c:760 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "No"
 msgstr "Ez"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
+#: ../../any.pm_.c:601 ../../any.pm_.c:759 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "Yes"
 msgstr "Bai"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "Ikus harwarearen informazioa"
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:648
+#: ../../any.pm_.c:637
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "%s-ko %s txartelen driver-ak instalatzen"
 
-#: ../../any.pm_.c:649
+#: ../../any.pm_.c:638
 #, c-format
 msgid "(module %s)"
 msgstr "(%s modulua)"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:660
+#: ../../any.pm_.c:649
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Zein %s driver-an saia naiteke?"
 
-#: ../../any.pm_.c:668
+#: ../../any.pm_.c:657
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -793,20 +810,20 @@ msgstr ""
 "konputagailua\n"
 "eskegi lezake, honek ez du kalterik eragin beharrik."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "Autofroga"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "Aukerak espezifikatu"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Orain %s moduluari bere aukerak ezarri diezaiokezu."
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -817,11 +834,11 @@ msgstr ""
 "Aukeren formatua: ``izena=balioa izena2=balioa2 ...''.\n"
 "Adibidez, ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Muduluaren aukerak:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -830,33 +847,33 @@ msgstr ""
 "%s moduluare kargak porrot egin du.\n"
 "Beste parametro batuzuez saiatu nahi al duzu?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s dagoeneko gehitua)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "Pasahitza sinpleegia da"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "Mesedez erabiltzaile izena eman"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Erabiltzailearen izenean soilik hizki txikiak, zenbakiak, `-' eta `_'"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "Erabiltzaile izen hau dagoeneko gehituta dago"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "Gehitu erabiltzailea"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -865,55 +882,70 @@ msgstr ""
 "Erabiltzailea sartu\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Onartu erabiltzailea"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "Benetako izena"
 
-#: ../../any.pm_.c:740 ../../printerdrake.pm_.c:97
-#: ../../printerdrake.pm_.c:131
+#: ../../any.pm_.c:729 ../../printerdrake.pm_.c:401
+#: ../../printerdrake.pm_.c:480
 msgid "User name"
 msgstr "Erabiltzailearen izena"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "Maskorra"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "Ikonoa"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:756
 msgid "Autologin"
 msgstr "Autologin"
 
-#: ../../any.pm_.c:767
+#: ../../any.pm_.c:757
+#, fuzzy
 msgid ""
 "I can set up your computer to automatically log on one user.\n"
-"If you don't want to use this feature, click on the cancel button."
+"Do you want to use this feature?"
 msgstr ""
 "Zure konputagailua abiatzerakoan erabiltzailea log on egiteko egokitu "
 "dezaket.\n"
 "Ez baduzu aukera hau erabili, etsi botoia klikatu"
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "Hautatu jatorrizko erabiltzailea:"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "Hauta abiarazterakoan nahi duzun lehio kudeatzailea:"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "Mesedez, hauta hizkuntza."
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr ""
+"Instalazioaren ondoren erabilgarriak izan daitezkeen beste hizkuntzak hauta "
+"dezakezu"
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "Denak"
+
 # NOTE: this message will be displayed at boot time; that is
 # only the ascii charset will be available on most machines
 # so use only 7bit for this message (and do transliteration or
 # leave it in English, as it is the best for your language)
-# 
+#
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:262 ../../bootloader.pm_.c:608
+#: ../../bootloader.pm_.c:259
 #, c-format
 msgid ""
 "Welcome to %s the operating system chooser!\n"
@@ -937,54 +969,59 @@ msgstr ""
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:809
+#: ../../bootloader.pm_.c:835
 msgid "Welcome to GRUB the operating system chooser!"
 msgstr "Ongi etorri GRUBera, sistema eragilearen hautatzailea!"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:812
+#: ../../bootloader.pm_.c:838
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
 msgstr "%c eta %c tekla erabili hautatutakoa aukeratzeko"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:815
+#: ../../bootloader.pm_.c:841
 msgid "Press enter to boot the selected OS, 'e' to edit the"
 msgstr "Hautatutako OSa abiarazteko enter sakatu, 'e' editatzeko"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:818
+#: ../../bootloader.pm_.c:844
 msgid "commands before booting, or 'c' for a command-line."
 msgstr "abiatze aurretiko komandoak, edo 'c' komando-lerroa izateko"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:821
+#: ../../bootloader.pm_.c:847
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr "Hautatutakoa abiaraziko da %d segundu barru."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
 msgstr "ez dago leku nahikorik /boot-en"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
 #. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:918
+#: ../../bootloader.pm_.c:951
 msgid "Desktop"
 msgstr "Idazmahaia"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:920
+#: ../../bootloader.pm_.c:953
 msgid "Start Menu"
 msgstr "Abiatze Menua"
 
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "Non instalatu nahi duzu abiarazlea?"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
-msgstr ""
+msgstr "ez da oraindik laguntzarik prestatu.\n"
 
 #: ../../bootlook.pm_.c:62
 msgid "Boot Style Configuration"
@@ -994,516 +1031,699 @@ msgstr "Abiaratze konfigurazioa"
 msgid "/_File"
 msgstr "/_Fitxategiak"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/Fitxategi/_Barria"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>B"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/Fitxategi/_Ireki"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>I"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/Fitxategi/_Gorde"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>G"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/Fitxategi/Gorde _Horrela"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/Fitxategi/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/Fitxategi/_Irten"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>I"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_Aukerak"
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Aukerak/Saioa"
-
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/_Laguntza"
-
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/Laguntza/_Zerari buruz"
-
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "Konfiguratu"
-
-#: ../../bootlook.pm_.c:114
-#, fuzzy, c-format
-msgid ""
-"You are currently using %s as Boot Manager.\n"
-"Click on Configure to launch the setup wizard."
-msgstr ""
-"Internet konexio banatua!\n"
-"\n"
-"%s\n"
-"\n"
-"Konfiguratun saka egokitzapenak egiteko."
-
-#: ../../bootlook.pm_.c:121
-msgid "Lilo/grub mode"
-msgstr "Lilo/grub modua"
-
-#: ../../bootlook.pm_.c:131
+#: ../../bootlook.pm_.c:91
 msgid "NewStyle Categorizing Monitor"
 msgstr "NewStyle monitore-sailkatzea"
 
-#: ../../bootlook.pm_.c:134
+#: ../../bootlook.pm_.c:92
 msgid "NewStyle Monitor"
 msgstr "NewStyle Monitorea"
 
-#: ../../bootlook.pm_.c:137
+#: ../../bootlook.pm_.c:93
 msgid "Traditional Monitor"
 msgstr "Ohiko monitorea"
 
-#: ../../bootlook.pm_.c:140
+#: ../../bootlook.pm_.c:94
 msgid "Traditional Gtk+ Monitor"
 msgstr "Ohiko Gtk+ Monitorea"
 
-#: ../../bootlook.pm_.c:144
+#: ../../bootlook.pm_.c:95
 msgid "Launch Aurora at boot time"
 msgstr "Aurora piztu abiaratzerakoan"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "Lilo/grub modua"
+
+#: ../../bootlook.pm_.c:102
+#, c-format
+msgid ""
+"You are currently using %s as Boot Manager.\n"
+"Click on Configure to launch the setup wizard."
+msgstr ""
+"Abiapen Kudeatzaile bezela %s erabiltzen ari zera.\n"
+"Egin klik Ezarri gainean ezarketa aztia jaurtitzeko."
+
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "Konfiguratu"
+
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
 msgstr "Abiarazteko modua"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "Sistema modua"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr "X-Windows ezarri sistema abiaratzerakoan"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr "Ez, autologinik ez"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Bai, autologina nahi dut horrela (erabiltzaile, idazmahai)"
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "Sistema modua"
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "Jatorrizkoa"
-
-#: ../../bootlook.pm_.c:236 ../../standalone/draknet_.c:88
-#: ../../standalone/draknet_.c:120 ../../standalone/draknet_.c:184
-#: ../../standalone/draknet_.c:302 ../../standalone/draknet_.c:396
-#: ../../standalone/draknet_.c:473 ../../standalone/draknet_.c:509
-#: ../../standalone/draknet_.c:617
+#: ../../bootlook.pm_.c:155 ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:140 ../../standalone/draknet_.c:208
+#: ../../standalone/draknet_.c:320 ../../standalone/draknet_.c:433
+#: ../../standalone/draknet_.c:507 ../../standalone/draknet_.c:543
+#: ../../standalone/draknet_.c:644
 msgid "OK"
 msgstr "Ados"
 
-#: ../../bootlook.pm_.c:238 ../../install_steps_gtk.pm_.c:576
-#: ../../interactive.pm_.c:114 ../../interactive.pm_.c:269
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:357
-#: ../../my_gtk.pm_.c:360 ../../my_gtk.pm_.c:617
-#: ../../standalone/drakgw_.c:639 ../../standalone/draknet_.c:95
-#: ../../standalone/draknet_.c:127 ../../standalone/draknet_.c:295
-#: ../../standalone/draknet_.c:485 ../../standalone/draknet_.c:631
-#: ../../standalone/tinyfirewall_.c:63
+#: ../../bootlook.pm_.c:156 ../../install_steps_gtk.pm_.c:516
+#: ../../interactive.pm_.c:122 ../../interactive.pm_.c:286
+#: ../../interactive.pm_.c:308 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:416 ../../my_gtk.pm_.c:419 ../../my_gtk.pm_.c:716
+#: ../../printerdrake.pm_.c:1158 ../../standalone/drakgw_.c:648
+#: ../../standalone/draknet_.c:115 ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:313 ../../standalone/draknet_.c:519
+#: ../../standalone/draknet_.c:658 ../../standalone/tinyfirewall_.c:63
 msgid "Cancel"
 msgstr "Etsi"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "ezin ireki /etc/inittab hau irakurtzeko: $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "ezin ireki etc/sysconfig/autologin irakurtzeko: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "ezin ireki /etc/inittab hau irakurtzeko: %s"
 
-#: ../../bootlook.pm_.c:435 ../../standalone/drakboot_.c:47
+#: ../../bootlook.pm_.c:336 ../../standalone/drakboot_.c:47
 msgid "Installation of LILO failed. The following error occured:"
 msgstr "LILOren instalazioak porrot egin du. Errore hau izan da:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Eratu"
-
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Desmuntatu"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Ezabatu"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "KB"
 
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "Formatua"
+#: ../../common.pm_.c:93 ../../install_steps_graphical.pm_.c:287
+#: ../../install_steps_graphical.pm_.c:334
+msgid "MB"
+msgstr "MB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:653
-msgid "Resize"
-msgstr "Berregokitu"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr "TB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "Mota"
+#: ../../common.pm_.c:109
+#, c-format
+msgid "%d minutes"
+msgstr "%d minutu"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "Muntatze puntua"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "minutu 1"
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "Idatzi /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d segundu"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "Zoaz aditu modura"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "Mesedez, aurretik datuen backup-a egin"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "Zoaz ohiko modura"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "Arretaz irakur"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "Fitxategitik berreskuratu"
+#: ../../diskdrake.pm_.c:103
+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 erabiliko baduza, tokia utzi (diskoaren hasierako 2048 sektore\n"
+"nahikoak dira)"
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Fitxategian gorde"
+#: ../../diskdrake.pm_.c:122 ../../diskdrake_interactive.pm_.c:313
+#: ../../diskdrake_interactive.pm_.c:328 ../../install_steps.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:37
+#: ../../install_steps_interactive.pm_.c:310 ../../interactive_http.pm_.c:119
+#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:62
+msgid "Error"
+msgstr "Errorea"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "Gidaria"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Floppy-tik berreskuratu"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Berria"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Floppy-an gorde"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+#, fuzzy
+msgid "Remote"
+msgstr "Urrutiko isatsa"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "Garbitu dena"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "Muntatze puntua"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Dena formateatu"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Aukerak"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Berez egokitu"
+#: ../../diskdrake.pm_.c:211 ../../diskdrake.pm_.c:417
+#: ../../diskdrake.pm_.c:534 ../../diskdrake_interactive.pm_.c:353
+#: ../../diskdrake_interactive.pm_.c:488
+msgid "Type"
+msgstr "Mota"
 
-#: ../../diskdrake.pm_.c:59
-msgid "All primary partitions are used"
-msgstr "Partizio primario guztiak erabiltzen"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Desmuntatu"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "Ezin dut partizio gehiagorik gehitu"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Muntatu"
 
-#: ../../diskdrake.pm_.c:59
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Hautatu akzioa"
+
+#: ../../diskdrake.pm_.c:235
 msgid ""
-"To have more partitions, please delete one to be able to create an extended "
-"partition"
+"You have one big FAT partition\n"
+"(generally used by MicroSoft Dos/Windows).\n"
+"I suggest you first resize that partition\n"
+"(click on it, then click on \"Resize\")"
 msgstr ""
-"Partizio gehiago edukitzeko, mesedez ezabatu bat hedatutako partizioa eratu "
-"ahalizateko"
+"Fat partizio handi bakarra duzu\n"
+"(MicroSoft Dos/Windows-k erabilia gehienetan).\n"
+"Beharrezko zenuke partizio hau egokitzea\n"
+"(gainean klikatu, eta gero \"Egokitu\"-n)"
 
-#: ../../diskdrake.pm_.c:61
-msgid "Not enough space for auto-allocating"
-msgstr "Ez dago lekurik berezko egokitzapenerako"
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Partizio baten gainean klikatu"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Ez egin"
+#: ../../diskdrake.pm_.c:240
+#, fuzzy
+msgid "Please click on a media"
+msgstr "Partizio baten gainean klikatu"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "Partizio taula idatzi"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "Partizio baten gainean klikatu"
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "Gehiago"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
+
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "Ezaugarriak"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
+#, fuzzy
+msgid "Journalised FS"
+msgstr "muntaketak porrot egin du"
+
+#: ../../diskdrake.pm_.c:395
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Swap"
 msgstr "Swap"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:396 ../../diskdrake_interactive.pm_.c:952
 msgid "Empty"
 msgstr "Hutsik"
 
-#: ../../diskdrake.pm_.c:117 ../../install_steps_gtk.pm_.c:407
-#: ../../mouse.pm_.c:145
+#: ../../diskdrake.pm_.c:396 ../../install_steps_gtk.pm_.c:373
+#: ../../install_steps_gtk.pm_.c:433 ../../mouse.pm_.c:161
+#: ../../services.pm_.c:161
 msgid "Other"
 msgstr "Bestelakoa"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "Fitxategi-sistemen motak:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "Ezaugarriak"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Eratu"
+
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Bestela ``%s'' erabili"
+
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Lehenengo ``Unmount'' erabili"
 
-#: ../../diskdrake.pm_.c:147
+#: ../../diskdrake.pm_.c:424 ../../diskdrake_interactive.pm_.c:480
+#, c-format
 msgid ""
-"You have one big FAT partition\n"
-"(generally used by MicroSoft Dos/Windows).\n"
-"I suggest you first resize that partition\n"
-"(click on it, then click on \"Resize\")"
+"After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
-"Fat partizio handi bakarra duzu\n"
-"(MicroSoft Dos/Windows-k erabilia gehienetan).\n"
-"Beharrezko zenuke partizio hau egokitzea\n"
-"(gainean klikatu, eta gero \"Egokitu\"-n)"
+"%s partizio mota aldatzerakoan, partizio honetako datu guztiak galduko dira"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Mesedez, aurretik datuen backup-a egin"
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "%s tresna non instalatu nahi duzu?"
 
-#: ../../diskdrake.pm_.c:152 ../../diskdrake.pm_.c:170
-#: ../../diskdrake.pm_.c:179 ../../diskdrake.pm_.c:570
-#: ../../diskdrake.pm_.c:592
-msgid "Read carefully!"
-msgstr "Arretaz irakur"
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Mount options"
+msgstr "Muduluaren aukerak:"
 
-#: ../../diskdrake.pm_.c:155
-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"
+#: ../../diskdrake.pm_.c:507
+msgid "Various"
 msgstr ""
-"aboot erabiliko baduza, tokia utzi (diskoaren hasierako 2048 sektore\n"
-"nahikoak dira)"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "Kontuz: arrizkutsua izan daiteke."
+#: ../../diskdrake.pm_.c:525
+#, fuzzy
+msgid "Removable media"
+msgstr "Medio eramangarrien automuntaia"
 
-#: ../../diskdrake.pm_.c:214 ../../install_steps.pm_.c:72
-#: ../../install_steps_interactive.pm_.c:37
-#: ../../install_steps_interactive.pm_.c:322 ../../standalone/diskdrake_.c:66
-msgid "Error"
-msgstr "Errorea"
+#: ../../diskdrake.pm_.c:532
+#, fuzzy
+msgid "Change type"
+msgstr "Aldatu partizio mota"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Muntatze puntua: "
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Zein fitxategi sistema nahi duzu?"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Device-a: "
+#: ../../diskdrake.pm_.c:564
+msgid "Scanning available nfs shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:569
 #, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "DOS unitatearen hizkia: %s (iragarpena basterik)\n"
+msgid "Scanning available nfs shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:244 ../../diskdrake.pm_.c:251
-#: ../../diskdrake.pm_.c:301
-msgid "Type: "
-msgstr "Mota: "
+#: ../../diskdrake.pm_.c:578 ../../diskdrake.pm_.c:648
+msgid "If the list above doesn't contain the wanted entry, enter it here:"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:248
-msgid "Name: "
-msgstr "Izena: "
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "Zerbitzari"
 
-#: ../../diskdrake.pm_.c:253
-#, c-format
-msgid "Start: sector %s\n"
-msgstr "Hasi: %s sektorea\n"
+#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
+msgid "Shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Size: %s"
-msgstr "Tamaina: %s"
+#: ../../diskdrake.pm_.c:615
+msgid "Scanning available samba shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:256
+#: ../../diskdrake.pm_.c:626 ../../diskdrake.pm_.c:639
 #, c-format
-msgid ", %s sectors"
-msgstr ", %s sektore"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:258
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "%d zilindrotik %d zilindrora arte\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose a partition"
+msgstr "Hautatu akzioa"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Formateatuta\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose another partition"
+msgstr "Eratu partizio berriak"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "Formateatu gabe\n"
+#: ../../diskdrake_interactive.pm_.c:188
+#, fuzzy
+msgid "Exit"
+msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "Muntatua\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "Zoaz aditu modura"
 
-#: ../../diskdrake.pm_.c:262
-#, c-format
-msgid "RAID md%s\n"
-msgstr "RAID md%s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to normal mode"
+msgstr "Zoaz ohiko modura"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Loopback fitxategia(k): %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Ez egin"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Jatorrizko partizioa abiaraztua\n"
-"    (MS-DOS abiarazteko, ez lilo-rako)\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "Jarraitu dena den?"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "Maila %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "Irten gorde gabe"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Xerraren tamaina %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "Irten partizio taula idatzi gabe?"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "RAID-diska %s\n"
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Konfigurazioa frogatu nahi duzu?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Loopback fitxategiaren izena: %s"
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Berez egokitu"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "Garbitu dena"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "Gehiago"
+
+#: ../../diskdrake_interactive.pm_.c:250
+#, fuzzy
+msgid "Hard drive information"
+msgstr "Disko zurrunaren detekzioa"
+
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "Not enough space for auto-allocating"
+msgstr "Ez dago lekurik berezko egokitzapenerako"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "Partizio primario guztiak erabiltzen"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "Ezin dut partizio gehiagorik gehitu"
+
+#: ../../diskdrake_interactive.pm_.c:275
 msgid ""
-"\n"
-"Chances are, this partition is\n"
-"a Driver partition, you should\n"
-"probably leave it alone.\n"
+"To have more partitions, please delete one to be able to create an extended "
+"partition"
 msgstr ""
+"Partizio gehiago edukitzeko, mesedez ezabatu bat hedatutako partizioa eratu "
+"ahalizateko"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "Partizio taula idatzi"
+
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "Partizio taula berreskuratu"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "Partizio taula berreskuratu"
+
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "Partizio taula berreskuratu"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "Medio eramangarrien automuntaia"
+
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Hautatu fitxategia"
+
+#: ../../diskdrake_interactive.pm_.c:308
 msgid ""
-"\n"
-"This special Bootstrap\n"
-"partition is for\n"
-"dual-booting your system.\n"
+"The backup partition table has not the same size\n"
+"Still continue?"
 msgstr ""
+"Backup-aren partizio taulak ez du neurri berdina\n"
+"Jarraituko dut?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Partizio baten gainean klikatu"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Kontuz"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Tamaina: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Disketea sartu unitatean\n"
+"Disketeko datu guztiak galduko dira"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geometria: %s zilindro, %s buru, %s sektore\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "Partizio taula berreskuratzeko saioan"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "LVM-diska %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+#, fuzzy
+msgid "Detailed information"
+msgstr "Erakutsi informazioa"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Partizio taularen mota: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Berregokitu"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "on bus %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Mugitu"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Muntatu"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Formatua"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Aktibatu"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Gehitu RAIDi"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "RAIDtik ken"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "Aldatu RAID"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "Gehitu LVMi"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "RAIDtik ken"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "LVMtik ken"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "Aldatu RAID"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "Loopback erabili"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Hautatu akzioa"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Eratu partizio berriak"
+
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "Haste sektorea: "
+
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Tamaina MBetan: "
+
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Fitxategi-sistema mota: "
+
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Muntatze puntua: "
+
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Hobespena: "
+
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "%s loopback fitxategia formateatzen"
+
+#: ../../diskdrake_interactive.pm_.c:486
+msgid "Change partition type"
+msgstr "Aldatu partizio mota"
+
+#: ../../diskdrake_interactive.pm_.c:491
+msgid "Switching from ext2 to ext3"
+msgstr "ext2-tik ext3-ra aldatzen"
+
+#: ../../diskdrake_interactive.pm_.c:521
+#, c-format
+msgid "Where do you want to mount loopback file %s?"
+msgstr "%s loopback fitxategia non eraiki nahi duzu?"
+
+#: ../../diskdrake_interactive.pm_.c:528
+msgid ""
+"Can't unset mount point as this partition is used for loop back.\n"
+"Remove the loopback first"
+msgstr ""
+"Ezin kendu muntai puntua hemendik, loop back-ek erabiltzen du.\n"
+"Aurretik loopback kendu"
+
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "fat-aren fitxategi-sistemen loturak zenbatzen"
+
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "Egokitzen"
+
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "Ezinezko da partizio hau berregokitzea."
+
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "Partizio honetako datu guztien backup-a beharrezkoa litzateke"
+
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr ""
+"%s partizioa egokitzerakoan, partizio honetako datu guztiak galduko dira"
+
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Hautatu tamaina berria"
+
+#: ../../diskdrake_interactive.pm_.c:591
+#, fuzzy
+msgid "New size in MB: "
+msgstr "Tamaina MBetan: "
+
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Which disk do you want to move it to?"
+msgstr "Zein diskotara mugitu nahi duzu?"
+
+#: ../../diskdrake_interactive.pm_.c:632
+msgid "Sector"
+msgstr "Sektore"
+
+#: ../../diskdrake_interactive.pm_.c:633
+msgid "Which sector do you want to move it to?"
+msgstr "Zein sektore mugitu nahi duzu?"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving"
+msgstr "Mugituz"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving partition..."
+msgstr "Partizioa mugitzen..."
+
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "Hautatu esistitzen den RAIDa hona gehitzeko"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "berria"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "Hautatu esistitzen den LVMa hona gehitzeko"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "LVM izena?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "Partizio hau ezin du loopback-ek erabili"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Loopback"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Loopback-en fitxategi izena: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "Benetako izena"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "Beste loopback batek erabilitako fitxategia, hauta besteren bat"
 
-#: ../../diskdrake.pm_.c:435
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "%s fitxategia esistitzen da. Erabili?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "tresna (device)"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "maila"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "xerraren tamaina"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "Kontuz: arrizkutsua izan daiteke."
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "Zein partizio mota?"
+
+#: ../../diskdrake_interactive.pm_.c:834
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -1515,7 +1735,7 @@ msgstr ""
 "LILO erabiliz gero ez du funtzionatuko, edo LILO erabili ezean ez duzu /boot-"
 "en beharrik"
 
-#: ../../diskdrake.pm_.c:439
+#: ../../diskdrake_interactive.pm_.c:838
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -1527,7 +1747,7 @@ msgstr ""
 "eta ez duzu /boot partiziorik.\n"
 "LILO abiarazle modura erabiliko baduzu, /boot partizioa gehitu"
 
-#: ../../diskdrake.pm_.c:445
+#: ../../diskdrake_interactive.pm_.c:844
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
 "No bootloader is able to handle this without a /boot partition.\n"
@@ -1537,281 +1757,241 @@ msgstr ""
 "Abiarazleak ezin du hau kudeatu /boot partiziorik gabe.\n"
 "Beraz habil kontuz eta gehitu /boot partizioa"
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "Bestela ``%s'' erabili"
-
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "Lehenengo ``Unmount'' erabili"
-
-#: ../../diskdrake.pm_.c:469 ../../diskdrake.pm_.c:513
-#, c-format
-msgid ""
-"After changing type of partition %s, all data on this partition will be lost"
-msgstr ""
-"%s partizio mota aldatzerakoan, partizio honetako datu guztiak galduko dira"
-
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "Jarraitu dena den?"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "Irten gorde gabe"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "Irten partizio taula idatzi gabe?"
-
-#: ../../diskdrake.pm_.c:516
-msgid "Change partition type"
-msgstr "Aldatu partizio mota"
-
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "Zein fitxategi sistema nahi duzu?"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Ez erabili ReiserFS 32MB baino gutxiagoko partizioak eratzeko"
-
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
-msgid "Where do you want to mount loopback file %s?"
-msgstr "%s loopback fitxategia non eraiki nahi duzu?"
-
-#: ../../diskdrake.pm_.c:538
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "%s tresna non instalatu nahi duzu?"
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "%s unitatearen partizio taula diskoan idatziko da!"
 
-#: ../../diskdrake.pm_.c:542
-msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
-"Remove the loopback first"
-msgstr ""
-"Ezin kendu muntai puntua hemendik, loop back-ek erabiltzen du.\n"
-"Aurretik loopback kendu"
+#: ../../diskdrake_interactive.pm_.c:868
+msgid "You'll need to reboot before the modification can take place"
+msgstr "Aldaketak indarrean jar daitezen breabiatu behar duzu ordenadorea"
 
-#: ../../diskdrake.pm_.c:561
+#: ../../diskdrake_interactive.pm_.c:879
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 "%s partizioa formateatuz gero, partizio honetako datu guztiak galduko dira"
 
-#: ../../diskdrake.pm_.c:563
+#: ../../diskdrake_interactive.pm_.c:881
 msgid "Formatting"
 msgstr "Formateatzen"
 
-#: ../../diskdrake.pm_.c:564
+#: ../../diskdrake_interactive.pm_.c:882
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "%s loopback fitxategia formateatzen"
 
-#: ../../diskdrake.pm_.c:565 ../../install_steps_interactive.pm_.c:430
+#: ../../diskdrake_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:419
 #, c-format
 msgid "Formatting partition %s"
 msgstr "%s partizioa formateatzen"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "Partizio guztiak formateatu ondoren,"
-
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "partizio hoietako datu guztiak galduko dira"
-
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Mugitu"
-
-#: ../../diskdrake.pm_.c:577
-msgid "Which disk do you want to move it to?"
-msgstr "Zein diskotara mugitu nahi duzu?"
-
-#: ../../diskdrake.pm_.c:578
-msgid "Sector"
-msgstr "Sektore"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid-ek huts egin du"
 
-#: ../../diskdrake.pm_.c:579
-msgid "Which sector do you want to move it to?"
-msgstr "Zein sektore mugitu nahi duzu?"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "Ez dago lekurik partizio berririk ezartzeko"
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving"
-msgstr "Mugituz"
+#: ../../diskdrake_interactive.pm_.c:895
+#, c-format
+msgid ""
+"Directory %s already contain some data\n"
+"(%s)"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving partition..."
-msgstr "Partizioa mugitzen..."
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "Ez dago lekurik partizio berririk ezartzeko"
 
-#: ../../diskdrake.pm_.c:592
+#: ../../diskdrake_interactive.pm_.c:910
 #, c-format
-msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "%s unitatearen partizio taula diskoan idatziko da!"
+msgid "Copying %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:594
-msgid "You'll need to reboot before the modification can take place"
-msgstr "Aldaketak indarrean jar daitezen breabiatu behar duzu ordenadorea"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Erresoluzioa: %s\n"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "fat-aren fitxategi-sistemen loturak zenbatzen"
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Device-a: "
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "Egokitzen"
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "DOS unitatearen hizkia: %s (iragarpena basterik)\n"
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "Ezinezko da partizio hau berregokitzea."
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Mota: "
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "Partizio honetako datu guztien backup-a beharrezkoa litzateke"
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Izena: "
 
-#: ../../diskdrake.pm_.c:650
+#: ../../diskdrake_interactive.pm_.c:954
 #, c-format
-msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr ""
-"%s partizioa egokitzerakoan, partizio honetako datu guztiak galduko dira"
+msgid "Start: sector %s\n"
+msgstr "Hasi: %s sektorea\n"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Hautatu tamaina berria"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Tamaina: %s"
 
-#: ../../diskdrake.pm_.c:660 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
-msgid "MB"
-msgstr "MB"
+#: ../../diskdrake_interactive.pm_.c:957
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s sektore"
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "Eratu partizio berriak"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "%d zilindrotik %d zilindrora arte\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "Haste sektorea: "
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Formateatuta\n"
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Tamaina MBetan: "
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "Formateatu gabe\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Fitxategi-sistema mota: "
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "Muntatua\n"
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "Hobespena: "
+#: ../../diskdrake_interactive.pm_.c:963
+#, c-format
+msgid "RAID md%s\n"
+msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:798
-msgid "This partition can't be used for loopback"
-msgstr "Partizio hau ezin du loopback-ek erabili"
+#: ../../diskdrake_interactive.pm_.c:965
+#, fuzzy, c-format
+msgid ""
+"Loopback file(s):\n"
+"   %s\n"
+msgstr "Loopback fitxategia(k): %s\n"
 
-#: ../../diskdrake.pm_.c:808
-msgid "Loopback"
-msgstr "Loopback"
+#: ../../diskdrake_interactive.pm_.c:966
+msgid ""
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
+msgstr ""
+"Jatorrizko partizioa abiaraztua\n"
+"    (MS-DOS abiarazteko, ez lilo-rako)\n"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Loopback-en fitxategi izena: "
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "Maila %s\n"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "Beste loopback batek erabilitako fitxategia, hauta besteren bat"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Xerraren tamaina %s\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "%s fitxategia esistitzen da. Erabili?"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "RAID-diska %s\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Hautatu fitxategia"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Loopback fitxategiaren izena: %s"
 
-#: ../../diskdrake.pm_.c:876
+#: ../../diskdrake_interactive.pm_.c:975
 msgid ""
-"The backup partition table has not the same size\n"
-"Still continue?"
+"\n"
+"Chances are, this partition is\n"
+"a Driver partition, you should\n"
+"probably leave it alone.\n"
 msgstr ""
-"Backup-aren partizio taulak ez du neurri berdina\n"
-"Jarraituko dut?"
-
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "Kontuz"
+"\n"
+"Baliteke partizio hau Gidari\n"
+"partizio bat izatea, hobe zenuke\n"
+"dagoenean uztea.\n"
 
-#: ../../diskdrake.pm_.c:885
+#: ../../diskdrake_interactive.pm_.c:978
 msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
 msgstr ""
-"Disketea sartu unitatean\n"
-"Disketeko datu guztiak galduko dira"
-
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "Partizio taula berreskuratzeko saioan"
-
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "tresna (device)"
-
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "maila"
-
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "xerraren tamaina"
+"\n"
+"Bootstrap partizio berezi hau\n"
+"zure sistemaren\n"
+"abiapen dualerako da.\n"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "Hautatu esistitzen den RAIDa hona gehitzeko"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Tamaina: %s\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "berria"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geometria: %s zilindro, %s buru, %s sektore\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "Hautatu esistitzen den LVMa hona gehitzeko"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Info: "
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr ""
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM-diska %s\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "Medio eramangarrien automuntaia"
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Partizio taularen mota: %s\n"
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "Partizio taula berreskuratu"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "on bus %d id %d\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "Berkargatu"
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Aukerak: %s"
 
-#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
-#: ../../fs.pm_.c:113
+#: ../../fs.pm_.c:447 ../../fs.pm_.c:457 ../../fs.pm_.c:461 ../../fs.pm_.c:465
+#: ../../fs.pm_.c:469 ../../fs.pm_.c:473
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s-ren %s formateatzeak porrot egin du"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "ez dakit nola formateatu %s %s motan"
 
-#: ../../fs.pm_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "muntaketak porrot egin du"
+
+#: ../../fs.pm_.c:588
+#, c-format
+msgid "fsck failed with exit code %d or signal %d"
+msgstr "fsck-ek hutsegin du %d irteera kode edo %d seinalearekin"
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
 msgid "mount failed: "
 msgstr "muntaketak porrot egin du: "
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "%s desmuntatzen errorea: %s"
@@ -1824,41 +2004,44 @@ msgstr "erraza"
 msgid "server"
 msgstr "zerbitzaria"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Ezin duzu JFS erabili 16 MB baino txikiago diren partizioetan"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Ez erabili ReiserFS 32MB baino gutxiagoko partizioak eratzeko"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "Muntaia puntuak /-z hasi behar dira"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Jadanik esistitzen da %s muntaketa puntua duen partizioa\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Muntai zirkularrak %s\n"
-
-#: ../../fsedit.pm_.c:285
+#: ../../fsedit.pm_.c:476
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
-msgstr ""
+msgstr "Ezin duzu LVM Bolumen Logiko bat %s muntatze puntu bezela erabili"
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
-msgstr ""
+msgstr "Direktorio hau erroko fitxategi sisteman mantendu behar da"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "Benetako fitxategi sistema behar duzu (ext2, reiserfs) muntai puntu "
 "honetarako\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "%s irekitzerakoan errorea: %s"
 
-#: ../../fsedit.pm_.c:453
+#: ../../fsedit.pm_.c:681
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
@@ -1866,1072 +2049,1016 @@ msgstr ""
 "Errorea gertatu da - sistemaren fitxategiak eraikitzeko unitate "
 "baliogarririkez da aurkitu. Hardwarea aztertu mesedez."
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "Partiziorik ez duzu!"
 
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr ""
-"Mesedez hauta hobestutako hizkuntza instalaziorako eta sistemaren erabilerako"
-
-#: ../../help.pm_.c:12
-msgid ""
-"You need to accept the terms of the above license to continue installation.\n"
-"\n"
-"\n"
-"Please click on \"Accept\" if you agree with its terms.\n"
-"\n"
-"\n"
-"Please click on \"Refuse\" if you disagree with its terms. Installation will "
-"end without modifying your current\n"
-"configuration."
-msgstr ""
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Hautatu zureari dagokion teklatuaren itxura goiko listan"
-
-#: ../../help.pm_.c:25
-msgid ""
-"If you wish other languages (than the one you choose at\n"
-"beginning of installation) will be available after installation, please "
-"chose\n"
-"them in list above. If you want select all, you just need to select \"All\"."
-msgstr ""
-
-#: ../../help.pm_.c:30
+#: ../../help.pm_.c:13
+msgid ""
+"GNU/Linux is a multiuser system, and this means that each user can have his\n"
+"own preferences, his own files and so on. You can read the ``User Guide''\n"
+"to learn more. But unlike \"root\", which is the administrator, the users\n"
+"you will add here will not be entitled to change anything except their own\n"
+"files and their own configuration. You will have to create at least one\n"
+"regular user for yourself. That account is where you should log in for\n"
+"routine use. Although it is very practical to log in as \"root\" everyday,\n"
+"it may also be very dangerous! The slightest mistake could mean that your\n"
+"system would not work any more. If you make a serious mistake as a regular\n"
+"user, you may only lose some information, but not the entire system.\n"
+"\n"
+"First, you have to enter your real name. This is not mandatory, of course -\n"
+"as you can actually enter whatever you want. DrakX will then take the first\n"
+"word you have entered in the box and will bring it over to the \"User\n"
+"name\". This is the name this particular user will use to log into the\n"
+"system. You can change it. You then have to enter a password here. A\n"
+"non-privileged (regular) user's password is not as crucial as that of\n"
+"\"root\" from a security point of view, but that is no reason to neglect it\n"
+"- after all, your files are at risk.\n"
+"\n"
+"If you click on \"Accept user\", you can then add as many as you want. Add\n"
+"a user for each one of your friends: your father or your sister, for\n"
+"example. When you finish adding all the users you want, select \"Done\".\n"
+"\n"
+"Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
+"for that user (bash by default)."
+msgstr ""
+
+#: ../../help.pm_.c:41
+#, fuzzy
 msgid ""
-"Please choose \"Install\" if there are no previous version of Linux-"
-"Mandrake\n"
-"installed or if you wish to use several operating systems.\n"
+"Listed above are the existing Linux partitions detected on your hard drive.\n"
+"You can keep the choices made by the wizard, they are good for most common\n"
+"installs. If you make any changes, you must at least define a root\n"
+"partition (\"/\"). Do not choose too small a partition or you will not be\n"
+"able to install enough software. If you want to store your data on a\n"
+"separate partition, you will also need to create a partition for \"/home\"\n"
+"(only possible if you have more than one Linux partition available).\n"
 "\n"
+"Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\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"
-"Depend of your knowledge in GNU/Linux, you can choose one of the following "
-"levels to install or update your\n"
-"Linux-Mandrake operating system:\n"
+"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard drives:\n"
 "\n"
-"\t* Recommended: if you have never installed a GNU/Linux operating system "
-"choose this. Installation will be\n"
-"\t  be very easy and you will be asked only on few questions.\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"
-"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
-"the primary usage (workstation, server,\n"
-"\t  development) of your system. You will need to answer to more questions "
-"than in \"Recommended\" installation\n"
-"\t  class, so you need to know how GNU/Linux works to choose this "
-"installation class.\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"
-"\t* Expert: if you have a good knowledge in GNU/Linux, you can choose this "
-"installation class. As in \"Customized\"\n"
-"\t  installation class, you will be able to choose the primary usage "
-"(workstation, server, development). Be very\n"
-"\t  careful before choose this installation class. You will be able to "
-"perform a higly customized installation.\n"
-"\t  Answer to some questions can be very difficult if you haven't a good "
-"knowledge in GNU/Linux. So, don't choose\n"
-"\t  this installation class unless you know what you are doing."
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc."
 msgstr ""
-
-#: ../../help.pm_.c:56
-msgid ""
-"Select:\n"
+"Gainean, zure unitate zurrunean aurkitu diren Linux partizioak\n"
+"zerrendaratu dira. Aztiak eginiko aukerak gorde ditzakezu, erabilera "
+"arrunterako baliagarri\n"
+"dira. Aukera hauek aldatzen badituzu, gutxienez erro partizio bat zehaztu "
+"behar\n"
+"duzu (\"/\"). Ez aukeratu partizio txikiegia edo ezingo duzu behar adina "
+"software\n"
+"instalatu. Zure datuak beste partizio batean gorde nahi badituzu, gainera,\n"
+"\"/home\" (soilik Linux partizio bat baino gehiago erabilgarri badaukazu) "
+"partizio\n"
+"bat hautatu beharko duzu.\n"
 "\n"
-"  - Customized: If you are familiar enough with GNU/Linux, you may then "
-"choose\n"
-"    the primary usage for your machine. See below for details.\n"
 "\n"
+"Argibide gisa, partizio bakoitza honela zerrendatzen da: \"Izena\", hedadura "
+"\".\n"
 "\n"
-"  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
-"    perform a highly customized installation. As for a \"Customized\"\n"
-"    installation class, you will be able to select the usage for your "
-"system.\n"
-"    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
-"DOING!"
-msgstr ""
-"Hauta:\n"
 "\n"
-"  - Norberarena: GNU/Linux ezagutzen baduzu. Gero, makinaren erabiera "
-"nagusia hautatzeko aukera izango duzu. Beherago ikus azalpenak.\n"
+"\"Izena\" honela kodetzen da: \"unitate zurrun moeta\", \"unitate zurrun "
+"zenbakia\",\n"
+"\"partizio zenbakia\" (adibidez, \"hda1\").\n"
 "\n"
 "\n"
-"  - Aditua: GNU/Linux sakonki ezagutuz gero, eta oso instalazio berezia\n"
-"egin nahi baduzu,instalazio modu hau zuretzako da. Zure sistemaren\n"
-"erabilera honela egin beharko duzu \"Norberarena\".\n"
-"    Baina mesedez, EGITEN ZABILTZANA ZERTAN DATZAN EZ BADAKIZU, EZ HAUTA "
-"AUKERA HAU!"
-
-#: ../../help.pm_.c:68
-msgid ""
-"You must now define your machine usage. Choices are:\n"
+"\"Unitate zurrun moeta\" \"hd\" da zure unitate zurruna IDE motakoa bada eta "
+"\"sd\"\n"
+"SCSI moetakoa bada.\n"
 "\n"
-"\t* Workstation: this the ideal choice if you intend to use your machine "
-"primarily for everyday use, at office or\n"
-"\t  at home.\n"
 "\n"
+"\"Unitate zurrun zenbakia\" \"hd\" edo \"sd\" ondorengo hizkia da. IDE "
+"unitate zurrunekin:\n"
 "\n"
-"\t* Development: if you intend to use your machine primarily for software "
-"development, it is the good choice. You\n"
-"\t  will then have a complete collection of software installed in order to "
-"compile, debug and format source code,\n"
-"\t  or create software packages.\n"
 "\n"
+"   * \"a\"-k esan nahi du \"unitate zurrun nagusia lehenengo IDE "
+"kontrolatzailean\",\n"
 "\n"
-"\t* Server: if you intend to use this machine as a server, it is the good "
-"choice. Either a file server (NFS or\n"
-"\t  SMB), a print server (Unix style or Microsoft Windows style), an "
-"authentication server (NIS), a database\n"
-"\t  server and so on. As such, do not expect any gimmicks (KDE, GNOME, etc.) "
-"to be installed."
-msgstr ""
-"Makinaren erabilera desberdinak hauta zenezake. Aukerak:\n"
+"   * \"b\"-k esan nahi du \"unitate zurrun morroia lehenengo IDE "
+"kontrolatzailean\",\n"
 "\n"
-"\t* Arrunta: egunerako erabilerarako (bulego lana, irudiketa, eta abar). Ez\n"
-"\t  duzu konplikaziorik edo garatzale lanerako tresnarik edukiko.\n"
+"   * \"c\"-k esan nahi du \"unitate zurrun nagusia bigarren IDE "
+"kontrolatzailean\",\n"
 "\n"
-"\n"
-"\t* Garatzaile: sofwarearen garapenerako erabiliko baduzu makina. Orduan "
-"software\n"
-"\t  bilduma osoa izango duzu konpilatu, debug eta jatorrizko\n"
-"kodearen formateaoa, edo software paketeak eratzeko.\n"
+"   * \"d\"-k esan nahi du \"unitate zurrun morroia bigarren IDE "
+"kontrolatzailean\".\n"
 "\n"
 "\n"
-"\t* Zerbitzari: hauta hau zure Linux-Mandrake instalazioa zerbitzari modura "
-"erabiltzeko. Hau da fitxategi zerbitzari \t (NFS edo SMB),  irarkola "
-"zerbitzari (Unix edo Microsoft bezalako inpresioa), egiaztatze zerbitzari "
-"(NIS), datubase zerbitzari eta abar. \t Hemen, ez duzu gimmicks-k izango "
-"(KDE, GNOME...)."
+"SCSI unitate zurrunekin, \"a\"-k esan nahi du \"lehenengo unitate zurruna\", "
+"\"b\"-k esan nahi du \"bigarren unitate zurruna\", etab..."
+
+#: ../../help.pm_.c:72
+msgid ""
+"The Mandrake Linux installation is spread out over several CDROMs. DrakX\n"
+"knows if a selected package is located on another CDROM and will eject the\n"
+"current CD and ask you to insert a different one as required."
+msgstr ""
 
-#: ../../help.pm_.c:84
+#: ../../help.pm_.c:77
 msgid ""
-"DrakX will attempt to look for PCI SCSI adapter(s). If DrakX\n"
-"finds an SCSI adapter and knows which driver to use, it will be "
-"automatically\n"
-"installed.\n"
+"It is now time to specify which programs you wish to install on your\n"
+"system. There are thousands of packages available for Mandrake Linux, and\n"
+"you are not supposed to know them all by heart.\n"
 "\n"
+"If you are performing a standard installation from CDROM, you will first be\n"
+"asked to specify the CDs you currently have (in Expert mode only). Check\n"
+"the CD labels and highlight the boxes corresponding to the CDs you have\n"
+"available for installation. Click \"OK\" when you are ready to continue.\n"
 "\n"
-"If you have no SCSI adapter, an ISA SCSI adapter or a PCI SCSI adapter that\n"
-"DrakX doesn't recognize, you will be asked if a SCSI adapter is present in "
-"your\n"
-"system. If there is no adapter present, you can click on \"No\". If you "
-"click on\n"
-"\"Yes\", a list of drivers will be presented from which you can select your\n"
-"specific adapter.\n"
+"Packages are sorted in groups corresponding to a particular use of your\n"
+"machine. The groups themselves are sorted into four sections:\n"
 "\n"
+" * \"Workstation\": if you plan to use your machine as a workstation, "
+"select\n"
+"one or more of the corresponding groups.\n"
 "\n"
-"If you have to manually specify your adapter, DrakX will ask if you want to\n"
-"specify options for it. You should allow DrakX to probe the hardware for "
+" * \"Development\": if the machine is to be used for programming, choose "
 "the\n"
-"options. This usually works well.\n"
+"desired group(s).\n"
+"\n"
+" * \"Server\": finally, if the machine is intended to be a server, you will\n"
+"be able to select which of the most common services you wish to see\n"
+"installed on the machine.\n"
+"\n"
+" * \"Graphical Environment\": this is where you will choose your preferred\n"
+"graphical environment. At least one must be selected if you want to have a\n"
+"graphical workstation!\n"
 "\n"
+"Moving the mouse cursor over a group name will display a short explanatory\n"
+"text about that group.\n"
 "\n"
-"If not, you will need to provide options to the driver. Please review the "
-"User\n"
-"Guide (chapter 3, section \"Collective informations on your hardware) for "
-"hints\n"
-"on retrieving this information from hardware documentation, from the\n"
-"manufacturer's Web site (if you have Internet access) or from Microsoft "
-"Windows\n"
-"(if you have it on your system)."
+"You can check the \"Individual package selection\" box, which is useful if\n"
+"you are familiar with the packages being offered or if you want to have\n"
+"total control over what will be installed.\n"
+"\n"
+"If you started the installation in \"Update\" mode, you can unselect all\n"
+"groups to avoid installing any new package. This is useful for repairing or\n"
+"updating an existing system."
 msgstr ""
-"DrakX-ek PCI SCSI egokitzaileak bilatuko ditu. \n"
-"DrakX-ek SCSI egokitzailerik aurkitzekoatan, driver-a ezagutuz gero\n"
-"automatikoki instalatuko d(it)u.\n"
+
+#: ../../help.pm_.c:115
+msgid ""
+"Finally, depending on your choice of whether or not to select individual\n"
+"packages, you will be presented a tree containing all packages classified\n"
+"by groups and subgroups. While browsing the tree, you can select entire\n"
+"groups, subgroups, or individual packages.\n"
 "\n"
-"Ez baduzu SCSI egokitzailerik, ISA SCSI egokitzaile, edo \n"
-"PCI SCSI egokitzailerik galdetuko zaizu ia\n"
-"SCSI egokitzailerik baduzu zure sisteman. Ez baduzu\n"
-"'Ez' klikatu. 'Bai' klikatuz gero, driver zerrenda\n"
-"erakutziko zaizi, eta bertatik hautatu beharko duzu zure egokitzailea.\n"
+"Whenever you select a package on the tree, a description appears on the\n"
+"right. When your selection is finished, click the \"Install\" button which\n"
+"will then launch the installation process. Depending on the speed of your\n"
+"hardware and the number of packages that need to be installed, it may take\n"
+"a while to complete the process. A time to complete estimate is displayed\n"
+"on the screen to help you gauge if there is sufficient time to enjoy a cup\n"
+"of coffee.\n"
 "\n"
+"!! If a server package has been selected either intentionally or because it\n"
+"was part of a whole group, you will be asked to confirm that you really\n"
+"want those servers to be installed. Under Mandrake Linux, any installed\n"
+"servers are started by default at boot time. Even if they are safe and have\n"
+"no known issues at the time the distribution was shipped, it may happen\n"
+"that security holes are discovered after this version of Mandrake Linux was\n"
+"finalized. If you do not know what a particular service is supposed to do\n"
+"or why it is being installed, then click \"No\". Clicking \"Yes\" will\n"
+"install the listed services and they will be started automatically by\n"
+"default. !!\n"
 "\n"
-"Eskuz egokitu behar baduzu zure egokitzailea, DrakX-ek\n"
-"harren aukerak galdetuko dizu. DrakX-i frogatzeko aukera\n"
-"eman beharko diozu. Gehienetan ongi doa.\n"
+"The \"Automatic dependencies\" option simply disables the warning dialog\n"
+"which appears whenever the installer automatically selects a package. This\n"
+"occurs because it has determined that it needs to satisfy a dependency with\n"
+"another package in order to successfully complete the installation.\n"
 "\n"
-"Horrela ez bada, driver-aren aukerak eman beharko duzu.\n"
-"Berrikuzi Instalazio Gida, eta Windows-en arakatu informazioa\n"
-"(windows baduzu noski),\n"
-"hardwarearen dokumentaziorako, edo fabrikatzailearen webgunera\n"
-"jo (Internet baduzu)."
+"The tiny floppy disc icon at the bottom of the list allows to load the\n"
+"packages list chosen during a previous installation. Clicking on this icon\n"
+"will ask you to insert a floppy disk previously created at the end of\n"
+"another installation. See the second tip of last step on how to create such\n"
+"a floppy."
+msgstr ""
 
-#: ../../help.pm_.c:108
+#: ../../help.pm_.c:151
 msgid ""
-"At this point, you need to choose where to install your\n"
-"Linux-Mandrake operating system on your hard drive. If it is empty or if an\n"
-"existing operating system uses all the space available on it, you need to\n"
-"partition it. Basically, partitioning a hard drive consists of logically\n"
-"dividing it to create space to install your new Linux-Mandrake system.\n"
+"If you wish to connect your computer to the Internet or to a local network,\n"
+"please choose the correct option. Please turn on your device before\n"
+"choosing the correct option to let DrakX detect it automatically.\n"
 "\n"
+"Mandrake Linux proposes the configuration of an Internet connection at\n"
+"installation time. Available connections are: traditional modem, ISDN\n"
+"modem, ADSL connection, cable modem, and finally a simple LAN connection\n"
+"(Ethernet).\n"
 "\n"
-"Because the effects of the partitioning process are usually irreversible,\n"
-"partitioning can be intimidating and stressful if you are an inexperienced "
-"user.\n"
-"This wizard simplifies this process. Before beginning, please consult the "
-"manual\n"
-"and take your time.\n"
+"Here, we will not detail each configuration. Simply make sure that you have\n"
+"all the parameters from your Internet Service Provider or system\n"
+"administrator.\n"
 "\n"
+"You can consult the manual chapter about Internet connections for details\n"
+"about the configuration, or simply wait until your system is installed and\n"
+"use the program described there to configure your connection.\n"
 "\n"
-"You need at least two partitions. One is for the operating system itself and "
-"the\n"
-"other is for the virtual memory (also called Swap).\n"
+"If you wish to configure the network later after installation or if you\n"
+"have finished configuring your network connection, click \"Cancel\"."
+msgstr ""
+
+#: ../../help.pm_.c:172
+#, fuzzy
+msgid ""
+"You may now choose which services you wish to start at boot time.\n"
 "\n"
+"Here are presented all the services available with the current\n"
+"installation. Review them carefully and uncheck those which are not always\n"
+"needed at boot time.\n"
 "\n"
-"If partitions have been already defined (from a previous installation or "
-"from\n"
-"another partitioning tool), you just need choose those to use to install "
-"your\n"
-"Linux system.\n"
+"You can get a short explanatory text about a service by selecting a\n"
+"specific service. However, if you are not sure whether a service is useful\n"
+"or not, it is safer to leave the default behavior.\n"
 "\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."
+msgstr ""
+"Abiatzerakoan zein zerbitzu nahi duzun hauta zenezake orain.\n"
 "\n"
-"If partitions haven't been already defined, you need to create them. \n"
-"To do that, use the wizard available above. Depending of your hard drive\n"
-"configuration, several solutions can be available:\n"
 "\n"
-"\t* Use existing partition: the wizard has detected one or more existing "
-"Linux partitions on your hard drive. If\n"
-"\t  you want to keep them, choose this option. \n"
+"Sagua item baten gainetik pasatzerakoan, globo txiki batek zerbitzuaren\n"
+"zeregina aipatuko dizu.\n"
 "\n"
 "\n"
-"\t* Erase entire disk: if you want delete all data and all partitions "
-"present on your hard drive and replace them by\n"
-"\t  your new Linux-Mandrake system, you can choose this option. Be careful "
-"with this solution, you will not be\n"
-"\t  able to revert your choice after confirmation.\n"
+"Makina zerbitzari modura erabiliko baduzu, kontu handiz ibili:\n"
+"erabiliko ez dudun zerbitzuak ez abiarazi."
+
+#: ../../help.pm_.c:188
+msgid ""
+"GNU/Linux manages time in GMT (Greenwich Manage Time) and translates it in\n"
+"local time according to the time zone you selected."
+msgstr ""
+"GNU/Linux-ek GMT edo \"Greenwich Mean Time\" erabiltzen du eta hau\n"
+"zure bizitokira egokitzen du."
+
+#: ../../help.pm_.c:192
+msgid ""
+"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
+"on which all the graphics environments (KDE, Gnome, AfterStep,\n"
+"WindowMaker...) bundled with Mandrake Linux rely. In this section, DrakX\n"
+"will try to configure X automatically.\n"
 "\n"
+"It is extremely rare for it to fail, unless the hardware is very old (or\n"
+"very new). If it succeeds, it will start X automatically with the best\n"
+"resolution possible depending on the size of the monitor. A window will\n"
+"then appear and ask you if you can see it.\n"
 "\n"
-"\t* Use the free space on the Windows partition: if Microsoft Windows is "
-"installed on your hard drive and takes\n"
-"\t  all space available on it, you have to create free space for Linux data. "
-"To do that you can delete your\n"
-"\t  Microsoft Windows partition and data (see \"Erase entire disk\" or "
-"\"Expert mode\" solutions) or resize your\n"
-"\t  Microsoft Windows partition. Resizing can be performed without loss of "
-"any data. This solution is\n"
-"\t  recommended if you want use both Linux-Mandrake and Microsoft Windows on "
-"same computer.\n"
+"If you are doing an \"Expert\" install, you will enter the X configuration\n"
+"wizard. See the corresponding section of the manual for more information\n"
+"about this wizard.\n"
 "\n"
+"If you can see the message and answer \"Yes\", then DrakX will proceed to\n"
+"the next step. If you cannot see the message, it simply means that the\n"
+"configuration was wrong and the test will automatically end after 10\n"
+"seconds, restoring the screen."
+msgstr ""
+
+#: ../../help.pm_.c:212
+msgid ""
+"The first time you try the X configuration, you may not be very satisfied\n"
+"with its display (screen is too small, shifted left or right...). Hence,\n"
+"even if X starts up correctly, DrakX then asks you if the configuration\n"
+"suits you. It will also propose to change it by displaying a list of valid\n"
+"modes it could find, asking you to select one.\n"
+"\n"
+"As a last resort, if you still cannot get X to work, choose \"Change\n"
+"graphics card\", select \"Unlisted card\", and when prompted on which\n"
+"server you want, choose \"FBDev\". This is a failsafe option which works\n"
+"with any modern graphics card. Then choose \"Test again\" to be sure."
+msgstr ""
+
+#: ../../help.pm_.c:224
+msgid ""
+"Finally, you will be asked whether you want to see the graphical interface\n"
+"at boot. Note this question will be asked even if you chose not to test the\n"
+"configuration. Obviously, you want to answer \"No\" if your machine is to\n"
+"act as a server, or if you were not successful in getting the display\n"
+"configured."
+msgstr ""
+
+#: ../../help.pm_.c:231
+msgid ""
+"The Mandrake Linux CDROM has a built-in rescue mode. You can access it by\n"
+"booting from the CDROM, press the >>F1<< key at boot and type >>rescue<< at\n"
+"the prompt. But in case your computer cannot boot from the CDROM, you\n"
+"should come back to this step for help in at least two situations:\n"
 "\n"
-"\t  Before choosing this solution, please understand that the size of your "
-"Microsoft\n"
-"\t  Windows partition will be smaller than at present time. It means that "
-"you will have less free space under\n"
-"\t  Microsoft Windows to store your data or install new software.\n"
+" * when installing the boot loader, DrakX will rewrite the boot sector "
+"(MBR)\n"
+"of your main disk (unless you are using another boot manager) so that you\n"
+"can start up with either Windows or GNU/Linux (assuming you have Windows in\n"
+"your system). If you need to reinstall Windows, the Microsoft install\n"
+"process will rewrite the boot sector, and then you will not be able to\n"
+"start GNU/Linux!\n"
 "\n"
+" * if a problem arises and you cannot start up GNU/Linux from the hard "
+"disk,\n"
+"this floppy disk will be the only means of starting up GNU/Linux. It\n"
+"contains a fair number of system tools for restoring a system, which has\n"
+"crashed due to a power failure, an unfortunate typing error, a typo in a\n"
+"password, or any other reason.\n"
 "\n"
-"\t* Expert mode: if you want to partition manually your hard drive, you can "
-"choose this option. Be careful before\n"
-"\t  choosing this solution. It is powerful but it is very dangerous. You can "
-"lose all your data very easily. So,\n"
-"\t  don't choose this solution unless you know what you are doing."
+"When you click on this step, you will be asked to enter a disk inside the\n"
+"drive. The floppy disk you will insert must be empty or contain data which\n"
+"you do not need. You will not have to format it since DrakX will rewrite\n"
+"the whole disk."
 msgstr ""
 
-#: ../../help.pm_.c:160
+#: ../../help.pm_.c:255
+#, fuzzy
 msgid ""
-"At this point, you need to choose what\n"
-"partition(s) to use to install your new Linux-Mandrake system. If "
-"partitions\n"
-"have been already defined (from a previous installation of GNU/Linux or "
-"from\n"
-"another partitioning tool), you can use existing partitions. In other "
-"cases,\n"
-"hard drive partitions must be defined.\n"
+"At this point you need to choose where on your hard drive to install your\n"
+"Mandrake Linux operating system. If your hard drive is empty or if an\n"
+"existing operating system is using all the space available, you will need\n"
+"to partition it. Basically, partitioning a hard drive consists of logically\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
+"Because the effects of the partitioning process are usually irreversible,\n"
+"partitioning can be intimidating and stressful if you are an inexperienced\n"
+"user. Fortunately, there is a wizard which simplifies this process. Before\n"
+"beginning, please consult the manual and take your time.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select "
-"the\n"
-"disk for partitioning by clicking on \"hda\" for the first IDE drive, \"hdb"
-"\" for\n"
-"the second or \"sda\" for the first SCSI drive and so on.\n"
+"If you are running the install in Expert mode, you will enter DiskDrake,\n"
+"the Mandrake Linux partitioning tool, which allows you to fine-tune your\n"
+"partitions. See the DiskDrake chapter of the manual. From the installation\n"
+"interface, you can use the wizards as described here by clicking the\n"
+"\"Wizard\" button of the dialog.\n"
 "\n"
+"If partitions have already been defined, either from a previous\n"
+"installation or from another partitioning tool, simply select those to\n"
+"install your Linux system.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"If partitions are not defined, you will need to create them using the\n"
+"wizard. Depending on your hard drive configuration, several options are\n"
+"available:\n"
 "\n"
-"   * Clear all: this option deletes all partitions available on the selected "
-"hard drive.\n"
+" * \"Use free space\": this option will simply lead to an automatic\n"
+"partitioning of your blank drive(s). You will not be prompted further.\n"
 "\n"
+" * \"Use existing partition\": the wizard has detected one or more existing\n"
+"Linux partitions on your hard drive. If you want to use them, choose this\n"
+"option.\n"
 "\n"
-"   * Auto allocate: this option allows you to automatically create Ext2 and "
-"swap partitions in free space of your\n"
-"     hard drive.\n"
+" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+"installed on your hard drive and takes all the space available on it, you\n"
+"have to create free space for Linux data. To do that, you can delete your\n"
+"Microsoft Windows partition and data (see \"Erase entire disk\" or \"Expert\n"
+"mode\" solutions) or resize your Microsoft Windows partition. Resizing can\n"
+"be performed without the loss of any data. This solution is recommended if\n"
+"you want to use both Mandrake Linux and Microsoft Windows on same computer.\n"
 "\n"
+"   Before choosing this option, please understand that after this "
+"procedure,\n"
+"the size of your Microsoft Windows partition will be smaller than at the\n"
+"present time. You will have less free space under Microsoft Windows to\n"
+"store your data or to install new software.\n"
 "\n"
-"   * Rescue partition table: if your partition table is damaged, you can try "
-"to recover it using this option. Please\n"
-"     be careful and remember that it can fail.\n"
+" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
+"present on your hard drive and replace them with your new Mandrake Linux\n"
+"system, choose this option. Be careful with this solution because you will\n"
+"not be able to revert your choice after confirmation.\n"
 "\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"   * Undo: you can use this option to cancel your changes.\n"
+" * \"Remove Windows\": this will simply erase everything on the drive and\n"
+"begin fresh, partitioning everything from scratch. All data on your disk\n"
+"will be lost.\n"
 "\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"   * Reload: you can use this option if you wish to undo all changes and "
-"load your initial partitions table\n"
+" * \"Expert mode\": choose this option if you want to manually partition\n"
+"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"can very easily lose all your data. Hence, do not choose this unless you\n"
+"know what you are doing."
+msgstr ""
+"Une honetan zure Mandrake Linux sistema eragilea zure\n"
+"disko gogorraren zein lekutan instalatu aukeratu behar duzu. Hutsik badago\n"
+"edo beste sistema eragile batek leku guztia erabiltzen badu, zatikatu egin\n"
+"behar duzu. Funtsean, disko gogor bat zatikatzea, zure Mandrake Linux\n"
+"sistema berriari lekua egiteko berau logikoki zatitzean datza.\n"
 "\n"
 "\n"
-"   * Wizard: If you wish to use a wizard to partition your hard drive, you "
-"can use this option. It is recommended if\n"
-"     you do not have a good knowledge in partitioning.\n"
+"Zatikatze prozesuaren ondorioak gehienetan itzulezinak direnez, zatikatzea\n"
+"beldurgarri eta estresagarri izan daiteke trebatu gabeko erabiltzaile "
+"bazara.\n"
+"Azti honek prozesu hau errazten du. Hasi aurretik, irakurri ezazu manuala\n"
+"eta hartu beharrezko duzun denbora.\n"
 "\n"
 "\n"
-"   * Restore from floppy: if you have saved your partition table on a floppy "
-"during a previous installation, you can\n"
-"     recover it using this option.\n"
+"Gutxienez bi partizio behar dituzu. Bat sistema eragile berarentzako eta "
+"bestea\n"
+"alegiazko oroimenarentzako (Swap bezela ezaguna).\n"
 "\n"
 "\n"
-"   * Save on floppy: if you wish to save your partition table on a floppy to "
-"be able to recover it, you can use this\n"
-"     option. It is strongly recommended to use this option\n"
+"Partizioak dagoeneko sorturik badaude (aurreko instalazio batean edo beste\n"
+"zatikatze baten bitartez), aukeratu zure Linux sitema instalatzeko "
+"erabiliko\n"
+"dituzunak.\n"
 "\n"
 "\n"
-"   * Done: when you have finished partitioning your hard drive, use this "
-"option to save your changes.\n"
+"Partizioak dagoeneko sortu ez badira, sortu egin behar dituzu. \n"
+"Hori egiteko, erabili gorago erabilgarri duzun aztia. Zure disko gogorraren\n"
+"ezarpenaren arabera, zenbait aukera erabil ditzakezu:\n"
 "\n"
+"* Dagoen partizioa erabili: laguntzaileak zenbait Linux partizio aurkitu "
+"dituzure disko zurrunean. Hauek mantendu nahi\n"
+"  badituzu, hautatu aukera hau.\n"
 "\n"
-"For information, you can reach any option using the keyboard: navigate "
-"trough the partitions using Tab and Up/Down arrows.\n"
 "\n"
+"* Disko osoa ezabatu: Zure unitate zurrunean dauden datu eta partizio "
+"guztiak ezabatu eta zure Mandrake Linux sistema berriaz\n"
+"  ordezkatu nahi badituzu, aukera hau hautatu dezakezu. Kontuz erabili "
+"aukera hau, ezin izango duzu atzera egin\n"
+"  baiezkoa eman ondoren.\n"
 "\n"
-"When a partition is selected, you can use:\n"
 "\n"
-"           * Ctrl-c to create a new partition (when a empty partition is "
-"selected)\n"
+"* Erabili Windows partizioko tarte hutsa: Microsoft Windows disko zurrunean "
+"instalaturik baduzu, eta\n"
+"  leku guztia hartzen badu, Linux datuentzako lekua askatu behar duzu. Hori "
+"egiteko zure Microsoft Windows\n"
+"  partizio eta datuak ezabatu ditzakezu (begiratu \"Disko osoa ezabatu\" edo "
+"\"Aditu modua\" aukerak) edo zure\n"
+"  Microsoft Windows partizioaren neurria aldatu. Neurri aldaketa datu "
+"galerarik gabe egin daiteke.\n"
+"  Aukera hau gomendatzen da biak, Mandrake Linux eta Microsoft Windows, "
+"konputagailu berdinean erabili nahi badituzu.\n"
 "\n"
-"           * Ctrl-d to delete a partition\n"
 "\n"
-"           * Ctrl-m to set the mount point\n"
-"           \n"
+"  Aukera hau hautatu aurretik, ulertu ezazu zure Microsoft Windows "
+"patizioaorain dana\n"
+"  baino txikiagoa izango dela. Honek esan nahi du tarte huts txikiagoa "
+"izango duzula Microsof Windowsen\n"
+"  zure datuak gorde edo software berria instalatzeko.\n"
 "\n"
-"           \n"
-"If you are installing on a PPC Machine, you will want to create a small HFS "
-"'bootstrap' partition of at least 1MB for use\n"
-"by the yaboot bootloader. If you opt to make the partition a bit larger, say "
-"50MB, you may find it a useful place to store \n"
-"a spare kernel and ramdisk image for emergency boot situations."
-msgstr ""
+"\n"
+"* Aditu modua: Zure unitate zurruna eskuz zatikatu nahi baduzu, aukera hau "
+"hautatu dezakezu. Kontu izan\n"
+"  aukera hau hautatu aurretik. Oso indartsua da baino oso arriskutsua. Zure "
+"datu guztiak aise galdu ditzakezu. Beraz,\n"
+"  ez hautatu aukera zer egiten ari zaren ez badakizu."
 
-#: ../../help.pm_.c:224
+#: ../../help.pm_.c:319
 msgid ""
-"Above are listed the existing Linux partitions detected on\n"
-"your hard drive. You can keep choices make by the wizard, they are good for "
-"a\n"
-"common usage. If you change these choices, you must at least define a root\n"
-"partition (\"/\"). Don't choose a too little partition or you will not be "
-"able\n"
-"to install enough software. If you want store your data on a separate "
-"partition,\n"
-"you need also to choose a \"/home\" (only possible if you have more than "
-"one\n"
-"Linux partition available).\n"
+"There you are. Installation is now complete and your GNU/Linux system is\n"
+"ready to use. Just click \"OK\" to reboot the system. You can start\n"
+"GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
+"soon as the computer has booted up again.\n"
 "\n"
+"The \"Advanced\" button (in Expert mode only) shows two more buttons to:\n"
 "\n"
-"For information, each partition is listed as follows: \"Name\", \"Capacity"
-"\".\n"
+" * \"generate auto-install floppy\": to create an installation floppy disk\n"
+"which will automatically perform a whole installation without the help of\n"
+"an operator, similar to the installation you just configured.\n"
 "\n"
+"   Note that two different options are available after clicking the button:\n"
 "\n"
-"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
+"    * \"Replay\". This is a partially automated install as the partitioning\n"
+"step (and only this one) remains interactive.\n"
 "\n"
+"    * \"Automated\". Fully automated install: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and "
-"\"sd\"\n"
-"if it is an SCSI hard drive.\n"
+"   This feature is very handy when installing a great number of similar\n"
+"machines. See the Auto install section at our web site.\n"
 "\n"
+" * \"Save packages selection\"(*): saves the packages selection as made\n"
+"previously. Then, when doing another installation, insert the floppy inside\n"
+"the driver and run the installation going to the help screen by pressing on\n"
+"the [F1] key, and by issuing >>linux defcfg=\"floppy\"<<.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE "
-"hard drives:\n"
+"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
+"\"mformat a:\")"
+msgstr ""
+
+#: ../../help.pm_.c:350
+msgid ""
+"Any partitions that have been newly defined must be formatted for use\n"
+"(formatting means creating a file system).\n"
 "\n"
-"   * \"a\" means \"master hard drive on the primary IDE controller\",\n"
+"At this time, you may wish to reformat some already existing partitions to\n"
+"erase any data they contain. If you wish to do that, please select those\n"
+"partitions as well.\n"
 "\n"
-"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
+"Please note that it is not necessary to reformat all pre-existing\n"
+"partitions. You must reformat the partitions containing the operating\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
+"reformat partitions containing data that you wish to keep (typically\n"
+"\"/home\").\n"
 "\n"
-"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
+"Please be careful when selecting partitions. After formatting, all data on\n"
+"the selected partitions will be deleted and you will not be able to recover\n"
+"any of them.\n"
 "\n"
-"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+"Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
+"Click on \"Cancel\" if you want to choose another partition for your new\n"
+"Mandrake Linux operating system installation.\n"
 "\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc..."
+"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
+"for bad blocks on the disc."
 msgstr ""
 
-#: ../../help.pm_.c:258
+#: ../../help.pm_.c:376
+#, fuzzy
 msgid ""
-"Choose the hard drive you want to erase to install your\n"
-"new Linux-Mandrake partition. Be careful, all data present on it will be "
-"lost\n"
-"and will not be recoverable."
+"Your new Mandrake Linux operating system is currently being installed.\n"
+"Depending on the number of packages you will be installing and the speed of\n"
+"your computer, this operation could take from a few minutes to a\n"
+"significant amount of time.\n"
+"\n"
+"Please be patient."
 msgstr ""
+"Zure Mandrake Linux sistema eragile berria instalatzen ari da.\n"
+"Eragiketa honek minutu batzuk behar ditu (instalatu nahi duzunaren eta\n"
+"zure ordenagailuaren abiaduraren arabera).\n"
+"\n"
+"\n"
+"Izan pazientzia."
 
-#: ../../help.pm_.c:263
+#: ../../help.pm_.c:384
 msgid ""
-"Click on \"OK\" if you want to delete all data and\n"
-"partitions present on this hard drive. Be careful, after clicking on \"OK\", "
-"you\n"
-"will not be able to recover any data and partitions present on this hard "
-"drive,\n"
-"including any Windows data.\n"
-"\n"
+"Before continuing you should read carefully the terms of the license. It\n"
+"covers the whole Mandrake Linux distribution, and if you do not agree with\n"
+"all the terms in it, click on the \"Refuse\" button which will immediately\n"
+"terminate the installation. To continue with the installation, click the\n"
+"\"Accept\" button."
+msgstr ""
+
+#: ../../help.pm_.c:391
+msgid ""
+"At this point, it is time to choose the security level desired for the\n"
+"machine. As a rule of thumb, the more exposed the machine is, and the more\n"
+"the data stored in it is crucial, the higher the security level should be.\n"
+"However, a higher security level is generally obtained at the expenses of\n"
+"easiness of use. Refer to the MSEC chapter of the ``Reference Manual'' to\n"
+"get more information about the meaning of these levels.\n"
 "\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
-"partitions present on this hard drive."
+"If you do not know what to choose, keep the default option."
 msgstr ""
 
-#: ../../help.pm_.c:273
+#: ../../help.pm_.c:401
+#, fuzzy
 msgid ""
-"More than one Microsoft Windows partition have been\n"
-"detected on your hard drive. Please choose the one you want resize to "
-"install\n"
-"your new Linux-Mandrake operating system.\n"
+"At this point, you need to choose what partition(s) will be used for the\n"
+"installation of your Mandrake Linux system. If partitions have been already\n"
+"defined, either from a previous installation of GNU/Linux or from 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"
-"For information, each partition is listed as follow; \"Linux name\", "
-"\"Windows\n"
-"name\" \"Capacity\".\n"
+"To partition the selected hard drive, you can use these options:\n"
 "\n"
-"\"Linux name\" is coded as follow: \"hard drive type\", \"hard drive number"
-"\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
+" * \"Clear all\": this option deletes all partitions on the selected hard\n"
+"drive.\n"
 "\n"
+" * \"Auto allocate\": this option allows you to automatically create Ext2\n"
+"and swap partitions in free space of your hard drive.\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and \"sd"
-"\"\n"
-"if it is an SCSI hard drive.\n"
+" * \"Rescue partition table\": if your partition table is damaged, you can\n"
+"try to recover it using this option. Please be careful and remember that it\n"
+"can fail.\n"
 "\n"
+" * \"Undo\": use this option to cancel your changes.\n"
 "\n"
-"\"Hard drive number\" is always a letter putted after \"hd\" or \"sd\". With "
-"IDE hard drives:\n"
+" * \"Reload\": you can use this option if you wish to undo all changes and\n"
+"load your initial partitions table.\n"
 "\n"
-"   * \"a\" means \"master hard drive on the primary IDE controller\",\n"
+" * \"Wizard\": 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 knowledge of\n"
+"partitioning.\n"
 "\n"
-"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
+" * \"Restore from floppy\": this option will allow you to restore a\n"
+"previously saved partition table from floppy disk.\n"
 "\n"
-"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
+" * \"Save to floppy\": saves the partition table to a floppy. Useful for\n"
+"later partition-table recovery if necessary. It is strongly recommended to\n"
+"perform this step.\n"
 "\n"
-"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"Done\": when you have finished partitioning your hard drive, this will\n"
+"save your changes back to disc.\n"
 "\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc.\n"
+"Note: you can reach any option using the keyboard. Navigate through the\n"
+"partitions using [Tab] and [Up/Down] arrows.\n"
 "\n"
+"When a partition is selected, you can use:\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first "
-"disk\n"
-"or partition is called \"C:\")."
-msgstr ""
-
-#: ../../help.pm_.c:306
-msgid "Please be patient. This operation can take several minutes."
-msgstr ""
-
-#: ../../help.pm_.c:309
-msgid ""
-"Any partitions that have been newly defined must be\n"
-"formatted for use (formatting meaning creating a filesystem).\n"
+" * Ctrl-c to create a new partition (when an empty partition is selected);\n"
 "\n"
+" * Ctrl-d to delete a partition;\n"
 "\n"
-"At this time, you may wish to reformat some already existing partitions to "
-"erase\n"
-"the data they contain. If you wish do that, please also select the "
-"partitions\n"
-"you want to format.\n"
+" * Ctrl-m to set the mount point.\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"
+"boot loader. 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 ""
+"Une honetan, erabaki behar duzu zein partizio\n"
+"erabili nahi d(it)uzun zure Mandrake Linux sistema berria instalatzeko. "
+"Baldin eta partizioak\n"
+"jadanik definitu badira (aurreko GNU/Linux instalazio batean edo beste "
+"zatikatze\n"
+"tresna baten bitartez), dauden partizioak erabili ditzakezu. Beste "
+"kasuetan,\n"
+"disko gogorreko partizioak definitu behar dira.\n"
 "\n"
-"Please note that it is not necessary to reformat all pre-existing "
-"partitions.\n"
-"You must reformat the partitions containing the operating system (such as \"/"
-"\",\n"
-"\"/usr\" or \"/var\") but do you no have to reformat partitions containing "
-"data\n"
-"that you wish to keep (typically /home).\n"
 "\n"
+"Partizioak sortzeko, aurrena disko zurrun bat aukeratu behar duzu. "
+"Zatikatzeko diskoa\n"
+"aukeratu dezakezu bere gainean klik eginez,\"hda\" lehenengo IDE "
+"unitatearentzako, \"hdb\" bigarrena\n"
+" edo \"sda\" lehenengo SCSI unitatearentzako eta horrela gainerakoak ere.\n"
 "\n"
-"Please be careful selecting partitions, after formatting, all data will be\n"
-"deleted and you will not be able to recover any of them.\n"
 "\n"
+"Hautatutako disko zurruna zatikatzeko, aukera hauek erabili ditzakezu:\n"
 "\n"
-"Click on \"OK\" when you are ready to format partitions.\n"
+"   * Guztia garbitu: aukera honek hautatutako diskoan partizio guztiak "
+"ezabatzen ditu.\n"
 "\n"
 "\n"
-"Click on \"Cancel\" if you want to choose other partitions to install your "
-"new\n"
-"Linux-Mandrake operating system."
-msgstr ""
-
-#: ../../help.pm_.c:335
-msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
+"   * Auto alokatu: aukera honek zure disko zurrunaren leku hutsean Ext2 eta "
+"swap partizioak automatikoki sortzea\n"
+"     ahalbidetzen dizu.\n"
 "\n"
 "\n"
-"DrakX will then check whether you have enough room to install them all. If "
-"not,\n"
-"it will warn you about it. If you want to go on anyway, it will proceed onto "
-"the\n"
-"installation of all selected groups but will drop some packages of lesser\n"
-"interest. At the bottom of the list you can select the option \n"
-"\"Individual package selection\"; in this case you will have to browse "
-"through\n"
-"more than 1000 packages..."
-msgstr ""
-"Orain instalatu edo eguneratu nahi duzun paketa taldea\n"
-"hauta dezakezu.\n"
+"   * Berreskuratu partizio taula: zure partizio taula hondatu bada, aukera "
+"hau erabiliz berreskuratzen saia zaitezke. Mesedez,\n"
+"     kontu izan eta gogoratu hutsegin dezakela.\n"
 "\n"
-"DrakX-ek instalaziorako tokirik baduzu begiratuko du. Ez baduzu,\n"
-"ohartuko dizu. Aurrera jarraitu nahi baduzu, hautatutakoen artean "
-"instalazioak\n"
-"garrantzi handiagoko paketeak hobestuko ditu eta leku faltan garrantzi\n"
-"gutxiagokoak bastertuko ditu.Zerrendaren behealdeko\n"
-"\"Banan banako pakete hautaketa\" erabil zenezake; kasu honetan\n"
-"1000 baino gehiagoko pakete zerrendan murgildu beharko zara..."
-
-#: ../../help.pm_.c:347
-msgid ""
-"You can now choose individually all the packages you\n"
-"wish to install.\n"
 "\n"
+"   * Desegin: aukera hau zure aldaketak galerazteko erabili dezakezu.\n"
 "\n"
-"You can expand or collapse the tree by clicking on options in the left "
-"corner of\n"
-"the packages window.\n"
 "\n"
+"   * Birzamatu: aukera hau erabili dezakezu aldaketa guztiak desegin eta "
+"hasierako partizioen taula zamatu nahi baduzu.\n"
 "\n"
-"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
-"\"Toggle flat and group sorted\".\n"
 "\n"
+"   * Aztia: zure disko zurruna zatikatzeko aztia erabili nahi baduzu, aukera "
+"hau erabili dezakezu. Berau gomendatzen da \n"
+"     zatikatzen ezagutza nahikoa ez badaukazu.\n"
 "\n"
-"If you want not to be warned on dependencies, click on \"Automatic\n"
-"dependencies\". If you do this, note that unselecting one package may "
-"silently\n"
-"unselect several other packages which depend on it."
-msgstr ""
-
-#: ../../help.pm_.c:364
-msgid ""
-"If you have all the CDs in the list above, click Ok. If you have\n"
-"none of those CDs, click Cancel. If only some CDs are missing, unselect "
-"them,\n"
-"then click Ok."
-msgstr ""
-"Goiko zerrendako CD guztiak badituzu, Ados klikatu.\n"
-"Batere ez baduzu, Etsi klikatu.\n"
-"Baten bat faltatuz gero, hautatuetatik atera eta ondoren,\n"
-"Ados klikatu."
-
-#: ../../help.pm_.c:369
-msgid ""
-"Your new Linux-Mandrake operating system is currently being\n"
-"installed. This operation should take a few minutes (it depends on size you\n"
-"choose to install and the speed of your computer).\n"
 "\n"
+"   * Berreskuratu disketetik: zure partizio taula disketean gorde baduzu "
+"aurreko instalazio batean, hura berreskuratu\n"
+"     dezakezu aukera hau erabiliz.\n"
 "\n"
-"Please be patient."
-msgstr ""
-
-#: ../../help.pm_.c:377
-msgid ""
-"You can now test your mouse. Use buttons and wheel to verify\n"
-"if settings are good. If not, you can click on \"Cancel\" to choose another\n"
-"driver."
-msgstr ""
-
-#: ../../help.pm_.c:382
-msgid ""
-"Please select the correct port. For example, the COM1\n"
-"port under MS Windows is named ttyS0 under GNU/Linux."
-msgstr ""
-"Mesedez kai zuzena hautatu. Adibidez, MS Windows-eko COM1 kaia\n"
-"ttyS0 izendatzen da GNU/Linux-en."
-
-#: ../../help.pm_.c:386
-msgid ""
-"If you wish to connect your computer to the Internet or\n"
-"to a local network please choose the correct option. Please turn on your "
-"device\n"
-"before choosing the correct option to let DrakX detect it automatically.\n"
 "\n"
+"   * Gorde disketean: zure partizio taula disketean gorde nahi baduzu berau "
+"berreskuratu ahal izateko, aukera hau erabili\n"
+"     dezakezu. Aukera hau erabiltzea gomendatzen da.\n"
 "\n"
-"If you do not have any connection to the Internet or a local network, "
-"choose\n"
-"\"Disable networking\".\n"
 "\n"
+"   * Eginda: zure diska zurruna zatikatzen amaitu duzunean, erabili aukera "
+"hau zure aldaketak gordetzeko.\n"
 "\n"
-"If you wish to configure the network later after installation or if you "
-"have\n"
-"finished to configure your network connection, choose \"Done\"."
-msgstr ""
-
-#: ../../help.pm_.c:399
-msgid ""
-"No modem has been detected. Please select the serial port on which it is "
-"plugged.\n"
 "\n"
+"Argibide gisa, edozein aukerara heldu dezakezu teklatua erabiliz: mugitu "
+"partizioetan barrena Tab eta Gora/Bera geziak erabiliz.\n"
 "\n"
-"For information, the first serial port (called \"COM1\" under Microsoft\n"
-"Windows) is called \"ttyS0\" under Linux."
-msgstr ""
-
-#: ../../help.pm_.c:406
-msgid ""
-"You may now enter dialup options. If you don't know\n"
-"or are not sure what to enter, the correct informations can be obtained "
-"from\n"
-"your Internet Service Provider. If you do not enter the DNS (name server)\n"
-"information here, this information will be obtained from your Internet "
-"Service\n"
-"Provider at connection time."
-msgstr ""
-"markatze aukerak sar zenezake. ez badakizu\n"
-"edo ez bazaude zihur zer sartuz, informazio uzena zure Internet "
-"ornitzailearieskatu\n"
-"Ornitzailea, indarrean dagoen konexioarena."
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr "Modema kanpokoa baduzu, piztu egizu DrakX-ek automatikoki ezar dezan"
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "Piztu modem-a eta hauta zuzena."
-
-#: ../../help.pm_.c:419
-msgid ""
-"If you are not sure if informations above are\n"
-"correct or if you don't know or are not sure what to enter, the correct\n"
-"informations can be obtained from your Internet Service Provider. If you do "
-"not\n"
-"enter the DNS (name server) information here, this information will be "
-"obtained\n"
-"from your Internet Service Provider at connection time."
-msgstr ""
-"Goiko informazioa ez baduzu, edo honetaz zihur ez bazaude\n"
-"eska egiozu Internet ornitzaileari. Ez baduzu DNSren informaziorik\n"
-"hori berori ere Internet ornitzaileak eman diezazuke."
-
-#: ../../help.pm_.c:426
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, the correct informations can be\n"
-"obtained from your Internet Service Provider."
-msgstr ""
-"Ostalari izena ezar zenezake behar izanez gero. Ez baduzu\n"
-"ezagutzen, edo ez badakizu zer sartu, Internet Zerbitzu emaleari galdeiozu."
-
-#: ../../help.pm_.c:431
-msgid ""
-"You may now configure your network device.\n"
 "\n"
-"   * IP address: if you don't know or are not sure what to enter, ask your "
-"network administrator.\n"
-"     You should not enter an IP address if you select the option \"Automatic "
-"IP\" below.\n"
+"Partizio bat hautatuta dagoenean, erabili dezakezu:\n"
 "\n"
-"   * Netmask: \"255.255.255.0\" is generally a good choice. If you don't "
-"know or are not sure what to enter,\n"
-"     ask your network administrator.\n"
+"           * Ctrl-c partizio berri bat sortzeko (partizio huts bat hautatu "
+"bada)\n"
 "\n"
-"   * Automatic IP: if your network uses BOOTP or DHCP protocol, select this "
-"option. If selected, no value is needed in\n"
-"    \"IP address\". If you don't know or are not sure if you need to select "
-"this option, ask your network administrator."
-msgstr ""
-"Orain sarerako tresna egokitu zenezake:\n"
+"           * Ctrl-d partizio bat ezabatzeko\n"
 "\n"
-"  * IP helbidea: ez badakizu, sare administrariari edo Internet Zerbitzu \n"
-" emaleari galdeiozu.\n"
-"    Behean \"IP Automatikoa\" hautatuko baduzu, ez duzu IPrik ezarri behar\n"
-"  * Netmask: \"255.255.255.0\" ohikoena da. Ziur ez bazaude\n"
-"administratzaileari edo Internet Zerbitzu emaleari galdetu.\n"
+"           * Ctrl-m muntaia puntua ezartzeko\n"
+"           \n"
 "\n"
-"  * Automatic IP: Sareak BOOTP edo DHCP protokoloak erabiliz gero, hautatu \n"
-"aukera hau. Hautatuz gero, \"IP helbidea\"-rako ez de baliorik eman behar.\n"
-"Ziur ez bazaude, galdetu administrariari edo ISP-ari."
-
-#: ../../help.pm_.c:443
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, ask your network administrator."
-msgstr ""
-"Orain, behar izanez gero, ostalari izena ezar zenezake.\n"
-"Ez badakizu zer jarri administrariari edo Internet Zerbitzu emaleari "
-"galdeiozu."
-
-#: ../../help.pm_.c:447
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, leave blank."
-msgstr ""
-"Orain, behar izanez gero, ostalari izena ezar zenezake.\n"
-"Ez badakizu zer jarri, hutsik laga."
-
-#: ../../help.pm_.c:451
-msgid ""
-"You may now enter dialup options. If you're not sure what to enter, the\n"
-"correct information can be obtained from your ISP."
-msgstr ""
-"Markatze opziotan sar zintezke. Sartu beharreko informazioa\n"
-"zure ISP-tik lor dezakezu."
-
-#: ../../help.pm_.c:455
-msgid ""
-"If you will use proxies, please configure them now. If you don't know if\n"
-"you should use proxies, ask your network administrator or your ISP."
-msgstr ""
-"Proxy-rik erabiliz gero, mesedez orain konfiguratu. Ez badakizu\n"
-"ISP-ari edo sareko administrariari galdetu."
+"           \n"
+"PCC Makina batean instalatzen ari bazara, HFS 'bootstrap' partizio txiki bat "
+"sortu nahiko duzu, gutxienez 1MB-koa,\n"
+"yaboot abiarazleak erabili dezan. Partizioa haundiagoa egitea erabakitzen "
+"baduzu, 50MB esaterako, larrialdietarako ordezko\n"
+"kernel eta ramdisk irudi bat gordetzeko erabilgarria izan daiteke. "
 
-#: ../../help.pm_.c:459
+#: ../../help.pm_.c:460
+#, fuzzy
 msgid ""
-"You can install cryptographic package if your internet connection has been\n"
-"set up correctly. First choose a mirror where you wish to download packages "
-"and\n"
-"after that select the packages to install.\n"
+"More than one Microsoft Windows partition has been detected on your hard\n"
+"drive. Please choose the one you want 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"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
-msgstr ""
-"Pakete kriptografikoa instalatu dezakezu zure interneteko konexioa zuzen\n"
-"badabil. Lehenengo hautatu zein mirror-etik jaitsi nahi dituzu paketeak eta "
-"gero\n"
-"instalatu beharreko paketeak hautatu.\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"
-"Mirror ete pakete kriptografikoak zure tokiko legeen arabera hautatu\n"
-"behar dituzu."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "Bizitokira egokitu zenezake orain ordu eremua."
-
-#: ../../help.pm_.c:471
-msgid ""
-"GNU/Linux manages time in GMT (Greenwich Manage\n"
-"Time) and translates it in local time according to the time zone you have\n"
-"selected.\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"
-"If you use Microsoft Windows on this computer, choose \"No\"."
-msgstr ""
-"GNU/Linux-ek GMT edo \"Greenwich Mean Time\" erabiltzen du eta hau\n"
-"zure bizitokira egokitzen du.\n"
-"\n"
-"Konputagailuan Microsoft Windows erabiliz gero hauta \"Ez\"."
-
-#: ../../help.pm_.c:479
-msgid ""
-"You may now choose which services you want to start at boot time.\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"
-"When your mouse comes over an item, a small balloon help will popup which\n"
-"describes the role of the service.\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"
-"Be very careful in this step if you intend to use your machine as a server: "
-"you\n"
-"will probably want not to start any services that you don't need. Please\n"
-"remember that several services can be dangerous if they are enable on a "
-"server.\n"
-"In general, select only the services that you really need."
+"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"disk or partition is called \"C:\")."
 msgstr ""
-"Abiatzerakoan zein zerbitzu nahi duzun hauta zenezake orain.\n"
-"\n"
+"Gainean, zure unitate zurrunean aurkitu diren Linux partizioak\n"
+"zerrendaratu dira. Aztiak eginiko aukerak gorde ditzakezu, erabilera "
+"arrunterako baliagarri\n"
+"dira. Aukera hauek aldatzen badituzu, gutxienez erro partizio bat zehaztu "
+"behar\n"
+"duzu (\"/\"). Ez aukeratu partizio txikiegia edo ezingo duzu behar adina "
+"software\n"
+"instalatu. Zure datuak beste partizio batean gorde nahi badituzu, gainera,\n"
+"\"/home\" (soilik Linux partizio bat baino gehiago erabilgarri badaukazu) "
+"partizio\n"
+"bat hautatu beharko duzu.\n"
 "\n"
-"Sagua item baten gainetik pasatzerakoan, globo txiki batek zerbitzuaren\n"
-"zeregina aipatuko dizu.\n"
 "\n"
+"Argibide gisa, partizio bakoitza honela zerrendatzen da: \"Izena\", hedadura "
+"\".\n"
 "\n"
-"Makina zerbitzari modura erabiliko baduzu, kontu handiz ibili:\n"
-"erabiliko ez dudun zerbitzuak ez abiarazi."
-
-#: ../../help.pm_.c:492
-msgid ""
-"You can configure a local printer (connected to your computer) or remote\n"
-"printer (accessible via a Unix, Netware or Microsoft Windows network)."
-msgstr ""
-"Bertako irarkola (konputagailuari konektatua) edo urrutikoa\n"
-"(Unix, Netware edo Microsoft Windows sareetakoa) egokitu zenezake orain."
-
-#: ../../help.pm_.c:496
-msgid ""
-"If you wish to be able to print, please choose one printing system between\n"
-"CUPS and LPR.\n"
 "\n"
+"\"Izena\" honela kodetzen da: \"unitate zurrun moeta\", \"unitate zurrun "
+"zenbakia\",\n"
+"\"partizio zenbakia\" (adibidez, \"hda1\").\n"
 "\n"
-"CUPS is a new, powerful and flexible printing system for Unix systems (CUPS\n"
-"means \"Common Unix Printing System\"). It is the default printing system "
-"in\n"
-"Linux-Mandrake.\n"
 "\n"
+"\"Unitate zurrun moeta\" \"hd\" da zure unitate zurruna IDE motakoa bada eta "
+"\"sd\"\n"
+"SCSI moetakoa bada.\n"
 "\n"
-"LPR is the old printing system used in previous Linux-Mandrake "
-"distributions.\n"
 "\n"
+"\"Unitate zurrun zenbakia\" \"hd\" edo \"sd\" ondorengo hizkia da. IDE "
+"unitate zurrunekin:\n"
 "\n"
-"If you don't have printer, click on \"None\"."
-msgstr ""
-
-#: ../../help.pm_.c:511
-msgid ""
-"GNU/Linux can deal with many types of printer. Each of these types requires\n"
-"a different setup.\n"
 "\n"
+"   * \"a\"-k esan nahi du \"unitate zurrun nagusia lehenengo IDE "
+"kontrolatzailean\",\n"
 "\n"
-"If your printer is physically connected to your computer, select \"Local\n"
-"printer\".\n"
+"   * \"b\"-k esan nahi du \"unitate zurrun morroia lehenengo IDE "
+"kontrolatzailean\",\n"
 "\n"
+"   * \"c\"-k esan nahi du \"unitate zurrun nagusia bigarren IDE "
+"kontrolatzailean\",\n"
 "\n"
-"If you want to access a printer located on a remote Unix machine, select\n"
-"\"Remote printer\".\n"
+"   * \"d\"-k esan nahi du \"unitate zurrun morroia bigarren IDE "
+"kontrolatzailean\".\n"
 "\n"
 "\n"
-"If you want to access a printer located on a remote Microsoft Windows "
-"machine\n"
-"(or on Unix machine using SMB protocol), select \"SMB/Windows 95/98/NT\"."
-msgstr ""
+"SCSI unitate zurrunekin, \"a\"-k esan nahi du \"lehenengo unitate zurruna\", "
+"\"b\"-k esan nahi du \"bigarren unitate zurruna\", etab..."
 
-#: ../../help.pm_.c:527
+#: ../../help.pm_.c:491
+msgid "Please be patient. This operation can take several minutes."
+msgstr "Mesedez izan pazientzia. Eragiketa honek zenbait minutu behar ditzake."
+
+#: ../../help.pm_.c:494
+#, fuzzy
 msgid ""
-"Please turn on your printer before continuing to let DrakX detect it.\n"
+"DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
+"installation or if you want to have greater control (\"Expert\"). You also\n"
+"have the choice of performing a new install or an upgrade of an existing\n"
+"Mandrake Linux system. Clicking \"Install\" will completely wipe out the\n"
+"old system. Select \"Upgrade\" if you are upgrading or repairing an\n"
+"existing system.\n"
 "\n"
-"You have to enter some informations here.\n"
+"Please choose \"Install\" if there are no previous version of Mandrake\n"
+"Linux installed or if you wish to boot between various operating systems.\n"
 "\n"
+"Please choose \"Update\" if you wish to update or repair an already\n"
+"installed version of Mandrake Linux.\n"
 "\n"
-"   * Name of printer: the print spooler uses \"lp\" as default printer name. "
-"So, you must have a printer named \"lp\".\n"
-"     If you have only one printer, you can use several names for it. You "
-"just need to separate them by a pipe\n"
-"     character (a \"|\"). So, if you prefer a more meaningful name, you have "
-"to put it first, eg: \"My printer|lp\".\n"
-"     The printer having \"lp\" in its name(s) will be the default printer.\n"
+"Depending on your knowledge of GNU/Linux, please choose one of the\n"
+"following to install or update your Mandrake Linux operating system:\n"
 "\n"
+" * Recommended: choose this if you have never installed a GNU/Linux\n"
+"operating system. The installation will be very easy and you will only be\n"
+"asked a few questions.\n"
 "\n"
-"   * Description: this is optional but can be useful if several printers are "
-"connected to your computer or if you allow\n"
-"     other computers to access to this printer.\n"
-"\n"
-"\n"
-"   * Location: if you want to put some information on your\n"
-"     printer location, put it here (you are free to write what\n"
-"     you want, for example \"2nd floor\").\n"
+" * Expert: if you have a good knowledge of GNU/Linux, you can choose this\n"
+"installation class. The expert installation will allow you to perform a\n"
+"highly customized installation. Answering some of the questions can be\n"
+"difficult if you do not have a good knowledge of GNU/Linux so do not choose\n"
+"this unless you know what you are doing."
 msgstr ""
-
-#: ../../help.pm_.c:548
-msgid ""
-"You need to enter some informations here.\n"
+"Aukeratu \"Instalatu\" ez badago Mandrake Linuxen bertsio zaharragoa\n"
+"instalaturik edo sistema eragile anitz erabili nahi baduzu.\n"
 "\n"
 "\n"
-"   * Name of queue: the print spooler uses \"lp\" as default printer name. "
-"So, you need have a printer named \"lp\".\n"
-"    If you have only one printer, you can use several names for it. You just "
-"need to separate them by a pipe\n"
-"    character (a \"|\"). So, if you prefer to have a more meaningful name, "
-"you have to put it first, eg: \"My printer|lp\".\n"
-"    The printer having \"lp\" in its name(s) will be the default printer.\n"
+"Aukeratu \"Eguneratu\" instalaturik dagoen Mandrake Linux-en bertsio bat "
+"eguneratu nahi baduzu.\n"
 "\n"
-"  \n"
-"   * Spool directory: it is in this directory that printing jobs are stored. "
-"Keep the default choice\n"
-"     if you don't know what to use\n"
 "\n"
+"GNU/Linux inguruan daukazun ezagutzaren arabera, ondorengo Mandrake Linux "
+"sistema eragilearen instalazio edo eguneratze\n"
+"mailetako bat aukeratu dezakezu:\n"
 "\n"
-"   * Printer Connection: If your printer is physically connected to your "
-"computer, select \"Local printer\".\n"
-"     If you want to access a printer located on a remote Unix machine, "
-"select \"Remote lpd printer\".\n"
+"* Gomendatua: Sekula GNU/Linux sistema eragilerik instalatu ez baduzu "
+"aukeratu hau. Instalazioa oso erraza\n"
+"  izango da eta galdera gutxi egingo zaizkizu.\n"
 "\n"
 "\n"
-"     If you want to access a printer located on a remote Microsoft Windows "
-"machine (or on Unix machine using SMB\n"
-"     protocol), select \"SMB/Windows 95/98/NT\".\n"
+"* Norberarena: GNU/Linux-en ezagutza nahikoa badaukazu, zure sistemaren "
+"erabilera nagusia aukeratu dezakezu\n"
+"  (lanestazioa, zerbitzaria, garapenerako). Instalazio moeta \"Gomendatuan\" "
+"baino galdera gehiago erantzun beharko duzu,\n"
+"  beraz GNU/Linux-ek nola lan eginten duen jakin behar duzu instalazio moeta "
+"hau aukeratzeko.\n"
 "\n"
 "\n"
-"     If you want to acces a printer located on NetWare network, select "
-"\"NetWare\".\n"
-msgstr ""
+"* Aditua: GNU/Linux-en ezagutza ona badaukazu, instalazio moeta hau aukeratu "
+"dezakezu. \"Norberarena\" instalazio\n"
+"  moetan bezala, erabilera nagusia aukeratu ahal izango duzu (lanestazioa, "
+"zerbitzaria, garapenerako). Argi ibili\n"
+"  instalazio moeta hau aukeratu aurretik. Oso instalazio pertsonalizatua "
+"egiteko aukera izango duzu.\n"
+"  Galdera batzu erantzutea oso zaila gerta daiteke ez badaukazu GNU/Linux-i "
+"buruzko ezagutza sakona. Beraz, ez aukeratu\n"
+"  instalazio moeta hau egiten ari zarenaz ziur egon gabe."
 
-#: ../../help.pm_.c:573
+#: ../../help.pm_.c:521
 msgid ""
-"Your printer has not been detected. Please enter the name of the device on\n"
-"which it is connected.\n"
-"\n"
+"Normally, DrakX selects the right keyboard for you (depending on the\n"
+"language you have chosen) and you will not even see this step. However, you\n"
+"might not have a keyboard that corresponds exactly to your language: for\n"
+"example, if you are an English speaking Swiss person, you may still want\n"
+"your keyboard to be a Swiss keyboard. Or if you speak English but are\n"
+"located in Quebec, you may find yourself in the same situation. In both\n"
+"cases, you will have to go back to this installation step and select an\n"
+"appropriate keyboard from the list.\n"
 "\n"
-"For information, most printers are connected on the first parallel port. "
-"This\n"
-"one is called \"/dev/lp0\" under GNU/Linux and \"LPT1\" under Microsoft "
-"Windows."
+"Click on the \"More\" button to be presented with the complete list of\n"
+"supported keyboards."
 msgstr ""
 
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "Goiko zerrendakoetatik, irarkola hauta zenezake."
-
-#: ../../help.pm_.c:584
+#: ../../help.pm_.c:534
 msgid ""
-"Please select the right options according to your printer.\n"
-"Please see its documentation if you don't know what choose here.\n"
+"Please choose your preferred language for installation and system usage.\n"
 "\n"
+"Clicking on the \"Advanced\" button will allow you to select other\n"
+"languages to be installed on your workstation. Selecting other languages\n"
+"will install the language-specific files for system documentation and\n"
+"applications. For example, if you will host users from Spain on your\n"
+"machine, select English as the main language in the tree view and in the\n"
+"Advanced section click on the grey star corresponding to \"Spanish|Spain\".\n"
 "\n"
-"You will be able to test your configuration in next step and you will be "
-"able to modify it if it doesn't work as you want."
+"Note that multiple languages may be installed. Once you have selected any\n"
+"additional locales click the \"OK\" button to continue."
 msgstr ""
-"Irarkolari dagozkion aukerak hauta.\n"
-"Haren dokumentazioa aztertu, aukerak ez badituzu ezagutzen.\n"
-"\n"
-"\n"
-"Konfigurazioa saia zenezake hurrengo hurratsean, eta adatu erebehar den "
-"modura ez badabil"
 
-#: ../../help.pm_.c:591
+#: ../../help.pm_.c:547
 msgid ""
-"You can now enter the root password for your Linux-Mandrake system.\n"
-"The password must be entered twice to verify that both password entries are "
-"identical.\n"
+"By default, DrakX assumes you have a two-button mouse and will set it up\n"
+"for third-button emulation. DrakX will automatically know whether it is a\n"
+"PS/2, serial or USB mouse.\n"
 "\n"
+"If you wish to specify a different type of mouse select the appropriate\n"
+"type from the list provided.\n"
 "\n"
-"Root is the system's administrator and is the only user allowed to modify "
-"the\n"
-"system configuration. Therefore, choose this password carefully. \n"
-"Unauthorized use of the root account can be extemely dangerous to the "
-"integrity\n"
-"of the system, its data and other system connected to it.\n"
-"\n"
+"If you choose a mouse other than the default you will be presented with a\n"
+"mouse test screen. Use the buttons and wheel to verify that the settings\n"
+"are good. If the mouse is not working correctly press the space bar or\n"
+"RETURN to \"Cancel\" and choose again."
+msgstr ""
+
+#: ../../help.pm_.c:560
+#, fuzzy
+msgid ""
+"Please select the correct port. For example, the COM1 port under MS Windows\n"
+"is named ttyS0 under GNU/Linux."
+msgstr ""
+"Mesedez kai zuzena hautatu. Adibidez, MS Windows-eko COM1 kaia\n"
+"ttyS0 izendatzen da GNU/Linux-en."
+
+#: ../../help.pm_.c:564
+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 one authorized to make updates, add users,\n"
+"change the overall system configuration, and so on. In short, \"root\" can\n"
+"do everything! That is why you must choose a password that is difficult to\n"
+"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
+"choose not to enter a password, but we strongly advise you against this if\n"
+"only for one reason: do not think that because you booted GNU/Linux that\n"
+"your other operating systems are safe from mistakes. Since \"root\" can\n"
+"overcome all limitations and unintentionally erase all data on partitions\n"
+"by carelessly accessing the partitions themselves, it is important for it\n"
+"to be difficult to become \"root\".\n"
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. It should never be written down.\n"
+"characters long. Never write down the \"root\" password - it makes it too\n"
+"easy to compromise a system.\n"
 "\n"
+"However, please do not make the password too long or complicated because\n"
+"you must be able to remember it without too much effort.\n"
 "\n"
-"Do not make the password too long or complicated, though: you must be able "
-"to\n"
-"remember it without too much effort."
-msgstr ""
-"Orain zure Linux-Mandrake sistemarako pasahitza sar dezakezu.\n"
-"Pasahitza birritan tekleatu beharko duzu, bigarrenean\n"
-"lehena baieztatzeko.\n"
-"\n"
+"The password will not be displayed on screen as you type it in. Hence, you\n"
+"will have to type the password twice to reduce the chance of a typing\n"
+"error. If you do happen to make the same typing error twice, this\n"
+"\"incorrect\" password will have to be used the first time you connect.\n"
 "\n"
-"Root sistemaren administratzailea da eta sistemaren konfigurazioa\n"
-"aldatu dezakeen bakarra. Beraz, kontuz hautatu\n"
-"pasahitz hau! root kontuaren erabilpen maltzurrak\n"
-"zure sistema eta datuentzako arriskutsua izan daiteke,\n"
-"eta baita bertara konetatuta egon litezkeentzako.\n"
-"Pasahitza gutxienez 8 hizkien luzera duen hitz eta zenbaki nahastea izan "
-"beharko\n"
-"litzateke. Inoiz ez idatzi inon.\n"
+"In expert mode, you will be asked if you will be connecting to an\n"
+"authentication server, like NIS or LDAP.\n"
 "\n"
+"If your network uses LDAP (or NIS) protocol for authentication, select\n"
+"\"LDAP\" (or \"NIS\") as authentication. If you do not know, ask your\n"
+"network administrator.\n"
 "\n"
-"Luzeegia edo konplikatuegia ere ez du izan behar, hau da: neke handiegirik "
-"gabe gogora dezakezuna\n"
-"behar du izan."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"Sistema seguruago izan daitean, hautatu \"Fitxategi itzaldua erabili\" eta\n"
-"\"MD5 pasahitzak erabili\"."
 
-#: ../../help.pm_.c:613
+#: ../../help.pm_.c:600
 msgid ""
-"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
-"network administrator."
-msgstr ""
-"Sareak NIS erabiliz gero, hautatu \"Erabil NIS\". Ez badakizu, sarearen "
-"administrariari\n"
-"galde egiozu."
-
-#: ../../help.pm_.c:617
-msgid ""
-"You may now create one or more \"regular\" user account(s), as\n"
-"opposed to the \"privileged\" user account, root. You can create\n"
-"one or more account(s) for each person you want to allow to use\n"
-"the computer. Note that each user account will have its own\n"
-"preferences (graphical environment, program settings, etc.)\n"
-"and its own \"home directory\", in which these preferences are\n"
-"stored.\n"
+"LILO and GRUB are boot loaders for GNU/Linux. This stage, normally, is\n"
+"totally automated. In fact, DrakX analyzes the disk boot sector and acts\n"
+"accordingly, depending on what it finds here:\n"
 "\n"
+" * if Windows boot sector is found, it will replace it with a GRUB/LILO "
+"boot\n"
+"sector. Hence, you will be able to load either GNU/Linux or another OS;\n"
 "\n"
-"First of all, create an account for yourself! Even if you will be the only "
-"user\n"
-"of the machine, you may NOT connect as root for daily use of the system: "
-"it's a\n"
-"very high security risk. Making the system unusable is very often a typo "
-"away.\n"
+" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
+"one;\n"
 "\n"
+"If in doubt, DrakX will display a dialog with various options.\n"
 "\n"
-"Therefore, you should connect to the system using the user account\n"
-"you will have created here, and login as root only for administration\n"
-"and maintenance purposes."
-msgstr ""
-"Orain \"ohiko\" erabiltzaile kontua(k) egin dezakezu,\n"
-"\"pribilegiatua\" root da. Pertsona bakoitzeko\n"
-"kontu bat baino gehiago egin dezakezu, konputagailuaren erabileraren\n"
-"arabera. Kontuan izan kontu bakoitzak bere aukerak erabiliko dituela\n"
-"(entorno grafikoa, programen aukerak, etab.)\n"
-"eta berezkoa den \"home direktorioa\", non hobespenak gordeko\n"
-"diren.\n"
+" * \"Boot loader to use\": you have three choices:\n"
 "\n"
+"    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
+"interface.\n"
 "\n"
-"Lehenengo eta behi, zurea den kontua egizu! Nahiz eta makinaren erabiltzaile "
-"bakarraizan\n"
-", eguneroko erabileran ezin zintezke root modura konektatu: Oso a\n"
-"arriskutsua izan daitekelako. Sistema izorratudezakezu.\n"
+"    * \"GRUB\": if you prefer GRUB (text menu).\n"
 "\n"
+"    * \"LILO with text menu\": if you prefer LILO with its text menu "
+"interface.\n"
 "\n"
-"Beraz, sistemara ezarritako erabiltzaile kontuaz konektatuko zara\n"
-", eta root login-a bakarrik administraziorako eta mantenurako\n"
-"erabiliko duzu."
-
-#: ../../help.pm_.c:636
-msgid ""
-"Creating a boot disk is strongly recommended. If you can't\n"
-"boot your computer, it's the only way to rescue your system without\n"
-"reinstalling it."
-msgstr ""
-
-#: ../../help.pm_.c:641
-msgid ""
-"You need to indicate where you wish\n"
-"to place the information required to boot to GNU/Linux.\n"
+" * \"Boot device\": in most cases, you will not change the default\n"
+"(\"/dev/hda\"), but if you prefer, the boot loader can be installed on the\n"
+"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\").\n"
 "\n"
+" * \"Delay before booting the default image\": when rebooting the computer,\n"
+"this is the delay granted to the user to choose - in the boot loader menu,\n"
+"another boot entry than the default one.\n"
 "\n"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"GNU/Linux abiarazteko beharrezkoa den informazioa\n"
-"non kokatu nahi duzun galdetuko zaizu.\n"
+"!! Beware that if you choose not to install a boot loader (by selecting\n"
+"\"Cancel\" here), you must ensure that you have a way to boot your Mandrake\n"
+"Linux system! Also be sure you know what you do before changing any of the\n"
+"options. !!\n"
 "\n"
+"Clicking the \"Advanced\" button in this dialog will offer many advanced\n"
+"options, which are reserved to the expert user.\n"
 "\n"
-"Ziur ez bazaude, hautatu \"Honen lehenengo sektorea\n"
-"unitatez (MBR)\"."
-
-#: ../../help.pm_.c:649
-msgid ""
-"Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
-" (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+"Mandrake Linux installs its own boot loader, which will let you boot either\n"
+"GNU/Linux or any other operating systems which you have on your system.\n"
+"\n"
+"If there is another operating system installed on your machine, it will be\n"
+"automatically added to the boot menu. Here, you can choose to fine-tune the\n"
+"existing options. Double-clicking on an existing entry allows you to change\n"
+"its parameters or remove it; \"Add\" creates a new entry; and \"Done\" goes\n"
+"on to the next installation step."
 msgstr ""
-"Bestelakorik ez badakizu, ohikoena \"/dev/hda\" da\n"
-" (IDE disko nagusia) edo \"/dev/sda\" (lehen SCSI diskoa)."
 
-#: ../../help.pm_.c:653
+#: ../../help.pm_.c:647
+#, fuzzy
 msgid ""
-"LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
+"LILO (the LInux LOader) and GRUB are boot loaders: they are able to boot\n"
 "either GNU/Linux or any other operating system present on your computer.\n"
 "Normally, these other operating systems are correctly detected and\n"
 "installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
-"\n"
+"screen. Be careful to choose the correct parameters.\n"
 "\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
+"You may also not want to give access to these other operating systems to\n"
+"anyone. In which case, you can delete the corresponding entries. But then,\n"
+"you will need a boot disk in order to boot those other operating systems!"
 msgstr ""
 "LILO (the LInux LOader) eta Grub abiarazleak dira: biek\n"
 "GNU/Linux edo bestelako sistema eragileak abiarazteko gai dira.\n"
@@ -2946,393 +3073,261 @@ msgstr ""
 "diskete abiarazlea beharko duzu, bestelako sistema eragilerik erabili nahiez "
 "gero!"
 
-#: ../../help.pm_.c:665
+#: ../../help.pm_.c:658
+#, fuzzy
 msgid ""
-"LILO and grub main options are:\n"
-"  - Boot device: Sets the name of the device (e.g. a hard disk\n"
-"partition) that contains the boot sector. Unless you know specifically\n"
-"otherwise, choose \"/dev/hda\".\n"
-"\n"
-"\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero.\n"
-"\n"
-"\n"
-"  - Video mode: This specifies the VGA text mode that should be selected\n"
-"when booting. The following values are available: \n"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\n"
 "\n"
-"    * normal: select normal 80x25 text mode.\n"
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
+msgstr ""
+"GNU/Linux abiarazteko beharrezkoa den informazioa\n"
+"non kokatu nahi duzun galdetuko zaizu.\n"
 "\n"
-"    * <number>:  use the corresponding text mode.\n"
 "\n"
+"Ziur ez bazaude, hautatu \"Honen lehenengo sektorea\n"
+"unitatez (MBR)\"."
+
+#: ../../help.pm_.c:665
+msgid ""
+"Here we select a printing system for your computer to use. Other OSes may\n"
+"offer you one, but Mandrake offers three.\n"
 "\n"
-"  - Clean \"/tmp\" at each boot: if you want delete all files and "
-"directories\n"
-"stored in \"/tmp\" when you boot your system, select this option.\n"
+" * \"pdq\" - which means ``print, don't queue'', is the choice if you have "
+"a\n"
+"direct connection to your printer and you want to be able to panic out of\n"
+"printer jams, and you do not have any networked printers. It will handle\n"
+"only very simple network cases and is somewhat slow for networks. Pick\n"
+"\"pdq\" if this is your maiden voyage to GNU/Linux. You can change your\n"
+"choices after install by running PrinterDrake from the Mandrake Control\n"
+"Center and clicking the expert button.\n"
+"\n"
+" * \"CUPS\" - ``Common Unix Printing System'' is excellent at printing to\n"
+"your local printer and also halfway round the planet. It is simple and can\n"
+"act like a server or a client for the ancient \"lpd\" printing system, so\n"
+"it is compatible with the systems that went before. It can do many tricks,\n"
+"but the basic setup is almost as easy as \"pdq\". If you need this to\n"
+"emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
+"graphical front-ends for printing or choosing printer options.\n"
+"\n"
+" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
+"approximately the same things the others can do, but it will print to\n"
+"printers mounted on a Novell Network, because it supports IPX protocol, and\n"
+"it can print directly to shell commands. If you have need of Novell or\n"
+"printing to commands without using a separate pipe construct, use lprNG.\n"
+"Otherwise, CUPS is preferable as it is simpler and better at working over\n"
+"networks."
+msgstr ""
+
+#: ../../help.pm_.c:693
+#, fuzzy
+msgid ""
+"DrakX is now detecting any IDE devices present in your computer. It will\n"
+"also scan for one or more PCI SCSI card(s) on your system. If a SCSI card\n"
+"is found DrakX will automatically install the appropriate driver.\n"
 "\n"
+"Because hardware detection will sometimes not detect a piece of hardware\n"
+"DrakX will ask you to confirm if a PCI SCSI card is present. Click \"Yes\"\n"
+"if you know that there is a SCSI card installed in your machine. You will\n"
+"be presented a list of SCSI cards to choose from. Click \"No\" if you have\n"
+"no SCSI hardware. If you are unsure you can check the list of hardware\n"
+"detected in your machine by selecting \"See hardware info\" and clicking\n"
+"\"OK\". Examine the list of hardware and then click on the \"OK\" button to\n"
+"return to the SCSI interface question.\n"
 "\n"
-"  - Precise RAM if needed: unfortunately, there is no standard method to ask "
-"the\n"
-"BIOS about the amount of RAM present in your computer. As consequence, Linux "
-"may\n"
-"fail to detect your amount of RAM correctly. If this is the case, you can\n"
-"specify the correct amount or RAM here. Please note that a difference of 2 "
-"or 4\n"
-"MB between detected memory and memory present in your system is normal."
+"If you have to manually specify your adapter, DrakX will ask if you want to\n"
+"specify options for it. You should allow DrakX to probe the hardware for\n"
+"the card-specific options that the hardware needs to initialize. This\n"
+"usually works well.\n"
+"\n"
+"If DrakX is not able to probe for the options that need to be passed, you\n"
+"will need to manually provide options to the driver. Please review the\n"
+"``User Guide'' (chapter 3, section \"Collecting information on your\n"
+"hardware\") for hints on retrieving the parameters required from hardware\n"
+"documentation, from the manufacturer's web site (if you have Internet\n"
+"access) or from Microsoft Windows (if you used this hardware with Windows\n"
+"on your system)."
 msgstr ""
-"LILO eta grub-en aukera nagusiak dira:\n"
-"  - Abiarazteko unitatea: boot sektorea non (e.g. disko zurruna edo\n"
-"non partizioadagoen esaten du). Bestera ez bada,\n"
-"hauta \"/dev/hda\" .\n"
-"\n"
-"\n"
-"  - Atzerapena, jatorrizko imagina abiarazi aurretik: segunduen \n"
-"hamarrekotan imagina abiarazi aurretik behar den itxaron denbora.\n"
-"Erabilgarria teklatua ezagutu eta gero abiarazten diren sistemetan.\n"
-"Abiarazlea ez du itzarongo ez baduzu \"atzerapen\"-en ezer edo zero jarriz "
-"gero.\n"
-"\n"
-"\n"
-"  - Video modua: Hau abiatzerakoan zein VGA testu modua hautatzeko da\n"
-"Hurrengo balioak izan dezake: \n"
-"    * arrunta: hauta 80x25 testu modua.\n"
+"DrakX-ek PCI SCSI egokitzaileak bilatuko ditu. \n"
+"DrakX-ek SCSI egokitzailerik aurkitzekoatan, driver-a ezagutuz gero\n"
+"automatikoki instalatuko d(it)u.\n"
 "\n"
-"    * <zenbakia>:  erabili dagokion testu modua.\n"
+"Ez baduzu SCSI egokitzailerik, ISA SCSI egokitzaile, edo \n"
+"PCI SCSI egokitzailerik galdetuko zaizu ia\n"
+"SCSI egokitzailerik baduzu zure sisteman. Ez baduzu\n"
+"'Ez' klikatu. 'Bai' klikatuz gero, driver zerrenda\n"
+"erakutziko zaizi, eta bertatik hautatu beharko duzu zure egokitzailea.\n"
 "\n"
-"  - Garbitu \"/tmp\" abialdi bakoitzeko: \"/tmp\"en direktorio eta fitxategi "
-"guztiak\n"
-"ezabatu nahi baduzu, boot-ean gordeta dudenak, hauta auketra hau.\n"
 "\n"
+"Eskuz egokitu behar baduzu zure egokitzailea, DrakX-ek\n"
+"harren aukerak galdetuko dizu. DrakX-i frogatzeko aukera\n"
+"eman beharko diozu. Gehienetan ongi doa.\n"
 "\n"
-"  - Zehaztu RAM beharrezko bada: zoritxarrez, BIOSek ez dute ematen modu "
-"standarrean RAMaz\n"
-"duten informazioa ematen. Beraz, Linux-ek akatsak egin ditzake RAMa "
-"zenbatzerakoan.\n"
-"Hala bada, duzun RAMaren tamaina hemen zehaztu zenezake. Kasu, 2-4 Mb-en "
-"gorabeherak\n"
-"normaltzat hartu behar dira."
+"Horrela ez bada, driver-aren aukerak eman beharko duzu.\n"
+"Berrikuzi Instalazio Gida, eta Windows-en arakatu informazioa\n"
+"(windows baduzu noski),\n"
+"hardwarearen dokumentaziorako, edo fabrikatzailearen webgunera\n"
+"jo (Internet baduzu)."
 
-#: ../../help.pm_.c:697
+#: ../../help.pm_.c:720
 msgid ""
-"Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able\n"
-"to boot either GNU/Linux, MacOS, or MacOSX, if present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
-"\n"
-"\n"
-"Yaboot main options are:\n"
+"You can add additional entries for yaboot, either for other operating\n"
+"systems, alternate kernels, or for an emergency boot image.\n"
 "\n"
+"For other OS's, the entry consists only of a label and the root partition.\n"
 "\n"
-"  - Init Message: A simple text message that is displayed before the boot\n"
-"prompt.\n"
+"For Linux, there are a few possible options:\n"
 "\n"
+" * Label: this is simply the name you will have to type at the yaboot "
+"prompt\n"
+"to select this boot option.\n"
 "\n"
-"  - Boot Device: Indicate where you want to place the information required "
-"to \n"
-"boot to GNU/Linux. Generally, you will have setup a bootstrap partition "
-"earlier \n"
-"to hold this information.\n"
+" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
+"or a variation of vmlinux with an extension.\n"
 "\n"
+" * Root: the \"root\" device or \"/\" for your Linux installation.\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"
+" * Append: on Apple hardware, the kernel append option is used quite often\n"
+"to assist in initializing video hardware, or to enable keyboard mouse\n"
+"button emulation for the often lacking 2nd and 3rd mouse buttons on a stock\n"
+"Apple mouse. The following are some examples:\n"
 "\n"
+"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"hda=autotune\n"
 "\n"
-"  - Kernel Boot Timeout: This timeout is similar to the LILO boot delay.  "
-"After \n"
-"selecting Linux, you will have this delay in 0.1 seconds before your "
-"default\n"
-"kernel description is selected.\n"
+"         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"
-"  - Enable CD Boot?: Checking this option will allow you to choose 'C' for "
-"CD at\n"
-"the first boot prompt.\n"
+" * Initrd-size: the default ramdisk size is generally 4,096 bytes. If you\n"
+"need to allocate a large ramdisk, this option can be used.\n"
 "\n"
+" * Read-write: normally the \"root\" partition is initially brought up in\n"
+"read-only, to allow a file system check before the system becomes \"live\".\n"
+"Here, you can override this option.\n"
 "\n"
-"  - Enable OF Boot?: Checking this option will allow you to choose 'N' for "
-"Open\n"
-"Firmware at the first boot prompt.\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"
-"\n"
-"  - Default OS: You can select which OS will boot by default when the Open "
-"Firmware \n"
-"Delay expires."
+" * Default: selects this entry as being the default Linux selection,\n"
+"selectable by just pressing ENTER at the yaboot prompt. This entry will\n"
+"also be highlighted with a \"*\", if you press [Tab] to see the boot\n"
+"selections."
 msgstr ""
 
-#: ../../help.pm_.c:738
+#: ../../help.pm_.c:765
 msgid ""
-"You can add additional entries for yaboot, either for other operating "
-"systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"\n"
-"For other OS's - the entry consists only of a label and the root partition.\n"
-"\n"
-"\n"
-"For Linux, there are a few possible options: \n"
-"\n"
-"\n"
-"  - Label: This is simply the name will type at the yaboot prompt to select "
-"this \n"
-"boot option.\n"
-"\n"
-"\n"
-"  - Image: This would be the name of the kernel to boot.  Typically vmlinux "
-"or\n"
-"a variation of vmlinux with an extension.\n"
+"Yaboot is a boot loader for NewWorld MacIntosh hardware. It is able to boot\n"
+"either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
+"these other operating systems are correctly detected and installed. If this\n"
+"is not the case, you can add an entry by hand in this screen. Be careful as\n"
+"to choose the correct parameters.\n"
 "\n"
+"Yaboot's main options are:\n"
 "\n"
-"  - Root: The root device or '/' for your Linux installation.\n"
-"\n"
+" * Init Message: a simple text message that is displayed before the boot\n"
+"prompt.\n"
 "\n"
-"  \n"
-"  - Append: On Apple hardware, the kernel append option is used quite often "
+" * Boot Device: indicate where you want to place the information required "
 "to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button "
-"emulation\n"
-"for the often lacking 2nd and 3rd mouse buttons on a stock Apple mouse.  The "
-"following \n"
-"are some examples:\n"
-"\n"
-"\n"
-"\t\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
-"hda=autotune\n"
-"\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
+"boot to GNU/Linux. Generally, you setup a bootstrap partition earlier to\n"
+"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"
-" \n"
-"  - Initrd: This option can be used either to load initial modules, before "
-"the boot \n"
-"device is available, or to load a ramdisk image for an emergency boot "
-"situation.\n"
+" * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
+"After selecting Linux, you will have this delay in 0.1 second before your\n"
+"default kernel description is selected.\n"
 "\n"
+" * Enable CD Boot?: checking this option allows you to choose \"C\" for CD\n"
+"at the first boot prompt.\n"
 "\n"
-"  - Initrd-size: The default ramdisk size is generally 4096 bytes.  If you "
-"should need\n"
-"to allocate a large ramdisk, this option can be used.\n"
-"\n"
-"\n"
-"  - Read-write: Normally the 'root' partition is initially brought up read-"
-"only, to allow\n"
-"a filesystem check before the system becomes 'live'.  You can override this "
-"option here.\n"
-"\n"
-"\n"
-"  - NoVideo: Should the Apple video hardware prove to be exceptionally "
-"problematic, you can\n"
-"select this option to boot in 'novideo' mode, with native framebuffer "
-"support.\n"
-"\n"
+" * Enable OF Boot?: checking this option allows you to choose \"N\" for "
+"Open\n"
+"Firmware at the first boot prompt.\n"
 "\n"
-"  - Default: Selects this entry as being the default Linux selection, "
-"selectable by just\n"
-"pressing ENTER at the yaboot prompt.  This entry will also be highlighted "
-"with a '*', if you\n"
-"press TAB to see the boot selections."
+" * Default OS: you can select which OS will boot by default when the Open\n"
+"Firmware Delay expires."
 msgstr ""
 
-#: ../../help.pm_.c:793
+#: ../../help.pm_.c:798
 msgid ""
-"SILO is a bootloader for SPARC: it is able to boot\n"
-"either GNU/Linux or any other operating system present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
+"Here are presented various parameters concerning your machine. Depending on\n"
+"your installed hardware, you may - or not, see the following entries:\n"
 "\n"
+" * \"Mouse\": mouse check the current mouse configuration and click on the\n"
+"button to change it if necessary.\n"
 "\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
-msgstr ""
-"SILO SPARC-en abiarazlea da: GNU/Linux eta bestelako\n"
-"sistema eragileak abiarazi dezake.\n"
-"Normalean, bestelako sistema eragileak zuzen detektatu eta instalatzen "
-"dituzte.\n"
-"Horrela ez bada, pantaila honetan sarrera eskuz gehitu zenezake.\n"
-"Kontuz ibili eta parametro egokiak hautatu.\n"
-"\n"
+" * \"Keyboard\": keyboard check the current keyboard map configuration and\n"
+"click on the button to change that if necessary.\n"
 "\n"
-"Beste sistema eragile batzuetarako sarrera kendu nahiko duzu,\n"
-" orduan dagokion sarrerak ezabatu. Hau egitekotan, \n"
-"diskete abiarazlea beharko duzu, bestelako sistema eragilerik erabili nahiez "
-"gero!"
-
-#: ../../help.pm_.c:805
-msgid ""
-"SILO main options are:\n"
-"  - Bootloader installation: Indicate where you want to place the\n"
-"information required to boot to GNU/Linux. Unless you know exactly\n"
-"what you are doing, choose \"First sector of drive (MBR)\".\n"
-"\n"
-"\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero."
-msgstr ""
-"SILOren aukera nagusiak dira:\n"
-"  - Abiarazlearen instalazioa: Hauta GNU/Linux abiarazteko informazioa non\n"
-"ezarri nahi duzun. Egiten duzuna zehatz ez badakizu,\n"
-"hauta \"diskoaren lehen sektorea (MBR)\"\n"
+" * \"Timezone\": time zoneDrakX, by default, guesses your time zone from "
+"the\n"
+"language you have chosen. But here again, as for the choice of a keyboard,\n"
+"you may not be in the country for which the chosen language should\n"
+"correspond. Hence, you may need to click on the \"Timezone\" button in\n"
+"order to configure the clock according to the time zone you are in.\n"
 "\n"
+" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
+"configuration wizard.\n"
 "\n"
-"  - Atzerapena, jatorrizko imagina abiarazi aurretik: segunduen "
-"hamarrekotan\n"
-"imagina abiarazi aurretik behar den itxaron denbora.\n"
-"Erabilgarria teklatua ezagutu eta gero abiarazten diren sistemetan.\n"
-"Abiarazlea ez du itzarongo ez baduzu \"atzerapen\"-en ezer edo zero jarriz "
-"gero."
-
-#: ../../help.pm_.c:818
-msgid ""
-"Now it's time to configure the X Window System, which is the\n"
-"core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
-"you must configure your video card and monitor. Most of these\n"
-"steps are automated, though, therefore your work may only consist\n"
-"of verifying what has been done and accept the settings :)\n"
+" * \"Sound card\": if a sound card is detected on your system, it is\n"
+"displayed here. No modification possible at installation time.\n"
 "\n"
+" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
+"here. No modification possible at installation time.\n"
 "\n"
-"When the configuration is over, X will be started (unless you\n"
-"ask DrakX not to) so that you can check and see if the\n"
-"settings suit you. If they don't, you can come back and\n"
-"change them, as many times as necessary."
+" * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
+"displayed here. You can click on the button to change the parameters\n"
+"associated to it."
 msgstr ""
-"Orain X Window Sistem konfiguratu behar duzu, hau\n"
-"GNU/Linux GUIren (Graphical User Interface) muina da. Honetarako,\n"
-"monitorea eta bideo txartela konfiguratu behar dituzu. Hurrats\n"
-"gehienak automatikoak dira, beraz, zure lana hautatutakoa\n"
-"baieztatzea eta onartzearena izango da :)\n"
-"\n"
-"\n"
-"Konfigurazioa bukatzerakoan, X abiaraziko da(kontrakoa\n"
-"DrakX-i eskatzen ez badiozu) eta horrela frogatu dezakezu\n"
-"aukeren egokiera. Ez bazaude konforme atzera jo dezakezu,\n"
-"aukerak aldatu eta berriz frogatu."
 
-#: ../../help.pm_.c:831
-msgid ""
-"If something is wrong in X configuration, use these options to correctly\n"
-"configure the X Window System."
-msgstr ""
-"X konfigurazioan zerbait gaizki izanez gero, aukera hauek erabili\n"
-"X Window Sistema konfiguratzeko."
-
-#: ../../help.pm_.c:835
-msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
-msgstr ""
-"Login grafikoa nahi baduzu \"Bai\" hautatu. Bestela, hautatu\n"
-"\"Ez\"."
-
-#: ../../help.pm_.c:839
+#: ../../help.pm_.c:827
+#, fuzzy
 msgid ""
-"You can choose a security level for your system. Please refer to the manual "
-"for complete\n"
-"  information. Basically, if you don't know what to choose, keep the default "
-"option.\n"
+"Choose the hard drive you want to erase to install your new Mandrake Linux\n"
+"partition. Be careful, all data present on it will be lost and will not be\n"
+"recoverable!"
 msgstr ""
+"Aukeratu zure Mandrake Linux partizio berria instalatzeko\n"
+"ezabatu nahi duzun disko gogorra. Kontuz, bertan dauden datu guztiak galdu "
+"egingo dira\n"
+"eta ezingo dira berreskuratu."
 
-#: ../../help.pm_.c:844
+#: ../../help.pm_.c:832
+#, fuzzy
 msgid ""
-"Your system is going to reboot.\n"
+"Click on \"OK\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
 "\n"
-"After rebooting, your new Linux Mandrake system will load automatically.\n"
-"If you want to boot into another existing operating system, please read\n"
-"the additional instructions."
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
-"Zure sistema berabiaraziko da.\n"
+"Sakatu \"Ados\" disko zurrun honetan dauden datu eta\n"
+"partizio guztiak ezabatu nahi badituzu. Kontuz, \"Ados\" sakatu ondoren, "
+"ezin\n"
+"izango dituzu unitate zurrunean dauden datu eta partizioak berreskuratu,\n"
+"edozein Windows datu barne.\n"
 "\n"
-"Berabiarazi ondoren, Linux Mandrake sistema automatikoki kargatuko da.\n"
-"Bestelako sistema eragilerik erabili nahi izanez gero mesedez irakurri\n"
-"instrukzio gehigarriak."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Hautatu hizkuntza"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Hautatu instalazio mota"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Disko zurrunaren detekzioa"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Konfiguratu sagua"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Aukeratu teklatua"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
-msgstr "Segurtasuna"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Fitxategi sistemak egokitu"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Partizioak formateatu"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Aukeratu instalatu beharreko paketeak"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Instalatu sitema"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "root-aren pasahitza ezarri"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Gehitu erabiltzailea"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Konfiguratu sare lana"
+"\n"
+"Sakatu \"Etsi\" unitate zurrunean dagoen datu eta partiziorik galdu gabe\n"
+"eragiketa hau bertan behera uzteko."
 
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
+#: ../../install2.pm_.c:114
+#, c-format
+msgid ""
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
 
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Konfiguratu zerbitzuak"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Bootdisk-a eraiki"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Instalatu bootloader-ra"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Konfiguratu X"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Instalaziotik irten"
-
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3346,21 +3341,30 @@ msgid ""
 "\n"
 "Do you really want to install these servers?\n"
 msgstr ""
+"Hautatu duzun zerbitzaria(k): %s\n"
+"\n"
+"\n"
+"Zerbitzari hauek jatorriz aktibatuta daude. Ez dute segurtasunezko inolako\n"
+"informaziorik, baina berriak aurki daitezke. Horrela bada, lehen bait lehen "
+"eguneratu.\n"
+"\n"
+"\n"
+"Benetan instalatu nahi dituzu zerbitzariok?\n"
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
 msgstr "NIS domeinurik gabe ezin erabili broadcast"
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "%s-n diskoa sartu, FAT formatuduna"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
-msgstr ""
+msgstr "Diskete hau ez dago FATekin eratua"
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -3368,30 +3372,20 @@ msgstr ""
 "Gordetako paketeen aukera erabiltzeko,``linux defcfg=floppy'' "
 "instalazioaabiarazi"
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "$f fitxategia irakurtzean errorea"
-
-#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:310
-#: ../../interactive.pm_.c:99 ../../interactive.pm_.c:114
-#: ../../interactive.pm_.c:269 ../../interactive_newt.pm_.c:166
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:356
-#: ../../my_gtk.pm_.c:617 ../../my_gtk.pm_.c:640
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "%s fitxategia irakurtzean errorea"
+
+#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:325
+#: ../../interactive.pm_.c:107 ../../interactive.pm_.c:122
+#: ../../interactive.pm_.c:286 ../../interactive.pm_.c:308
+#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:170
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:415
+#: ../../my_gtk.pm_.c:716 ../../my_gtk.pm_.c:738
 msgid "Ok"
 msgstr "Ados"
 
-#: ../../install_gtk.pm_.c:423
-msgid "Please test the mouse"
-msgstr "Mesedez testatu sagua"
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "Sagua pizteko,"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "GURPILA BIRA ARAZI!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -3402,7 +3396,7 @@ msgstr ""
 "gidariak behar ditu.\n"
 "Horri buruzko informazioa hemen duzu: %s"
 
-#: ../../install_interactive.pm_.c:41
+#: ../../install_interactive.pm_.c:44
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -3412,11 +3406,11 @@ msgstr ""
 "Honetarako, partizioa eratu (edo existitzen deneko batean klikatu).\n"
 "Geru hauta ``Muntai puntua'' eta `/' ezarri"
 
-#: ../../install_interactive.pm_.c:46 ../../install_steps_graphical.pm_.c:259
+#: ../../install_interactive.pm_.c:49 ../../install_steps_graphical.pm_.c:259
 msgid "You must have a swap partition"
 msgstr "swap partizioa beharrezko duzu"
 
-#: ../../install_interactive.pm_.c:47 ../../install_steps_graphical.pm_.c:261
+#: ../../install_interactive.pm_.c:50 ../../install_steps_graphical.pm_.c:261
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -3426,55 +3420,59 @@ msgstr ""
 "\n"
 "Jarraitu?"
 
-#: ../../install_interactive.pm_.c:68
+#: ../../install_interactive.pm_.c:53 ../../install_steps.pm_.c:165
+msgid "You must have a FAT partition mounted in /boot/efi"
+msgstr "\"/boot/efi\"-n FAT partizio bat muntatuta eduki behar duzu"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Erabili toki librea"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "Ez dago lekurik partizio berririk ezartzeko"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "Erabili dauden partizioak"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "Ez dago partizio erabilgarririk"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "Loopback-erako erabili Windows partizioa"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Zein partizio erabili nahi duzu Linux4Win ezartzeko?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "Hautatu tamainak"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "Root partizioaren tamaina MBetan: "
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "Swap partizzioaren tamaina MBetan: "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "Erabili Windows partizioako toki librea"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "Zein partizio berregokitu nahi duzu?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "Windows-aren fitxategi-sistemen loturak zenbatzen"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -3483,11 +3481,11 @@ msgstr ""
 "FATaren berregokitzaileak ezin du zure partizioan eragin, \n"
 "hurrengo errorea gertatu da: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr "Zure windows partizioa oso zatikatua, mesedez ``defrag'' egin"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -3502,23 +3500,23 @@ msgstr ""
 "DrakX-ek zure Windows partizioa egokitu behar du. Kontuz: operazio hau\n"
 "arriskutsua da. Ez baduzu oraindik egin, aurretik scandisk abiarazi (eta\n"
 "aukeran defrag) partizio honetan eta egizu backupa.\n"
-"Ziur bazaude, sakatu Ok."
+"Ziur bazaude, sakatu Ados."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "Zein tamaina gorde nahi duzu windowserako?"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "partizioa %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "FAT tamaina egokierak huts egin du: %s"
 
-#: ../../install_interactive.pm_.c:145
+#: ../../install_interactive.pm_.c:154
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
@@ -3526,33 +3524,33 @@ msgstr ""
 "Ez dao FAT partiziorik berregokitzeko edo loopback bezala erabiltzeko (edo "
 "ez da lekurik geratzen)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
-msgstr ""
+msgstr "Ezabatu disko osoa"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "Ezabatu Windows(TM)"
 
-#: ../../install_interactive.pm_.c:154
+#: ../../install_interactive.pm_.c:163
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr ""
 "Disko zurrun bat baino gehiago duzu, zeinetan instalatu nahi duzu linux?"
 
-#: ../../install_interactive.pm_.c:157
+#: ../../install_interactive.pm_.c:166
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "Dauden partizio GUZTIAK eta hauetako datuak galduko dira %s-n"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 msgstr "Norberaren araberako partizioak"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "Erabili fdisk"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -3561,28 +3559,28 @@ msgstr ""
 "%s partizioa egin dezakezu orain\n"
 "Eginda dagoenean, ez ahaztu, gorde `w' erabiliz"
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
 msgstr "Ez duzu Windows partizioan toki libre nahikorik"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
 msgstr "Ezin dut intalaziorako lekurik aurkitu"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DraX-en partiziorako tresnak hurrengo soluzioak aurkitu ditu:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Partizioak huts egin du: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "Sarea eraikitzen"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "Sarea beheratzen"
 
@@ -3594,12 +3592,12 @@ msgstr ""
 "Errorea eman da eta ezin dezaket egokiro kudeatu.\n"
 "Jarraitu zure kabuz."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "%s muntaia puntua bikoiztu"
 
-#: ../../install_steps.pm_.c:385
+#: ../../install_steps.pm_.c:384
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
@@ -3611,16 +3609,16 @@ msgstr ""
 "Saiatu cd-a instalatutako konputagailuren batean \"rpm -qpl Mandrake/RPMS/*."
 "rpm\" erabiliaz\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "Ongi etorri %s-ra"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "Ez dago disketerik"
 
-#: ../../install_steps_auto_install.pm_.c:51
+#: ../../install_steps_auto_install.pm_.c:77
 #: ../../install_steps_stdio.pm_.c:23
 #, c-format
 msgid "Entering step `%s'\n"
@@ -3634,32 +3632,32 @@ msgstr "Instalatu nahi duzunaren tamaina hautatu"
 msgid "Total size: "
 msgstr "Tamaina guztira: "
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:437
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:387
 #, c-format
 msgid "Version: %s\n"
 msgstr "Bertsioa: %s\n"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:438
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:388
 #, c-format
 msgid "Size: %d KB\n"
 msgstr "Tamaina: %d KB\n"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:337
-#: ../../install_steps_interactive.pm_.c:520
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:509
 msgid "Choose the packages you want to install"
 msgstr "Instalatu nahi dituzun paketeak hautatu"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:340
+#: ../../install_steps_graphical.pm_.c:465 ../../interactive_gtk.pm_.c:571
 msgid "Info"
 msgstr "Info"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:345
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:457
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Install"
 msgstr "Instalatu"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:558
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:497
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Installing"
 msgstr "Instalatzen"
 
@@ -3667,7 +3665,7 @@ msgstr "Instalatzen"
 msgid "Please wait, "
 msgstr "Mesedez itxaron, "
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:570
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:510
 msgid "Time remaining "
 msgstr "Falta den denbora "
 
@@ -3676,21 +3674,21 @@ msgid "Total time "
 msgstr "Denbora guztira"
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "Instalazioa prestatzen"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:618
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:558
 #, c-format
 msgid "Installing package %s"
 msgstr "%s paketea instalatzen"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
+#: ../../install_steps_gtk.pm_.c:646
 msgid "Go on anyway?"
 msgstr "Jarraitu dena den?"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
 msgid "There was an error ordering packages:"
 msgstr "Paketeak antolatzerakoan errorea izan da:"
 
@@ -3698,29 +3696,33 @@ msgstr "Paketeak antolatzerakoan errorea izan da:"
 msgid "Use existing configuration for X11?"
 msgstr "X11-rako dagoen konfigurazioa erabili?"
 
-#: ../../install_steps_gtk.pm_.c:142
+#: ../../install_steps_gtk.pm_.c:148
 msgid ""
 "Your system is low on resource. You may have some problem installing\n"
-"Linux-Mandrake. If that occurs, you can try a text install instead. For "
+"Mandrake Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Zure sistemak ahalmen gutxi du. Linux-Mandrakeren instalazioak arazoak eman\n"
+"Zure sistemak ahalmen gutxi du. Mandrake Linuxren instalazioak arazoak eman\n"
 " ditzazke. Horrela bada, Testu bidezko instalazioe egin zenezake. Hartarako, "
 "sakatu,\n"
 "`F1' CDROMa abiatzerakoan, eta gero sartu `text'."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Instalazio mota"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "Mesedez, hurrengoetatik instalazio mota hautatu"
 
-#: ../../install_steps_gtk.pm_.c:222
+#: ../../install_steps_gtk.pm_.c:228
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr "Hautatutako taldeen tamaina gutxigorabehera %d MBekoa da.\n"
 
-#: ../../install_steps_gtk.pm_.c:224
+#: ../../install_steps_gtk.pm_.c:230
 #, c-format
 msgid ""
 "If you wish to install less than this size,\n"
@@ -3733,7 +3735,7 @@ msgstr ""
 "hauta instalatu nahi duzun paketeen ehunekoa.\n"
 "100%%ekoak pakete guztiak instalatuko du."
 
-#: ../../install_steps_gtk.pm_.c:229
+#: ../../install_steps_gtk.pm_.c:235
 #, c-format
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
@@ -3750,83 +3752,67 @@ msgstr ""
 "Ehuneko txikiak pakete nagusiak instalatuko ditu;\n"
 "%d%% ehunekoak ahal bezain besteko paketeak instalatuko ditu."
 
-#: ../../install_steps_gtk.pm_.c:235
+#: ../../install_steps_gtk.pm_.c:241
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "Hurrengo hurratsean zehatzago hauta dezakezu"
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "Instalatu beharreko paketeen ehunekoa"
 
-#: ../../install_steps_gtk.pm_.c:285 ../../install_steps_interactive.pm_.c:599
+#: ../../install_steps_gtk.pm_.c:291 ../../install_steps_interactive.pm_.c:619
 msgid "Package Group Selection"
 msgstr "Pakete Taldearen aukeraketa"
 
-#: ../../install_steps_gtk.pm_.c:305 ../../install_steps_interactive.pm_.c:614
+#: ../../install_steps_gtk.pm_.c:320 ../../install_steps_interactive.pm_.c:634
 msgid "Individual package selection"
 msgstr "Banan-banako pakete hautapena"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "Zabaldu adarrak"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Batu adarrak"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Toggle between flat and group sorted"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Tamaina guztira: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Pakete okerra"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Izena: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Garrantzia: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Tamaina guztira: %d / %d MB"
-
-#: ../../install_steps_gtk.pm_.c:467
+#: ../../install_steps_gtk.pm_.c:411
 msgid ""
 "You can't select this package as there is not enough space left to install it"
 msgstr "Ez dago lekurik pakete honetarako"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "Hurrengo paketeak instalatuko dira"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "Hurrengo paketeak ezabatuko dira"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "Ezin hauta/kendu pakete hau"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Ezinbesteko paketea da, ezin zaio huatapena kendu"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
 msgstr "Ezin duzu hautatutako hau kendu. Dagoeneko instalatua"
 
-#: ../../install_steps_gtk.pm_.c:507
+#: ../../install_steps_gtk.pm_.c:447
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -3834,24 +3820,40 @@ msgstr ""
 "Pakete hau eguneratu behar da\n"
 "Aukera kendu nahi?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Ezin duzu hautatutakoa kendu. Eguneratu behar da"
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr "Erakutsi automatikoki aukeraturiko paketeak"
+
+#: ../../install_steps_gtk.pm_.c:460
+msgid "Load/Save on floppy"
+msgstr "Zamatu/Gorde disketean"
+
+#: ../../install_steps_gtk.pm_.c:461
+msgid "Updating package selection"
+msgstr "Pakete aukera eguneratzen"
+
+#: ../../install_steps_gtk.pm_.c:466
+msgid "Minimal install"
+msgstr "Gutxieneko instalazioa"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "Neurtzen"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
 msgstr "Instalazioa prestatzen, itzaron mesedez"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d pakete"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -3882,16 +3884,43 @@ msgid ""
 "respective authors and are protected by intellectual property and \n"
 "copyright laws applicable to software programs.\n"
 msgstr ""
+"\n"
+"Adi\n"
+"\n"
+"Mesedez behean dauden zehazpenak arretaz irakur. Edozerekin\n"
+"e bazaude ados, ezin duzu hurrengo CDak instalatu. Saka 'Ez onartu' \n"
+"instalazioarekin jarraitzeko Cd horiek erabili gabe.\n"
+"\n"
+"\n"
+"Hurrengo CDetako zenbait atal ez daude GPL lizentzia edo\n"
+"antzekoez arautuak. Osagai horietako bakoitzak bere zehazpen eta\n"
+"baldintza bereziak ditu. \n"
+"Mesedez arretaz irakur eta bete lizentziotako zehaztapen eta baldintzak \n"
+"inolako osagaion erabilpen edo banaketa egingo baduzu. \n"
+"Lizentziok gehienetan debekatzen dute transferentzia,  bikoizpena \n"
+"(backup-erako ez bada), berbanaketa, reverse engineering, \n"
+"de-assembly, de-compilation edo aldaketarik osagaietan. \n"
+"Akordioaren edozein apurketak, lizentziarekiko dituzun ahalmenak \n"
+"ezabatuko ditu. Lizentzia berezi bakoitzak ez badizu baimen berezirik\n"
+"ematen sisteman zein sarean erabiltzeko. Dudatan bazaude, mesedez "
+"osagaiaren \n"
+"editore edo banatzailearengana zuzenean jo. \n"
+"Gehienetan transferentziak eta kopak debekatuta daude.\n"
+"\n"
+"\n"
+"Hurrengo CDetako osagaien jabetza, dagokion jabearena da eta \n"
+"bere jabetza intelektuala eta copyright'a  babesttuta daude \n"
+"software programetaz arduratzen diren legeez.\n"
 
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Accept"
 msgstr "Onartu"
 
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Refuse"
 msgstr "Ez onartu"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -3902,10 +3931,11 @@ msgid ""
 msgstr ""
 "Aldatu Cd-Rom-a!\n"
 "\n"
-"Mesedez, \"%s\" izena duen Cd-Rom-a sartu unitatean eta gero Ok sakaegizu.\n"
+"Mesedez, \"%s\" izena duen Cd-Rom-a sartu unitatean eta gero Ados "
+"sakaegizu.\n"
 "Ez baldin baduzu Etsi sakatu Cd-Rom-etiko instalazioa ezeztatzeko."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "Paketeak instalatzerakoan errorea izan da:"
 
@@ -3913,36 +3943,21 @@ msgstr "Paketeak instalatzerakoan errorea izan da:"
 msgid "An error occurred"
 msgstr "Errorea gertatu da"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "Mesedez, hauta hizkuntza."
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr ""
-"Instalazioaren ondoren erabilgarriak izan daitezkeen beste hizkuntzak hauta "
-"dezakezu"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "Denak"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
-msgstr ""
+msgstr "Lizentzia adostasuna"
 
-#: ../../install_steps_interactive.pm_.c:87
+#: ../../install_steps_interactive.pm_.c:72
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Linux-"
-"Mandrake distribution \n"
+"The operating system and the different components available in the Mandrake "
+"Linux 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 Linux-Mandrake distribution.\n"
+"system and the different components of the Mandrake Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -3996,7 +4011,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 Linux-Mandrake sites  which are prohibited or restricted in some "
+"from one of Mandrake Linux 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"
@@ -4033,7 +4048,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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
 "MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -4053,103 +4068,99 @@ msgid ""
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:182
-#: ../../install_steps_interactive.pm_.c:822
+#: ../../install_steps_interactive.pm_.c:168
+#: ../../install_steps_interactive.pm_.c:871
 #: ../../standalone/keyboarddrake_.c:28
 msgid "Keyboard"
 msgstr "Teklatua"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "Mesedez, hauta zure teklatuaren itxura."
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
-msgstr ""
+msgstr "Hemen dago aukeratu daitezkeen teklatuen zerrenda osoa"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Instalazio mota"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "Zein instalazio mota nahi duzu?"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
 msgstr "Instalatu/Eguneratu"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
 msgstr "Instalazioa edo eguneraketa da?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Gomendatua"
 
-#: ../../install_steps_interactive.pm_.c:215
-#: ../../install_steps_interactive.pm_.c:218
+#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:204
 msgid "Expert"
 msgstr "Aditua"
 
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Update"
 msgstr "Eguneratu"
 
-#: ../../install_steps_interactive.pm_.c:238 ../../standalone/mousedrake_.c:41
+#: ../../install_steps_interactive.pm_.c:224 ../../standalone/mousedrake_.c:48
 msgid "Please, choose the type of your mouse."
 msgstr "Mesedez, hauta da zure sagu mota."
 
-#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:57
+#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
 msgid "Mouse Port"
 msgstr "Saguaren kaia(port)"
 
-#: ../../install_steps_interactive.pm_.c:245 ../../standalone/mousedrake_.c:58
+#: ../../install_steps_interactive.pm_.c:231 ../../standalone/mousedrake_.c:65
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Mesedez, hauta zure sagua serieko zein kaietara konektatua dagoen."
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
-msgstr ""
+msgstr "Botoien emulazioa"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
-msgstr ""
+msgstr "2. Botoiaren Emulazioa"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
-msgstr ""
+msgstr "3. Botoiaren Emulazioa"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "PCMCIA txartelak konfiguratzen..."
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "Configuring IDE"
 msgstr "IDE Konfiguratzen"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:295
+#: ../../install_steps_interactive.pm_.c:281
 msgid "no available partitions"
 msgstr "ez dago partizio erabilgarririk"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
-msgstr ""
+msgstr "Partizioak azterkatzen muntaia puntu bila"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "Muntai puntuak hautatu"
 
-#: ../../install_steps_interactive.pm_.c:323
+#: ../../install_steps_interactive.pm_.c:311
 #, c-format
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
@@ -4164,7 +4175,7 @@ msgstr ""
 "(Akatsa: %s)\n"
 "\n"
 
-#: ../../install_steps_interactive.pm_.c:336
+#: ../../install_steps_interactive.pm_.c:324
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
@@ -4172,48 +4183,58 @@ msgstr ""
 "DiskDrake-k ezin izan du partizio taula irakurrri.\n"
 "Zure kontura jarraitu!"
 
-#: ../../install_steps_interactive.pm_.c:361
+#: ../../install_steps_interactive.pm_.c:340
+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_.c:349
+msgid "No root partition found to perform an upgrade"
+msgstr "Ez da eguneratzea gauzatzeko erro partizioa aurkitu"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "Root partizioa"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
 msgstr "Zure sisteman zein da root (/) partizioa?"
 
-#: ../../install_steps_interactive.pm_.c:376
+#: ../../install_steps_interactive.pm_.c:365
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "Aldaketak indarrean jar daitezen breabiatu behar duzu ordenadorea"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "Hautatu formateatu nahi duzun partizioak"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "Bloke txarrak txekeatu?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "Partizioak formateatzen"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "%s fitxategia eratzen eta formateatzen"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Instalazioa burutzeko swap nahikorik ez, mesedez gehitu pixka bat"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "Erabilgarri dauden paketeak bilatzen"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "Eguneratu beharreko paketeak bilatzen"
 
-#: ../../install_steps_interactive.pm_.c:461
+#: ../../install_steps_interactive.pm_.c:450
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
@@ -4221,30 +4242,56 @@ msgstr ""
 "Zure sistemak ez du leku nahikorik instalaziorako edo eguneratzerako (%d > %"
 "d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Osoa (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "Minimoa (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Gomendatua (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "Norberarena"
 
-#: ../../install_steps_interactive.pm_.c:585
-msgid "Selected size is larger than available space"
+#: ../../install_steps_interactive.pm_.c:522
+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_.c:650
+#: ../../install_steps_interactive.pm_.c:525
+msgid "Load from floppy"
+msgstr "Disketetik zamatu"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Loading from floppy"
+msgstr "Disketetik zamatzen"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Package selection"
+msgstr "Pakete aukeraketa"
+
+#: ../../install_steps_interactive.pm_.c:532
+msgid "Insert a floppy containing package selection"
+msgstr "Sartu pakete aukeraketa daukan diskete bat"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Floppy-an gorde"
+
+#: ../../install_steps_interactive.pm_.c:605
+msgid "Selected size is larger than available space"
+msgstr "Aukeraturiko neurria leku eskuragarria baino handiagoa da"
+
+#: ../../install_steps_interactive.pm_.c:670
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -4254,12 +4301,12 @@ msgstr ""
 "Ez badituzu, Etsi klikatu.\n"
 "Ez duzuna ezaba dezakezu, eta gero Ados klikatu."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom etiketan %s"
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -4268,11 +4315,21 @@ msgstr ""
 "%s paketea instalatzen\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "Postinstalazioaren konfigurazioa"
 
-#: ../../install_steps_interactive.pm_.c:718
+#: ../../install_steps_interactive.pm_.c:719
+#, c-format
+msgid "Please insert the Boot floppy used in drive %s"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:725
+#, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "Mesedez, sartu Eguneratze Moduluen disketea %s unitatean"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -4342,93 +4399,133 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:750
+#: ../../install_steps_interactive.pm_.c:782
 msgid "Choose a mirror from which to get the packages"
 msgstr "Hautatu paketeak lortzeko erabiliko duzun mirror-a"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Mirror-arekin kontaktazen eskuragai dauden pakete zerrenda lortzeko"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "Mesedea hauta instalatu nahi dituzun paketeak."
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "Zein da zure ordu eremua?"
 
-#: ../../install_steps_interactive.pm_.c:778
-msgid "Is your hardware clock set to GMT?"
-msgstr "Zure hardwareko erlojua GTMari egokitua dago?"
+#: ../../install_steps_interactive.pm_.c:813
+msgid "Hardware clock set to GMT"
+msgstr "Hardware ordularia GTMra egokituta"
+
+#: ../../install_steps_interactive.pm_.c:814
+msgid "Automatic time synchronization (using NTP)"
+msgstr "Denbora sinkronizazio automatikoa (NTP erabiliz)"
+
+#: ../../install_steps_interactive.pm_.c:821
+msgid "NTP Server"
+msgstr "NTP Zerbitzaria"
 
-#: ../../install_steps_interactive.pm_.c:806 ../../printer.pm_.c:22
-#: ../../printerdrake.pm_.c:415
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
 msgstr "Urrutiko CUPS zerbitzaria"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "Irarkolarik ez"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Laburpena"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
 msgstr "Sagua"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr "Ordu-eremua"
 
-#: ../../install_steps_interactive.pm_.c:824 ../../printerdrake.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:873 ../../printerdrake.pm_.c:1773
+#: ../../printerdrake.pm_.c:1844
 msgid "Printer"
 msgstr "Irarkola"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:875
 msgid "ISDN card"
 msgstr "ISDAN txarela"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
 msgstr "Soinu txartela"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr "TB txartela"
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "Zein inprimaketa sistema erabili nahi duzu?"
+#: ../../install_steps_interactive.pm_.c:917
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:945
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../../install_steps_interactive.pm_.c:918
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:954
+msgid "NIS"
+msgstr "NIS"
+
+#: ../../install_steps_interactive.pm_.c:919
+#: ../../install_steps_interactive.pm_.c:941
+msgid "Local files"
+msgstr "Bertako fitxategiak"
+
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "root-aren pasahitza ezarri"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Pasahitzik ez"
 
-#: ../../install_steps_interactive.pm_.c:901
+#: ../../install_steps_interactive.pm_.c:935
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "Pasahitza sinpleegia da (gutxienez %d karaktere izan behar ditu)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "NIS erabili"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Egiaztapena"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "orri horiak"
+#: ../../install_steps_interactive.pm_.c:949
+msgid "Authentication LDAP"
+msgstr "LDAP autentifikazioa"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
-msgstr "NIS egiaztapena"
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr "LDAP dn Oinarria"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:951
+msgid "LDAP Server"
+msgstr "LDAP Zerbitzaria"
+
+#: ../../install_steps_interactive.pm_.c:957
+msgid "Authentication NIS"
+msgstr "NIS Autentifikazioa"
+
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
-msgstr "NIS domeinua"
+msgstr "NIS Domeinua"
 
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:959
 msgid "NIS Server"
 msgstr "NIS Zerbitzaria:"
 
-#: ../../install_steps_interactive.pm_.c:951
+#: ../../install_steps_interactive.pm_.c:994
 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 "
@@ -4456,19 +4553,19 @@ msgstr ""
 "porrotetatik berreskura dezake. Zure sistemarako disko abiarazlerik egin "
 "nahi baduzu \"Ados\" klikatu."
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Lehenengo diskete unitatea"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Bigarren diskete unitatea"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "Ahaztu"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:1017
 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 "
@@ -4492,32 +4589,44 @@ msgstr ""
 "porrotetatik berreskura dezake. Zure sistemarako disko abiarazlerik egin "
 "nahi duzu?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "Parkatu, ez dago disko unitate erabilgarririk"
 
-#: ../../install_steps_interactive.pm_.c:987
+#: ../../install_steps_interactive.pm_.c:1030
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Hautatu disko abiarazlea egiteko erabiliko den unitatea"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "%s-n diskoa sartu"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "Disko abiarazlea eraikitzen"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "Abiarazlea prestatzen"
 
-#: ../../install_steps_interactive.pm_.c:1010
+#: ../../install_steps_interactive.pm_.c:1055
+msgid ""
+"You appear to have an OldWorld or Unknown\n"
+" machine, the yaboot bootloader will not work for you.\n"
+"The install will continue, but you'll\n"
+" need to use BootX to boot your machine"
+msgstr ""
+"Dirudienez makina ezezaguna edo oso zaharra\n"
+"daukazu, yaboot abiarazlea ez da zurean ibiliko.\n"
+"Instalazioak jarraituko du, baino BootX\n"
+"erabili beharko duzu zure makina abiatzeko."
+
+#: ../../install_steps_interactive.pm_.c:1060
 msgid "Do you want to use aboot?"
 msgstr "aboot erabili nahi duzu?"
 
-#: ../../install_steps_interactive.pm_.c:1013
+#: ../../install_steps_interactive.pm_.c:1063
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -4526,51 +4635,54 @@ msgstr ""
 "indarrez ezarri instalazioa nahiz eta lehen partizioa urratzeko arriskua "
 "egon?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "Instalatu bootloader-ra"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "abiarazlearen instalazioak porrot egin du. Errore hau izan da:"
 
-#: ../../install_steps_interactive.pm_.c:1030
+#: ../../install_steps_interactive.pm_.c:1084
+#, 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 $of_boot,\\\\:tbxi\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_.c:1038 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1092 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "Gutxi"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Ertaina"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Handia"
 
-#: ../../install_steps_interactive.pm_.c:1044 ../../standalone/draksec_.c:49
+#: ../../install_steps_interactive.pm_.c:1098 ../../standalone/draksec_.c:62
 msgid "Choose security level"
 msgstr "Hautatu segurtasun neurria"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr "Linuxaren replikazioarako auto install floppya egin nahi duzu?"
-
-#: ../../install_steps_interactive.pm_.c:1082
+#: ../../install_steps_interactive.pm_.c:1134
+#: ../../standalone/drakautoinst_.c:80
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "%s-n disko hutsa sartu"
 
-#: ../../install_steps_interactive.pm_.c:1096
-#: ../../install_steps_interactive.pm_.c:1128
+#: ../../install_steps_interactive.pm_.c:1138
+#: ../../standalone/drakautoinst_.c:82
 msgid "Creating auto install floppy"
 msgstr "Berez instalatzeko disketea prestatzen"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -4580,33 +4692,33 @@ msgstr ""
 "\n"
 "Benetan irten nahi duzu?"
 
-#: ../../install_steps_interactive.pm_.c:1167
+#: ../../install_steps_interactive.pm_.c:1160
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
-"For information on fixes which are available for this release of Linux-"
-"Mandrake,\n"
-"consult the Errata available from http://www.linux-mandrake.com/.\n"
+"For information on fixes which are available for this release of Mandrake "
+"Linux,\n"
+"consult the Errata available from http://www.mandrakelinux.com/.\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Linux-Mandrake User's Guide."
+"install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
 "Zorionak, instalazioa osotu duzu.\n"
 "Abiarazlea (boot media) kendu eta return sakatu berrabiatzeko.\n"
 "\n"
-"Linux-Mandrake honentzako beharrezko litzatezken konpoketetaz jabetzeko,\n"
-"http://www.linux-mandrake.com/-n dauden Erratak begiratu.\n"
+"Mandrake Linux honentzako beharrezko litzatezken konpoketetaz jabetzeko,\n"
+"http://www.mandrakelinux.com/-n dauden Erratak begiratu.\n"
 "\n"
 "Systemaren post instalaziozko konfiguraziorako beharrezkoa den informazioa\n"
-"Linux-Mandrake Erabiltzailearen Gida Ofizialean dagoen instalazio kapitulura "
+"Mandrake Linux Erabiltzailearen Gida Ofizialean dagoen instalazio kapitulura "
 "jo."
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
 msgstr "Berez instalatzeko disketea prestatu"
 
-#: ../../install_steps_interactive.pm_.c:1181
+#: ../../install_steps_interactive.pm_.c:1174
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -4620,42 +4732,59 @@ msgstr ""
 "\n"
 "Instalazioa berriz abiariazi nahi zenezake.\n"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "Automatikoa"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
 msgstr "Berabiatu"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 msgstr "Pakete hautapena gorde"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Linux-Mandrake-ren %s instalazioa"
+msgid "Mandrake Linux Installation %s"
+msgstr "Mandrake Linux-ren %s instalazioa"
 
-#: ../../install_steps_newt.pm_.c:33
+#: ../../install_steps_newt.pm_.c:34
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> elementuen artean  | <Space> hautatzeko | <F12> hurrengo "
 "pantaila "
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
 msgstr "kdesu galduta"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "Hautatu akzioa"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "Mesedez itxaron"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Zabaldu adarrak"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Batu adarrak"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Toggle between flat and group sorted"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -4681,267 +4810,288 @@ msgstr "Zure aukera? (jatorrizkoa %s"
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Zure aukera? (jatorrizko % sar `none' ezer denean"
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "Txekoa (QWERTZ)"
 
-#: ../../keyboard.pm_.c:125 ../../keyboard.pm_.c:138 ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:141 ../../keyboard.pm_.c:155 ../../keyboard.pm_.c:180
 msgid "German"
 msgstr "Germaniarra"
 
-#: ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:142
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:127 ../../keyboard.pm_.c:164
+#: ../../keyboard.pm_.c:143 ../../keyboard.pm_.c:186
 msgid "Spanish"
 msgstr "Hegoko Euskalduna edo Espaniarra"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "Finlandarra"
 
-#: ../../keyboard.pm_.c:129 ../../keyboard.pm_.c:139 ../../keyboard.pm_.c:166
+#: ../../keyboard.pm_.c:145 ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:188
 msgid "French"
 msgstr "Iparreko Euskalduna edo Frantziarra"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
 msgstr "Norbegiarra"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "Polonesa"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "Errusiarra"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "Suediarra"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "Erresuma Batukoa"
 
-#: ../../keyboard.pm_.c:134 ../../keyboard.pm_.c:137 ../../keyboard.pm_.c:204
+#: ../../keyboard.pm_.c:152 ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:237
 msgid "US keyboard"
 msgstr "Estatu Batuetakoa"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+msgid "Albanian"
+msgstr "Albaniarra"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "Armeniarra (zaharra)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "Armeniarra (teklatuzkoa)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "Armeniarra (fonetikoa)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "Azerbaidjan-era (latinoa)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Azerbaidjan-era (zirilikoa)"
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "Belgikarra"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "Bulgariarra"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "Brazildarra"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Bielorrusiarra"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "Suitzarra (Germaniarra)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "Suitzarra (Frantseza)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "Txekoa (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr ""
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "Alemana (alferrikako teklarik ez)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "Daniarra"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:183
 msgid "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:184
 msgid "Dvorak (Norwegian)"
 msgstr "Dvorak (Norbegiarra)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Estoniarra"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgiarra (\"Errusiarra\")"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgiarra (\"Latindarra\")"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "grekoa"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "Hungariarra"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Kroata"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "Israeldarra"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "Israeldarra (fonetikoa)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Iraniarra"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "Islandiarra"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "Italiarra"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "Japoniarra 106 tekla"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
 msgstr "Korearra"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "Amerika latindarra"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr ""
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "Holandarra"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lituaniako AZERTY (zaharra)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lituaniako AZERTY (berria)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lituaniako \"lerro zenbakia\" QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lituaniako \"fonetikoa\"QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "Kokapena"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Mazedoniarra"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "Holandarra"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Poloniarra (QWERTY)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Poloniarra (QWERTZ)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "Portugaldarra"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "Kanadakoa (Quebec)"
 
-#: ../../keyboard.pm_.c:193
+#: ../../keyboard.pm_.c:217
+msgid "Romanian (qwertz)"
+msgstr "Errumaniarra (qwertz)"
+
+#: ../../keyboard.pm_.c:218
+msgid "Romanian (qwerty)"
+msgstr "Errumaniarra (qwerty)"
+
+#: ../../keyboard.pm_.c:220
 msgid "Russian (Yawerty)"
 msgstr "Errusiarra (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "Suediarra"
-
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "Eslobeniarra"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "Eslobakiarra (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "Eslobakiarra (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr ""
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "Azerbaidjan-era (zirilikoa)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Tailandarra"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "Tailandarra"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turkiarra (ohiko \"F\" modeloa"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turkiarra (modernoa \"Q\" modeloa"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ukraniarra"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "Estatu Batuetakoa (nazioartekoa)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnameko \"lerro zenbakia\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
+#: ../../keyboard.pm_.c:240
+#, fuzzy
+msgid "Yugoslavian (latin)"
 msgstr "Iugoslabiarra (latinoa/kyrilikoa)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Muntai zirkularrak %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr "Lehenengo bolumen logikoak ezabatu\n"
 
@@ -5053,170 +5203,227 @@ msgstr "batez"
 msgid "No mouse"
 msgstr "Sagurik ez"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Mesedez testatu sagua"
+
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "Sagua pizteko,"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "GURPILA BIRA ARAZI!"
+
+#: ../../my_gtk.pm_.c:380
+msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+
+#: ../../my_gtk.pm_.c:415
 msgid "Finish"
 msgstr "Finlandiarra"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "Hurrengoa ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
 msgstr "<- Aurrekoa"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "Zuzena da?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Interneten konfigurazioa"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Internetera konektatu"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "Internetera konektatze saiorik egin nahi orain?"
+#: ../../network/adsl.pm_.c:20
+msgid ""
+"The most common way to connect with adsl is pppoe.\n"
+"Some connections use pptp, a few ones use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"Gehienetan adsl konektatzeko pppoe da.\n"
+"Zenbaitzuk pptp erabiltzen dute, eta gutxi batzuk dhcp.\n"
+"Ez badakizu, hauta 'pppoe erabili'"
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "Konexioa frogatzen..."
+#: ../../network/adsl.pm_.c:22
+msgid "Alcatel speedtouch usb"
+msgstr ""
 
-#: ../../netconnect.pm_.c:154 ../../standalone/draknet_.c:196
-msgid "The system is now connected to Internet."
-msgstr "Internetera konektatuta zaude."
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "dhcp erabili"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr ""
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "pppoe erabili"
 
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "pptp erabili"
+
+#: ../../network/ethernet.pm_.c:37
 msgid ""
-"The system doesn't seem to be connected to internet.\n"
-"Try to reconfigure your connection."
+"Which dhcp client do you want to use?\n"
+"Default is dhcpcd"
 msgstr ""
-"Internetera konektatu ezinik.\n"
-"Egokitu konexioa."
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "Sare Konfigurazioa"
-
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
-msgid "ISDN Configuration"
-msgstr "ISDN Konfigurazioa"
+"Zein dhcp bezero erabili nahi duzu?\n"
+"Jatorrizkoa dhcpcd da"
 
-#: ../../netconnect.pm_.c:222
+#: ../../network/ethernet.pm_.c:88
 msgid ""
-"Select your provider.\n"
-" If it's not in the list, choose Unlisted"
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
-"Ornitzailea hautatu.\n"
-"Zerrendan ezbalego, hauta Unlisted"
+"Ez duzu Ethernet egokitzailerik zure sisteman.Ezin dut konexioa egokitu."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Konexioaren Konfigurazioa"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Hautatu sareko interfacea"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Mesedez beheko eremua bete edo berrikusi"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "Mesedez hauta interneterako erabili nahi duzun sare-egokitzailea."
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "Txartelaren IRQ"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "ez da sare txartelik aurkitu"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "Txartelaren memoria (DMA)"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "Sarea konfiguratzen"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "Txartelaren IO"
+#: ../../network/ethernet.pm_.c:203
+msgid ""
+"Please enter your host name if you know it.\n"
+"Some DHCP servers require the hostname to work.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''."
+msgstr ""
+"Ostalariaren izena sartu mesedez.\n"
+"Zenbait DHCP zerbitzariek ostalariaren izena behar dute.\n"
+"Ostalariaren izena guztiz osatutakoa behar du izan,\n"
+"hnakoa bezala ``nirekutxa.niregela.nirelantegia.com''."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "Txartelaren IO_0"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "Ostalariaren izena"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "Txartelaren IO_1"
+#: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
+#: ../../network/netconnect.pm_.c:91 ../../network/netconnect.pm_.c:105
+#: ../../network/netconnect.pm_.c:154 ../../network/netconnect.pm_.c:164
+#: ../../network/netconnect.pm_.c:190 ../../network/netconnect.pm_.c:213
+#: ../../network/netconnect.pm_.c:221
+msgid "Network Configuration Wizard"
+msgstr "Sare Konfiguraziorako Aztia"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "Zure telefono zenbakia"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "Kanpoko ISDN modema"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Ornitzailearen izena (adb: ornitzaile.net)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Barneko ISDAN txarela"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "Ornitzailearen telefono zenbakia"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "Zure ISDN konexioa zein motatakoa da?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "Ornitzailearen dns 1"
+#: ../../network/isdn.pm_.c:45
+msgid ""
+"Which ISDN configuration do you prefer?\n"
+"\n"
+"* The Old configuration uses isdn4net. It contains powerfull\n"
+"  tools, but is tricky to configure, and not standard.\n"
+"\n"
+"* The New configuration is easier to understand, more\n"
+"  standard, but with less tools.\n"
+"\n"
+"We recommand the light configuration.\n"
+msgstr ""
+"Zein RDSI ezarpen duzu nahiago?\n"
+"\n"
+"* Ezarpen zaharrak isdn4net erabiltzen du. Tresna indartsuak\n"
+"  erabiltzen ditu, baino ezartzea latza izan daiteke hasberri\n"
+"  batentzako, eta ez da estandarra.\n"
+"\n"
+"* Ezarpen berria ulerterrazagoa da, estandarragoa, baino tresna\n"
+"  gutxiago ditu.\n"
+"\n"
+"Ezarpen arina gomendatzen dugu.\n"
+"\n"
 
-#: ../../netconnect.pm_.c:248
-msgid "Provider dns 2"
-msgstr "Ornitzailearen dns 2"
+#: ../../network/isdn.pm_.c:54
+msgid "New configuration (isdn-light)"
+msgstr "Ezarpen berria (isdn-light)"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "Markatze modua"
+#: ../../network/isdn.pm_.c:54
+msgid "Old configuration (isdn4net)"
+msgstr "Ezarpen zaharra (isdn4net)"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Kontuaren login-a (erabiltzailearen izena)"
+#: ../../network/isdn.pm_.c:169 ../../network/isdn.pm_.c:187
+#: ../../network/isdn.pm_.c:197 ../../network/isdn.pm_.c:204
+#: ../../network/isdn.pm_.c:214
+msgid "ISDN Configuration"
+msgstr "ISDN Konfigurazioa"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Kontuaren Pasahitza"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Ornitzailea hautatu.\n"
+"Zerrendan ezbalego, hauta Unlisted"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Europa"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "Abiatze Protokoloa"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol (EDSS1)"
 msgstr "Europa (EDSS1)"
 
-#: ../../netconnect.pm_.c:263
-msgid "Rest of the world"
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
+msgid "Protocol for the rest of the world"
 msgstr "Munduko beste guztia"
 
-#: ../../netconnect.pm_.c:263
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
 msgid ""
-"Rest of the world \n"
+"Protocol for the rest of the world \n"
 " no D-Channel (leased lines)"
 msgstr ""
 "Eropatik at \n"
 " ez D-Channel-ik (leased lines)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Zein protokolo erabili nahi duzu?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Zein da zure txartel mota?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "Ez dakit"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../netconnect.pm_.c:284
+#: ../../network/isdn.pm_.c:205
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -5229,19 +5436,19 @@ msgstr ""
 "\n"
 "PCMCIA txartela baduzu, txartelaren irq eta io-a jakin behar duzu.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "Eten"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "Jarraitu"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "Zein da zure ISDN txartela?"
 
-#: ../../netconnect.pm_.c:314
+#: ../../network/isdn.pm_.c:234
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
@@ -5249,104 +5456,60 @@ msgstr ""
 "ISDN PCI txartela aurkitu dut, baina ez dakit zein motakoa. Mesedez hauta "
 "PCI txartel mota hurrengo pantailan."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 "Ez dut ISDN PCI txartelik aurkitu. Mesedez hauta hurrengo pantailakoren bat."
 
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Ez duzu Ethernet egokitzailerik zure sisteman.Ezin dut konexioa egokitu."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "Hautatu sareko interfacea"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr "Mesedez hauta interneterako erabili nahi duzun sare-egokitzailea."
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "Sarearen interfazea"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "Sarerako tresna berabiaraziko dut:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "ADSL konfigurazioa"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "Abiatzerakoan zure konexioa abiarazi nahi duzu?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Mesedez hauta serieko zein kaira dago zure modema konektatua."
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Markatze aukerak"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "Konexioaren izena"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "Telefono zenbakia"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "Login ID"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "Egiaztapena"
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
+msgid "CHAP"
+msgstr "CHAP"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Script-based"
 msgstr "Scipt-ean oinarritua"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Terminalean oinarritua"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Domeinuaren izena"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
 msgstr "Lehenengo DNS zerbitzaria (aukerakoa)"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 msgid "Second DNS Server (optional)"
 msgstr "Bigarren DNS zerbitzaria (aukerakoa)"
 
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr "$netc->{NET_DEVICE} abiaraziko dut. Ados?"
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -5354,7 +5517,7 @@ msgstr ""
 "\n"
 "Deskonektatu edo konexioa berkonfiguratu zenzake."
 
-#: ../../netconnect.pm_.c:745 ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:33 ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can reconfigure your connection."
@@ -5362,11 +5525,11 @@ msgstr ""
 "\n"
 "Internet konexioa berregokitu zenezake."
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "Interneten zaude."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -5374,102 +5537,56 @@ msgstr ""
 "\n"
 "Internetera konektatu edo konexioa berregokitu zenezake."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "Internetera konektatu gabe zabiltza."
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "Internetera konektatu"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "Irteneteko konexioa eten"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Konfiguratu sare konexioa (Bertoko sarea edo Internet)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Internet konexioa  & konfigurazioa"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "Sare Konfiguraziorako Aztia"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "Kanpoko ISDN modema"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Barneko ISDAN txarela"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "Zure ISDN konexioa zein motatakoa da?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Internetera konektatu"
-
-#: ../../netconnect.pm_.c:834
-msgid ""
-"The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few ones use dhcp.\n"
-"If you don't know, choose 'use pppoe'"
-msgstr ""
-"Gehienetan adsl konektatzeko pppoe da.\n"
-"Zenbaitzuk pptp erabiltzen dute, eta gutxi batzuk dhcp.\n"
-"Ez badakizu, hauta 'pppoe erabili'"
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "dhcp erabili"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "pppoe erabili"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "pptp erabili"
-
-#: ../../netconnect.pm_.c:846
+#: ../../network/netconnect.pm_.c:96
 #, c-format
-msgid "I'm about to restart the network device %s. Do you agree?"
-msgstr "Zure %s sare tresna berrabiaraziko dut. Ados?"
+msgid "We are now going to configure the %s connection."
+msgstr "Orain %s lotura ezarriko dugu."
 
-#: ../../netconnect.pm_.c:883
-msgid ""
-"Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
-msgstr ""
-"Zein dhcp bezero erabili nahi duzu?\n"
-"Jatorrizkoa dhcpcd da"
-
-#: ../../netconnect.pm_.c:900
-msgid "Network configuration"
-msgstr "Sare Konfigurazioa"
-
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "Sarea berrabiarazi nahi duzu?"
-
-#: ../../netconnect.pm_.c:904
+#: ../../network/netconnect.pm_.c:105
 #, c-format
 msgid ""
-"A problem occured while restarting the network: \n"
 "\n"
-"%s"
+"\n"
+"\n"
+"We are now going to configure the %s connection.\n"
+"\n"
+"\n"
+"Press OK to continue."
 msgstr ""
-"Arazoa sarea abiaraztean: \n"
 "\n"
-"%s"
+"\n"
+"\n"
+"Orain %s lotura ezarriko dugu.\n"
+"\n"
+"\n"
+"Sakatu Ados hasteko."
+
+#: ../../network/netconnect.pm_.c:129 ../../network/netconnect.pm_.c:243
+#: ../../network/netconnect.pm_.c:255 ../../network/tools.pm_.c:56
+msgid "Network Configuration"
+msgstr "Sare Konfigurazioa"
 
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -5478,10 +5595,10 @@ msgid ""
 msgstr ""
 "Sare instalazioa egiten ari zarenez, zure sarea dagoeneko konfiguraturik "
 "da.\n"
-"OK sakatu konfigurazioa mantentzeko, edo etsi Internet eta sarerako konexioa "
-"ezagutarazteko.\n"
+"Ados sakatu konfigurazioa mantentzeko, edo etsi Internet eta sarerako "
+"konexioa ezagutarazteko.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -5493,102 +5610,119 @@ msgstr ""
 "Zure Internet/Sare lotura konfiguratzen ari zara.\n"
 "Autodetekziorik erabili nahi ez baduzu, hautua ezaba egizu.\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "Hautatu konfiguratu beharreko profila"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
 msgstr "Erabili autodetekzioa"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "Unitateak ezabatzen..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr "Modem konexio arrunta"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
 msgstr "%s-n kaia kausitua"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
 msgstr "ISDN konexioa"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr "kausitua %s"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "DSL (edo ADSL) konexioa"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+msgid "ADSL connection"
+msgstr "ADSL lotura"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
 msgstr "kausitua: %s interfazea"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "Kable konexioa"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+msgid "cable connection detected"
+msgstr "Kable bidezko lotura detektatu da"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
 msgstr "LAN konexioa"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr "ethernet txartela(k) kausituak"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "Zelan nahi duzu interneten sartu?"
+#: ../../network/netconnect.pm_.c:190
+msgid "Choose the connection you want to configure"
+msgstr "Hautatu ezarri nahi duzun lotura"
 
-#: ../../netconnect.pm_.c:1004
+#: ../../network/netconnect.pm_.c:214
 msgid ""
-"Congratulation, The network and internet configuration is finished.\n"
+"You have configured multiple ways to connect to the Internet.\n"
+"Choose the one you want to use.\n"
 "\n"
-"The configuration will now be applied to your system."
 msgstr ""
-"Zorionak. interneten zaude.\n"
+"Internetera lotzeko bide ugari ezarri duzu.\n"
+"Hautatu erabili nahi duzuna.\n"
 "\n"
-"Konfigurazioa zure sisteman egokituko da."
 
-#: ../../netconnect.pm_.c:1007
-msgid ""
-"After that is done, we recommend you to restart your X\n"
-"environnement to avoid hostname changing problem."
-msgstr "Ondoren, X berrabiarazi, problemarik egon ez daitean."
+#: ../../network/netconnect.pm_.c:215
+msgid "Internet connection"
+msgstr "Internetera lotura"
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "ez da sare txartelik aurkitu"
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "Abiatzerakoan zure konexioa abiarazi nahi duzu?"
 
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "Sarea konfiguratzen"
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "Sare Konfigurazioa"
+
+#: ../../network/netconnect.pm_.c:240
+msgid "The network needs to be restarted"
+msgstr ""
 
-#: ../../network.pm_.c:278
+#: ../../network/netconnect.pm_.c:243
+#, c-format
 msgid ""
-"Please enter your host name if you know it.\n"
-"Some DHCP servers require the hostname to work.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''."
+"A problem occured while restarting the network: \n"
+"\n"
+"%s"
 msgstr ""
-"Ostalariaren izena sartu mesedez.\n"
-"Zenbait DHCP zerbitzariek ostalariaren izena behar dute.\n"
-"Ostalariaren izena guztiz osatutakoa behar du izan,\n"
-"hnakoa bezala ``nirekutxa.niregela.nirelantegia.com''."
+"Arazoa sarea abiaraztean: \n"
+"\n"
+"%s"
 
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "Ostalariaren izena"
+#: ../../network/netconnect.pm_.c:247
+msgid ""
+"Congratulations, the network and internet configuration is finished.\n"
+"\n"
+"The configuration will now be applied to your system.\n"
+msgstr ""
+"Zorionak. interneten zaude.\n"
+"\n"
+"Konfigurazioa zure sisteman egokituko da.\n"
 
-#: ../../network.pm_.c:319
+#: ../../network/netconnect.pm_.c:250
+msgid ""
+"After that is done, we recommend you to restart your X\n"
+"environnement to avoid hostname changing problem."
+msgstr "Ondoren, X berrabiarazi, problemarik egon ez daitean."
+
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -5596,10 +5730,10 @@ msgid ""
 "Modifying the fields below will override this configuration."
 msgstr ""
 "KASU: Tresna hau aurretik Interneten erabiltzeko egokita duzu.\n"
-"OK sakatu tresna dagoen moduan mantentzeko.\n"
+"Ados sakatu tresna dagoen moduan mantentzeko.\n"
 "Aldaketak eginez gero konfigurazioa aldatuko da."
 
-#: ../../network.pm_.c:324
+#: ../../network/network.pm_.c:288
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
@@ -5609,38 +5743,38 @@ msgstr ""
 "Item bakoitze zenbaki eta puntuz sartu behar da IPan bezala\n"
 "(adibidez, 1.2.3.4)."
 
-#: ../../network.pm_.c:333 ../../network.pm_.c:334
+#: ../../network/network.pm_.c:297 ../../network/network.pm_.c:298
 #, c-format
 msgid "Configuring network device %s"
 msgstr "% sarerako tresna konfiguratzen"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr ""
+#: ../../network/network.pm_.c:298
+#, c-format
+msgid " (driver %s)"
+msgstr " (%s gidaria)"
 
-#: ../../network.pm_.c:336 ../../standalone/draknet_.c:231
-#: ../../standalone/draknet_.c:427
+#: ../../network/network.pm_.c:300 ../../standalone/draknet_.c:255
+#: ../../standalone/draknet_.c:461
 msgid "IP address"
 msgstr "IP helbidea"
 
-#: ../../network.pm_.c:337 ../../standalone/draknet_.c:428
+#: ../../network/network.pm_.c:301 ../../standalone/draknet_.c:462
 msgid "Netmask"
 msgstr "Maskara (Netmask)"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "(bootp/dhcp)"
 msgstr "(bootp/dhcp)"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "Automatic IP"
 msgstr "IP automatikoa"
 
-#: ../../network.pm_.c:359 ../../printerdrake.pm_.c:102
-#: ../../printerdrake.pm_.c:425
+#: ../../network/network.pm_.c:323 ../../printerdrake.pm_.c:406
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP helbidea hurrengo formatuan 1.2.3.4"
 
-#: ../../network.pm_.c:388
+#: ../../network/network.pm_.c:351
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -5652,43 +5786,149 @@ msgstr ""
 "honakoa bezala ``nirekutxa.niregela.nirelantegia.com''.\n"
 "Atariaren (gateway) IP helbidea sar dezakezu horrelakorik baduzu"
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "DNS zerbitzaria"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
 msgstr "Ataria (gateway)"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "Atariko tresna (gateway device)"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Proxien konfigurazioa"
 
-#: ../../network.pm_.c:408
+#: ../../network/network.pm_.c:372
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
-#: ../../network.pm_.c:409
+#: ../../network/network.pm_.c:373
 msgid "FTP proxy"
 msgstr "FTP proxy"
 
-#: ../../network.pm_.c:412
+#: ../../network/network.pm_.c:374
+msgid "Track network card id (usefull for laptops)"
+msgstr ""
+
+#: ../../network/network.pm_.c:377
 msgid "Proxy should be http://..."
 msgstr "Proxy-a honelakoa http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "Proxy-a honelakoa ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Interneten konfigurazioa"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Internetera konektatze saiorik egin nahi orain?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "Konexioa frogatzen..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "Internetera konektatuta zaude."
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr "Segurtasunagatik, orain deskonektatuko da."
+
+#: ../../network/tools.pm_.c:51 ../../standalone/draknet_.c:220
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr ""
+"Internetera konektatu ezinik.\n"
+"Egokitu konexioa."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Konexioaren Konfigurazioa"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Mesedez beheko eremua bete edo berrikusi"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "Txartelaren IRQ"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "Txartelaren memoria (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "Txartelaren IO"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "Txartelaren IO_0"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "Txartelaren IO_1"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "Zure telefono zenbakia"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Ornitzailearen izena (adb: ornitzaile.net)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "Ornitzailearen telefono zenbakia"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "Ornitzailearen dns 1 (aukerakoa)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "Ornitzailearen dns 2 (aukerakoa)"
+
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "Aukeratu teklatua"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "Markatze modua"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+msgid "Connection speed"
+msgstr "Loturaren abiadura"
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "Lotura Denbora "
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Kontuaren login-a (erabiltzailearen izena)"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Kontuaren Pasahitza"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
 msgstr "Plataforma honek ez du onartzen hedatutako(extended) partiziorik"
 
-#: ../../partition_table.pm_.c:581
+#: ../../partition_table.pm_.c:640
 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 "
@@ -5698,26 +5938,21 @@ msgstr ""
 "Soluzio bakarra da lehen mailako partizioak mugitzea eta zuloa hedatutako"
 "(extended) partizioen parean uztea"
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "Errorea %s fitxategia irakurtzerakoan"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "%s fitxategitik berreskuratzen: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "Backup fitxategi kaxkarra"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "%s fitxategia idazterakoan errorea"
 
-#: ../../partition_table_raw.pm_.c:161
+#: ../../partition_table_raw.pm_.c:154
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
@@ -5744,49 +5979,213 @@ msgstr "ederra"
 msgid "maybe"
 msgstr "litekeena"
 
-#: ../../printer.pm_.c:20
+#: ../../printer.pm_.c:23
+msgid "CUPS - Common Unix Printing System"
+msgstr "CUPS - Common Unix Printing System"
+
+#: ../../printer.pm_.c:24
+msgid "LPRng - LPR New Generation"
+msgstr "LPRng - LPR New Generation"
+
+#: ../../printer.pm_.c:25
+msgid "LPD - Line Printer Daemon"
+msgstr "LPD - Line Printer Daemon"
+
+#: ../../printer.pm_.c:26
+msgid "PDQ - Print, Don't Queue"
+msgstr "PDQ - Inprimatu, Ez jarri ilaran"
+
+#: ../../printer.pm_.c:32
+msgid "CUPS"
+msgstr ""
+
+#: ../../printer.pm_.c:33
+msgid "LPRng"
+msgstr ""
+
+#: ../../printer.pm_.c:34
+msgid "LPD"
+msgstr ""
+
+#: ../../printer.pm_.c:35
+msgid "PDQ"
+msgstr ""
+
+#: ../../printer.pm_.c:40
 msgid "Local printer"
 msgstr "Bertoko irarkola"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "Urrutiko irarkola"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
+#: ../../printer.pm_.c:42
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "Urrutiko CUPS zerbitzaria"
+
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "Urrutiko lpd zerbitzaria"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "Sareko irarkola (socket)"
 
-#: ../../printer.pm_.c:25
-msgid "SMB/Windows 95/98/NT"
+#: ../../printer.pm_.c:45
+#, fuzzy
+msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:26
-msgid "NetWare"
-msgstr "NetWare"
+#: ../../printer.pm_.c:46
+#, fuzzy
+msgid "Printer on NetWare server"
+msgstr "Inprimatze zerbitzaria"
 
-#: ../../printer.pm_.c:27 ../../printerdrake.pm_.c:158
-#: ../../printerdrake.pm_.c:160
-msgid "Printer Device URI"
+#: ../../printer.pm_.c:47
+#, fuzzy
+msgid "Enter a printer device URI"
 msgstr "Irarkolaren Tresna URI"
 
-#: ../../printerdrake.pm_.c:19
+#: ../../printer.pm_.c:48
+msgid "Pipe job into a command"
+msgstr ""
+
+#: ../../printer.pm_.c:418 ../../printer.pm_.c:839
+#: ../../printerdrake.pm_.c:1227 ../../printerdrake.pm_.c:2023
+msgid "Unknown model"
+msgstr ""
+
+#: ../../printer.pm_.c:546 ../../printerdrake.pm_.c:790
+msgid "Raw printer (No driver)"
+msgstr ""
+
+#: ../../printer.pm_.c:693
+#, fuzzy, c-format
+msgid "(on %s)"
+msgstr "(%s modulua)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "Irarkolaren konexioa hautatu"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "Zelan dago irarkola konektatua?"
+
+#: ../../printerdrake.pm_.c:25
+#, fuzzy
+msgid ""
+"\n"
+"Printers on remote CUPS servers you do not have to configure\n"
+"here; these printers will be automatically detected. Please\n"
+"select \"Printer on remote CUPS server\" in this case."
+msgstr ""
+"Urrutiko CUPS zerbitzariaz, ez duzu hemen inolako irarkola konfiguraziorik\n"
+"egin behar; irarkolak automatikoki detektatuko dira.\n"
+"Bestelako zerbitzarikik baduzu beste sare batetan, CUPS zerbitzariaren\n"
+"IP helbidea eman beharko duzu, eta aukeran, kai zenbakia."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+msgid "None"
+msgstr "Batez"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Hautatu jatorrizko erabiltzailea:"
+
+#: ../../printerdrake.pm_.c:105
+msgid ""
+"With remote CUPS servers, you do not have to configure any \n"
+"printer here; CUPS servers inform your machine automatically\n"
+"about their printers. All printers known to your machine\n"
+"currently are listed in the \"Default printer\" field. Choose\n"
+"the default printer for your machine there and click the\n"
+"\"Apply/Re-read printers\" button. Click the same button to\n"
+"refresh the list (it can take up to 30 seconds after the start\n"
+"of CUPS until all remote printers are visible).\n"
+"When your CUPS server is in a different network, you have to \n"
+"give the CUPS server IP address and optionally the port number\n"
+"to get the printer information from the server, otherwise leave\n"
+"these fields blank."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:117
+msgid ""
+"\n"
+"Normally, CUPS is automatically configured according to your\n"
+"network environment, so that you can access the printers on the\n"
+"CUPS servers in your local network. If this does not work \n"
+"correctly, turn off \"Automatic CUPS configuration\" and edit\n"
+"your file /etc/cups/cupsd.conf manually. Do not forget to restart\n"
+"CUPS afterwards (command: \"service cups restart\")."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:124 ../../printerdrake.pm_.c:1290
+#: ../../printerdrake.pm_.c:1294 ../../printerdrake.pm_.c:1295
+#: ../../printerdrake.pm_.c:1296 ../../printerdrake.pm_.c:2011
+msgid "Close"
+msgstr "Itxi"
+
+#: ../../printerdrake.pm_.c:125
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "Urrutiko irarkola"
+
+#: ../../printerdrake.pm_.c:129
+#, fuzzy
+msgid "The IP address should look like 192.168.1.20"
+msgstr "IP helbidea hurrengo formatuan 1.2.3.4"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "Kai zenbakia, zenbaki behar du izan."
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+#, fuzzy
+msgid "Default printer"
+msgstr "Bertoko irarkola"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "CUPS zerbitzariaren IP"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Kaia"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "Abiaratze konfigurazioa"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "Unitateak ezabatzen..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "Kaiak saiatzen"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Irarkola, \"%s\" modelokoa, hurrengo tokian aurkitua:"
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Bertoko Irarkolaren Tresna"
 
-#: ../../printerdrake.pm_.c:53
+#: ../../printerdrake.pm_.c:256
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -5794,38 +6193,60 @@ msgstr ""
 "Zein tresnetara konektatzen da zure irarkola \n"
 "(kasu! /dev/lp0 eta LPT1 gauza bera dira:)?\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Irarkolaren Tresna"
 
-#: ../../printerdrake.pm_.c:74
+#: ../../printerdrake.pm_.c:261
+msgid "Device/file name missing!"
+msgstr "Gailu/fitxategi izena falta da!"
+
+#: ../../printerdrake.pm_.c:274 ../../printerdrake.pm_.c:698
+#: ../../printerdrake.pm_.c:786
+#, fuzzy
+msgid "Reading printer database ..."
+msgstr "CUPSen gidari databasea irakurtzen..."
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "Urrutiko lpd Irarkolaren Aukerak"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:313
+#, fuzzy
 msgid ""
-"To use a remote lpd print queue, you need to supply\n"
-"the hostname of the printer server and the queue name\n"
-"on that server which jobs should be placed in."
+"To use a remote lpd printer, you need to supply\n"
+"the hostname of the printer server and the printer name\n"
+"on that server."
 msgstr ""
 "Urritiko lpt irarkola isatsa erabiltzeko, irarkola zerbitzariaren ostalari "
 "izena\n"
 "eta isatsaren izena eman behar duzu.\n"
 "Lanak bertatik inprimatu daitezen."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
 msgstr "Urrutiko ostalari izena"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Urrutiko isatsa"
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "Urrutiko irarkola"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:320
+msgid "Remote host name missing!"
+msgstr "Urruneko ostalari izena falta da!"
+
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "Urruneko ostalari izena falta da!"
+
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) Irarkolaren Aukerak"
 
-#: ../../printerdrake.pm_.c:89
+#: ../../printerdrake.pm_.c:393
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -5840,29 +6261,37 @@ msgstr ""
 "irarkolaren banatze izena, erabiltzailearen izena,\n"
 "pasahitza eta lantaldearen informazioa."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "SMB zerbitzariaren ostalaria"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "SMB zerbitzariaren IP"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "Banatze izena"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "Lantaldea"
 
-#: ../../printerdrake.pm_.c:124
+#: ../../printerdrake.pm_.c:410
+msgid "Either the server name or the server's IP must be given!"
+msgstr "Zerbitzaria izena edo zerbitzariaren IP eman behar da!"
+
+#: ../../printerdrake.pm_.c:414
+msgid "Samba share name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:473
 msgid "NetWare Printer Options"
 msgstr "NetWare Irarkolen Aukerak"
 
-#: ../../printerdrake.pm_.c:125
+#: ../../printerdrake.pm_.c:474
 msgid ""
-"To print to a NetWare printer, you need to provide the\n"
+"To print on a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
 "TCP/IP hostname!) as well as the print queue name for the printer you\n"
 "wish to access and any applicable user name and password."
@@ -5873,59 +6302,227 @@ msgstr ""
 ", erabili nahi duzun irarkolaren izena eta beharrezko daitezken\n"
 "erabiltzaile izena eta pasahitza."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Inprimatze zerbitzaria"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "Inprimatze isatsaren izena"
 
-#: ../../printerdrake.pm_.c:142
+#: ../../printerdrake.pm_.c:484
+msgid "NCP server name missing!"
+msgstr "NCP zerbitzari izena falta da!"
+
+#: ../../printerdrake.pm_.c:488
+msgid "NCP queue name missing!"
+msgstr "NCP ilara izena falta da!"
+
+#: ../../printerdrake.pm_.c:527
 msgid "Socket Printer Options"
-msgstr "Socket-eko irarkolaren aukerak"
+msgstr "Socket-eko Inprimagailu Aukerak"
 
-#: ../../printerdrake.pm_.c:143
+#: ../../printerdrake.pm_.c:528
+#, fuzzy
 msgid ""
 "To print to a socket printer, you need to provide the\n"
-"hostname of the printer and optionally the port number."
+"host name of the printer and optionally the port number.\n"
+"On HP JetDirect servers the port number is usually 9100,\n"
+"on other servers it can vary. See the manual of your\n"
+"hardware."
 msgstr ""
 "Socket irarkolan inprimitzeko, irarkolaren ostalari izena\n"
 "eta aukeran, kaiaren zenbakia."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
 msgstr "Irarkolaren ostalari izena"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Kaia"
+#: ../../printerdrake.pm_.c:537
+msgid "Printer host name missing!"
+msgstr "Inprimagailuaren ostalari izena falta da!"
+
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "Irarkolaren Tresna URI"
+
+#: ../../printerdrake.pm_.c:567
+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 ""
+
+#: ../../printerdrake.pm_.c:582
+msgid "A valid URI must be entered!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:682
+msgid ""
+"Every printer needs a name (for example lp).\n"
+"The Description and Location fields do not need \n"
+"to be filled in. They are comments for the users."
+msgstr ""
+"Inprimagailu guztiek behar dute izena (adibidez lp).\n"
+"Azalpen eta Kokapen eremuak betetzea ez da beharrezkoa\n"
+"Erabiltzailearentzako aipamenak dira."
+
+#: ../../printerdrake.pm_.c:685
+msgid "Name of printer"
+msgstr "Irarkolaren izena"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Deskripzioa"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Kokapena"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "CUPSen gidari databasea irakurtzen..."
+
+#: ../../printerdrake.pm_.c:793
+msgid "Printer model selection"
+msgstr "Inprimagailu eredu aukeraketa"
+
+#: ../../printerdrake.pm_.c:794
+msgid "Which printer model do you have?"
+msgstr "Zein inprimagailu eredu daukazu?"
+
+#: ../../printerdrake.pm_.c:866
+#, fuzzy
+msgid "OKI winprinter configuration"
+msgstr "Interneten konfigurazioa"
+
+#: ../../printerdrake.pm_.c:867
+msgid ""
+"You are configuring an OKI laser winprinter. These printers\n"
+"use a very special communication protocol and therefore they\n"
+"work only when connected to the first parallel port. When\n"
+"your printer is connected to another port or to a print\n"
+"server box please connect the printer to the first parallel\n"
+"port before you print a test page. Otherwise the printer\n"
+"will not work. Your connection type setting will be ignored\n"
+"by the driver."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:916 ../../printerdrake.pm_.c:946
+#, fuzzy
+msgid "Lexmark inkjet configuration"
+msgstr "Interneten konfigurazioa"
+
+#: ../../printerdrake.pm_.c:917
+msgid ""
+"The inkjet printer drivers provided by Lexmark only support\n"
+"local printers, no printers on remote machines or print server\n"
+"boxes. Please connect your printer to a local port or\n"
+"configure it on the machine where it is connected to."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:947
+msgid ""
+"To be able to print with your Lexmark inkjet and this\n"
+"configuration, you need the inkjet printer drivers\n"
+"provided by Lexmark (http://www.lexmark.com/). Go to\n"
+"the US site and click on the \"Drivers\" button. Then\n"
+"choose your model and afterwards \"Linux\" as\n"
+"operating system. The drivers come as RPM packages\n"
+"or shell scripts with interactive graphical installation.\n"
+"You do not need to do this configuration by the\n"
+"graphical frontends. Cancel directly after the license\n"
+"agreement. Then print printhead alignment pages with\n"
+"\"lexmarkmaintain\" and adjust the head alignment\n"
+"settings with this program."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1079
+msgid ""
+"Printer default settings\n"
+"You should make sure that the page size and the\n"
+"ink type (if available) are set correctly. Note\n"
+"that with a very high printout quality printing\n"
+"can get substantially slower."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1090
+#, fuzzy, c-format
+msgid "Option %s must be an integer number!"
+msgstr "Portua zenbaki osoa izan behar da!"
+
+#: ../../printerdrake.pm_.c:1094
+#, fuzzy, c-format
+msgid "Option %s must be a number!"
+msgstr "Portua zenbaki osoa izan behar da!"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "Zuzenean URI eman dezakezu, CUPS duen irarkola erabiltzeko."
+#: ../../printerdrake.pm_.c:1099
+#, c-format
+msgid "Option %s out of range!"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
-msgstr "Zein da zure irarkola mota?"
+#: ../../printerdrake.pm_.c:1136
+#, fuzzy, c-format
+msgid ""
+"Do you want to set this printer (\"%s\")\n"
+"as the default printer?"
+msgstr "Froga orria inprimatu nahi duzu?"
+
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "Kaiak saiatzen"
+
+#: ../../printerdrake.pm_.c:1153
+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\n"
+"and on laser printers with too low memory it can even not come out.\n"
+"In most cases it is enough to print the standard test page."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1158
+msgid "No test pages"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:204 ../../printerdrake.pm_.c:305
-msgid "Do you want to test printing?"
-msgstr "Inprimaketaren testa egin nahi duzu?"
+#: ../../printerdrake.pm_.c:1159
+#, fuzzy
+msgid "Print"
+msgstr "Irarkola"
+
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "Standard"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "Test orria(k) inprimatzen ..."
+
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "Test orria(k) inprimatzen ..."
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "Test orria(k) inprimatzen ..."
 
-#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:324
-#, c-format
+#: ../../printerdrake.pm_.c:1200
+#, fuzzy, c-format
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
+"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"
-"Does it work properly?"
 msgstr ""
 "Inprimatze deabrura bialdu da/dira test orria/k.\n"
 "Irarkola lanean hasteko denboratxoa behar lezake.\n"
@@ -5934,234 +6531,601 @@ msgstr ""
 "\n"
 "Egokiro dabil?"
 
-#: ../../printerdrake.pm_.c:218 ../../printerdrake.pm_.c:328
+#: ../../printerdrake.pm_.c:1204
+#, fuzzy
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Does it work properly?"
+"Test page(s) have been sent to the printer.\n"
+"It may take some time before the printer starts.\n"
 msgstr ""
 "Inprimatze deabrura bialdu da/dira test orria/k.\n"
 "Irarkola lanean hasteko denboratxoa behar lezake.\n"
 "Egokiro dabil?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "Bai, ASCII orria inprimatu test modura"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "Bai, PostScript orria inprimatu test modura"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Irarkolarik ez"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "Bai, orri biak inprimatu"
+#: ../../printerdrake.pm_.c:1237
+#, 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 "
+"\"qtcups <file>\". The graphical tools allow you to choose the printer and "
+"to modify the option settings easily.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:243
-msgid "Configure Printer"
-msgstr "Konfiguratu irarkola"
+#: ../../printerdrake.pm_.c:1239
+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 ""
 
-#: ../../printerdrake.pm_.c:273
-msgid "Printer options"
-msgstr "Irarkolaren aukerak"
+#: ../../printerdrake.pm_.c:1242 ../../printerdrake.pm_.c:1254
+#: ../../printerdrake.pm_.c:1266
+#, 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 ""
+
+#: ../../printerdrake.pm_.c:1244 ../../printerdrake.pm_.c:1284
+msgid ""
+"To get a list of the options available for the current printer read either "
+"the list shown below or click on the \"Print option list\" button.\n"
+"\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1249 ../../printerdrake.pm_.c:1261
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\".\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Paperaren tamaina"
+#: ../../printerdrake.pm_.c:1251 ../../printerdrake.pm_.c:1263
+#: ../../printerdrake.pm_.c:1275
+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 ""
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "Lana bukatzerakoan papera kanporatu?"
+#: ../../printerdrake.pm_.c:1256 ../../printerdrake.pm_.c:1268
+msgid ""
+"To get a list of the options available for the current printer click on the "
+"\"Print option list\" button.\n"
+"\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Uniprint driver-aren aukerak"
+#: ../../printerdrake.pm_.c:1273
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\" or \"%s <file>\".\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1277
+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 ""
 
-#: ../../printerdrake.pm_.c:281
-msgid "Color depth options"
-msgstr "Kolore sakontzsunaren aukerak"
+#: ../../printerdrake.pm_.c:1281
+#, 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 ""
+
+#: ../../printerdrake.pm_.c:1292
+#, fuzzy, c-format
+msgid "Printing on the printer \"%s\""
+msgstr "Sarea beheratzen"
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
+msgstr "Inprimagailu aukerak"
+
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+msgid "Reading printer data ..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "Interneten konfigurazioa"
 
-#: ../../printerdrake.pm_.c:283
-msgid "Print text as PostScript?"
-msgstr "Testua PostScript bezala inprimatu?"
+#: ../../printerdrake.pm_.c:1339
+#, c-format
+msgid ""
+"You can copy the printer configuration which you have done \n"
+"for the spooler %s to %s, your current spooler. All the\n"
+"configuration data (printer name, description, location, \n"
+"connection type, and default option settings) is overtaken,\n"
+"but jobs will not be transferred.\n"
+"Not all queues can be transferred due to the following \n"
+"reasons:\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:285
-msgid "Fix stair-stepping text?"
-msgstr "Mailada-hurrats testu finkoa?"
+#: ../../printerdrake.pm_.c:1347
+msgid ""
+"CUPS does not support printers on Novell servers or printers\n"
+"sending the data into a free-formed command.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:287
-msgid "Number of pages per output pages"
-msgstr "Orrialdeen kopurua, irtendako orrialdeen arabera"
+#: ../../printerdrake.pm_.c:1350
+msgid ""
+"PDQ only supports local printers, remote LPD printers, and\n"
+"Socket/TCP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:288
-msgid "Right/Left margins in points (1/72 of inch)"
-msgstr "Eskubi/Ezker marginak puntuetan (erpuruaren 1/72)"
+#: ../../printerdrake.pm_.c:1353
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:289
-msgid "Top/Bottom margins in points (1/72 of inch)"
-msgstr "Goi/Beheko marginak puntutan (erpuruaren 1/72)"
+#: ../../printerdrake.pm_.c:1355
+msgid ""
+"In addition, queues not created with this program or\n"
+"\"foomatic-configure\" cannot be transferred."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:291
-msgid "Extra GhostScript options"
-msgstr "GostScript aukera estrak"
+#: ../../printerdrake.pm_.c:1357
+msgid ""
+"\n"
+"Also printers configured with the PPD files provided by\n"
+"their manufacturers or with native CUPS drivers can not be\n"
+"transferred."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "Testu aukera estrak"
+#: ../../printerdrake.pm_.c:1360
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "Orriak atzetik aurrerako ordenean"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:345
-msgid "Would you like to configure a printer?"
-msgstr "Irarkolarik konfiguratu nahi duzu?"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:351
+#: ../../printerdrake.pm_.c:1377
+#, c-format
 msgid ""
-"Here are the following print queues.\n"
-"You can add some more or change the existing ones."
+"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 ""
+
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr ""
+"Inprimagailu izenak hizkiak, zenbakiak eta azpikomarra soilik izan behar "
+"lituzke"
+
+#: ../../printerdrake.pm_.c:1390
+#, c-format
+msgid ""
+"The printer \"%s\" already exists,\n"
+"do you really want to overwrite its configuration?"
 msgstr ""
-"Hemen daude  hurrengo irarkola isatsak.\n"
-"Zenbait gehitu edo daudenak aldatu dezakezu."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "CUPS abiarazten"
+#: ../../printerdrake.pm_.c:1398
+#, fuzzy
+msgid "New printer name"
+msgstr "Irarkolarik ez"
+
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:370
-msgid "Reading CUPS drivers database..."
+#: ../../printerdrake.pm_.c:1412
+#, c-format
+msgid ""
+"You have transferred your former default printer (\"%s\"),\n"
+"Should it be also the default printer under the\n"
+"new printing system %s?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1423
+#, fuzzy
+msgid "Refreshing printer data ..."
 msgstr "CUPSen gidari databasea irakurtzen..."
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "Irarkolaren konexioa hautatu"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+#, fuzzy
+msgid "Configuration of a remote printer"
+msgstr "Konfiguratu irarkola"
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "Zelan dago irarkola konektatua?"
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "Lotura abiatzen..."
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "Irarkolaren urrutiko konexioa hautatu"
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "Konfiguratu sare lana"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "Monitorea konfiguratu gabe"
+
+#: ../../printerdrake.pm_.c:1456
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected.\n"
-"In case of doubt, select \"Remote CUPS server\"."
+"You are going to configure a remote printer. This needs working\n"
+"network access, but your network is not configured yet. If you\n"
+"go on without network configuration, you will not be able to use\n"
+"the printer which you are configuring now. How do you want \n"
+"to proceed?"
 msgstr ""
-"Urrutiko CUPS zerbitzariaz, ez duzu hemen inolako irarkola konfiguraziorik\n"
-"egin behar; irarkolak automatikoki detektatuko dira.\n"
-"Dudan bazaude, hauta \"Urrutiko CUPS zerbitzaria\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "Sarea konfiguratzen"
+
+#: ../../printerdrake.pm_.c:1496
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected\n"
-"unless you have a server on a different network; in the\n"
-"latter case, you have to give the CUPS server IP address\n"
-"and optionally the port number."
+"The network configuration done during the installation \n"
+"cannot be started now. Please check whether the network\n"
+"gets accessable after booting your system and correct the\n"
+"configuration using the Mandrake Control Center, section\n"
+"\"Network & Internet\"/\"Connection\", and afterwards set\n"
+"up the printer, also using the Mandrake Control Center,\n"
+"section \"Hardware\"/\"Printer\""
 msgstr ""
-"Urrutiko CUPS zerbitzariaz, ez duzu hemen inolako irarkola konfiguraziorik\n"
-"egin behar; irarkolak automatikoki detektatuko dira.\n"
-"Bestelako zerbitzarikik baduzu beste sare batetan, CUPS zerbitzariaren\n"
-"IP helbidea eman beharko duzu, eta aukeran, kai zenbakia."
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "CUPS zerbitzariaren IP"
+#: ../../printerdrake.pm_.c:1503
+msgid ""
+"The network access was not running and could not be \n"
+"started. Please check your configuration and your \n"
+"hardware. Then try to configure your remote printer\n"
+"again."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:429
-msgid "Port number should be numeric"
-msgstr "Kai zenbakia, zenbaki behar du izan."
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
+msgstr "Zein inprimaketa sistema erabili nahi duzu?"
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "Handia"
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Paranoidea"
+
+#: ../../printerdrake.pm_.c:1549
+#, c-format
+msgid "Installing a printing system in the %s security level"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "Kendu isatsa"
+#: ../../printerdrake.pm_.c:1550
+#, c-format
+msgid ""
+"You are about to install the printing system %s on\n"
+"a system running in the %s security level.\n"
+"\n"
+"This printing system runs a daemon (background process)\n"
+"which waits for print jobs and handles them. This daemon\n"
+"is also accessable by remote machines through the network\n"
+"and so it is a possible point for attacks. Therefore only\n"
+"a few selected daemons are started by default in this\n"
+"security level.\n"
+"\n"
+"Do you really want to configure printing on this\n"
+"machine?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:454
+#: ../../printerdrake.pm_.c:1584
+#, fuzzy
+msgid "Starting the printing system at boot time"
+msgstr "Zein inprimaketa sistema erabili nahi duzu?"
+
+#: ../../printerdrake.pm_.c:1585
+#, c-format
 msgid ""
-"Name of printer should contains only letters, numbers and the underscore"
+"The printing system (%s) will not be started automatically\n"
+"when the machine is booted.\n"
+"\n"
+"It is possible that the automatic starting was turned off \n"
+"by changing to a higher security level, because the printing\n"
+"system is a potential point for attacks.\n"
+"\n"
+"Do you want to have the automatic starting of the printing\n"
+"system turned on again?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1612 ../../printerdrake.pm_.c:1644
+#: ../../printerdrake.pm_.c:1671 ../../printerdrake.pm_.c:1701
+#: ../../printerdrake.pm_.c:1778
+msgid "Checking installed software..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1727
+msgid "Select Printer Spooler"
+msgstr "Aukeratu Inprimagailu %s Spoolerra"
+
+#: ../../printerdrake.pm_.c:1728
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Zein inprimaketa sistema (spooler) erabili nahi duzu?"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Konfiguratu irarkola"
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Inprimagailu aukerak"
+
+#: ../../printerdrake.pm_.c:1815
+msgid "Preparing PrinterDrake ..."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:461
+#: ../../printerdrake.pm_.c:1845
+msgid "Would you like to configure printing?"
+msgstr "Inprimagailua ezarri nahi duzu?"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1879
 msgid ""
-"Every printer need a name (for example lp).\n"
-"Other parameters such as the description of the printer or its location\n"
-"can be defined. What name should be used for this printer and\n"
-"how is the printer connected?"
+"The following printers are configured.\n"
+"Click on one of them to modify it or\n"
+"to get information about it or on \n"
+"\"Add Printer\" to add a new printer."
 msgstr ""
-"Irarkola oro izena behar du( lp adibidez).\n"
-"Betelako parametroak, kokapena, deskripzioa eman daitezke.\n"
-"Zein izen du eta nola dago konektatua irarkola?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Irarkolaren izena"
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "Arrunta"
 
-#: ../../printerdrake.pm_.c:466
-msgid "Description"
-msgstr "Deskripzioa"
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Jatorrizkoa)"
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Kokapena"
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "Urrutiko CUPS zerbitzaria"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "Urrutiko CUPS zerbitzaria"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+msgid "Add printer"
+msgstr "Inprimagailua gehitu"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "Konfigurazioa frogatu nahi duzu?"
+
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "Interneten konfigurazioa"
+
+#: ../../printerdrake.pm_.c:2004
+#, c-format
+msgid ""
+"Printer %s: %s %s\n"
+"What do you want to modify on this printer?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2012
+msgid "Do it!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+#, fuzzy
+msgid "Printer connection type"
+msgstr "Internetera lotura"
+
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
+msgstr "Inprimagailu eredu aukeraketa"
+
+#: ../../printerdrake.pm_.c:2018 ../../printerdrake.pm_.c:2081
+msgid "Printer manufacturer, model, driver"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2019 ../../printerdrake.pm_.c:2082
+msgid "Printer manufacturer, model"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2028 ../../printerdrake.pm_.c:2092
+msgid "Set this printer as the default"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2029 ../../printerdrake.pm_.c:2097
+#, fuzzy
+msgid "Print test pages"
+msgstr "Test orria(k) inprimatzen ..."
+
+#: ../../printerdrake.pm_.c:2030 ../../printerdrake.pm_.c:2099
+msgid "Know how to print with this printer"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2031 ../../printerdrake.pm_.c:2101
+#, fuzzy
+msgid "Remove printer"
+msgstr "Urrutiko irarkola"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "Urrutiko irarkola"
+
+#: ../../printerdrake.pm_.c:2096
+#, c-format
+msgid "The printer \"%s\" is set as the default printer now."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2103
+#, fuzzy, c-format
+msgid "Do you really want to remove the printer \"%s\"?"
+msgstr "Sarea berrabiarazi nahi duzu?"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "Urrutiko irarkola"
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+msgid "Proxy configuration"
+msgstr "Proxy ezarpena"
+
+#: ../../proxy.pm_.c:30
+msgid ""
+"Welcome to the proxy configuration utility.\n"
+"\n"
+"Here, you'll be able to set up your http and ftp proxies\n"
+"with or without login and password\n"
+msgstr ""
+"Ongi etorri proxy ezarketa tresnara.\n"
+"\n"
+"Hemen, zure http eta ftp proxiak ezartzeko aukera izango duzu\n"
+"login eta pasahitzarekin edo gabe.\n"
+
+#: ../../proxy.pm_.c:38
+msgid ""
+"Please fill in the http proxy informations\n"
+"Leave it blank if you don't want an http proxy"
+msgstr ""
+"Mesedez bete http proxy informazioak.\n"
+"Utzi hutsik http proxyrik nahi ez baduzu."
+
+#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
+msgid "URL"
+msgstr "URL"
+
+#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
+msgid "port"
+msgstr "portua"
+
+#: ../../proxy.pm_.c:44
+msgid "Url should begin with 'http:'"
+msgstr "Url-a 'http:'-az hasi beharko litzateke"
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+msgid "The port part should be numeric"
+msgstr "Portu zatia zenbakizkoa izan beharko litzateke"
+
+#: ../../proxy.pm_.c:59
+msgid ""
+"Please fill in the ftp proxy informations\n"
+"Leave it blank if you don't want an ftp proxy"
+msgstr ""
+"Bete ftp proxiari buruzko informazioak\n"
+"Utzi hutsik ez baduzu ftp proxirik nahi"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../proxy.pm_.c:65
+msgid "Url should begin with 'ftp:'"
+msgstr "Url-a 'ftp:'-az hasi beharko litzateke"
+
+#: ../../proxy.pm_.c:79
 msgid ""
-"Every print queue (which print jobs are directed to) needs a\n"
-"name (often lp) and a spool directory associated with it. What\n"
-"name and directory should be used for this queue and how is the printer "
-"connected?"
+"Please enter proxy login and password, if any.\n"
+"Leave it blank if you don't want login/passwd"
 msgstr ""
-"Irarkolen isats (inprimaketa lanak bideratzen diren tokia) oro izena\n"
-"(maiz lp) eta honeri dagokion metaketa direktorioa behar du. Zein\n"
-"izen eta direktorio erabili behar dira isats honetarako?"
+"Sartu proxiaren erabiltzaile eta pasahitza, beharrezkoa bada.\n"
+"Utzi hutsik ez baduzu erabiltzaile/pasahitza nahi"
+
+#: ../../proxy.pm_.c:80
+msgid "login"
+msgstr "login"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "Isatsaren izena"
+#: ../../proxy.pm_.c:82
+msgid "password"
+msgstr "pasahitza"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "Metaketa direktorioa"
+#: ../../proxy.pm_.c:84
+msgid "re-type password"
+msgstr "berridatzi pasahitza"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
-msgstr "Irarkolaren konexioa"
+#: ../../proxy.pm_.c:88
+msgid "The passwords don't match. Try again!"
+msgstr "Pasahitzak ez datoz bat. Saiatu berriro!"
 
-#: ../../raid.pm_.c:33
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Formateatutako RAID md%d-i ezin partiziorik gehitu"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "Fitxategia ezin idatz: $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "Fitxategia ezin idatz: %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid-ek huts egin du"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid-ek huts egin du (agian raidtools-ak galdu egin dira?)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Ez dago partizio nahikorik %d RAID mailarako\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
-msgstr ""
+msgstr "Jaurti ALSA (Advanced Linux Sound Architecture) soinu sistema"
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron, aldiroko komando programatzailea"
 
-#: ../../services.pm_.c:18
+#: ../../services.pm_.c:17
 msgid ""
 "apmd is used for monitoring batery status and logging it via syslog.\n"
 "It can also be used for shutting down the machine when the battery is low."
@@ -6169,7 +7133,7 @@ msgstr ""
 "apmd bateriaren egoera aztertzeko da eta syslog-en bitartez lortzeko.\n"
 "Bateria gutxi dagoenean makina itzaltzeko erabil daiteke ere."
 
-#: ../../services.pm_.c:20
+#: ../../services.pm_.c:19
 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."
@@ -6177,7 +7141,7 @@ msgstr ""
 "atindarrean dagoenean at komandoan esan bezala, komandoak abiarazten ditu,\n"
 "eta batch komandoak abiarazten ditu karga gutxi dagoenean."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:21
 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 "
@@ -6189,7 +7153,7 @@ msgstr ""
 "UNIX programa standarra da. vixie cron ezaugarriak gehitzen dituoinarriko\n"
 "UNIX cron-era, segurtasun hobea eta konfigurazio tresna ahalmentsuak."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:24
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -6201,13 +7165,15 @@ msgstr ""
 "itsatsi operazioak,\n"
 "eta konsolako pop-up menuentzako soportea ematen du."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr ""
+"HardDrakek hardware froga egiten du, eta hardware berri/aldatua\n"
+"ezartzeko aukera emanten du."
 
-#: ../../services.pm_.c:30
+#: ../../services.pm_.c:29
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -6216,7 +7182,7 @@ msgstr ""
 "zerbitzatzeko\n"
 "erabilgarri."
 
-#: ../../services.pm_.c:32
+#: ../../services.pm_.c:31
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -6232,13 +7198,15 @@ msgstr ""
 "erantzunkizun\n"
 "diren zerbitzu guztiak etetzen ditu."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:35
 msgid ""
 "Launch packet filtering for Linux kernel 2.2 series, to set\n"
 "up a firewall to protect your machine from network attacks."
 msgstr ""
+"Jaurti Linux Kernel 2.2 seriearentzako pakete iragazkia, zure\n"
+"makina sareko erasoengatik babestuko duen suhesia ezartzeko."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:37
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -6249,23 +7217,25 @@ msgstr ""
 "erabiliaz hauta genezake.\n"
 "Makina gehienentzako ezinbestekoa da."
 
-#: ../../services.pm_.c:41
+#: ../../services.pm_.c:40
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
 msgstr ""
+"Berreratze automatikoa erner header-arena /boot-en\n"
+"/usr/include/linux/{autoconf,version}.h"
 
-#: ../../services.pm_.c:43
+#: ../../services.pm_.c:42
 msgid "Automatic detection and configuration of hardware at boot."
-msgstr ""
+msgstr "Hardware detekzio eta ezarpen automatikoa abiapenean."
 
-#: ../../services.pm_.c:44
+#: ../../services.pm_.c:43
 msgid ""
 "Linuxconf will sometimes arrange to perform various tasks\n"
 "at boot-time to maintain the system configuration."
 msgstr ""
 
-#: ../../services.pm_.c:46
+#: ../../services.pm_.c:45
 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)."
@@ -6274,13 +7244,15 @@ msgstr ""
 "Irarkolara\n"
 "doazen lanak kudeatzen duen zerbitzaria da."
 
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:47
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
 msgstr ""
+"Linux Alegiazko Zerbitzaria, errendimendu haundiko eta erabilgarritasun\n"
+"haundiko zerbitzaria eraikitzeko erabilia."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:49
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -6288,7 +7260,7 @@ msgstr ""
 "named (BIND) Domain Name Server-a (DNS) da, honek ostalarien izenak\n"
 "IP helbidetan bihurtzen ditu."
 
-#: ../../services.pm_.c:52
+#: ../../services.pm_.c:51
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -6296,7 +7268,7 @@ msgstr ""
 "Network File System-ak (NFS) muntatu eta desmontatzen ditu, SMB (Lan\n"
 "Manager/Windows), eta NCP (NetWare) muntai puntuak."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -6304,7 +7276,7 @@ msgstr ""
 "Abiaratzekoan hasteko dauden sare interfazeak aktibatu/desaktibatu\n"
 "egiten ditu."
 
-#: ../../services.pm_.c:56
+#: ../../services.pm_.c:55
 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"
@@ -6314,7 +7286,7 @@ msgstr ""
 "Zerbitzu honek, NFS zerbitzariaren funtzioa ematen du,\n"
 "/etc/exports fitxategiak konfiguratua."
 
-#: ../../services.pm_.c:59
+#: ../../services.pm_.c:58
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -6322,17 +7294,17 @@ msgstr ""
 "NFS, TCP/IP sareetan fitxategiak banatzeko protokoloa da.\n"
 "Zerbitzu honek, NFS fitxategi-giltza funtzioa ematen du."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
 msgstr ""
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
-msgstr ""
+msgstr "OKI 4w eta wininprimagailu baterabarriei euskarria eman."
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:63
 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 "
@@ -6343,7 +7315,7 @@ msgstr ""
 "da. Ez da hasiko ez badago konfiguratua, beraz gomendagarria da\n"
 "beharrezko ez duten maniketan instalatzea."
 
-#: ../../services.pm_.c:67
+#: ../../services.pm_.c:66
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -6354,7 +7326,7 @@ msgstr ""
 "erabiltzen dutena. Portmap zerbitzaria erabili beharda\n"
 "RPC mekanismoa erabiltzen duten zerbitzarietan."
 
-#: ../../services.pm_.c:70
+#: ../../services.pm_.c:69
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -6362,7 +7334,7 @@ msgstr ""
 "Postfix Mail Transport Agentea da, makinen arteko postari\n"
 "lana egiten duen porgrama da."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -6371,13 +7343,15 @@ msgstr ""
 "zenbakien\n"
 "sorrerarako."
 
-#: ../../services.pm_.c:74
+#: ../../services.pm_.c:73
 msgid ""
 "Assign raw devices to block devices (such as hard drive\n"
 "partitions), for the use of applications such as Oracle"
 msgstr ""
+"Egokitu raw gailuak bloke gailuei (hala nola unitate zurrun\n"
+"partizioak), Oracle bezalako aplikazioekin erabiltzeko"
 
-#: ../../services.pm_.c:76
+#: ../../services.pm_.c:75
 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"
@@ -6388,7 +7362,7 @@ msgstr ""
 "handientzako\n"
 "routing protokolo konplexuagoak behar dira."
 
-#: ../../services.pm_.c:79
+#: ../../services.pm_.c:78
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -6396,7 +7370,7 @@ msgstr ""
 "Rstat protokoloak sareko edozein makinaren\n"
 "funtzionamendua neur lezake."
 
-#: ../../services.pm_.c:81
+#: ../../services.pm_.c:80
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -6404,7 +7378,7 @@ msgstr ""
 "Rusers protokoloak sareko edozein makina darabilen\n"
 "erabiltzaileak identifikatu lezake."
 
-#: ../../services.pm_.c:83
+#: ../../services.pm_.c:82
 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)."
@@ -6412,12 +7386,11 @@ msgstr ""
 "Rwho protokoloak kanpoko erabiltzaileei, rwho deabrua erabiltzen dutenen\n"
 "zerrenda lortzen du (finger-en antzekoa)."
 
-#: ../../services.pm_.c:85
-#, fuzzy
+#: ../../services.pm_.c:84
 msgid "Launch the sound system on your machine"
-msgstr "X-Windows ezarri sistema abiaratzerakoan"
+msgstr "Jaurtiki soinu sistema zure makinan"
 
-#: ../../services.pm_.c:86
+#: ../../services.pm_.c:85
 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."
@@ -6425,43 +7398,85 @@ msgstr ""
 "Syslog-a deabruek erabiltzen dute sistemen log fitxategietan\n"
 "log mezuak uzteko. Komenigarria da beti indarrean izatea."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
-msgstr ""
+msgstr "Zamatu zure usb gailuentzako gidariak."
 
-#: ../../services.pm_.c:89
-#, fuzzy
+#: ../../services.pm_.c:88
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr ""
-"X Font Zerbitzaria piztu eta itzali egiten du, pizterakoan eta itzaltzerakoan"
+msgstr "X-Font Zerbitzaria abiatzen du (ezinbestekoa da XFree erabiltzeko)."
 
-#: ../../services.pm_.c:118
+#: ../../services.pm_.c:114 ../../services.pm_.c:156
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Hautatu zein zerbitzu hasiko den automatikoki abiatzerakoan"
 
+#: ../../services.pm_.c:126
+#, fuzzy
+msgid "Printing"
+msgstr "Irarkola"
+
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "Internet"
+
+#: ../../services.pm_.c:130
+msgid "File sharing"
+msgstr ""
+
+#: ../../services.pm_.c:132
+#, fuzzy
+msgid "System"
+msgstr "Sistema modua"
+
 #: ../../services.pm_.c:137
+#, fuzzy
+msgid "Remote Administration"
+msgstr "Urrutiko lpd Irarkolaren Aukerak"
+
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Zerbitzari, Datubase"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+#, fuzzy
+msgid "Services"
+msgstr "tresna (device)"
+
+#: ../../services.pm_.c:198
 msgid "running"
 msgstr "abian"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 msgid "stopped"
 msgstr "etanda"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr ""
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
 msgstr ""
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
+#, fuzzy
 msgid "On boot"
-msgstr ""
+msgstr "Yaboot"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "%s paketea instalatzen"
+
+#: ../../standalone/diskdrake_.c:63
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
 "I'll try to go on blanking bad partitions"
@@ -6469,15 +7484,66 @@ msgstr ""
 "Partizio taula ezin irakurri, zeharo galduta:(\n"
 "Partizio txarrak hustutzen saiatuko naiz"
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+#, fuzzy
+msgid "Error!"
+msgstr "Errorea"
+
+#: ../../standalone/drakautoinst_.c:45
+#, c-format
+msgid "I can't find needed image file `%s'."
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:47
+#, fuzzy
+msgid "Auto Install Configurator"
+msgstr "Postinstalazioaren konfigurazioa"
+
+#: ../../standalone/drakautoinst_.c:48
+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"
+"Do you want to continue?"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:70
+#, fuzzy
+msgid "Automatic Steps Configuration"
+msgstr "Abiaratze konfigurazioa"
+
+#: ../../standalone/drakautoinst_.c:71
+msgid ""
+"Please choose for each step whether it will replay like your install, or it "
+"will be manual"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:112 ../../standalone/drakgw_.c:599
+msgid "Congratulations!"
+msgstr "Zorionak!"
+
+#: ../../standalone/drakautoinst_.c:113
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:36 ../../standalone/drakgw_.c:181
 msgid "Internet Connection Sharing"
 msgstr "Internet konexio banatua"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Internet konexioare banaketa gaitua"
 
-#: ../../standalone/drakgw_.c:119
+#: ../../standalone/drakgw_.c:120
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
@@ -6489,31 +7555,31 @@ msgstr ""
 "\n"
 "Zer egin nahi duzu?"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "ezgaitu"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr "etsi"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
 msgstr "berregokitu"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
 msgstr "Zerbitzariak ezereztatzen..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "Internet konexioaren banaketa ezgaitua."
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Internet konexioaren banaketa ezgaitua"
 
-#: ../../standalone/drakgw_.c:144
+#: ../../standalone/drakgw_.c:145
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -6525,27 +7591,19 @@ msgstr ""
 "\n"
 "Zer egin nahi duzu?"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "gaitu"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
 msgstr "Zerbitzariak gaitzen..."
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "Internet konexioaren banaketa gaitua."
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "Config fitxategia ezin ulertu."
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr ""
-
-#: ../../standalone/drakgw_.c:181
+#: ../../standalone/drakgw_.c:182
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
 "With that feature, other computers on your local network will be able to use "
@@ -6560,21 +7618,21 @@ msgstr ""
 "\n"
 "Oharra: Sare Egokitzaile berezia beharko duzu bertako sarea eraikitzeko."
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Interface %s (using module %s)"
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:209
 #, c-format
 msgid "Interface %s"
 msgstr "Interface %s"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:217
 msgid "No network adapter on your system!"
 msgstr "Ez duzu sare-egokitzailerik zure sisteman!"
 
-#: ../../standalone/drakgw_.c:217
+#: ../../standalone/drakgw_.c:218
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
@@ -6583,6 +7641,10 @@ msgstr ""
 "harwarearen konfigurazio tresna erabili."
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "Sarearen interfazea"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -6597,26 +7659,27 @@ msgstr ""
 "\n"
 "Zure LANa egokitzaile horrekin konfiguratuko dut."
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "Mesedez hauta zein sare-egokitzaile izango duzuzure LANerako."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr "Adi, sare egokitzailea dagoeneko konfiguratua. Berkonfiguratuko dut."
 
-#: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
-msgstr "Litekeen LAN helbidearen konfliktoa oraingo $_-ren konfigurazioan!\n"
+#: ../../standalone/drakgw_.c:254
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr "Litekeen LAN helbidearen konfliktoa oraingo %s-ren konfigurazioan!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "Firewall konfigurazioa aurkitua!"
 
-#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:263 ../../standalone/drakgw_.c:269
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
@@ -6624,24 +7687,21 @@ msgstr ""
 "Kasu! Esistitzen den firewall konfigurazioa aurkitu da. Agian\n"
 "eskuzko finkapena egin beharko duzu instalazioa eta gero."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "Konfiguratzen..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 "Konfigurazioko script-ak, softwarea instalatzen, zerbitzariak abiarazten..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "Arazoa $_ instalatzean"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "Zorionak!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Arazoa %s instalatzean"
 
-#: ../../standalone/drakgw_.c:591
+#: ../../standalone/drakgw_.c:600
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
@@ -6650,24 +7710,24 @@ msgstr ""
 "Dena egokiturik.\n"
 "Internet konexioa banatu zenezake, DHCP erabiliaz."
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
 msgstr ""
 "Internet konexiaren banaketaren egokierak eginda, baina orain ez dabil."
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
 msgstr "Internet konexiaren banaketaren egokierak eginda. Erabilgarri dago."
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "Internet konexioaren banaketa ez da inoiz konfiguratu."
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
 msgstr "Internet konexioaren banaketaren konfigurazioa"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -6682,84 +7742,82 @@ msgstr ""
 "\n"
 "Konfiguratun saka egokitzapenak egiteko."
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Sare Konfigurazioa (%d egokitzaileak)"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:539
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 msgid "Profile: "
 msgstr "Profila: "
 
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:94
 msgid "Del profile..."
 msgstr "Ezaba profila..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr "Ezabatzeko profila:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "Profil berria..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "Eratu beharreko profilaren izena:"
+#: ../../standalone/draknet_.c:134
+msgid ""
+"Name of the profile to create (the new profile is created as a copy of the "
+"current one) :"
+msgstr ""
 
-#: ../../standalone/draknet_.c:140
+#: ../../standalone/draknet_.c:160
 msgid "Hostname: "
 msgstr "Ostalari-izena:"
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "Internet lotura"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
 msgstr "Mota:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "Ataria (gateway):"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Interface:"
 msgstr "Interface:"
 
-#: ../../standalone/draknet_.c:168
+#: ../../standalone/draknet_.c:192
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:122 ../../standalone/net_monitor_.c:224
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 msgid "Connected"
 msgstr "Konektaturik"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:83 ../../standalone/net_monitor_.c:122
-#: ../../standalone/net_monitor_.c:224
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 msgid "Not connected"
 msgstr "Konektatu gabe"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
 msgstr "Konektatu..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Disconnect..."
 msgstr "Eten..."
 
-#: ../../standalone/draknet_.c:191
-#, fuzzy
+#: ../../standalone/draknet_.c:215
 msgid "Starting your connection..."
-msgstr "Konexioa frogatzen..."
+msgstr "Lotura abiatzen..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
 msgstr "Konexioa ixten..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -6770,120 +7828,119 @@ msgstr ""
 "Eskuz ireki root-en:\n"
 "/etc/sysconfig/network-scripts/net_cnx_down"
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
 msgstr "Sistema deskonektatuta."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "Konfiguratu Internet Lotura..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "LAN konfigurazioa"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "Egokitzailea"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "Gidaria"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "Interface"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr "Protokolo"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+#, fuzzy
+msgid "State"
+msgstr "Status:"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "Konfiguratu bertoko sarea LAN..."
 
-#: ../../standalone/draknet_.c:283
-msgid "Normal Mode"
-msgstr "Arrunta"
+#: ../../standalone/draknet_.c:279
+msgid "Click here to launch the wizard ->"
+msgstr ""
 
-#: ../../standalone/draknet_.c:288
+#: ../../standalone/draknet_.c:306
 msgid "Apply"
 msgstr "Ezarri"
 
-#: ../../standalone/draknet_.c:307
+#: ../../standalone/draknet_.c:325
 msgid "Please Wait... Applying the configuration"
 msgstr "Zain egon...konfigurazioa ezartzen"
 
-#: ../../standalone/draknet_.c:391
+#: ../../standalone/draknet_.c:428
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
+"Ez daukazu interfaze batere ezarrita.\n"
+"Ezarri itzazu 'Ezarri' gainean sakatuz"
 
-#: ../../standalone/draknet_.c:415
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
 msgstr "LAN konfigurazioa"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Egokitzaile %s: %s"
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
 msgstr "Abiatze Protokoloa"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
 msgstr "Abiatzerakoan hasia"
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
 msgstr "DHCP bezeroa"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Disable"
-msgstr "Ezgaitu"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "activate now"
+msgstr "aktibatu"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "Gaitu"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "desactivate now"
+msgstr "aktibatu"
 
-#: ../../standalone/draknet_.c:504
+#: ../../standalone/draknet_.c:538
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
 msgstr ""
+"Ez daukazu interneterako loturarik.\n"
+"Sortu ezazu bat 'Ezarri' gainean sakatuz"
 
-#: ../../standalone/draknet_.c:528
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
 msgstr "Internet konexioaren konfigurazioa"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "Internet konexioaren konfigurazioa"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "Konexioaren mota: "
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "Parametroak"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "Ornitzailearen dns 1 (aukerakoa)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "Ornitzailearen dns 2 (aukerakoa)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "Ethernet txartela"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "DHCP bezeroa"
 
@@ -6953,15 +8010,30 @@ msgstr ""
 "4. mailaren ezaugarriak, baina orain sistema guztiz hertsia.\n"
 "Segurtasun maila maximoa."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "Hautatu segurtasun neurria"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "Hautatu zerbitzariarentzako aukerak"
+
+#: ../../standalone/draksec_.c:68
+msgid ""
+"A library which defends against buffer overflow and format string attacks."
+msgstr ""
+
+#: ../../standalone/draksec_.c:72
 msgid "Setting security level"
 msgstr "Hautatu segurtasun neurria"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
 msgstr "Kontrol Zentroa"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "Instalatu nahi duzun tresna hautatu"
 
@@ -6982,90 +8054,22 @@ 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 ""
-"Mesedez, \"%s\" izena duen Cd-Rom-a sartu unitatean eta gero Ok sakaegizu.\n"
+"Mesedez, \"%s\" izena duen Cd-Rom-a sartu unitatean eta gero Ados "
+"sakaegizu.\n"
 "Ez baldin baduzu Etsi sakatu Cd-Rom-etiko instalazioa ezeztatzeko."
 
 #: ../../standalone/livedrake_.c:34
 msgid "Unable to start live upgrade !!!\n"
-msgstr ""
+msgstr "Ezin da eguneratze bizia abiatu !!!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "ez dut aurkitu serieko_usb-rik\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "Emulatu hirugarren botoia?"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "Mesedez testatu sagua"
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-msgid "Network Monitoring"
-msgstr "Sare Ikuskapena"
-
-#: ../../standalone/net_monitor_.c:56
-msgid "Statistics"
-msgstr "Estatistikak"
-
-#: ../../standalone/net_monitor_.c:59
-msgid "Sending Speed: "
-msgstr "Bidaltze abiadura: "
-
-#: ../../standalone/net_monitor_.c:61
-msgid "Receiving Speed: "
-msgstr "Jasotze abiadaura: "
-
-#: ../../standalone/net_monitor_.c:66
-msgid "Close"
-msgstr "Itxi"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Connecting to Internet "
-msgstr "Internetera konektatzen"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Disconnecting from Internet "
-msgstr "Irteneteko konexioa etetzen"
-
-#: ../../standalone/net_monitor_.c:114
-msgid "Disconnection from Internet failed."
-msgstr "Irteneteko konexioa ezin eten"
-
-#: ../../standalone/net_monitor_.c:115
-msgid "Disconnection from Internet complete."
-msgstr "Irteneteko konexioa etenda."
-
-#: ../../standalone/net_monitor_.c:117
-msgid "Connection complete."
-msgstr "Konexio osoa."
-
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-"Konexioaren akatsa.\n"
-"Mandrake Control Center-en konfigurazioa begiratu."
-
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr "bidali: "
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr "jasota: "
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Connect"
-msgstr "Konektatu"
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Disconnect"
-msgstr "Eten konexioa"
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "Firewall konfigurazioa"
@@ -7096,21 +8100,89 @@ msgstr ""
 "\n"
 "Konfiguratun saka standarra nahi baduzu."
 
-#: ../../tinyfirewall.pm_.c:10
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "Hautatu hizkuntza"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Hautatu instalazio mota"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Disko zurrunaren detekzioa"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Konfiguratu sagua"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Aukeratu teklatua"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "Segurtasuna"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Fitxategi sistemak egokitu"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Partizioak formateatu"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Aukeratu instalatu beharreko paketeak"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Instalatu sitema"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "Gehitu erabiltzailea"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Konfiguratu sare lana"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Konfiguratu zerbitzuak"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Bootdisk-a eraiki"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Instalatu bootloader-ra"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Konfiguratu X"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Instalaziotik irten"
+
+#: ../../tinyfirewall.pm_.c:9
 msgid ""
 "tinyfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Linux Mandrake machine.\n"
+"This configures a personal firewall for this Mandrake Linux machine.\n"
 "For a powerful dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "tinyfirewall configurator\n"
 "\n"
-"Linux Mandrake makinarako norberarentzako firewalla ezartzen du.\n"
+"Mandrake Linux makinarako norberarentzako firewalla ezartzen du.\n"
 "Segurtasun handiago nahi baduzu: MandrakeSecurity Firewall distribution;\n"
 "banaketa berezikoa."
 
-#: ../../tinyfirewall.pm_.c:15
+#: ../../tinyfirewall.pm_.c:14
 msgid ""
 "We'll now ask you questions about which services you'd like to allow\n"
 "the Internet to connect to.  Please think carefully about these\n"
@@ -7126,7 +8198,7 @@ msgstr ""
 "Behar izanez gero edozein momentutan berkonfiguratu zenezake\n"
 "zerbitzuok."
 
-#: ../../tinyfirewall.pm_.c:22
+#: ../../tinyfirewall.pm_.c:21
 msgid ""
 "Are you running a web server on this machine that you need the whole\n"
 "Internet to see? If you are running a webserver that only needs to be\n"
@@ -7138,7 +8210,7 @@ msgstr ""
 "erantzeun zenezake.\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:27
+#: ../../tinyfirewall.pm_.c:26
 msgid ""
 "Are you running a name server on this machine? If you didn't set one\n"
 "up to give away IP and zone information to the whole Internet, please\n"
@@ -7149,7 +8221,7 @@ msgstr ""
 "Ezetz erantzun IP informazioa gorde nahi izanez gero.\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:32
+#: ../../tinyfirewall.pm_.c:31
 msgid ""
 "Do you want to allow incoming Secure Shell (ssh) connections? This\n"
 "is a telnet-replacement that you might use to login. If you're using\n"
@@ -7163,47 +8235,68 @@ msgstr ""
 "encrypted -- so some attackers can steal your password if you use\n"
 "it. ssh is encrypted and doesn't allow for this eavesdropping."
 
-#: ../../tinyfirewall.pm_.c:37
+#: ../../tinyfirewall.pm_.c:36
 msgid ""
 "Do you want to allow incoming telnet connections?\n"
 "This is horribly unsafe, as we explained in the previous screen. We\n"
 "strongly recommend answering No here and using ssh in place of\n"
 "telnet.\n"
 msgstr ""
+"Kanpotik datozen telnet loturak baimendu nahi dituzu?\n"
+"Hau izugarri arriskutsua da, aurreko pantailan azaldu dugun bezala. Guk\n"
+"irmoki gomendatzen dugu galdera honi Ezetz erantzutea eta telnet ordez\n"
+"ssh erabiltzea.\n"
 
-#: ../../tinyfirewall.pm_.c:42
+#: ../../tinyfirewall.pm_.c:41
 msgid ""
 "Are you running an FTP server here that you need accessible to the\n"
 "Internet? If you are, we strongly recommend that you only use it for\n"
 "Anonymous transfers. Any passwords sent by FTP can be stolen by some\n"
 "attackers, since FTP also uses no encryption for transferring passwords.\n"
 msgstr ""
+"Internetetik eskuragarri dagoen FTP zerbitzari bat korritzen ari zera?\n"
+"Ala bada, irmoki gomendatzen dizugu transferentzia anonimoetarako\n"
+"soilik erabiltzea. FTP bitartez bidalitako edozein pasahitz erasotzaileek\n"
+"lapurtu dezakete, FTP-k ez duelako pasahitzak bidaltzeko enkriptaziorik "
+"erabiltzen.\n"
 
-#: ../../tinyfirewall.pm_.c:47
+#: ../../tinyfirewall.pm_.c:46
 msgid ""
 "Are you running a mail server here? If you're sending you \n"
 "messages through pine, mutt or any other text-based mail client,\n"
 "you probably are.  Otherwise, you should firewall this off.\n"
 "\n"
 msgstr ""
+"Hemen posta zerbitzaria exekutatzen ari zara? Zure mezuak\n"
+"pine, mutt edo beste edozein testu-oinarridun posta bezero bitartez\n"
+"bidaltzen baduzu ziurrenik hala da. Bestela, suhesiaz babestu behar zenuke.\n"
+"\n"
 
-#: ../../tinyfirewall.pm_.c:52
+#: ../../tinyfirewall.pm_.c:51
 msgid ""
 "Are you running a POP or IMAP server here? This would\n"
 "be used to host non-web-based mail accounts for people via \n"
 "this machine.\n"
 "\n"
 msgstr ""
+"POP edo IMAP zerbitzaria exekutatzen ari zara? Hau erabiliko\n"
+"litzateke makina honen bitartez jendearentzako web oinarrigabeko\n"
+"posta kontuei ostatu emateko\n"
+"\n"
 
-#: ../../tinyfirewall.pm_.c:57
+#: ../../tinyfirewall.pm_.c:56
 msgid ""
 "You appear to be running a 2.2 kernel.  If your network IP\n"
 "is automatically set by a computer in your home or office \n"
 "(dynamically assigned), we need to allow for this.  Is\n"
 "this the case?\n"
 msgstr ""
+"Dirudienez 2.2 kernela erabiltzen ari zara. Zure sare IPa\n"
+"automatikoki ezartzen bada zure etxe edo bulegoan duzun\n"
+"konputagailu baten bitartez (dinamikoki egokitua), hau gaitu\n"
+"behar dugu. Zure kasua da?\n"
 
-#: ../../tinyfirewall.pm_.c:62
+#: ../../tinyfirewall.pm_.c:61
 msgid ""
 "Is your computer getting time syncronized to another computer?\n"
 "Mostly, this is used by medium-large Unix/Linux organizations\n"
@@ -7211,293 +8304,1534 @@ msgid ""
 "of a larger office and haven't heard of this, you probably \n"
 "aren't."
 msgstr ""
+"Zure konputagailuak beste batekin denbora sinkronizatzen du?\n"
+"Gehienbat, Unix/Linux erakunde ertain-haundietan erabiltzen da hau\n"
+"sesioan sarrera eta halakoetarako denbora sinkronizatzeko. Ez bazara\n"
+"bulego haundi bateko partaide eta honi buruz ezer entzun ez baduzu\n"
+"ziurrenik ez duzu egiten."
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
 "\n"
 "\n"
 msgstr ""
+"Ezarpena amaitu da.  Aldaketa hauek diskora idatziko ditugu?\n"
+"\n"
+"\n"
+"\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
 msgstr "Ezin ireki %s: %s\n"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "Ezin ireki %s idazteko: %s\n"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Protokolo desberdinetareko bezeroak, ssh barne"
+msgid "Web/FTP"
+msgstr "Zerbitzaria, Web/FTP"
 
 #: ../../share/compssUsers:999
-msgid "Development"
-msgstr "Garatzaile"
+msgid "Network Computer (client)"
+msgstr "Sareko Konputagailu (bezeroa)"
 
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Lan estazioa"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Zerbitzari, Firewall/Router"
+msgid "Office"
+msgstr "Office"
 
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Norberaren Informazioaren Kudeatzeileak"
+msgid "Gnome Workstation"
+msgstr "Gnome Lan estazioa"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimedia - Grafikoak"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Palm edo Visor-entzako tresnak"
 
 #: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "Internet"
+msgid "Workstation"
+msgstr "Lan estazioa"
 
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Sareko Konputagailu (bezeroa)"
+msgid "Firewall/Router"
+msgstr "Zerbitzari, Firewall/Router"
+
+#: ../../share/compssUsers:999
+msgid "Domain Name and Network Information Server"
+msgstr ""
+
+#: ../../share/compssUsers:999
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr "Bulego programak"
 
 #: ../../share/compssUsers:999
 msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr "Audio tresnak: mp3 edo midi jotzeko, nahasleak, eta abar"
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Interneten estazioa"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Liburuak eta Linux laguntza"
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Office"
+msgid "KDE Workstation"
+msgstr "KDE Lan estazioa"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimedia estazioa"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"posta eta berriak irakurtzeko eta bialtzeko tresnak: pine, mutt, tin... eta "
-"Amarauna arakatzeko"
+msgid "Multimedia - Video"
+msgstr "Multimedia - Video"
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C eta C++ garatzeko liburutegiak, programak eta abar"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Trenak posta, berri, web, fitxategi igorrtze eta txaterako"
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
+msgid "Database"
+msgstr "Zerbitzari, Datubase"
+
+#: ../../share/compssUsers:999
+msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Finantzetarakoak: gnucash..."
+msgid "Tools to ease the configuration of your computer"
+msgstr "Konfigurazioa errazteko tresnak"
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Soinua"
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
+msgid "Utilities"
+msgstr "Laguntzaileak"
 
 #: ../../share/compssUsers:999
 msgid "Documentation"
 msgstr "Dokumentazioa"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Console Tools"
+msgstr "Consola tresnak"
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Laguntzaileak"
+msgid "Postfix mail server, Inn news server"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr ""
+msgid "Internet station"
+msgstr "Interneten estazioa"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr ""
+msgid "Multimedia station"
+msgstr "Multimedia estazioa"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Soinua"
+#, fuzzy
+msgid "Configuration"
+msgstr "LAN konfigurazioa"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Denborapasa: arcade, taulakoak, estrategia..."
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Idazmahi grafikoak (Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Videoa editatu eta ikusteko"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "KDE idazmahi giroa"
 
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Consola tresnak"
+msgid "Graphical Environment"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Saoinua eta bideoa"
+msgid "Development"
+msgstr "Garatzaile"
 
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Zientzirako lanestazioa"
+msgid "Apache, Pro-ftpd"
+msgstr "Apache eta Pro-ftpd"
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editoreak, maskorrak, fitxategi tresnak, terminalak"
+msgid "Tools to create and burn CD's"
+msgstr "CDak erreteko"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Liburuak eta Linux laguntza"
+msgid "Office Workstation"
+msgstr "Office estazioa"
 
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr "Giro grafikoa"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr ""
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafikoentzako programak, Gimp barne."
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "Jokuak"
+msgid "DNS/NIS "
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Video"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C eta C++ garatzeko liburutegiak, programak eta abar"
 
 #: ../../share/compssUsers:999
 msgid "Network Computer server"
 msgstr "Sare Zerbitzaria"
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafikoentzako programak, Gimp barne."
+msgid "Mail/Groupware/News"
+msgstr "Zerbitzari, Posta/Taldeware/Berriak"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Office estazioa"
+msgid "Game station"
+msgstr "Joku estazio"
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr "KDE idazmahi giroa"
+msgid "Video players and editors"
+msgstr "Videoa editatu eta ikusteko"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Idazmahi grafikoak (Gnome, IceWM)"
+msgid "Multimedia - Graphics"
+msgstr "Multimedia - Grafikoak"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "CDak erreteko"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Denborapasa: arcade, taulakoak, estrategia..."
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - CD erretzaileak"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"posta eta berriak irakurtzeko eta bialtzeko tresnak: pine, mutt, tin... eta "
+"Amarauna arakatzeko"
 
 #: ../../share/compssUsers:999
 msgid "Archiving, emulators, monitoring"
 msgstr "Gordailuak, emuladoreak, monitoreak"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Zerbitzari, Datubase"
+msgid "Personal Finance"
+msgstr "Norberaren Finantzak"
 
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr "Bulego programak"
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "Giro grafikoa"
 
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Zerbitzaria, Web/FTP"
+msgid "Clients for different protocols including ssh"
+msgstr "Protokolo desberdinetareko bezeroak, ssh barne"
 
 #: ../../share/compssUsers:999
-msgid "Server"
-msgstr "Zerbitzari"
+#, fuzzy
+msgid "Internet gateway"
+msgstr "Internet lotura"
 
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Norberaren Finantzak"
+msgid "Sound and video playing/editing programs"
+msgstr "Saoinua eta bideoa"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfigurazioa"
+msgid "Other Graphical Desktops"
+msgstr "Bestelako idazmahi grafikoak"
 
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE Lan estazioa"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editoreak, maskorrak, fitxategi tresnak, terminalak"
 
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Bestelako idazmahi grafikoak"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Finantzetarakoak: gnucash..."
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache eta Pro-ftpd"
+msgid "Games"
+msgstr "Jokuak"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Zerbitzari, Posta/Taldeware/Berriak"
+msgid "Personal Information Management"
+msgstr "Norberaren Informazioaren Kudeatzeileak"
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome Lan estazioa"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - CD erretzaileak"
 
 #: ../../share/compssUsers:999
+msgid "Scientific Workstation"
+msgstr "Zientzirako lanestazioa"
+
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "ezin ireki etc/sysconfig/autologin irakurtzeko: %s"
+
+#~ msgid "Do you want to restart the network"
+#~ msgstr "Sarea berrabiarazi nahi duzu?"
+
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "Ados zaude?"
+
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "Sarerako tresna berabiaraziko dut:\n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "Zure %s sare tresna berrabiaraziko dut. Ados?"
+
 #, fuzzy
-msgid "Internet gateway"
-msgstr "Internet lotura"
+#~ msgid ""
+#~ "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
+#~ "(primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+#~ msgstr ""
+#~ "Bestelakorik ez badakizu, ohikoena \"/dev/hda\" da\n"
+#~ " (IDE disko nagusia) edo \"/dev/sda\" (lehen SCSI diskoa)."
 
-#: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Palm edo Visor-entzako tresnak"
+#, fuzzy
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "Hemen daude  hurrengo irarkola isatsak.\n"
+#~ "Zenbait gehitu edo daudenak aldatu dezakezu."
 
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Joku estazio"
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "Lotura Denbora "
 
-#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "Hautatu jatorrizko erabiltzailea:"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Konfigurazioa errazteko tresnak"
+#~ msgid "Spooler: "
+#~ msgstr "Inprimaketa ilara:"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Trenak posta, berri, web, fitxategi igorrtze eta txaterako"
+#~ msgid "Test the mouse here."
+#~ msgstr "Frogatu sagua hemen."
 
-#~ msgid "GB"
-#~ msgstr "GB"
+#~ msgid "Press next to continue."
+#~ msgstr "Sakatu hurrengoa jarraitzeko."
 
-#~ msgid "KB"
-#~ msgstr "KB"
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ msgstr ""
+#~ "Mesedez hauta hobestutako hizkuntza instalaziorako eta sistemaren "
+#~ "erabilerako"
 
-#~ msgid "TB"
-#~ msgstr "TB"
+#~ msgid ""
+#~ "You need to accept the terms of the above license to continue "
+#~ "installation.\n"
+#~ "\n"
+#~ "\n"
+#~ "Please click on \"Accept\" if you agree with its terms.\n"
+#~ "\n"
+#~ "\n"
+#~ "Please click on \"Refuse\" if you disagree with its terms. Installation "
+#~ "will end without modifying your current\n"
+#~ "configuration."
+#~ msgstr ""
+#~ "Gaineko lizentzian aipaturikoa onartu behar duzu instalazioarekin "
+#~ "jarraitzeko.\n"
+#~ "\n"
+#~ "\n"
+#~ "Mesedez egin klik \"Onartu\" gainean lizentziarekin ados bazaude.\n"
+#~ "\n"
+#~ "\n"
+#~ "Egin klik \"Errefusatu\" gaienan lizentziarekin ados ez bazaude. "
+#~ "Instalazioa orain duzun ezarpena aldatu gabe\n"
+#~ "amaituko da."
 
-#~ msgid "%d minutes"
-#~ msgstr "%d minutu"
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr "Hautatu zureari dagokion teklatuaren itxura goiko listan"
 
-#~ msgid "1 minute"
-#~ msgstr "minutu 1"
+#~ msgid ""
+#~ "If you wish other languages (than the one you choose at\n"
+#~ "beginning of installation) will be available after installation, please "
+#~ "chose\n"
+#~ "them in list above. If you want select all, you just need to select \"All"
+#~ "\"."
+#~ msgstr ""
+#~ "Gainerako hizkuntzarik nahi baduzu (instalazioaren hasieran\n"
+#~ "aukeraturikoez gain) eskuragarri izango dituzu instalazioaren ondoren, "
+#~ "mesedez aukeratu\n"
+#~ "itzazu gaineko zerrendan. Guztiak aukeratu nahi badituzu, aukeratu "
+#~ "\"Guztiak\"."
+
+#~ msgid ""
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Customized: If you are familiar enough with GNU/Linux, you may then "
+#~ "choose\n"
+#~ "    the primary usage for your machine. See below for details.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
+#~ "    perform a highly customized installation. As for a \"Customized\"\n"
+#~ "    installation class, you will be able to select the usage for your "
+#~ "system.\n"
+#~ "    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
+#~ "DOING!"
+#~ msgstr ""
+#~ "Hauta:\n"
+#~ "\n"
+#~ "  - Norberarena: GNU/Linux ezagutzen baduzu. Gero, makinaren erabiera "
+#~ "nagusia hautatzeko aukera izango duzu. Beherago ikus azalpenak.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Aditua: GNU/Linux sakonki ezagutuz gero, eta oso instalazio berezia\n"
+#~ "egin nahi baduzu,instalazio modu hau zuretzako da. Zure sistemaren\n"
+#~ "erabilera honela egin beharko duzu \"Norberarena\".\n"
+#~ "    Baina mesedez, EGITEN ZABILTZANA ZERTAN DATZAN EZ BADAKIZU, EZ HAUTA "
+#~ "AUKERA HAU!"
+
+#~ msgid ""
+#~ "You must now define your machine usage. Choices are:\n"
+#~ "\n"
+#~ "* Workstation: this the ideal choice if you intend to use your machine "
+#~ "primarily for everyday use, at office or\n"
+#~ "  at home.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Development: if you intend to use your machine primarily for software "
+#~ "development, it is the good choice. You\n"
+#~ "  will then have a complete collection of software installed in order to "
+#~ "compile, debug and format source code,\n"
+#~ "  or create software packages.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Server: if you intend to use this machine as a server, it is the good "
+#~ "choice. Either a file server (NFS or\n"
+#~ "  SMB), a print server (Unix style or Microsoft Windows style), an "
+#~ "authentication server (NIS), a database\n"
+#~ "  server and so on. As such, do not expect any gimmicks (KDE, GNOME, "
+#~ "etc.) to be installed."
+#~ msgstr ""
+#~ "Makinaren erabilera desberdinak hauta zenezake. Aukerak:\n"
+#~ "\n"
+#~ "* Arrunta: egunerako erabilerarako (bulego lana, irudiketa, eta abar). "
+#~ "Ez\n"
+#~ "  duzu konplikaziorik edo garatzale lanerako tresnarik edukiko.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Garatzaile: sofwarearen garapenerako erabiliko baduzu makina. Orduan "
+#~ "software\n"
+#~ "  bilduma osoa izango duzu konpilatu, debug eta jatorrizko\n"
+#~ "kodearen formateaoa, edo software paketeak eratzeko.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Zerbitzari: hauta hau zure Mandrake Linux instalazioa zerbitzari modura "
+#~ "erabiltzeko. Hau da fitxategi zerbitzari  (NFS edo SMB),  irarkola "
+#~ "zerbitzari (Unix edo Microsoft bezalako inpresioa), egiaztatze zerbitzari "
+#~ "(NIS), datubase zerbitzari eta abar.  Hemen, ez duzu gimmicks-k izango "
+#~ "(KDE, GNOME...)."
+
+#~ msgid ""
+#~ "You may now select the group of packages you wish to\n"
+#~ "install or upgrade.\n"
+#~ "\n"
+#~ "\n"
+#~ "DrakX will then check whether you have enough room to install them all. "
+#~ "If not,\n"
+#~ "it will warn you about it. If you want to go on anyway, it will proceed "
+#~ "onto the\n"
+#~ "installation of all selected groups but will drop some packages of "
+#~ "lesser\n"
+#~ "interest. At the bottom of the list you can select the option \n"
+#~ "\"Individual package selection\"; in this case you will have to browse "
+#~ "through\n"
+#~ "more than 1000 packages..."
+#~ msgstr ""
+#~ "Orain instalatu edo eguneratu nahi duzun paketa taldea\n"
+#~ "hauta dezakezu.\n"
+#~ "\n"
+#~ "DrakX-ek instalaziorako tokirik baduzu begiratuko du. Ez baduzu,\n"
+#~ "ohartuko dizu. Aurrera jarraitu nahi baduzu, hautatutakoen artean "
+#~ "instalazioak\n"
+#~ "garrantzi handiagoko paketeak hobestuko ditu eta leku faltan garrantzi\n"
+#~ "gutxiagokoak bastertuko ditu.Zerrendaren behealdeko\n"
+#~ "\"Banan banako pakete hautaketa\" erabil zenezake; kasu honetan\n"
+#~ "1000 baino gehiagoko pakete zerrendan murgildu beharko zara..."
+
+#~ msgid ""
+#~ "You can now choose individually all the packages you\n"
+#~ "wish to install.\n"
+#~ "\n"
+#~ "\n"
+#~ "You can expand or collapse the tree by clicking on options in the left "
+#~ "corner of\n"
+#~ "the packages window.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you prefer to see packages sorted in alphabetic order, click on the "
+#~ "icon\n"
+#~ "\"Toggle flat and group sorted\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you want not to be warned on dependencies, click on \"Automatic\n"
+#~ "dependencies\". If you do this, note that unselecting one package may "
+#~ "silently\n"
+#~ "unselect several other packages which depend on it."
+#~ msgstr ""
+#~ "Orain, banan-banan aukeratu ditzakezu instalatu nahi dituzun\n"
+#~ "paketeak.\n"
+#~ "\n"
+#~ "\n"
+#~ "Zuhaitza zabaldu edo estutu dezakezu pakete leihoaren ezker ertzeko "
+#~ "aukeretan\n"
+#~ "klik eginez\n"
+#~ "\n"
+#~ "\n"
+#~ "Paketeak alfabetikoki antolaturik ikustea nahiago baduzu, egin ezazu "
+#~ "klik\n"
+#~ "\"Laua eta taldeka antolaturik\" ikonoak.\n"
+#~ "\n"
+#~ "\n"
+#~ "Menpekotasun oharrik jaso nahi ez baduzu, klik \"Menpekotasu automatikoak"
+#~ "\"\n"
+#~ "gainean. Hau egiten baduzu, kontutan izan pakete bat aukeratik kentzean, "
+#~ "isilean,\n"
+#~ "honen menpekotasuna duten beste bakete batzu kendu daitezkeela."
+
+#~ msgid ""
+#~ "If you have all the CDs in the list above, click Ok. If you have\n"
+#~ "none of those CDs, click Cancel. If only some CDs are missing, unselect "
+#~ "them,\n"
+#~ "then click Ok."
+#~ msgstr ""
+#~ "Goiko zerrendako CD guztiak badituzu, Ados klikatu.\n"
+#~ "Batere ez baduzu, Etsi klikatu.\n"
+#~ "Baten bat faltatuz gero, hautatuetatik atera eta ondoren,\n"
+#~ "Ados klikatu."
+
+#~ msgid ""
+#~ "You can now test your mouse. Use buttons and wheel to verify\n"
+#~ "if settings are good. If not, you can click on \"Cancel\" to choose "
+#~ "another\n"
+#~ "driver.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you are installing on an Apple machine with a 1-button mouse, you "
+#~ "will\n"
+#~ "be given the opportunity to define some keyboard keys to emulate the 2nd\n"
+#~ "and 3rd mouse buttons.  This will allow you to be able to access the "
+#~ "full\n"
+#~ "functionality of the mouse in both the Linux console and the X Window "
+#~ "GUI.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you have an ADB mouse, please select USB, as the Linux kernel will "
+#~ "take\n"
+#~ "care of mapping your mouse hardware correctly."
+#~ msgstr ""
+#~ "Orain zure sagua frogatu dezakezu. Erabili botoiak eta gurpila\n"
+#~ "ezarpenak ongi dauden egiaztatzeko. Ala ez bada, \"Etsi\" sakatu "
+#~ "dezakezu\n"
+#~ "beste gidari bat aukeratzeko.\n"
+#~ "\n"
+#~ "\n"
+#~ "Botoi bakarreko sagu bat duen Apple makina batean instalatzen ari "
+#~ "bazara,\n"
+#~ "2. eta 3. sagu botoiak emulatzeko teklatu botoi batzu zehazteko aukera\n"
+#~ "emango zaizu. Honela, bai Linux kontsolan baita X Window GUIan ere "
+#~ "saguaren\n"
+#~ "funtzionalitate osoa erabili ahal izango duzu.\n"
+#~ "\n"
+#~ "ADB sagua badaukazu, mesedez, aukeratu USB, honela Linux kernelak hartuko "
+#~ "du\n"
+#~ "zure sagu hardwarea behar bezela mapeatzeko ardura."
+
+#~ msgid ""
+#~ "If you wish to connect your computer to the Internet or\n"
+#~ "to a local network please choose the correct option. Please turn on your "
+#~ "device\n"
+#~ "before choosing the correct option to let DrakX detect it automatically.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you do not have any connection to the Internet or a local network, "
+#~ "choose\n"
+#~ "\"Disable networking\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you wish to configure the network later after installation or if you "
+#~ "have\n"
+#~ "finished to configure your network connection, choose \"Done\"."
+#~ msgstr ""
+#~ "Zure konputagailua Internet edo beste bertoko sare batera\n"
+#~ "lotu nahi baduzu , mesedez hautatu aukera zuzena. Mesedez, piztu zure "
+#~ "gailua\n"
+#~ "aukera zuzena hautatu aurretik DrakXek automatikoki detektatu dezan.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ez badaukazu Internet edo bertako sare batera loturarik, aukeratu\n"
+#~ "\"Ezgaitu sarea\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Sarea, instalazioa amaitu ondoren, ezarri nahi baduzu edo zure\n"
+#~ "sare loturaren ezarpena burutu baduzu, hautatu \"Eginda\"."
+
+#~ msgid ""
+#~ "No modem has been detected. Please select the serial port on which it is "
+#~ "plugged.\n"
+#~ "\n"
+#~ "\n"
+#~ "For information, the first serial port (called \"COM1\" under Microsoft\n"
+#~ "Windows) is called \"ttyS0\" under Linux."
+#~ msgstr ""
+#~ "Ez da modemik detektatu. Mesedez, hautatu loturik dagoen portua.\n"
+#~ "\n"
+#~ "\n"
+#~ "Lagungarri gisa, lehenengo serie portua (Microsoft Windowsek \"COM1\"\n"
+#~ "deitzen duena) \"ttyS0\" deitzen da Linuxen."
+
+#~ msgid ""
+#~ "You may now enter dialup options. If you don't know\n"
+#~ "or are not sure what to enter, the correct informations can be obtained "
+#~ "from\n"
+#~ "your Internet Service Provider. If you do not enter the DNS (name "
+#~ "server)\n"
+#~ "information here, this information will be obtained from your Internet "
+#~ "Service\n"
+#~ "Provider at connection time."
+#~ msgstr ""
+#~ "markatze aukerak sar zenezake. ez badakizu\n"
+#~ "edo ez bazaude zihur zer sartuz, informazio uzena zure Internet "
+#~ "ornitzailearieskatu\n"
+#~ "Ornitzailea, indarrean dagoen konexioarena."
+
+#~ msgid ""
+#~ "If your modem is an external modem, please turn on it now to let DrakX "
+#~ "detect it automatically."
+#~ msgstr ""
+#~ "Modema kanpokoa baduzu, piztu egizu DrakX-ek automatikoki ezar dezan"
+
+#~ msgid "Please turn on your modem and choose the correct one."
+#~ msgstr "Piztu modem-a eta hauta zuzena."
+
+#~ msgid ""
+#~ "If you are not sure if informations above are\n"
+#~ "correct or if you don't know or are not sure what to enter, the correct\n"
+#~ "informations can be obtained from your Internet Service Provider. If you "
+#~ "do not\n"
+#~ "enter the DNS (name server) information here, this information will be "
+#~ "obtained\n"
+#~ "from your Internet Service Provider at connection time."
+#~ msgstr ""
+#~ "Goiko informazioa ez baduzu, edo honetaz zihur ez bazaude\n"
+#~ "eska egiozu Internet ornitzaileari. Ez baduzu DNSren informaziorik\n"
+#~ "hori berori ere Internet ornitzaileak eman diezazuke."
+
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, the correct informations can "
+#~ "be\n"
+#~ "obtained from your Internet Service Provider."
+#~ msgstr ""
+#~ "Ostalari izena ezar zenezake behar izanez gero. Ez baduzu\n"
+#~ "ezagutzen, edo ez badakizu zer sartu, Internet Zerbitzu emaleari "
+#~ "galdeiozu."
+
+#~ msgid ""
+#~ "You may now configure your network device.\n"
+#~ "\n"
+#~ "   * IP address: if you don't know or are not sure what to enter, ask "
+#~ "your network administrator.\n"
+#~ "     You should not enter an IP address if you select the option "
+#~ "\"Automatic IP\" below.\n"
+#~ "\n"
+#~ "   * Netmask: \"255.255.255.0\" is generally a good choice. If you don't "
+#~ "know or are not sure what to enter,\n"
+#~ "     ask your network administrator.\n"
+#~ "\n"
+#~ "   * Automatic IP: if your network uses BOOTP or DHCP protocol, select "
+#~ "this option. If selected, no value is needed in\n"
+#~ "    \"IP address\". If you don't know or are not sure if you need to "
+#~ "select this option, ask your network administrator."
+#~ msgstr ""
+#~ "Orain sarerako tresna egokitu zenezake:\n"
+#~ "\n"
+#~ "  * IP helbidea: ez badakizu, sare administrariari edo Internet "
+#~ "Zerbitzu \n"
+#~ " emaleari galdeiozu.\n"
+#~ "    Behean \"IP Automatikoa\" hautatuko baduzu, ez duzu IPrik ezarri "
+#~ "behar\n"
+#~ "  * Netmask: \"255.255.255.0\" ohikoena da. Ziur ez bazaude\n"
+#~ "administratzaileari edo Internet Zerbitzu emaleari galdetu.\n"
+#~ "\n"
+#~ "  * Automatic IP: Sareak BOOTP edo DHCP protokoloak erabiliz gero, "
+#~ "hautatu \n"
+#~ "aukera hau. Hautatuz gero, \"IP helbidea\"-rako ez de baliorik eman "
+#~ "behar.\n"
+#~ "Ziur ez bazaude, galdetu administrariari edo ISP-ari."
+
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, ask your network administrator."
+#~ msgstr ""
+#~ "Orain, behar izanez gero, ostalari izena ezar zenezake.\n"
+#~ "Ez badakizu zer jarri administrariari edo Internet Zerbitzu emaleari "
+#~ "galdeiozu."
+
+#~ msgid ""
+#~ "You may now enter your host name if needed. If you\n"
+#~ "don't know or are not sure what to enter, leave blank."
+#~ msgstr ""
+#~ "Orain, behar izanez gero, ostalari izena ezar zenezake.\n"
+#~ "Ez badakizu zer jarri, hutsik laga."
+
+#~ msgid ""
+#~ "You may now enter dialup options. If you're not sure what to enter, the\n"
+#~ "correct information can be obtained from your ISP."
+#~ msgstr ""
+#~ "Markatze opziotan sar zintezke. Sartu beharreko informazioa\n"
+#~ "zure ISP-tik lor dezakezu."
+
+#~ msgid ""
+#~ "If you will use proxies, please configure them now. If you don't know if\n"
+#~ "you should use proxies, ask your network administrator or your ISP."
+#~ msgstr ""
+#~ "Proxy-rik erabiliz gero, mesedez orain konfiguratu. Ez badakizu\n"
+#~ "ISP-ari edo sareko administrariari galdetu."
+
+#~ msgid ""
+#~ "You can install cryptographic package if your internet connection has "
+#~ "been\n"
+#~ "set up correctly. First choose a mirror where you wish to download "
+#~ "packages and\n"
+#~ "after that select the packages to install.\n"
+#~ "\n"
+#~ "\n"
+#~ "Note you have to select mirror and cryptographic packages according\n"
+#~ "to your legislation."
+#~ msgstr ""
+#~ "Pakete kriptografikoa instalatu dezakezu zure interneteko konexioa zuzen\n"
+#~ "badabil. Lehenengo hautatu zein mirror-etik jaitsi nahi dituzu paketeak "
+#~ "eta gero\n"
+#~ "instalatu beharreko paketeak hautatu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Mirror ete pakete kriptografikoak zure tokiko legeen arabera hautatu\n"
+#~ "behar dituzu."
+
+#~ msgid "You can now select your timezone according to where you live."
+#~ msgstr "Bizitokira egokitu zenezake orain ordu eremua."
+
+#~ msgid ""
+#~ "You can configure a local printer (connected to your computer) or remote\n"
+#~ "printer (accessible via a Unix, Netware or Microsoft Windows network)."
+#~ msgstr ""
+#~ "Bertako irarkola (konputagailuari konektatua) edo urrutikoa\n"
+#~ "(Unix, Netware edo Microsoft Windows sareetakoa) egokitu zenezake orain."
+
+#~ msgid ""
+#~ "If you wish to be able to print, please choose one printing system "
+#~ "between\n"
+#~ "CUPS and LPR.\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS is a new, powerful and flexible printing system for Unix systems "
+#~ "(CUPS\n"
+#~ "means \"Common Unix Printing System\"). It is the default printing system "
+#~ "in\n"
+#~ "Mandrake Linux.\n"
+#~ "\n"
+#~ "\n"
+#~ "LPR is the old printing system used in previous Mandrake Linux "
+#~ "distributions.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you don't have printer, click on \"None\"."
+#~ msgstr ""
+#~ "Inprimatu ahal izan nahi baduzu, mesedez, aukeratu inprimaketa sistema "
+#~ "bat CUPS eta LPR artean.\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS Unix sistementzako inprimaketa sistema berri, indartsu eta malgua "
+#~ "da\n"
+#~ "(CUPSen esanahia da \"Common Unix Printing System\"). Mandrake Linuxen "
+#~ "inprimaketa\n"
+#~ "sistema lehenetsia da.\n"
+#~ "\n"
+#~ "\n"
+#~ "LPR aurreko Mandrake Linux banaketetan erabiltzen zen inprimaketa sistema "
+#~ "zarra da.\n"
+#~ "\n"
+#~ "\n"
+#~ "Inprimagailurik ez baduzu, sakatu \"Batere ez\"."
+
+#~ msgid ""
+#~ "GNU/Linux can deal with many types of printer. Each of these types "
+#~ "requires\n"
+#~ "a different setup.\n"
+#~ "\n"
+#~ "\n"
+#~ "If your printer is physically connected to your computer, select \"Local\n"
+#~ "printer\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you want to access a printer located on a remote Unix machine, select\n"
+#~ "\"Remote printer\".\n"
+#~ "\n"
+#~ "\n"
+#~ "If you want to access a printer located on a remote Microsoft Windows "
+#~ "machine\n"
+#~ "(or on Unix machine using SMB protocol), select \"SMB/Windows 95/98/NT\"."
+#~ msgstr ""
+#~ "GNU/Linuxek inprimagailu moeta askorekin tratatu dezake. Hauetariko "
+#~ "bakoitzak\n"
+#~ "ezarpen desberdina behar du.\n"
+#~ "\n"
+#~ "\n"
+#~ "Zure inprimagailua zure konputagailura fisikoki loturik badago, aukeratu\n"
+#~ "\"bertoko inprimagailua\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Urruneko Unix makina batean kokaturiko inprimagailua erabili nahi "
+#~ "baduzu,\n"
+#~ "aukeratu \"Urruneko inprimagailua\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Urruneko Microsoft Windows makina batean kokaturiko inprimagailua (edo "
+#~ "SMB protokoloa darabilen\n"
+#~ "Unix makina) erabili nahi baduzu, aukeratu \"SMB/Windows 95/98/NT\"."
+
+#~ msgid ""
+#~ "Please turn on your printer before continuing to let DrakX detect it.\n"
+#~ "\n"
+#~ "You have to enter some informations here.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Name of printer: the print spooler uses \"lp\" as default printer "
+#~ "name. So, you must have a printer named \"lp\".\n"
+#~ "     If you have only one printer, you can use several names for it. You "
+#~ "just need to separate them by a pipe\n"
+#~ "     character (a \"|\"). So, if you prefer a more meaningful name, you "
+#~ "have to put it first, eg: \"My printer|lp\".\n"
+#~ "     The printer having \"lp\" in its name(s) will be the default "
+#~ "printer.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Description: this is optional but can be useful if several printers "
+#~ "are connected to your computer or if you allow\n"
+#~ "     other computers to access to this printer.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Location: if you want to put some information on your\n"
+#~ "     printer location, put it here (you are free to write what\n"
+#~ "     you want, for example \"2nd floor\").\n"
+#~ msgstr ""
+#~ "Mesedez, piztu zure inprimagailua DrakX-ek detektatzen jarraitu "
+#~ "aurretik.\n"
+#~ "\n"
+#~ "Zenbait datu sartu behar dituzu hemen.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Inprimagailuaren izena: inprimagailu hilarak \"lp\" erabiltzen du "
+#~ "inprimagailu izen lehenetsi gisa. Beraz, \"lp\" izeneko inprimagailu bat "
+#~ "izan behar duzu.\n"
+#~ "     Inprimagailu bakarra badaukazu, izen ugari erabil ditzakezu "
+#~ "beretzako. Tutu hizki baten bidez (\"|\") banatu behar\n"
+#~ "     dituzu izenak. Beraz izen esanguratsuagoa nahi baduzu, hura jarri "
+#~ "behar duzu lehenbizi, adib: \"Nere inprimagailua|lp\".\n"
+#~ "     Bere izene(t)an \"lp\" duen inprimagailua izango da lehenetsia.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Azalpena: aukerakoa da, baino erabilgarria gerta daiteke zenbait "
+#~ "inprimagailu zure konputagailura loturik badaude edo\n"
+#~ "     beste konputagailuei inprimagailu hau erabiltzen uzten badiezu.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Kokapena: zure inprimagailuaren kokapenari buruzko informaziorik\n"
+#~ "     jarri nahi baduzu, hemen jarri (nahi duzuna idatzi dezakezu, "
+#~ "adibidez\n"
+#~ "     \"2. solairua\").\n"
+
+#~ msgid ""
+#~ "Your printer has not been detected. Please enter the name of the device "
+#~ "on\n"
+#~ "which it is connected.\n"
+#~ "\n"
+#~ "\n"
+#~ "For information, most printers are connected on the first parallel port. "
+#~ "This\n"
+#~ "one is called \"/dev/lp0\" under GNU/Linux and \"LPT1\" under Microsoft "
+#~ "Windows."
+#~ msgstr ""
+#~ "Zure inprimagailua ez da detektatu. Mesedez, sartu loturik dagoen "
+#~ "gailuaren\n"
+#~ "izena.\n"
+#~ "\n"
+#~ "\n"
+#~ "Argibide gisa, inprimagailu gehienak lehenengo portu paralelora lotzen "
+#~ "dira. Honi \"/dev/lp0\" deitzen zaio GNU/Linux barruan eta \"LPT1\" "
+#~ "Microsoft Windows barruan."
+
+#~ msgid "You must now select your printer in the above list."
+#~ msgstr "Goiko zerrendakoetatik, irarkola hauta zenezake."
+
+#~ msgid ""
+#~ "Please select the right options according to your printer.\n"
+#~ "Please see its documentation if you don't know what choose here.\n"
+#~ "\n"
+#~ "\n"
+#~ "You will be able to test your configuration in next step and you will be "
+#~ "able to modify it if it doesn't work as you want."
+#~ msgstr ""
+#~ "Irarkolari dagozkion aukerak hauta.\n"
+#~ "Haren dokumentazioa aztertu, aukerak ez badituzu ezagutzen.\n"
+#~ "\n"
+#~ "\n"
+#~ "Konfigurazioa saia zenezake hurrengo hurratsean, eta adatu erebehar den "
+#~ "modura ez badabil"
+
+#~ msgid ""
+#~ "You can now enter the root password for your Mandrake Linux system.\n"
+#~ "The password must be entered twice to verify that both password entries "
+#~ "are identical.\n"
+#~ "\n"
+#~ "\n"
+#~ "Root is the system's administrator and is the only user allowed to modify "
+#~ "the\n"
+#~ "system configuration. Therefore, choose this password carefully. \n"
+#~ "Unauthorized use of the root account can be extemely dangerous to the "
+#~ "integrity\n"
+#~ "of the system, its data and other system connected to it.\n"
+#~ "\n"
+#~ "\n"
+#~ "The password should be a mixture of alphanumeric characters and at least "
+#~ "8\n"
+#~ "characters long. It should never be written down.\n"
+#~ "\n"
+#~ "\n"
+#~ "Do not make the password too long or complicated, though: you must be "
+#~ "able to\n"
+#~ "remember it without too much effort."
+#~ msgstr ""
+#~ "Orain zure Mandrake Linux sistemarako pasahitza sar dezakezu.\n"
+#~ "Pasahitza birritan tekleatu beharko duzu, bigarrenean\n"
+#~ "lehena baieztatzeko.\n"
+#~ "\n"
+#~ "\n"
+#~ "Root sistemaren administratzailea da eta sistemaren konfigurazioa\n"
+#~ "aldatu dezakeen bakarra. Beraz, kontuz hautatu\n"
+#~ "pasahitz hau! root kontuaren erabilpen maltzurrak\n"
+#~ "zure sistema eta datuentzako arriskutsua izan daiteke,\n"
+#~ "eta baita bertara konetatuta egon litezkeentzako.\n"
+#~ "Pasahitza gutxienez 8 hizkien luzera duen hitz eta zenbaki nahastea izan "
+#~ "beharko\n"
+#~ "litzateke. Inoiz ez idatzi inon.\n"
+#~ "\n"
+#~ "\n"
+#~ "Luzeegia edo konplikatuegia ere ez du izan behar, hau da: neke "
+#~ "handiegirik gabe gogora dezakezuna\n"
+#~ "behar du izan."
+
+#~ msgid ""
+#~ "If your network uses LDAP (or NIS) protocol for authentication, select\n"
+#~ "\"LDAP\" (or \"NIS\") as authentication. If you don't know, ask your "
+#~ "network\n"
+#~ "administrator.\n"
+#~ "\n"
+#~ "If your computer is not connected to any administrated network, you may "
+#~ "want to\n"
+#~ "choose \"Local files\" for authentication."
+#~ msgstr ""
+#~ "Zure sareak autentifikaziorako LDAP (edo NIS) protokoloa erabiltzen "
+#~ "badu,\n"
+#~ "hautatu \"LDAP\" (edo \"NIS\") autentifikazio gisa. Ez badakizu, "
+#~ "galdeiozu zure sare\n"
+#~ "kudeatzaileari.\n"
+#~ "\n"
+#~ "Zure konputagailua ez badago kudeatutako sare batera loturik, "
+#~ "autentifikaziorako \"Betako tixategiak\" hautatu nahi ditzakezu."
+
+#~ msgid ""
+#~ "You may now create one or more \"regular\" user account(s), as\n"
+#~ "opposed to the \"privileged\" user account, root. You can create\n"
+#~ "one or more account(s) for each person you want to allow to use\n"
+#~ "the computer. Note that each user account will have its own\n"
+#~ "preferences (graphical environment, program settings, etc.)\n"
+#~ "and its own \"home directory\", in which these preferences are\n"
+#~ "stored.\n"
+#~ "\n"
+#~ "\n"
+#~ "First of all, create an account for yourself! Even if you will be the "
+#~ "only user\n"
+#~ "of the machine, you may NOT connect as root for daily use of the system: "
+#~ "it's a\n"
+#~ "very high security risk. Making the system unusable is very often a typo "
+#~ "away.\n"
+#~ "\n"
+#~ "\n"
+#~ "Therefore, you should connect to the system using the user account\n"
+#~ "you will have created here, and login as root only for administration\n"
+#~ "and maintenance purposes."
+#~ msgstr ""
+#~ "Orain \"ohiko\" erabiltzaile kontua(k) egin dezakezu,\n"
+#~ "\"pribilegiatua\" root da. Pertsona bakoitzeko\n"
+#~ "kontu bat baino gehiago egin dezakezu, konputagailuaren erabileraren\n"
+#~ "arabera. Kontuan izan kontu bakoitzak bere aukerak erabiliko dituela\n"
+#~ "(entorno grafikoa, programen aukerak, etab.)\n"
+#~ "eta berezkoa den \"home direktorioa\", non hobespenak gordeko\n"
+#~ "diren.\n"
+#~ "\n"
+#~ "\n"
+#~ "Lehenengo eta behi, zurea den kontua egizu! Nahiz eta makinaren "
+#~ "erabiltzaile bakarraizan\n"
+#~ ", eguneroko erabileran ezin zintezke root modura konektatu: Oso a\n"
+#~ "arriskutsua izan daitekelako. Sistema izorratudezakezu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Beraz, sistemara ezarritako erabiltzaile kontuaz konektatuko zara\n"
+#~ ", eta root login-a bakarrik administraziorako eta mantenurako\n"
+#~ "erabiliko duzu."
+
+#~ msgid ""
+#~ "Creating a boot disk is strongly recommended. If you can't\n"
+#~ "boot your computer, it's the only way to rescue your system without\n"
+#~ "reinstalling it."
+#~ msgstr ""
+#~ "Abiapen diska sortzea oso gomendagarria da. Ezin baduzu Zure\n"
+#~ "konputagailua abiatu, hau da berrinstalatu gabe berau berreskuratzeko\n"
+#~ "era bakarra."
+
+#~ msgid ""
+#~ "LILO and grub main options are:\n"
+#~ "  - Boot device: Sets the name of the device (e.g. a hard disk\n"
+#~ "partition) that contains the boot sector. Unless you know specifically\n"
+#~ "otherwise, choose \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Delay before booting default image: Specifies the number in tenths\n"
+#~ "of a second the boot loader should wait before booting the first image.\n"
+#~ "This is useful on systems that immediately boot from the hard disk after\n"
+#~ "enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+#~ "omitted or is set to zero.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Video mode: This specifies the VGA text mode that should be selected\n"
+#~ "when booting. The following values are available: \n"
+#~ "\n"
+#~ "    * normal: select normal 80x25 text mode.\n"
+#~ "\n"
+#~ "    * <number>:  use the corresponding text mode.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Clean \"/tmp\" at each boot: if you want delete all files and "
+#~ "directories\n"
+#~ "stored in \"/tmp\" when you boot your system, select this option.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Precise RAM if needed: unfortunately, there is no standard method to "
+#~ "ask the\n"
+#~ "BIOS about the amount of RAM present in your computer. As consequence, "
+#~ "Linux may\n"
+#~ "fail to detect your amount of RAM correctly. If this is the case, you "
+#~ "can\n"
+#~ "specify the correct amount or RAM here. Please note that a difference of "
+#~ "2 or 4\n"
+#~ "MB between detected memory and memory present in your system is normal."
+#~ msgstr ""
+#~ "LILO eta grub-en aukera nagusiak dira:\n"
+#~ "  - Abiarazteko unitatea: boot sektorea non (e.g. disko zurruna edo\n"
+#~ "non partizioadagoen esaten du). Bestera ez bada,\n"
+#~ "hauta \"/dev/hda\" .\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Atzerapena, jatorrizko imagina abiarazi aurretik: segunduen \n"
+#~ "hamarrekotan imagina abiarazi aurretik behar den itxaron denbora.\n"
+#~ "Erabilgarria teklatua ezagutu eta gero abiarazten diren sistemetan.\n"
+#~ "Abiarazlea ez du itzarongo ez baduzu \"atzerapen\"-en ezer edo zero "
+#~ "jarriz gero.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Video modua: Hau abiatzerakoan zein VGA testu modua hautatzeko da\n"
+#~ "Hurrengo balioak izan dezake: \n"
+#~ "    * arrunta: hauta 80x25 testu modua.\n"
+#~ "\n"
+#~ "    * <zenbakia>:  erabili dagokion testu modua.\n"
+#~ "\n"
+#~ "  - Garbitu \"/tmp\" abialdi bakoitzeko: \"/tmp\"en direktorio eta "
+#~ "fitxategi guztiak\n"
+#~ "ezabatu nahi baduzu, boot-ean gordeta dudenak, hauta auketra hau.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Zehaztu RAM beharrezko bada: zoritxarrez, BIOSek ez dute ematen modu "
+#~ "standarrean RAMaz\n"
+#~ "duten informazioa ematen. Beraz, Linux-ek akatsak egin ditzake RAMa "
+#~ "zenbatzerakoan.\n"
+#~ "Hala bada, duzun RAMaren tamaina hemen zehaztu zenezake. Kasu, 2-4 Mb-en "
+#~ "gorabeherak\n"
+#~ "normaltzat hartu behar dira."
+
+#~ msgid ""
+#~ "SILO is a bootloader for SPARC: it is able to boot\n"
+#~ "either GNU/Linux or any other operating system present on your computer.\n"
+#~ "Normally, these other operating systems are correctly detected and\n"
+#~ "installed. If this is not the case, you can add an entry by hand in this\n"
+#~ "screen. Be careful as to choose the correct parameters.\n"
+#~ "\n"
+#~ "\n"
+#~ "You may also want not to give access to these other operating systems to\n"
+#~ "anyone, in which case you can delete the corresponding entries. But\n"
+#~ "in this case, you will need a boot disk in order to boot them!"
+#~ msgstr ""
+#~ "SILO SPARC-en abiarazlea da: GNU/Linux eta bestelako\n"
+#~ "sistema eragileak abiarazi dezake.\n"
+#~ "Normalean, bestelako sistema eragileak zuzen detektatu eta instalatzen "
+#~ "dituzte.\n"
+#~ "Horrela ez bada, pantaila honetan sarrera eskuz gehitu zenezake.\n"
+#~ "Kontuz ibili eta parametro egokiak hautatu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Beste sistema eragile batzuetarako sarrera kendu nahiko duzu,\n"
+#~ " orduan dagokion sarrerak ezabatu. Hau egitekotan, \n"
+#~ "diskete abiarazlea beharko duzu, bestelako sistema eragilerik erabili "
+#~ "nahiez gero!"
+
+#~ msgid ""
+#~ "SILO main options are:\n"
+#~ "  - Bootloader installation: Indicate where you want to place the\n"
+#~ "information required to boot to GNU/Linux. Unless you know exactly\n"
+#~ "what you are doing, choose \"First sector of drive (MBR)\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Delay before booting default image: Specifies the number in tenths\n"
+#~ "of a second the boot loader should wait before booting the first image.\n"
+#~ "This is useful on systems that immediately boot from the hard disk after\n"
+#~ "enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+#~ "omitted or is set to zero."
+#~ msgstr ""
+#~ "SILOren aukera nagusiak dira:\n"
+#~ "  - Abiarazlearen instalazioa: Hauta GNU/Linux abiarazteko informazioa "
+#~ "non\n"
+#~ "ezarri nahi duzun. Egiten duzuna zehatz ez badakizu,\n"
+#~ "hauta \"diskoaren lehen sektorea (MBR)\"\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Atzerapena, jatorrizko imagina abiarazi aurretik: segunduen "
+#~ "hamarrekotan\n"
+#~ "imagina abiarazi aurretik behar den itxaron denbora.\n"
+#~ "Erabilgarria teklatua ezagutu eta gero abiarazten diren sistemetan.\n"
+#~ "Abiarazlea ez du itzarongo ez baduzu \"atzerapen\"-en ezer edo zero "
+#~ "jarriz gero."
+
+#~ msgid ""
+#~ "Now it's time to configure the X Window System, which is the\n"
+#~ "core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
+#~ "you must configure your video card and monitor. Most of these\n"
+#~ "steps are automated, though, therefore your work may only consist\n"
+#~ "of verifying what has been done and accept the settings :)\n"
+#~ "\n"
+#~ "\n"
+#~ "When the configuration is over, X will be started (unless you\n"
+#~ "ask DrakX not to) so that you can check and see if the\n"
+#~ "settings suit you. If they don't, you can come back and\n"
+#~ "change them, as many times as necessary."
+#~ msgstr ""
+#~ "Orain X Window Sistem konfiguratu behar duzu, hau\n"
+#~ "GNU/Linux GUIren (Graphical User Interface) muina da. Honetarako,\n"
+#~ "monitorea eta bideo txartela konfiguratu behar dituzu. Hurrats\n"
+#~ "gehienak automatikoak dira, beraz, zure lana hautatutakoa\n"
+#~ "baieztatzea eta onartzearena izango da :)\n"
+#~ "\n"
+#~ "\n"
+#~ "Konfigurazioa bukatzerakoan, X abiaraziko da(kontrakoa\n"
+#~ "DrakX-i eskatzen ez badiozu) eta horrela frogatu dezakezu\n"
+#~ "aukeren egokiera. Ez bazaude konforme atzera jo dezakezu,\n"
+#~ "aukerak aldatu eta berriz frogatu."
+
+#~ msgid ""
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
+#~ msgstr ""
+#~ "X konfigurazioan zerbait gaizki izanez gero, aukera hauek erabili\n"
+#~ "X Window Sistema konfiguratzeko."
+
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "Login grafikoa nahi baduzu \"Bai\" hautatu. Bestela, hautatu\n"
+#~ "\"Ez\"."
+
+#~ msgid ""
+#~ "You can choose a security level for your system. Please refer to the "
+#~ "manual for complete\n"
+#~ "  information. Basically, if you don't know what to choose, keep the "
+#~ "default option.\n"
+#~ msgstr ""
+#~ "Zure sistemarentzako segurtasun maila bat aukeratu dezakezu. Begiratu "
+#~ "eskuliburua\n"
+#~ "  informazio zabala jasotzeko. Oinarrian, ez badakizu zer hautatu, "
+#~ "mantendu aukera lehenetsiak.\n"
+
+#~ msgid ""
+#~ "Your system is going to reboot.\n"
+#~ "\n"
+#~ "After rebooting, your new Mandrake Linux system will load automatically.\n"
+#~ "If you want to boot into another existing operating system, please read\n"
+#~ "the additional instructions."
+#~ msgstr ""
+#~ "Zure sistema berabiaraziko da.\n"
+#~ "\n"
+#~ "Berabiarazi ondoren, Mandrake Linux sistema automatikoki kargatuko da.\n"
+#~ "Bestelako sistema eragilerik erabili nahi izanez gero mesedez irakurri\n"
+#~ "instrukzio gehigarriak."
+
+#~ msgid "Czech (Programmers)"
+#~ msgstr "Txekiarra (Programatzaileak)"
+
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "Eslobakiarra (Programatzaileak)"
+
+#~ msgid "Name of the profile to create:"
+#~ msgstr "Eratu beharreko profilaren izena:"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "Idatzi /etc/fstab"
+
+#~ msgid "Restore from file"
+#~ msgstr "Fitxategitik berreskuratu"
+
+#~ msgid "Save in file"
+#~ msgstr "Fitxategian gorde"
+
+#~ msgid "Restore from floppy"
+#~ msgstr "Floppy-tik berreskuratu"
+
+#~ msgid "Format all"
+#~ msgstr "Dena formateatu"
+
+#~ msgid "After formatting all partitions,"
+#~ msgstr "Partizio guztiak formateatu ondoren,"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "partizio hoietako datu guztiak galduko dira"
+
+#~ msgid "Reload"
+#~ msgstr "Berkargatu"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr "Linuxaren replikazioarako auto install floppya egin nahi duzu?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "ADSL konfigurazioa"
+
+#~ msgid ""
+#~ "With a remote CUPS server, you do not have to configure\n"
+#~ "any printer here; printers will be automatically detected\n"
+#~ "unless you have a server on a different network; in the\n"
+#~ "latter case, you have to give the CUPS server IP address\n"
+#~ "and optionally the port number."
+#~ msgstr ""
+#~ "Urrutiko CUPS zerbitzariaz, ez duzu hemen inolako irarkola "
+#~ "konfiguraziorik\n"
+#~ "egin behar; irarkolak automatikoki detektatuko dira.\n"
+#~ "Bestelako zerbitzarikik baduzu beste sare batetan, CUPS zerbitzariaren\n"
+#~ "IP helbidea eman beharko duzu, eta aukeran, kai zenbakia."
+
+#~ msgid "Enter Printer Name and Comments"
+#~ msgstr "Sartu Inprimagailua Izena eta Aipamenak"
+
+#~ msgid "Remote queue name missing!"
+#~ msgstr "Urruneko ilara izena falta da!"
+
+#~ msgid "Command line"
+#~ msgstr "Agindu lerroa"
+
+#, fuzzy
+#~ msgid "Modify printer"
+#~ msgstr "Irarkolarik ez"
+
+#, fuzzy
+#~ msgid "start it"
+#~ msgstr "murriztu"
+
+#~ msgid "Network Monitoring"
+#~ msgstr "Sare Ikuskapena"
+
+#~ msgid "Settings"
+#~ msgstr "Ezarpenak"
+
+#~ msgid "Profile "
+#~ msgstr "Profila "
+
+#~ msgid "Statistics"
+#~ msgstr "Estatistikak"
+
+#~ msgid "Sending Speed:"
+#~ msgstr "Bidaltze abiadura: "
+
+#~ msgid "Receiving Speed:"
+#~ msgstr "Jasotze abiadaura: "
+
+#~ msgid "Connection Time: "
+#~ msgstr "Lotura Denbora "
+
+#~ msgid "Logs"
+#~ msgstr "Erregistroak"
+
+#~ msgid "Connecting to Internet "
+#~ msgstr "Internetera konektatzen"
+
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "Irteneteko konexioa etetzen"
+
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "Irteneteko konexioa ezin eten"
+
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "Irteneteko konexioa etenda."
+
+#~ msgid "Connection complete."
+#~ msgstr "Konexio osoa."
+
+#~ msgid ""
+#~ "Connection failed.\n"
+#~ "Verify your configuration in the Mandrake Control Center."
+#~ msgstr ""
+#~ "Konexioaren akatsa.\n"
+#~ "Mandrake Control Center-en konfigurazioa begiratu."
+
+#~ msgid "Color configuration"
+#~ msgstr "Margo ezarpena"
+
+#~ msgid "sent: "
+#~ msgstr "bidali: "
+
+#~ msgid "received: "
+#~ msgstr "jasota: "
+
+#~ msgid "average"
+#~ msgstr "batazbeste"
+
+#~ msgid "Connect"
+#~ msgstr "Konektatu"
+
+#~ msgid "Disconnect"
+#~ msgstr "Eten konexioa"
+
+#~ msgid "/File/_New"
+#~ msgstr "/Fitxategi/_Barria"
+
+#~ msgid "<control>N"
+#~ msgstr "<control>B"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Fitxategi/_Ireki"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>I"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/Fitxategi/_Gorde"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>G"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Fitxategi/Gorde _Horrela"
+
+#~ msgid "/File/-"
+#~ msgstr "/Fitxategi/-"
+
+#~ msgid "/_Options"
+#~ msgstr "/_Aukerak"
+
+#~ msgid "/Options/Test"
+#~ msgstr "/Aukerak/Saioa"
+
+#~ msgid "/_Help"
+#~ msgstr "/_Laguntza"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/Laguntza/_Zerari buruz"
+
+#~ msgid "Default Runlevel"
+#~ msgstr "Ejekuzio Maila Lehenetsia"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#~ msgid "Remove queue"
+#~ msgstr "Kendu isatsa"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "Config fitxategia ezin ulertu."
+
+#~ msgid "Unrecognized config file"
+#~ msgstr "Ezarpen fitxategi ulertezina"
+
+#~ msgid "Adapter"
+#~ msgstr "Egokitzailea"
+
+#~ msgid "Disable network"
+#~ msgstr "Sarea ezgaitu"
+
+#~ msgid "Enable network"
+#~ msgstr "Sarea gaitu"
+
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "DSL (edo ADSL) konexioa"
+
+#, fuzzy
+#~ msgid "Choose"
+#~ msgstr "Itxi"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr "Zuzenean URI eman dezakezu, CUPS duen irarkola erabiltzeko."
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "Bai, ASCII orria inprimatu test modura"
 
-#~ msgid "%d seconds"
-#~ msgstr "%d segundu"
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "Bai, PostScript orria inprimatu test modura"
+
+#~ msgid "Yes, print both test pages"
+#~ msgstr "Bai, orri biak inprimatu"
+
+#~ msgid "Paper Size"
+#~ msgstr "Paperaren tamaina"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "Lana bukatzerakoan papera kanporatu?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "Uniprint driver-aren aukerak"
+
+#~ msgid "Color depth options"
+#~ msgstr "Kolore sakontzsunaren aukerak"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "Testua PostScript bezala inprimatu?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Mailada-hurrats testu finkoa?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "Orrialdeen kopurua, irtendako orrialdeen arabera"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "Eskubi/Ezker marginak puntuetan (erpuruaren 1/72)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "Goi/Beheko marginak puntutan (erpuruaren 1/72)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "GostScript aukera estrak"
+
+#~ msgid "Extra Text options"
+#~ msgstr "Testu aukera estrak"
+
+#~ msgid "Reverse page order"
+#~ msgstr "Orriak atzetik aurrerako ordenean"
+
+#~ msgid "CUPS starting"
+#~ msgstr "CUPS abiarazten"
+
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Irarkolaren urrutiko konexioa hautatu"
+
+#~ msgid ""
+#~ "With a remote CUPS server, you do not have to configure\n"
+#~ "any printer here; printers will be automatically detected.\n"
+#~ "In case of doubt, select \"Remote CUPS server\"."
+#~ msgstr ""
+#~ "Urrutiko CUPS zerbitzariaz, ez duzu hemen inolako irarkola "
+#~ "konfiguraziorik\n"
+#~ "egin behar; irarkolak automatikoki detektatuko dira.\n"
+#~ "Dudan bazaude, hauta \"Urrutiko CUPS zerbitzaria\"."
+
+#~ msgid ""
+#~ "Every printer need a name (for example lp).\n"
+#~ "Other parameters such as the description of the printer or its location\n"
+#~ "can be defined. What name should be used for this printer and\n"
+#~ "how is the printer connected?"
+#~ msgstr ""
+#~ "Irarkola oro izena behar du( lp adibidez).\n"
+#~ "Betelako parametroak, kokapena, deskripzioa eman daitezke.\n"
+#~ "Zein izen du eta nola dago konektatua irarkola?"
+
+#~ msgid ""
+#~ "Every print queue (which print jobs are directed to) needs a\n"
+#~ "name (often lp) and a spool directory associated with it. What\n"
+#~ "name and directory should be used for this queue and how is the printer "
+#~ "connected?"
+#~ msgstr ""
+#~ "Irarkolen isats (inprimaketa lanak bideratzen diren tokia) oro izena\n"
+#~ "(maiz lp) eta honeri dagokion metaketa direktorioa behar du. Zein\n"
+#~ "izen eta direktorio erabili behar dira isats honetarako?"
+
+#~ msgid "Name of queue"
+#~ msgstr "Isatsaren izena"
+
+#~ msgid "Spool directory"
+#~ msgstr "Metaketa direktorioa"
+
+#~ msgid "Disable"
+#~ msgstr "Ezgaitu"
+
+#~ msgid "Enable"
+#~ msgstr "Gaitu"
+
+#, fuzzy
+#~ msgid "Light configuration"
+#~ msgstr "LAN konfigurazioa"
+
+#~ msgid "Provider dns 1"
+#~ msgstr "Ornitzailearen dns 1"
+
+#~ msgid "Provider dns 2"
+#~ msgstr "Ornitzailearen dns 2"
+
+#, fuzzy
+#~ msgid "fsck failed: "
+#~ msgstr "muntaketak porrot egin du: "
+
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "Sistema seguruago izan daitean, hautatu \"Fitxategi itzaldua erabili\" "
+#~ "eta\n"
+#~ "\"MD5 pasahitzak erabili\"."
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "Sareak NIS erabiliz gero, hautatu \"Erabil NIS\". Ez badakizu, sarearen "
+#~ "administrariari\n"
+#~ "galde egiozu."
+
+#~ msgid "yellow pages"
+#~ msgstr "orri horiak"
+
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "Zelan nahi duzu interneten sartu?"
 
 #~ msgid "Configuration de Lilo/Grub"
 #~ msgstr "Kanfigurazioa, Lilo/Grub-ena"
@@ -7727,9 +10061,6 @@ msgstr "Trenak posta, berri, web, fitxategi igorrtze eta txaterako"
 #~ msgid "loopback"
 #~ msgstr "loopback"
 
-#~ msgid "None"
-#~ msgstr "Batez"
-
 #~ msgid "Which bootloader(s) do you want to use?"
 #~ msgstr "Zein abiarazle erabili nahi duzu?"
 
@@ -7751,9 +10082,6 @@ msgstr "Trenak posta, berri, web, fitxategi igorrtze eta txaterako"
 #~ msgid "Configure local network"
 #~ msgstr "Konfiguratu bertoko sarea"
 
-#~ msgid "Disable networking"
-#~ msgstr "Sarea ezgaitu"
-
 #~ msgid "Configure the Internet connection / Configure local Network"
 #~ msgstr "Interneterako konexioa egokitu / Bertoko sarea egokitu"
 
@@ -7801,9 +10129,6 @@ msgstr "Trenak posta, berri, web, fitxategi igorrtze eta txaterako"
 #~ msgid "Configure timezone"
 #~ msgstr "Konfiguratu ordu eremua"
 
-#~ msgid "Configure printer"
-#~ msgstr "Konfiguratu irarkola"
-
 #~ msgid "Network adaptater 1 (eth0):"
 #~ msgstr "Sare egokitzailea 1 (eth0)"
 
@@ -7913,9 +10238,6 @@ msgstr "Trenak posta, berri, web, fitxategi igorrtze eta txaterako"
 #~ msgid "Toggle between Installed and Available"
 #~ msgstr "Aldatu instalatu eta aukeran daudenen artean"
 
-#~ msgid "Uninstall"
-#~ msgstr "Desinstalatu"
-
 #~ msgid "Choose package to install"
 #~ msgstr "Aukeratu instalatu beharreko paketea"
 
@@ -8089,7 +10411,7 @@ msgstr "Trenak posta, berri, web, fitxategi igorrtze eta txaterako"
 #~ "Choose \"Install\" if there are no previous versions of GNU/Linux\n"
 #~ "installed, or if you wish to use multiple distributions or versions.\n"
 #~ "\n"
-#~ "Choose \"Rescue\" if you wish to rescue a version of Linux-Mandrake "
+#~ "Choose \"Rescue\" if you wish to rescue a version of Mandrake Linux "
 #~ "already installed.\n"
 #~ "\n"
 #~ "\n"
@@ -8133,7 +10455,7 @@ msgstr "Trenak posta, berri, web, fitxategi igorrtze eta txaterako"
 
 #~ msgid ""
 #~ "At this point, you may choose what partition(s) to use to install\n"
-#~ "your Linux-Mandrake system if they have been already defined (from a\n"
+#~ "your Mandrake Linux system if they have been already defined (from a\n"
 #~ "previous install of GNU/Linux or from another partitioning tool). In "
 #~ "other\n"
 #~ "cases, hard drive partitions must be defined. This operation consists of\n"
@@ -8173,7 +10495,7 @@ msgstr "Trenak posta, berri, web, fitxategi igorrtze eta txaterako"
 #~ "\n"
 #~ "- Ctrl-m  to set the mount point\n"
 #~ msgstr ""
-#~ "Orain, Linux-Mandrake sistema zein partiziotan instalatu nahi duzun\n"
+#~ "Orain, Mandrake Linux sistema zein partiziotan instalatu nahi duzun\n"
 #~ "hauta dezakezu, aldez aurretik partizioak eginak badituzu (aurretikfrom "
 #~ "a\n"
 #~ "instalatutako GNU/Linux-an edo bestelako partizio tresna batek "
@@ -8291,7 +10613,7 @@ msgstr "Trenak posta, berri, web, fitxategi igorrtze eta txaterako"
 #~ "hardware.\n"
 #~ "\n"
 #~ "\n"
-#~ "If you install a Linux-Mandrake system on a machine which is part\n"
+#~ "If you install a Mandrake Linux system on a machine which is part\n"
 #~ "of an already existing network, the network administrator will\n"
 #~ "have given you all necessary information (IP address, network\n"
 #~ "submask or netmask for short, and hostname). If you're setting\n"
@@ -8321,7 +10643,7 @@ msgstr "Trenak posta, berri, web, fitxategi igorrtze eta txaterako"
 #~ "aurki ditzakezu.\n"
 #~ "\n"
 #~ "\n"
-#~ "Linux-Mandrake sistema sare batean dagoen konputagailuan\n"
+#~ "Mandrake Linux sistema sare batean dagoen konputagailuan\n"
 #~ "instalatuz gero, sare administrariak beharrezko duzun informazioa eman "
 #~ "beharko dizu\n"
 #~ "(IP helbidea, sareko submaskara\n"
@@ -8543,9 +10865,6 @@ msgstr "Trenak posta, berri, web, fitxategi igorrtze eta txaterako"
 #~ msgid "USB Mouse (3 buttons or more)"
 #~ msgstr "USB Mouse (3 botoi edo gehiago)"
 
-#~ msgid "CHAP"
-#~ msgstr "CHAP"
-
 #~ msgid "Have you been provided with a hostname?"
 #~ msgstr "Ostalari izenik baduzu?"
 
@@ -8617,9 +10936,6 @@ msgstr "Trenak posta, berri, web, fitxategi igorrtze eta txaterako"
 #~ msgid "%s: This is not a root partition, please select another one."
 #~ msgstr "%s: hau ez da root partizioa, mesedez aukeratu besteren bat."
 
-#~ msgid "No root partition found"
-#~ msgstr "Ez dut aurkitu root partiziorik"
-
 #~ msgid "Please choose a partition to use as your root partition."
 #~ msgstr "Mesedez hauta zein partizio erabili nahi duzu root partizio modura."
 
@@ -8747,9 +11063,6 @@ msgstr "Trenak posta, berri, web, fitxategi igorrtze eta txaterako"
 #~ msgid "useless"
 #~ msgstr "erabileza"
 
-#~ msgid "garbage"
-#~ msgstr "zarama"
-
 #~ msgid ""
 #~ "Choose \"Install\" if there are no previous versions of Linux\n"
 #~ "installed, or if you wish to use multiple distributions or versions.\n"
diff --git a/perl-install/share/po/fi.po b/perl-install/share/po/fi.po
index 96c838029..2103d5a89 100644
--- a/perl-install/share/po/fi.po
+++ b/perl-install/share/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-02 17:16+0200\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
 "PO-Revision-Date: 2001-04-24 17:52+0200\n"
 "Last-Translator: Matias Griese <mahagr@utu.fi>\n"
 "Language-Team: Finnish\n"
@@ -15,24 +15,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.6\n"
 
-#: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
+#: ../../Xconfigurator.pm_.c:231
+msgid "Configure all heads independently"
 msgstr "Aseta kaikki n�yt�t erikseen"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
 msgstr "K�yt� Xinerama-laajennusta"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr "M��rittele vain kortin \"%s\" (%s) asetukset"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
 msgstr "Monen n�yt�n asettaminen"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:239
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
@@ -40,33 +40,33 @@ msgstr ""
 "J�rjestelm�si tukee monen n�yt�n laitteistokokoonpanoa.\n"
 "Mit� haluat tehd�?"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "N�yt�nohjain"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "Valitse n�yt�nohjain"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "Valitse X-palvelin"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "X server"
 msgstr "X-palvelin"
 
-#: ../../Xconfigurator.pm_.c:309 ../../Xconfigurator.pm_.c:316
-#: ../../Xconfigurator.pm_.c:366
+#: ../../Xconfigurator.pm_.c:307 ../../Xconfigurator.pm_.c:313
+#: ../../Xconfigurator.pm_.c:363 ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s"
 msgstr "XFree %s"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:310
 msgid "Which configuration of XFree do you want to have?"
 msgstr "Mit� versiota XFree-serverist� haluat k�ytt��?"
 
-#: ../../Xconfigurator.pm_.c:324
+#: ../../Xconfigurator.pm_.c:321
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -76,18 +76,19 @@ msgstr ""
 "ssa.\n"
 "Korttisi on tuettu my�s XFree %s:ssa, jossa on mahdollisesti parempi 2D-tuki."
 
-#: ../../Xconfigurator.pm_.c:326 ../../Xconfigurator.pm_.c:359
+#: ../../Xconfigurator.pm_.c:323 ../../Xconfigurator.pm_.c:356
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with XFree %s."
 msgstr ""
 "N�yt�nohjaimelle on olemassa laitteistokiihdytetyt 3D-ajurit XFree %s:ssa."
 
-#: ../../Xconfigurator.pm_.c:328 ../../Xconfigurator.pm_.c:361
+#: ../../Xconfigurator.pm_.c:325 ../../Xconfigurator.pm_.c:358
+#: ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s with 3D hardware acceleration"
 msgstr "XFree %s laitteistokiihdytetyll� 3D-tuella"
 
-#: ../../Xconfigurator.pm_.c:336 ../../Xconfigurator.pm_.c:350
+#: ../../Xconfigurator.pm_.c:333 ../../Xconfigurator.pm_.c:347
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -96,12 +97,12 @@ msgstr ""
 "N�yt�nohjaimelle on olemassa laitteistokiihdytetyt 3D-ajurit XFree %s:ssa.\n"
 "HUOMAA, ETT� TUKI ON KOKEELLINEN JA VOI JUMITTAA TIETOKONEESI."
 
-#: ../../Xconfigurator.pm_.c:338 ../../Xconfigurator.pm_.c:352
+#: ../../Xconfigurator.pm_.c:335 ../../Xconfigurator.pm_.c:349
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "XFree %s KOKEELLISELLA laitteistokiihdytetyll� 3D-tuella"
 
-#: ../../Xconfigurator.pm_.c:347
+#: ../../Xconfigurator.pm_.c:344
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -113,27 +114,31 @@ msgstr ""
 "HUOMAA, ETT� TUKI ON KOKEELLINEN JA VOI JUMITTAA TIETOKONEESI.Korttisi on "
 "tuettu my�s XFree %s:ssa, jossa on mahdollisesti parempi 2D-tuki."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "XFreen asentaminen"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "Valitse n�yt�nohjaimen muistin m��r�"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "Valitse optioita palvelimelle"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "Valitse monitori"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Monitor"
 msgstr "N�ytt�"
 
-#: ../../Xconfigurator.pm_.c:483
+#: ../../Xconfigurator.pm_.c:519
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -156,39 +161,39 @@ msgstr ""
 "vaakavirkistystaajuus\n"
 "on suurempi kuin oman n�ytt�si. Jos ep�r�it, valitse pienempi taajuus."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Vaakavirkistystaajuus"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Pystyvirkistystaajuus"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "N�ytt�� ei ole asetettu"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "N�yt�nohjainta ei ole viel� asetettu"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "N�yt�n resoluutiota ei ole viel� valittu"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "Haluatko kokeilla asetuksia?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Varoitus: n�yt�nohjaimesi testaaminen voi jumittaa tietokoneen"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Kokeile asetuksia"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -196,152 +201,156 @@ msgstr ""
 "\n"
 "kokeile joidenkin parametrien muuttamista"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "Tapahtui virhe:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Lopetan %d sekunnissa"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "Onko t�m� oikea asetus?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "Tapahtui virhe, kokeile joidenkin parametrien vaihtamista"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Resoluutio"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "Valitse resoluutio ja v�risyvyys"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "N�yt�nohjain: %s"
 
-#: ../../Xconfigurator.pm_.c:734
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 palvelin: %s"
 
-#: ../../Xconfigurator.pm_.c:750 ../../standalone/draknet_.c:280
-#: ../../standalone/draknet_.c:283
+#: ../../Xconfigurator.pm_.c:829 ../../printerdrake.pm_.c:1885
+#: ../../standalone/draknet_.c:298 ../../standalone/draknet_.c:301
 msgid "Expert Mode"
 msgstr "Asiantuntijatila"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "N�yt� kaikki"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Resoluutiot"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "N�pp�inasettelu: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Hiiren tyyppi: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Hiiren laite: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1333
+#: ../../Xconfigurator.pm_.c:1440
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "N�ytt�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1334
+#: ../../Xconfigurator.pm_.c:1441
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "N�yt�n vaakajuovataajuus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "N�yt�n virkistystaajuus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "N�yt�nohjain: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "N�yt�nohjain: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Grafiikkamuisti: %s kt\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "V�risyvyys: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resoluutio: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1342
+#: ../../Xconfigurator.pm_.c:1450
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 palvelin: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1343
+#: ../../Xconfigurator.pm_.c:1451
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "XFree86 ajurit: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "Valmistelen X-Windowin asetuksia"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "Mit� haluat tehd�?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "Vaihda n�ytt��"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "Vaihda n�yt�nohjainta"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "Vaihda palvelimen optioita"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "Vaihda resoluutiota"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "N�yt� tiedot"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "Kokeile uudelleen"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -354,20 +363,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Kirjaudu uudelleen %s:een aktivoidaksesi muutokset"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Kirjaudu ulos ja kirjoita sitten Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "K�ynnistett�ess� X:��"
 
-#: ../../Xconfigurator.pm_.c:1447
+#: ../../Xconfigurator.pm_.c:1556
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -420,215 +429,226 @@ msgid "8 MB"
 msgstr "8 Mt"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
+#, fuzzy
+msgid "16 MB"
+msgstr "1 Mt"
+
+#: ../../Xconfigurator_consts.pm_.c:113
+#, fuzzy
+msgid "32 MB"
+msgstr "2 Mt"
+
+#: ../../Xconfigurator_consts.pm_.c:114
+#, fuzzy
+msgid "64 MB or more"
 msgstr "16 Mt tai enemm�n"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Perus-VGA,  640x480 @ 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "SVGA, 800x600 @ 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514-yhteensopiva, 1024x768 @ 87 Hz lomitettu (ei 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:125
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
 msgstr "SVGA, 1024x768 @ 87 Hz lomitettu, 800x600 @ 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:126
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
 msgstr "Laajennettu SVGA, 800x600 @ 60 Hz, 640x480 @ 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:127
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "Lomittamaton SVGA, 1024x768 @ 60 Hz, 800x600 @ 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Korkeataajuuksinen SVGA, 1024x768 @ 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:127
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "N�ytt�, joka pystyy 1280x1024 @ 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:128
+#: ../../Xconfigurator_consts.pm_.c:130
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "N�ytt�, joka pystyy 1280x1024 @ 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:129
+#: ../../Xconfigurator_consts.pm_.c:131
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "N�ytt�, joka pystyy 1280x1024 @ 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "N�ytt�, joka pystyy 1600x1200 @ 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "N�ytt�, joka pystyy 1600x1200 @ 76 Hz"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124
+#: ../../any.pm_.c:96 ../../any.pm_.c:121
 msgid "First sector of boot partition"
 msgstr "Ensimm�inen sektori k�ynnistysosiolla"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124 ../../any.pm_.c:197
+#: ../../any.pm_.c:96 ../../any.pm_.c:121 ../../any.pm_.c:194
 msgid "First sector of drive (MBR)"
 msgstr "Levyn ensimm�inen sektori (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "SILOn asennus"
 
-#: ../../any.pm_.c:104 ../../any.pm_.c:117
+#: ../../any.pm_.c:101 ../../any.pm_.c:114
 msgid "Where do you want to install the bootloader?"
 msgstr "Minne haluat asentaa k�ytt�j�rjestelm�n lataajan?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "LILO/grub asennus"
 
-#: ../../any.pm_.c:128 ../../any.pm_.c:142
+#: ../../any.pm_.c:125 ../../any.pm_.c:139
 msgid "SILO"
 msgstr "SILO"
 
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:127
 msgid "LILO with text menu"
 msgstr "LILO tekstipohjaisella valikolla"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "LILO graafisella valikolla"
 
-#: ../../any.pm_.c:134
+#: ../../any.pm_.c:131
 msgid "Grub"
 msgstr "Grub"
 
-#: ../../any.pm_.c:138
+#: ../../any.pm_.c:135
 msgid "Boot from DOS/Windows (loadlin)"
 msgstr "K�ynnist� DOSista/Windowsista (loadlin)"
 
-#: ../../any.pm_.c:140 ../../any.pm_.c:142
+#: ../../any.pm_.c:137 ../../any.pm_.c:139
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: ../../any.pm_.c:148 ../../any.pm_.c:180
+#: ../../any.pm_.c:145 ../../any.pm_.c:177
 msgid "Bootloader main options"
 msgstr "K�ytt�j�rjestelm�n lataajan p��asetukset"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
 msgstr "K�ytett�v� k�ytt�j�rjestelm�n lataaja"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "K�ytt�j�rjestelm�n lataajan asennus"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "K�ynnistyslaite"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (ei toimi vanhoissa BIOSeissa)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Tiivis"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "tiivis"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "N�ytt�tila"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "Tauko ennen oletusj�rjestelm�n k�ynnistyst�"
 
-#: ../../any.pm_.c:160 ../../any.pm_.c:741
-#: ../../install_steps_interactive.pm_.c:904 ../../netconnect.pm_.c:629
-#: ../../printerdrake.pm_.c:98 ../../printerdrake.pm_.c:132
-#: ../../standalone/draknet_.c:569
+#: ../../any.pm_.c:157 ../../any.pm_.c:730
+#: ../../install_steps_interactive.pm_.c:938 ../../network/modem.pm_.c:46
+#: ../../printerdrake.pm_.c:402 ../../printerdrake.pm_.c:481
+#: ../../standalone/draknet_.c:603
 msgid "Password"
 msgstr "Salasana"
 
-#: ../../any.pm_.c:161 ../../any.pm_.c:742
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../any.pm_.c:158 ../../any.pm_.c:731
+#: ../../install_steps_interactive.pm_.c:939
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Rajoita komentorivioptioita"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "rajoita"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "Tyhjenn� /tmp jokaisella k�ynnistyskerralla"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Tarkka muistin koko, jos tarpeen (l�ydettiin %d Mt)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "K�yt� montaa profiilia"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Anna muistin koko megatavuina"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Asetus ``Rajoita komentorivioptioita'' ei ole hy�dyllinen ilman salasanaa"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "Please try again"
 msgstr "Yrit� uudelleen"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:718
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../any.pm_.c:171 ../../any.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:933
 msgid "The passwords do not match"
 msgstr "Salasanat poikkeavat toisistaan"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
 msgstr "K�ynnistysviesti"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr "Vapaa Firmware-viive"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
 msgstr "Timeout ytimen k�ynnistyksess�"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
 msgstr "Mahdollista k�ynnistys CD:lt�"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr "Mahdollista k�ynnistys OFilta"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 msgid "Default OS?"
 msgstr "Oletusk�ytt�j�rjestelm�?"
 
-#: ../../any.pm_.c:210
+#: ../../any.pm_.c:207
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -636,145 +656,144 @@ msgstr ""
 "T�ss� ovat asetustietueet.\n"
 "Voit lis�t� uusia tai muuttaa olemassaolevia."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "Lis��"
 
-#: ../../any.pm_.c:220 ../../any.pm_.c:729 ../../diskdrake.pm_.c:46
-#: ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217 ../../any.pm_.c:718 ../../diskdrake.pm_.c:161
+#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:1846
+#: ../../printerdrake.pm_.c:1847 ../../printerdrake.pm_.c:1904
+#: ../../printerdrake.pm_.c:1948
 msgid "Done"
 msgstr "Valmis"
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:217
 msgid "Modify"
 msgstr "Muokkaa"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "Mink� tyyppisen tietueen haluat lis�t�"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:226
 msgid "Other OS (SunOS...)"
 msgstr "Muu k�ytt�j�rjestelm� (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "Muu k�ytt�j�rjestelm� (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "Muu k�ytt�j�rjestelm� (Windows...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "Kuva"
 
-#: ../../any.pm_.c:253 ../../any.pm_.c:264
+#: ../../any.pm_.c:247 ../../any.pm_.c:258
 msgid "Root"
 msgstr "Juuri"
 
-#: ../../any.pm_.c:254 ../../any.pm_.c:283
+#: ../../any.pm_.c:248 ../../any.pm_.c:277
 msgid "Append"
 msgstr "Liit�"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "Luku-kirjoitus"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "Taulukko"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "Turvaton"
 
-#: ../../any.pm_.c:274 ../../any.pm_.c:279 ../../any.pm_.c:282
+#: ../../any.pm_.c:268 ../../any.pm_.c:273 ../../any.pm_.c:276
 msgid "Label"
 msgstr "Otsikko"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "Oletus"
 
-#: ../../any.pm_.c:284
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
 msgstr "Initrd:n koko"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
 msgstr "Ei N�ytt��"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "Poista tietue"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "Tyhj�� otsikkoa ei sallita"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "Otsikko on jo k�yt�ss�"
 
-#: ../../any.pm_.c:317
-msgid "What type of partitioning?"
-msgstr "Mink� tyyppinen osiointi?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "L�ysin %s %s liit�nt��"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "Onko sinulla muita?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Onko koneessa %s liitynt��?"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
-#: ../../printerdrake.pm_.c:237
+#: ../../any.pm_.c:601 ../../any.pm_.c:760 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "No"
 msgstr "Ei"
 
-#: ../../any.pm_.c:612 ../../interactive.pm_.c:104 ../../my_gtk.pm_.c:616
+#: ../../any.pm_.c:601 ../../any.pm_.c:759 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "Yes"
 msgstr "Kyll�"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "Katso laitteistotietoja"
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:648
+#: ../../any.pm_.c:637
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "Asetan ajuria %s ohjaimelle %s"
 
-#: ../../any.pm_.c:649
+#: ../../any.pm_.c:638
 #, c-format
 msgid "(module %s)"
 msgstr "(moduli %s)"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:660
+#: ../../any.pm_.c:649
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Mit� %s-ajuria kokeillaan?"
 
-#: ../../any.pm_.c:668
+#: ../../any.pm_.c:657
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -790,20 +809,20 @@ msgstr ""
 "lis�m��reit� vai annatko sen itse etsi� tarvitsemansa tiedot? Joskus haku\n"
 "voi jumittaa tietokoneen, mutta se ei aiheuta vahinkoa."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "Automaattihaku"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "Lis�asetukset"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Voit antaa lis�asetuksia modulille %s."
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -814,11 +833,11 @@ msgstr ""
 "Asetukset ovat muotoa ``nimi=arvo nimi2=arvo2 ...''.\n"
 "Esimerkiksi, ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Moduulin optiot:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -827,34 +846,34 @@ msgstr ""
 "Modulin %s lataaminen ep�onnistui.\n"
 "Haluatko yritt�� muilla asetuksilla?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(jo lis�tty %s)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "Salasana on liian yksinkertainen"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "Anna k�ytt�j�tunnus"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "K�ytt�j�tunnus saa sis�lt�� vain pieni� kirjaimia, numeroita, `-' ja `_'"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "K�ytt�j�tunnus on jo lis�tty"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "Lis�� k�ytt�j�"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -863,54 +882,67 @@ msgstr ""
 "Aseta k�ytt�j�\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Hyv�ksy k�ytt�j�"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "Oikea nimi"
 
-#: ../../any.pm_.c:740 ../../printerdrake.pm_.c:97
-#: ../../printerdrake.pm_.c:131
+#: ../../any.pm_.c:729 ../../printerdrake.pm_.c:401
+#: ../../printerdrake.pm_.c:480
 msgid "User name"
 msgstr "K�ytt�j�tunnus"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "Komentotulkki"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "Kuvake"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:756
 msgid "Autologin"
 msgstr "Automaattinen kirjautuminen"
 
-#: ../../any.pm_.c:767
+#: ../../any.pm_.c:757
+#, fuzzy
 msgid ""
 "I can set up your computer to automatically log on one user.\n"
-"If you don't want to use this feature, click on the cancel button."
+"Do you want to use this feature?"
 msgstr ""
 "Tietokoneen saa automaattisesti kirjoittautumaan sis��n oletusk�ytt�j�n�.\n"
 "Jos et halua k�ytt�� t�t� ominaisuutta, paina peruuta-nappia."
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "Valitse oletusk�ytt�j�:"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "Valitse k�ytett�v� ikkunointij�rjestelm�:"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "Valitse k�ytett�v� kieli."
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr "Voit valita kielet jotka ovat k�ytett�viss� asennuksen j�lkeen"
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "Kaikki"
+
 # NOTE: this message will be displayed at boot time; that is
 # only the ascii charset will be available on most machines
 # so use only 7bit for this message (and do transliteration or
 # leave it in English, as it is the best for your language)
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:262 ../../bootloader.pm_.c:608
+#: ../../bootloader.pm_.c:259
 #, c-format
 msgid ""
 "Welcome to %s the operating system chooser!\n"
@@ -935,7 +967,7 @@ msgstr ""
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:809
+#: ../../bootloader.pm_.c:835
 msgid "Welcome to GRUB the operating system chooser!"
 msgstr "Tervetuloa GRUB k~^Dytt~^Tj~^Drjestelm~^Dnvalitsijaan!"
 
@@ -949,7 +981,7 @@ msgstr "Tervetuloa GRUB k~^Dytt~^Tj~^Drjestelm~^Dnvalitsijaan!"
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:812
+#: ../../bootloader.pm_.c:838
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
 msgstr "Kayt~^D %c- ja %c-napp~^Dimi~^D valitaksesi korostetun tietueen"
@@ -964,7 +996,7 @@ msgstr "Kayt~^D %c- ja %c-napp~^Dimi~^D valitaksesi korostetun tietueen"
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:815
+#: ../../bootloader.pm_.c:841
 msgid "Press enter to boot the selected OS, 'e' to edit the"
 msgstr ""
 "Paina enter kaynnist~^D~^Dksesi valitun kaytt�j�rjestelm�n, 'e' muokataksesi"
@@ -979,7 +1011,7 @@ msgstr ""
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:818
+#: ../../bootloader.pm_.c:844
 msgid "commands before booting, or 'c' for a command-line."
 msgstr "komennot ennen k�ynnistyst�, tai 'c' komentoriville"
 
@@ -993,26 +1025,31 @@ msgstr "komennot ennen k�ynnistyst�, tai 'c' komentoriville"
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:821
+#: ../../bootloader.pm_.c:847
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr "Korostettu tietue k�ynnistet��n automaattisesti %d sekunnissa."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
 msgstr "ei tarpeeksi tilaa /boot-hakemistossa"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
 #. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:918
+#: ../../bootloader.pm_.c:951
 msgid "Desktop"
 msgstr "Ty�p�yt�"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:920
+#: ../../bootloader.pm_.c:953
 msgid "Start Menu"
 msgstr "K�ynnistysvalikko"
 
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "Minne haluat asentaa k�ytt�j�rjestelm�n lataajan?"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
 msgstr "ohjeita ei ole viel� olemassa.\n"
@@ -1025,523 +1062,701 @@ msgstr "K�ynnistyksen tavan asetus"
 msgid "/_File"
 msgstr "/_Tiedosto"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/Tiedosto/_Uusi"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/Tiedosto/_Avaa"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>O"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/Tiedosto/_Tallenna"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>S"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/Tiedosto/Tallenna _Nimell�"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/Tiedosto/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/Tiedosto/_Poistu"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_Optiot"
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Optiot/Testi"
-
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/_Apua"
-
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/Apua/_Tietoja..."
-
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "M��rittele"
-
-#: ../../bootlook.pm_.c:114
-#, c-format
-msgid ""
-"You are currently using %s as Boot Manager.\n"
-"Click on Configure to launch the setup wizard."
-msgstr ""
-"T�ll� hetkell� k�yt�ss� oleva j�rjestelm�lataaja on %s.\n"
-"Valitse Aseta k�ynnist��ksesi asennusohjelman."
-
-#: ../../bootlook.pm_.c:121
-msgid "Lilo/grub mode"
-msgstr "Lilo/grub-tila"
-
-#: ../../bootlook.pm_.c:131
+#: ../../bootlook.pm_.c:91
 msgid "NewStyle Categorizing Monitor"
 msgstr "Uuden tyylin kategoroiva tarkkailija"
 
-#: ../../bootlook.pm_.c:134
+#: ../../bootlook.pm_.c:92
 msgid "NewStyle Monitor"
 msgstr "Uuden tyylin tarkkailija"
 
-#: ../../bootlook.pm_.c:137
+#: ../../bootlook.pm_.c:93
 msgid "Traditional Monitor"
 msgstr "Perinteinen tarkkailija"
 
-#: ../../bootlook.pm_.c:140
+#: ../../bootlook.pm_.c:94
 msgid "Traditional Gtk+ Monitor"
 msgstr "Perinteinen Gtk+ tarkkailija"
 
-#: ../../bootlook.pm_.c:144
+#: ../../bootlook.pm_.c:95
 msgid "Launch Aurora at boot time"
 msgstr "K�yt� Auroraa k�ynnistyksen aikana"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "Lilo/grub-tila"
+
+#: ../../bootlook.pm_.c:102
+#, c-format
+msgid ""
+"You are currently using %s as Boot Manager.\n"
+"Click on Configure to launch the setup wizard."
+msgstr ""
+"T�ll� hetkell� k�yt�ss� oleva j�rjestelm�lataaja on %s.\n"
+"Valitse Aseta k�ynnist��ksesi asennusohjelman."
+
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "M��rittele"
+
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
 msgstr "K�ynnistila"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "J�rjestelm�n tila"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr "K�yt� X-Window-j�rjestelm��"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr "Ei, en halua autologinia"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Kyll�, haluan autologinin (k�ytt�j�, ymp�rist�)"
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "J�rjestelm�n tila"
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "Oletus"
-
-#: ../../bootlook.pm_.c:236 ../../standalone/draknet_.c:88
-#: ../../standalone/draknet_.c:120 ../../standalone/draknet_.c:184
-#: ../../standalone/draknet_.c:302 ../../standalone/draknet_.c:396
-#: ../../standalone/draknet_.c:473 ../../standalone/draknet_.c:509
-#: ../../standalone/draknet_.c:617
+#: ../../bootlook.pm_.c:155 ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:140 ../../standalone/draknet_.c:208
+#: ../../standalone/draknet_.c:320 ../../standalone/draknet_.c:433
+#: ../../standalone/draknet_.c:507 ../../standalone/draknet_.c:543
+#: ../../standalone/draknet_.c:644
 msgid "OK"
 msgstr "OK"
 
-#: ../../bootlook.pm_.c:238 ../../install_steps_gtk.pm_.c:576
-#: ../../interactive.pm_.c:114 ../../interactive.pm_.c:269
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:357
-#: ../../my_gtk.pm_.c:360 ../../my_gtk.pm_.c:617
-#: ../../standalone/drakgw_.c:639 ../../standalone/draknet_.c:95
-#: ../../standalone/draknet_.c:127 ../../standalone/draknet_.c:295
-#: ../../standalone/draknet_.c:485 ../../standalone/draknet_.c:631
-#: ../../standalone/tinyfirewall_.c:63
+#: ../../bootlook.pm_.c:156 ../../install_steps_gtk.pm_.c:516
+#: ../../interactive.pm_.c:122 ../../interactive.pm_.c:286
+#: ../../interactive.pm_.c:308 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:416 ../../my_gtk.pm_.c:419 ../../my_gtk.pm_.c:716
+#: ../../printerdrake.pm_.c:1158 ../../standalone/drakgw_.c:648
+#: ../../standalone/draknet_.c:115 ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:313 ../../standalone/draknet_.c:519
+#: ../../standalone/draknet_.c:658 ../../standalone/tinyfirewall_.c:63
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "ei voi lukea tiedostoa /etc/inittab: $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "ei voi lukea tiedostoa /etc/sysconfig/autologin: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "ei voi lukea tiedostoa /etc/inittab: %s"
 
-#: ../../bootlook.pm_.c:435 ../../standalone/drakboot_.c:47
+#: ../../bootlook.pm_.c:336 ../../standalone/drakboot_.c:47
 msgid "Installation of LILO failed. The following error occured:"
 msgstr "LILO:n asennus ep�onnistu. Seuraava virhe tapahtui:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Luo"
-
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Irroita"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "Gt"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Poista"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "Kt"
 
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "Alusta"
+#: ../../common.pm_.c:93 ../../install_steps_graphical.pm_.c:287
+#: ../../install_steps_graphical.pm_.c:334
+msgid "MB"
+msgstr "Mt"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:653
-msgid "Resize"
-msgstr "Uusi koko"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr "Tt"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "Tyyppi"
+#: ../../common.pm_.c:109
+#, c-format
+msgid "%d minutes"
+msgstr "%d minuuttia"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "Liitospaikka"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 minuutti"
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "Kirjoita /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekuntia"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "Vaihda asiantuntijatilaan"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "Tee ensin varmuuskopio tiedoistasi"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "Vaihda normaalitilaan"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "Lue tarkkaan!"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "Palauta tiedostosta"
+#: ../../diskdrake.pm_.c:103
+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 ""
+"Jos aiot k�ytt�� aboot:ia, varmista ett� j�t�t vapaata tilaa levyn alkuun\n"
+"(2048 sektoria on tarpeeksi)"
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Tallenna tiedostoon"
+#: ../../diskdrake.pm_.c:122 ../../diskdrake_interactive.pm_.c:313
+#: ../../diskdrake_interactive.pm_.c:328 ../../install_steps.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:37
+#: ../../install_steps_interactive.pm_.c:310 ../../interactive_http.pm_.c:119
+#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:62
+msgid "Error"
+msgstr "Virhe"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "Velho"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Palauta levykkeelt�"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Uusi"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Tallenna levykkeelle"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+#, fuzzy
+msgid "Remote"
+msgstr "Et�jonon nimi:"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "Tyhjenn� kaikki"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "Liitospaikka"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Alusta kaikki"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Optiot"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Automaattinen varaus"
+#: ../../diskdrake.pm_.c:211 ../../diskdrake.pm_.c:417
+#: ../../diskdrake.pm_.c:534 ../../diskdrake_interactive.pm_.c:353
+#: ../../diskdrake_interactive.pm_.c:488
+msgid "Type"
+msgstr "Tyyppi"
 
-#: ../../diskdrake.pm_.c:59
-msgid "All primary partitions are used"
-msgstr "Kaikki prim��riosiot k�ytetty"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Irroita"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "Uusia osioita ei voida lis�t�"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Liit�"
+
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Valitse toiminta"
 
-#: ../../diskdrake.pm_.c:59
+#: ../../diskdrake.pm_.c:235
 msgid ""
-"To have more partitions, please delete one to be able to create an extended "
-"partition"
+"You have one big FAT partition\n"
+"(generally used by MicroSoft Dos/Windows).\n"
+"I suggest you first resize that partition\n"
+"(click on it, then click on \"Resize\")"
 msgstr ""
-"Voidaksesi luoda lis�� osioita tuhoa yksi olemassaoleva osio jotta voisit "
-"luoda laajennetun osion"
+"Sinulla on yksi suuri FAT-osio.\n"
+"(Yleens� Microsoft DOS/Windowsin k�yt�ss�).\n"
+"Ehdotus: muuta ensimm�iseksi osion kokoa\n"
+"(klikkaa osiota ja valitse sitten \"Uusi koko\")"
 
-#: ../../diskdrake.pm_.c:61
-msgid "Not enough space for auto-allocating"
-msgstr "Ei tarpeeksi tilaa automaattiseen tilanvaraukseen"
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Klikkaa osiota"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Peruuta"
+#: ../../diskdrake.pm_.c:240
+#, fuzzy
+msgid "Please click on a media"
+msgstr "Klikkaa osiota"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "Kirjoita osiotaulu"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "Klikkaa osiota"
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "Lis�asetukset"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
+
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "Yksityiskohdat"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
+#, fuzzy
+msgid "Journalised FS"
+msgstr "liitt�minen ep�onnistui"
+
+#: ../../diskdrake.pm_.c:395
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Swap"
 msgstr "Swap"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:396 ../../diskdrake_interactive.pm_.c:952
 msgid "Empty"
 msgstr "Tyhj�"
 
-#: ../../diskdrake.pm_.c:117 ../../install_steps_gtk.pm_.c:407
-#: ../../mouse.pm_.c:145
+#: ../../diskdrake.pm_.c:396 ../../install_steps_gtk.pm_.c:373
+#: ../../install_steps_gtk.pm_.c:433 ../../mouse.pm_.c:161
+#: ../../services.pm_.c:161
 msgid "Other"
 msgstr "Muu"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "Tiedostoj�rjestelmien tyypit:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "Yksityiskohdat"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Luo"
 
-#: ../../diskdrake.pm_.c:147
-msgid ""
-"You have one big FAT partition\n"
-"(generally used by MicroSoft Dos/Windows).\n"
-"I suggest you first resize that partition\n"
-"(click on it, then click on \"Resize\")"
-msgstr ""
-"Sinulla on yksi suuri FAT-osio.\n"
-"(Yleens� Microsoft DOS/Windowsin k�yt�ss�).\n"
-"Ehdotus: muuta ensimm�iseksi osion kokoa\n"
-"(klikkaa osiota ja valitse sitten \"Uusi koko\")"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "K�yt� sen sijaan ``%s'':��"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Tee ensin varmuuskopio tiedoistasi"
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Poista"
 
-#: ../../diskdrake.pm_.c:152 ../../diskdrake.pm_.c:170
-#: ../../diskdrake.pm_.c:179 ../../diskdrake.pm_.c:570
-#: ../../diskdrake.pm_.c:592
-msgid "Read carefully!"
-msgstr "Lue tarkkaan!"
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "K�yt� ensin komentoa ``Irroita''"
 
-#: ../../diskdrake.pm_.c:155
+# mat
+#: ../../diskdrake.pm_.c:424 ../../diskdrake_interactive.pm_.c:480
+#, c-format
 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"
+"After changing type of partition %s, all data on this partition will be lost"
+msgstr "Vaihdettuasi osion %s tyyppi� kaikki sill� olevat tiedot h�vi�v�t"
+
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Minne haluat liitt�� laitteen %s?"
+
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Mount options"
+msgstr "Moduulin optiot:"
+
+#: ../../diskdrake.pm_.c:507
+msgid "Various"
 msgstr ""
-"Jos aiot k�ytt�� aboot:ia, varmista ett� j�t�t vapaata tilaa levyn alkuun\n"
-"(2048 sektoria on tarpeeksi)"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "Varo: t�m� on vaarallinen toiminto"
+#: ../../diskdrake.pm_.c:525
+#, fuzzy
+msgid "Removable media"
+msgstr "Vaihdettavien medioiden automaattinen liitt�minen"
 
-#: ../../diskdrake.pm_.c:214 ../../install_steps.pm_.c:72
-#: ../../install_steps_interactive.pm_.c:37
-#: ../../install_steps_interactive.pm_.c:322 ../../standalone/diskdrake_.c:66
-msgid "Error"
-msgstr "Virhe"
+#: ../../diskdrake.pm_.c:532
+#, fuzzy
+msgid "Change type"
+msgstr "Muuta osiotyyppi�"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Liitospaikka: "
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Mink� tiedostoj�rjestelm�n haluat?"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Laite: "
+#: ../../diskdrake.pm_.c:564
+msgid "Scanning available nfs shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:569
 #, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "DOS-asema: %s (vain arvaus)\n"
+msgid "Scanning available nfs shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:244 ../../diskdrake.pm_.c:251
-#: ../../diskdrake.pm_.c:301
-msgid "Type: "
-msgstr "Tyyppi: "
+#: ../../diskdrake.pm_.c:578 ../../diskdrake.pm_.c:648
+msgid "If the list above doesn't contain the wanted entry, enter it here:"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:248
-msgid "Name: "
-msgstr "Nimi: "
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "Palvelin"
 
-#: ../../diskdrake.pm_.c:253
-#, c-format
-msgid "Start: sector %s\n"
-msgstr "Alkaa: sektori %s\n"
+#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
+msgid "Shared resource"
+msgstr ""
 
-# mat
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Size: %s"
-msgstr "Koko: %s"
+#: ../../diskdrake.pm_.c:615
+msgid "Scanning available samba shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:256
+#: ../../diskdrake.pm_.c:626 ../../diskdrake.pm_.c:639
 #, c-format
-msgid ", %s sectors"
-msgstr ", %s sektoria"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:258
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Sylinterist� %d sylinteriin %d\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose a partition"
+msgstr "Valitse toiminta"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Alustettu\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose another partition"
+msgstr "Luo uusi osio"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "Ei alustettu\n"
+#: ../../diskdrake_interactive.pm_.c:188
+#, fuzzy
+msgid "Exit"
+msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "Liitetty\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "Vaihda asiantuntijatilaan"
 
-#: ../../diskdrake.pm_.c:262
-#, c-format
-msgid "RAID md%s\n"
-msgstr "RAID md%s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to normal mode"
+msgstr "Vaihda normaalitilaan"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Loopback tiedostot: %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Peruuta"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Osiolta k�ynnistet��n oletuksena\n"
-"    (MS-DOS k�ynnistys, ei lilo)\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "Jatka joka tapauksessa?"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "Taso %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "Lopeta tallentamatta"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Palan koko %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "Lopeta kirjoittamatta osiotalua?"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "RAID-levyt %s\n"
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Haluatko kokeilla asetuksia?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Loopback-tiedoston nimi: %s"
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Automaattinen varaus"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "Tyhjenn� kaikki"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "Lis�asetukset"
+
+#: ../../diskdrake_interactive.pm_.c:250
+#, fuzzy
+msgid "Hard drive information"
+msgstr "Kiintolevyjen tunnistus"
+
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "Not enough space for auto-allocating"
+msgstr "Ei tarpeeksi tilaa automaattiseen tilanvaraukseen"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "Kaikki prim��riosiot k�ytetty"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "Uusia osioita ei voida lis�t�"
+
+#: ../../diskdrake_interactive.pm_.c:275
 msgid ""
-"\n"
-"Chances are, this partition is\n"
-"a Driver partition, you should\n"
-"probably leave it alone.\n"
+"To have more partitions, please delete one to be able to create an extended "
+"partition"
 msgstr ""
-"\n"
-"On mahdollista, ett� t�m� osio on\n"
-"ajuriosio. Sinun olisi kaiketi\n"
-"parasta j�tt�� se rauhaan.\n"
+"Voidaksesi luoda lis�� osioita tuhoa yksi olemassaoleva osio jotta voisit "
+"luoda laajennetun osion"
+
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "Kirjoita osiotaulu"
+
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "Pelasta osiotaulu"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "Pelasta osiotaulu"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "Pelasta osiotaulu"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "Vaihdettavien medioiden automaattinen liitt�minen"
+
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Valitse tiedosto"
+
+#: ../../diskdrake_interactive.pm_.c:308
 msgid ""
-"\n"
-"This special Bootstrap\n"
-"partition is for\n"
-"dual-booting your system.\n"
+"The backup partition table has not the same size\n"
+"Still continue?"
 msgstr ""
-"\n"
-"T�m� erityinen Bootsrap-\n"
-"osio on j�rjestelm�si\n"
-"kaksoisk�ynnist�miseksi.\n"
+"Osiotaulun varmuuskopio ei ole saman kokoinen\n"
+"Jatka silti?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Klikkaa osiota"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Varoitus"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Koko: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Aseta levyke asemaan\n"
+"Kaikki levykkeen tiedot h�vi�v�t"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geometria: %s sylinteri�, %s lukup��t�, %s sektoria\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "Yrit�n osiotalulun palautusta"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "LVM-levyt %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+#, fuzzy
+msgid "Detailed information"
+msgstr "N�yt� tiedot"
 
-# mat
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Osion tyyppi: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Uusi koko"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "v�yl�ss� %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Siirr�"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Liit�"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Alusta"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Lis�� RAIDiin"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "Poista RAIDista"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "Muokkaa RAIDia"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "Lis�� LVM:iin"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "Poista RAIDista"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "Poista LVM:st�"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "Muokkaa RAIDia"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "K�yt� loopback-tiedostoa"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Valitse toiminta"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Luo uusi osio"
+
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "Aloitussektori: "
+
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Koko Mt: "
+
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Tiedostoj�rjestelm�: "
+
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Liitospaikka: "
+
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Etuoikeus: "
+
+# mat
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "Alustan loopback-osiota %s"
+
+#: ../../diskdrake_interactive.pm_.c:486
+msgid "Change partition type"
+msgstr "Muuta osiotyyppi�"
+
+#: ../../diskdrake_interactive.pm_.c:491
+msgid "Switching from ext2 to ext3"
+msgstr ""
+
+# mat
+#: ../../diskdrake_interactive.pm_.c:521
+#, c-format
+msgid "Where do you want to mount loopback file %s?"
+msgstr "Minne haluat liitt�� loopback-tiedoston %s?"
 
-#: ../../diskdrake.pm_.c:435
+#: ../../diskdrake_interactive.pm_.c:528
+msgid ""
+"Can't unset mount point as this partition is used for loop back.\n"
+"Remove the loopback first"
+msgstr ""
+"Ei voida poistaa liitospaikkaa koska osiota k�ytet��n loopback-tilassa.\n"
+"Poista loopback-tiedosto ensin"
+
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "Lasken FAT-tiedostoj�rjestelm�n rajoja"
+
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "Muutan kokoa"
+
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "T�m�n osion kokoa ei voi muuttaa"
+
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "Kaikki osion tiedot tulee varmuuskopioida"
+
+# mat
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr "Osion %s koon muuttamisen j�lkeen kaikki osion tiedot tuhoutuvat"
+
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Valitse uusi koko"
+
+#: ../../diskdrake_interactive.pm_.c:591
+#, fuzzy
+msgid "New size in MB: "
+msgstr "Koko Mt: "
+
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Which disk do you want to move it to?"
+msgstr "Mille levylle haluat siirt��?"
+
+#: ../../diskdrake_interactive.pm_.c:632
+msgid "Sector"
+msgstr "Sektori"
+
+#: ../../diskdrake_interactive.pm_.c:633
+msgid "Which sector do you want to move it to?"
+msgstr "Mille sektorille haluat siirt��?"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving"
+msgstr "Siirr�n"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving partition..."
+msgstr "Siirr�n osiota..."
+
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "Valitse olemassaoleva RAID johon lis�t��n"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "uusi"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "Valitse olemassaoleva LVM johon lis�t��n"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "LVM:n nimi?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "Osiota ei voida k�ytt�� loopback-osiona"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Loopback"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Loopback tiedostonimi: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "Oikea nimi"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "Tiedosto on jo k�yt�ss� toiselle loopbackille, valitse toinen"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "Tiedosto on jo olemassa. K�yt� sit�?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "laite"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "taso"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "palan koko"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "Varo: t�m� on vaarallinen toiminto"
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "Mink� tyyppinen osiointi?"
+
+#: ../../diskdrake_interactive.pm_.c:834
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -1553,7 +1768,7 @@ msgstr ""
 "Joko k�yt�t LILOa ja se ei toimi, tai et k�yt� LILOa, jolloin et tarvitse /"
 "boot -hakemistoa"
 
-#: ../../diskdrake.pm_.c:439
+#: ../../diskdrake_interactive.pm_.c:838
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -1564,7 +1779,7 @@ msgstr ""
 "eik� sinulla ole /boot osiota.\n"
 "Jos haluat k�ytt�� LILO-k�ynnistyksenhallintaa, lis�� Linuxille /boot osio."
 
-#: ../../diskdrake.pm_.c:445
+#: ../../diskdrake_interactive.pm_.c:844
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
 "No bootloader is able to handle this without a /boot partition.\n"
@@ -1574,283 +1789,244 @@ msgstr ""
 "Mik��n k�ynnistyslataaja ei osaa k�sitell� t�t� ilman /boot -osiota.\n"
 "Lis�� /boot -osio, jos haluat k�ytt�� liloa tai grubia"
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "K�yt� sen sijaan ``%s'':��"
-
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "K�yt� ensin komentoa ``Irroita''"
-
-# mat
-#: ../../diskdrake.pm_.c:469 ../../diskdrake.pm_.c:513
-#, c-format
-msgid ""
-"After changing type of partition %s, all data on this partition will be lost"
-msgstr "Vaihdettuasi osion %s tyyppi� kaikki sill� olevat tiedot h�vi�v�t"
-
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "Jatka joka tapauksessa?"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "Lopeta tallentamatta"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "Lopeta kirjoittamatta osiotalua?"
-
-#: ../../diskdrake.pm_.c:516
-msgid "Change partition type"
-msgstr "Muuta osiotyyppi�"
-
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "Mink� tiedostoj�rjestelm�n haluat?"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Et voi k�ytt�� ReiserFS:�� alle 32 Mt osioilla"
-
-# mat
-#: ../../diskdrake.pm_.c:537
-#, c-format
-msgid "Where do you want to mount loopback file %s?"
-msgstr "Minne haluat liitt�� loopback-tiedoston %s?"
-
-#: ../../diskdrake.pm_.c:538
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Minne haluat liitt�� laitteen %s?"
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "Levyn %s osiotaulu kirjotetaan levylle!"
 
-#: ../../diskdrake.pm_.c:542
-msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
-"Remove the loopback first"
-msgstr ""
-"Ei voida poistaa liitospaikkaa koska osiota k�ytet��n loopback-tilassa.\n"
-"Poista loopback-tiedosto ensin"
+#: ../../diskdrake_interactive.pm_.c:868
+msgid "You'll need to reboot before the modification can take place"
+msgstr "Sinun t�ytyy k�ynnist�� kone uudelleen ennen kuin muutos tulee voimaan"
 
 # mat
-#: ../../diskdrake.pm_.c:561
+#: ../../diskdrake_interactive.pm_.c:879
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Kaikki osiolla %s olevat tiedot h�vi�v�t osion alustuksen yhteydess�"
 
-#: ../../diskdrake.pm_.c:563
+#: ../../diskdrake_interactive.pm_.c:881
 msgid "Formatting"
 msgstr "Alustan"
 
 # mat
-#: ../../diskdrake.pm_.c:564
+#: ../../diskdrake_interactive.pm_.c:882
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Alustan loopback-osiota %s"
 
-#: ../../diskdrake.pm_.c:565 ../../install_steps_interactive.pm_.c:430
+#: ../../diskdrake_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:419
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Alustan osiota %s"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "Osioiden alustuksen j�lkeen,"
-
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "kaikki tieto n�ill� osioilla on h�vinnyt"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid ep�onnistui"
 
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Siirr�"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "Ei tarpeeksi tilaa uusien osioiden luomiseksi"
 
-#: ../../diskdrake.pm_.c:577
-msgid "Which disk do you want to move it to?"
-msgstr "Mille levylle haluat siirt��?"
+#: ../../diskdrake_interactive.pm_.c:895
+#, c-format
+msgid ""
+"Directory %s already contain some data\n"
+"(%s)"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:578
-msgid "Sector"
-msgstr "Sektori"
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "Ei tarpeeksi tilaa uusien osioiden luomiseksi"
 
-#: ../../diskdrake.pm_.c:579
-msgid "Which sector do you want to move it to?"
-msgstr "Mille sektorille haluat siirt��?"
+#: ../../diskdrake_interactive.pm_.c:910
+#, c-format
+msgid "Copying %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving"
-msgstr "Siirr�n"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Resoluutio: %s\n"
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving partition..."
-msgstr "Siirr�n osiota..."
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Laite: "
 
-#: ../../diskdrake.pm_.c:592
+#: ../../diskdrake_interactive.pm_.c:938
 #, c-format
-msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "Levyn %s osiotaulu kirjotetaan levylle!"
-
-#: ../../diskdrake.pm_.c:594
-msgid "You'll need to reboot before the modification can take place"
-msgstr "Sinun t�ytyy k�ynnist�� kone uudelleen ennen kuin muutos tulee voimaan"
-
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "Lasken FAT-tiedostoj�rjestelm�n rajoja"
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "DOS-asema: %s (vain arvaus)\n"
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "Muutan kokoa"
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Tyyppi: "
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "T�m�n osion kokoa ei voi muuttaa"
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Nimi: "
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "Kaikki osion tiedot tulee varmuuskopioida"
+#: ../../diskdrake_interactive.pm_.c:954
+#, c-format
+msgid "Start: sector %s\n"
+msgstr "Alkaa: sektori %s\n"
 
 # mat
-#: ../../diskdrake.pm_.c:650
+#: ../../diskdrake_interactive.pm_.c:955
 #, c-format
-msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "Osion %s koon muuttamisen j�lkeen kaikki osion tiedot tuhoutuvat"
-
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Valitse uusi koko"
+msgid "Size: %s"
+msgstr "Koko: %s"
 
-#: ../../diskdrake.pm_.c:660 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
-msgid "MB"
-msgstr "Mt"
+#: ../../diskdrake_interactive.pm_.c:957
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s sektoria"
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "Luo uusi osio"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Sylinterist� %d sylinteriin %d\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "Aloitussektori: "
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Alustettu\n"
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Koko Mt: "
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "Ei alustettu\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Tiedostoj�rjestelm�: "
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "Liitetty\n"
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "Etuoikeus: "
+#: ../../diskdrake_interactive.pm_.c:963
+#, c-format
+msgid "RAID md%s\n"
+msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:798
-msgid "This partition can't be used for loopback"
-msgstr "Osiota ei voida k�ytt�� loopback-osiona"
+#: ../../diskdrake_interactive.pm_.c:965
+#, fuzzy, c-format
+msgid ""
+"Loopback file(s):\n"
+"   %s\n"
+msgstr "Loopback tiedostot: %s\n"
 
-#: ../../diskdrake.pm_.c:808
-msgid "Loopback"
-msgstr "Loopback"
+#: ../../diskdrake_interactive.pm_.c:966
+msgid ""
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
+msgstr ""
+"Osiolta k�ynnistet��n oletuksena\n"
+"    (MS-DOS k�ynnistys, ei lilo)\n"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Loopback tiedostonimi: "
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "Taso %s\n"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "Tiedosto on jo k�yt�ss� toiselle loopbackille, valitse toinen"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Palan koko %s\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "Tiedosto on jo olemassa. K�yt� sit�?"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "RAID-levyt %s\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Valitse tiedosto"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Loopback-tiedoston nimi: %s"
 
-#: ../../diskdrake.pm_.c:876
+#: ../../diskdrake_interactive.pm_.c:975
 msgid ""
-"The backup partition table has not the same size\n"
-"Still continue?"
+"\n"
+"Chances are, this partition is\n"
+"a Driver partition, you should\n"
+"probably leave it alone.\n"
 msgstr ""
-"Osiotaulun varmuuskopio ei ole saman kokoinen\n"
-"Jatka silti?"
-
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "Varoitus"
+"\n"
+"On mahdollista, ett� t�m� osio on\n"
+"ajuriosio. Sinun olisi kaiketi\n"
+"parasta j�tt�� se rauhaan.\n"
 
-#: ../../diskdrake.pm_.c:885
+#: ../../diskdrake_interactive.pm_.c:978
 msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
 msgstr ""
-"Aseta levyke asemaan\n"
-"Kaikki levykkeen tiedot h�vi�v�t"
-
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "Yrit�n osiotalulun palautusta"
-
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "laite"
-
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "taso"
-
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "palan koko"
+"\n"
+"T�m� erityinen Bootsrap-\n"
+"osio on j�rjestelm�si\n"
+"kaksoisk�ynnist�miseksi.\n"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "Valitse olemassaoleva RAID johon lis�t��n"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Koko: %s\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "uusi"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geometria: %s sylinteri�, %s lukup��t�, %s sektoria\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "Valitse olemassaoleva LVM johon lis�t��n"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Tietoja: "
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr "LVM:n nimi?"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM-levyt %s\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "Vaihdettavien medioiden automaattinen liitt�minen"
+# mat
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Osion tyyppi: %s\n"
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "Pelasta osiotaulu"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "v�yl�ss� %d id %d\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "Uudelleenlataa"
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Optiot: %s"
 
-#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
-#: ../../fs.pm_.c:113
+#: ../../fs.pm_.c:447 ../../fs.pm_.c:457 ../../fs.pm_.c:461 ../../fs.pm_.c:465
+#: ../../fs.pm_.c:469 ../../fs.pm_.c:473
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s:n alustus %s:ta ep�onnistui"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "en osaa alustaa %s:�� tyyppi� %s"
 
-#: ../../fs.pm_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "liitt�minen ep�onnistui"
+
+#: ../../fs.pm_.c:588
+#, c-format
+msgid "fsck failed with exit code %d or signal %d"
+msgstr ""
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
 msgid "mount failed: "
 msgstr "liitt�minen ep�onnistui: "
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "virhe irroitettaessa %s: %s"
@@ -1863,41 +2039,44 @@ msgstr "yksinkertainen"
 msgid "server"
 msgstr "palvelin"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Et voi k�ytt�� JFS:�� alle 16 Mt osioilla"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Et voi k�ytt�� ReiserFS:�� alle 32 Mt osioilla"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "Liitospaikan pit�� alkaa /-merkill�."
 
 # mat
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "On jo olemassa osio, jonka liitospaikka on %s\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Rengasmaisia liitoksia %s\n"
-
-#: ../../fsedit.pm_.c:285
+#: ../../fsedit.pm_.c:476
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "Et voi k�ytt�� LVM loogista taltiota liitekohtana %s"
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
 msgstr "T�m�n hakemiston pit�isi olla juuritiedostoj�rjestelm�ss�"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "Tarvitset t�h�n liitoskohtaan oikean tiedostoj�rjestelm�n (ext2, reiserfs)\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Virhe kirjoitettaessa tiedostoon %s: %s"
 
-#: ../../fsedit.pm_.c:453
+#: ../../fsedit.pm_.c:681
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
@@ -1905,339 +2084,417 @@ msgstr ""
 "On tapahtunut virhe - ei l�ytynyt ainuttakaan laitetta, joille voi luoda "
 "uuden tiedostoj�rjestelm�n. Tarkista laitteistosi korjataksesi ongelman"
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "Sinulla ei ole yht��n osiota!"
 
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr "Valitse haluttu kieli asennukseen ja j�rjestelm�n k�ytt��n."
-
-#: ../../help.pm_.c:12
+#: ../../help.pm_.c:13
+msgid ""
+"GNU/Linux is a multiuser system, and this means that each user can have his\n"
+"own preferences, his own files and so on. You can read the ``User Guide''\n"
+"to learn more. But unlike \"root\", which is the administrator, the users\n"
+"you will add here will not be entitled to change anything except their own\n"
+"files and their own configuration. You will have to create at least one\n"
+"regular user for yourself. That account is where you should log in for\n"
+"routine use. Although it is very practical to log in as \"root\" everyday,\n"
+"it may also be very dangerous! The slightest mistake could mean that your\n"
+"system would not work any more. If you make a serious mistake as a regular\n"
+"user, you may only lose some information, but not the entire system.\n"
+"\n"
+"First, you have to enter your real name. This is not mandatory, of course -\n"
+"as you can actually enter whatever you want. DrakX will then take the first\n"
+"word you have entered in the box and will bring it over to the \"User\n"
+"name\". This is the name this particular user will use to log into the\n"
+"system. You can change it. You then have to enter a password here. A\n"
+"non-privileged (regular) user's password is not as crucial as that of\n"
+"\"root\" from a security point of view, but that is no reason to neglect it\n"
+"- after all, your files are at risk.\n"
+"\n"
+"If you click on \"Accept user\", you can then add as many as you want. Add\n"
+"a user for each one of your friends: your father or your sister, for\n"
+"example. When you finish adding all the users you want, select \"Done\".\n"
+"\n"
+"Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
+"for that user (bash by default)."
+msgstr ""
+
+#: ../../help.pm_.c:41
+#, fuzzy
 msgid ""
-"You need to accept the terms of the above license to continue installation.\n"
-"\n"
+"Listed above are the existing Linux partitions detected on your hard drive.\n"
+"You can keep the choices made by the wizard, they are good for most common\n"
+"installs. If you make any changes, you must at least define a root\n"
+"partition (\"/\"). Do not choose too small a partition or you will not be\n"
+"able to install enough software. If you want to store your data on a\n"
+"separate partition, you will also need to create a partition for \"/home\"\n"
+"(only possible if you have more than one Linux partition available).\n"
 "\n"
-"Please click on \"Accept\" if you agree with its terms.\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"
-"Please click on \"Refuse\" if you disagree with its terms. Installation will "
-"end without modifying your current\n"
-"configuration."
-msgstr ""
-"Jatkaaksesi asennusta sinun t�ytyy hyv�ksy� yll� olevan lisenssin ehdot.\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"
-"Valitse \"Hyv�ksy\", jos hyv�ksyt ehdot.\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"
-"Valitse \"Kielt�ydy\", jos et hyv�ksy ehtoja. T�ll�in asennus p��ttyy "
-"muuttamatta nykyisi� asetuksia."
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Valitse n�pp�inasettelu allaolevasta listasta"
-
-#: ../../help.pm_.c:25
-msgid ""
-"If you wish other languages (than the one you choose at\n"
-"beginning of installation) will be available after installation, please "
-"chose\n"
-"them in list above. If you want select all, you just need to select \"All\"."
-msgstr ""
-"Jos haluat asennuksen j�lkeen vaihtaa j�rjestelm�n k�ytt�m�� kielt�\n"
-"(asennuksen alussa valitsemiesi lis�ksi), valitse ne yll�olevasta listasta.\n"
-"Jos haluat valita kaikki, sinun ei tarvitse valita muita kuin \"Kaikki\"."
-
-#: ../../help.pm_.c:30
-msgid ""
-"Please choose \"Install\" if there are no previous version of Linux-"
-"Mandrake\n"
-"installed or if you wish to use several operating systems.\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"
-"Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\n"
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc."
+msgstr ""
+"Yll� on lueteltu kiintolevyill� olevat Linux-osiot. Voit pit�� velhon "
+"tekem�t\n"
+"valinnat, jotka ovat sopivat tavalliseen k�ytt��n. Jos muutat n�it� "
+"valintoja,\n"
+"sinun t�ytyy m��ritell� v�hint��n juuriosio (\"/\").  �l� valitse liian "
+"pient� osiota\n"
+"sill� silloin kaikkia ohjelmia ei voida asentaa. Jos haluat tallettaa "
+"tietosi erilliselle\n"
+"osiolle, sinun t�ytyy valita my�s \"/home\" (mik� on mahdollista vain, jos \n"
+"sinulla on enemm�n kuin yksi Linux-osio).\n"
 "\n"
 "\n"
-"Depend of your knowledge in GNU/Linux, you can choose one of the following "
-"levels to install or update your\n"
-"Linux-Mandrake operating system:\n"
+"Tiedoksi: jokaisesta osiosta on listattu seuraavat tiedot: \"Nimi\", "
+"\"Kapasiteetti\".\n"
 "\n"
-"\t* Recommended: if you have never installed a GNU/Linux operating system "
-"choose this. Installation will be\n"
-"\t  be very easy and you will be asked only on few questions.\n"
 "\n"
+"\"Nimi\" on koodattu seuraavalla tavalla: \"Kiintolevyn tyyppi\", "
+"\"Kiintolevyn numero\",\n"
+"\"Osion numero\" (esimerkiksi \"hda1\").\n"
 "\n"
-"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
-"the primary usage (workstation, server,\n"
-"\t  development) of your system. You will need to answer to more questions "
-"than in \"Recommended\" installation\n"
-"\t  class, so you need to know how GNU/Linux works to choose this "
-"installation class.\n"
 "\n"
+"\"Kiintolevyn tyyppi\" on \"hd\" jos kiintolevysi on IDE-levy ja \"sd\" jos "
+"se on\n"
+"SCSI-levy.\n"
 "\n"
-"\t* Expert: if you have a good knowledge in GNU/Linux, you can choose this "
-"installation class. As in \"Customized\"\n"
-"\t  installation class, you will be able to choose the primary usage "
-"(workstation, server, development). Be very\n"
-"\t  careful before choose this installation class. You will be able to "
-"perform a higly customized installation.\n"
-"\t  Answer to some questions can be very difficult if you haven't a good "
-"knowledge in GNU/Linux. So, don't choose\n"
-"\t  this installation class unless you know what you are doing."
-msgstr ""
-"Valitse \"Asenna\", jos sinulla ei ole aikaisempaa versiota Linux-"
-"Mandrakesta\n"
-"asennettuna tai haluat k�ytt�� useaa k�ytt�j�rjestelm��.\n"
 "\n"
+"\"Kiintolevyn kirjain\" on aina kirjain heti \"hd\":n tai \"sd\":n j�lkeen. "
+"IDE-asemilla:\n"
 "\n"
-"Valitse \"P�ivit�\", jos haluat p�ivitt�� olemassaolevan version Linux-"
-"Mandrakesta.\n"
+"   * \"a\" tarkoittaa \"herraksi m��ritelty kiintolevy ensisijaisella IDE-"
+"laitteella\",\n"
 "\n"
+"   * \"b\" tarkoittaa \"orjaksi m��ritelty kiintolevy ensisijaisella IDE-"
+"laitteella\",\n"
 "\n"
-"Riippuen osaamisestasi GNU/Linux-j�rjestelmiss�, voit valita jonkin "
-"seuraavista tasoista Linux-Mandrake -k�ytt�j�rjestelm�n asentamiseen tai "
-"p�ivitt�miseen:\n"
+"   * \"c\" tarkoittaa \"herraksi m��ritelty kiintolevy toissijaisella IDE-"
+"laitteella\",\n"
 "\n"
+"   * \"d\" tarkoittaa \"orjaksi m��ritelty kiintolevy toissijaisella IDE-"
+"laitteella\",\n"
 "\n"
-"\t* Suositeltu: jos et ole ikin� asentanut GNU/Linux-k�ytt�j�rjestelm��, "
-"valitse t�m� vaihtoehto.\n"
-"\t  Asennus tulee olemaan helppo ja sinulta tullaan kysym��n vain muutama "
-"kysymys.\n"
 "\n"
+"SCSI-levyill� \"a\" tarkoittaa \"ensisijainen kiintolevy\", \"b\" "
+"puolestaan\n"
+"\"toissijainen kiintolevy\", jne..."
+
+#: ../../help.pm_.c:72
+msgid ""
+"The Mandrake Linux installation is spread out over several CDROMs. DrakX\n"
+"knows if a selected package is located on another CDROM and will eject the\n"
+"current CD and ask you to insert a different one as required."
+msgstr ""
+
+#: ../../help.pm_.c:77
+msgid ""
+"It is now time to specify which programs you wish to install on your\n"
+"system. There are thousands of packages available for Mandrake Linux, and\n"
+"you are not supposed to know them all by heart.\n"
 "\n"
-"\t* Mukautettu: jos tunnet GNU/Linuxin tarpeeksi hyvin, voit valita "
-"j�rjestelm�n tyypin k�yt�n mukaan\n"
-"\t  (ty�asema, palvelin, kehitys). Sinun tarvitsee vastata useampaan "
-"kysymykseen, kuin \"Suositellussa\" asennuksessa,\n"
-"\t  joten sinun t�ytyy tiet�� miten GNU/Linux toimii, jos haluat valita "
-"t�m�n asennusluokan.\n"
+"If you are performing a standard installation from CDROM, you will first be\n"
+"asked to specify the CDs you currently have (in Expert mode only). Check\n"
+"the CD labels and highlight the boxes corresponding to the CDs you have\n"
+"available for installation. Click \"OK\" when you are ready to continue.\n"
 "\n"
+"Packages are sorted in groups corresponding to a particular use of your\n"
+"machine. The groups themselves are sorted into four sections:\n"
 "\n"
-"\t* Asiantuntija: jos tunnet GNU/Linux-j�rjestelm�n hyvin, voit valita t�m�n "
-"asennusluokan. Kuten\n"
-"\t  \"Mukautetussa\" asennuksessa, sinun t�ytyy valita ensisijainen "
-"k�ytt�kohde (ty�asema,\n"
-"\t  palvelin, kehitys). T�m� asennusluokka tarjoaa joustavimman asennuksen, "
-"mutta jotkin kysymykset\n"
-"\t  voivat osoittautua eritt�in vaikeiksi niille, jotka eiv�t tunne GNU/"
-"Linuxia riitt�v�n hyvin.\n"
-"\t  �l� valitse t�t� asennusluokkaa, ellet ole aivan varma, mit� olet "
-"tekem�ss�."
-
-#: ../../help.pm_.c:56
-msgid ""
-"Select:\n"
+" * \"Workstation\": if you plan to use your machine as a workstation, "
+"select\n"
+"one or more of the corresponding groups.\n"
 "\n"
-"  - Customized: If you are familiar enough with GNU/Linux, you may then "
-"choose\n"
-"    the primary usage for your machine. See below for details.\n"
+" * \"Development\": if the machine is to be used for programming, choose "
+"the\n"
+"desired group(s).\n"
 "\n"
+" * \"Server\": finally, if the machine is intended to be a server, you will\n"
+"be able to select which of the most common services you wish to see\n"
+"installed on the machine.\n"
 "\n"
-"  - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
-"    perform a highly customized installation. As for a \"Customized\"\n"
-"    installation class, you will be able to select the usage for your "
-"system.\n"
-"    But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
-"DOING!"
-msgstr ""
-"Valitse:\n"
+" * \"Graphical Environment\": this is where you will choose your preferred\n"
+"graphical environment. At least one must be selected if you want to have a\n"
+"graphical workstation!\n"
 "\n"
-"  - Mukautettu: Jos tunnet GNU/Linuxin ennest��n, voit valita erikseen "
-"koneen k�ytt�tarkoituksen.\n"
-"    Katso alta lis�tietoja.\n"
+"Moving the mouse cursor over a group name will display a short explanatory\n"
+"text about that group.\n"
 "\n"
+"You can check the \"Individual package selection\" box, which is useful if\n"
+"you are familiar with the packages being offered or if you want to have\n"
+"total control over what will be installed.\n"
 "\n"
-"  - Asiantuntija: Valinta edellytt��, ett� tunnet GNU/Linuxin ennest��n "
-"hyvin ja haluat tehd�\n"
-"    eritt�in mukautetun asennuksen. My�s t�ss� luokassa voit valita koneesi "
-"k�ytt�tarkoituksen.\n"
-"    Mutta �l� valitse t�t�, JOS ET TODELLA TIED� MIT� OLET TEKEM�SS�!"
+"If you started the installation in \"Update\" mode, you can unselect all\n"
+"groups to avoid installing any new package. This is useful for repairing or\n"
+"updating an existing system."
+msgstr ""
 
-#: ../../help.pm_.c:68
+#: ../../help.pm_.c:115
 msgid ""
-"You must now define your machine usage. Choices are:\n"
+"Finally, depending on your choice of whether or not to select individual\n"
+"packages, you will be presented a tree containing all packages classified\n"
+"by groups and subgroups. While browsing the tree, you can select entire\n"
+"groups, subgroups, or individual packages.\n"
 "\n"
-"\t* Workstation: this the ideal choice if you intend to use your machine "
-"primarily for everyday use, at office or\n"
-"\t  at home.\n"
+"Whenever you select a package on the tree, a description appears on the\n"
+"right. When your selection is finished, click the \"Install\" button which\n"
+"will then launch the installation process. Depending on the speed of your\n"
+"hardware and the number of packages that need to be installed, it may take\n"
+"a while to complete the process. A time to complete estimate is displayed\n"
+"on the screen to help you gauge if there is sufficient time to enjoy a cup\n"
+"of coffee.\n"
 "\n"
+"!! If a server package has been selected either intentionally or because it\n"
+"was part of a whole group, you will be asked to confirm that you really\n"
+"want those servers to be installed. Under Mandrake Linux, any installed\n"
+"servers are started by default at boot time. Even if they are safe and have\n"
+"no known issues at the time the distribution was shipped, it may happen\n"
+"that security holes are discovered after this version of Mandrake Linux was\n"
+"finalized. If you do not know what a particular service is supposed to do\n"
+"or why it is being installed, then click \"No\". Clicking \"Yes\" will\n"
+"install the listed services and they will be started automatically by\n"
+"default. !!\n"
 "\n"
-"\t* Development: if you intend to use your machine primarily for software "
-"development, it is the good choice. You\n"
-"\t  will then have a complete collection of software installed in order to "
-"compile, debug and format source code,\n"
-"\t  or create software packages.\n"
+"The \"Automatic dependencies\" option simply disables the warning dialog\n"
+"which appears whenever the installer automatically selects a package. This\n"
+"occurs because it has determined that it needs to satisfy a dependency with\n"
+"another package in order to successfully complete the installation.\n"
 "\n"
-"\n"
-"\t* Server: if you intend to use this machine as a server, it is the good "
-"choice. Either a file server (NFS or\n"
-"\t  SMB), a print server (Unix style or Microsoft Windows style), an "
-"authentication server (NIS), a database\n"
-"\t  server and so on. As such, do not expect any gimmicks (KDE, GNOME, etc.) "
-"to be installed."
+"The tiny floppy disc icon at the bottom of the list allows to load the\n"
+"packages list chosen during a previous installation. Clicking on this icon\n"
+"will ask you to insert a floppy disk previously created at the end of\n"
+"another installation. See the second tip of last step on how to create such\n"
+"a floppy."
 msgstr ""
-"Sinun tulee nyt valita koneesi ensisijainen k�ytt�tarkoitus. Valinnat ovat:\n"
-"\n"
-"\t* Ty�asema: ideaali valinta, jos aiot k�ytt�� tietokonettasi "
-"jokap�iv�isiss� teht�viss�, joko ty�paikalla\n"
-"\t  tai kotona.\n"
+
+#: ../../help.pm_.c:151
+msgid ""
+"If you wish to connect your computer to the Internet or to a local network,\n"
+"please choose the correct option. Please turn on your device before\n"
+"choosing the correct option to let DrakX detect it automatically.\n"
 "\n"
+"Mandrake Linux proposes the configuration of an Internet connection at\n"
+"installation time. Available connections are: traditional modem, ISDN\n"
+"modem, ADSL connection, cable modem, and finally a simple LAN connection\n"
+"(Ethernet).\n"
 "\n"
-"\t* Kehitysymp�rist�: hyv� valinta, jos aiot k�ytt�� tietokonettasi "
-"ensisijaisesti ohjelmistokehitykseen.\n"
-"\t  T�m�n asennuksen my�t� sinulla on t�ydellinen valikoima ty�kaluja niin "
-"k��nt�miseen, debuggaamiseen,\n"
-"l�hdekoodin muotoiluun kuin ohjelmistopakettien tekoon.\n"
+"Here, we will not detail each configuration. Simply make sure that you have\n"
+"all the parameters from your Internet Service Provider or system\n"
+"administrator.\n"
 "\n"
+"You can consult the manual chapter about Internet connections for details\n"
+"about the configuration, or simply wait until your system is installed and\n"
+"use the program described there to configure your connection.\n"
 "\n"
-"\t* Palvelin: jos aiot k�ytt�� t�t� tietokonetta internet-palvelimena, t�m� "
-"valinta on paras mahdollinen.\n"
-"Vaihtoehtoja ovat mm: tiedostopalvelin (NFS, SBM), tulostuspalvelin (Unix- "
-"tai Microsoft Windows -tyyppinen),\n"
-"autentikointipalvelin (NIS), tietokantapalvelin ja niin edelleen. "
-"Graafisiak�ytt�liittymi� ei asenneta oletuksena."
+"If you wish to configure the network later after installation or if you\n"
+"have finished configuring your network connection, click \"Cancel\"."
+msgstr ""
 
-#: ../../help.pm_.c:84
+#: ../../help.pm_.c:172
+#, fuzzy
 msgid ""
-"DrakX will attempt to look for PCI SCSI adapter(s). If DrakX\n"
-"finds an SCSI adapter and knows which driver to use, it will be "
-"automatically\n"
-"installed.\n"
+"You may now choose which services you wish to start at boot time.\n"
 "\n"
+"Here are presented all the services available with the current\n"
+"installation. Review them carefully and uncheck those which are not always\n"
+"needed at boot time.\n"
 "\n"
-"If you have no SCSI adapter, an ISA SCSI adapter or a PCI SCSI adapter that\n"
-"DrakX doesn't recognize, you will be asked if a SCSI adapter is present in "
-"your\n"
-"system. If there is no adapter present, you can click on \"No\". If you "
-"click on\n"
-"\"Yes\", a list of drivers will be presented from which you can select your\n"
-"specific adapter.\n"
+"You can get a short explanatory text about a service by selecting a\n"
+"specific service. However, if you are not sure whether a service is useful\n"
+"or not, it is safer to leave the default behavior.\n"
 "\n"
-"\n"
-"If you have to manually specify your adapter, DrakX will ask if you want to\n"
-"specify options for it. You should allow DrakX to probe the hardware for "
-"the\n"
-"options. This usually works well.\n"
-"\n"
-"\n"
-"If not, you will need to provide options to the driver. Please review the "
-"User\n"
-"Guide (chapter 3, section \"Collective informations on your hardware) for "
-"hints\n"
-"on retrieving this information from hardware documentation, from the\n"
-"manufacturer's Web site (if you have Internet access) or from Microsoft "
-"Windows\n"
-"(if you have it on your system)."
+"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."
 msgstr ""
-"DrakX hakee koneeseen asennettuja PCI-v�yl�isi� SCSI-laitteita. \n"
-"Jos SCSI-laite l�ytyy ja DrakX tiet�� mit� ajuria k�ytt��, laite otetaan \n"
-"automaattisesti k�ytt��n.\n"
-"\n"
+"Voit nyt valita mit� palveluita haluat k�ynnist�� koneen k�ynnistyess�.\n"
 "\n"
-"Jos tietokoneessasi ei ole SCSI-laitetta tai DrakX ei tunnista sinulla \n"
-"olevaa ISA- tai PCI-v�yl�ist� SCSI-laitetta, DrakX kysyy onko koneessasi\n"
-"SCSI-liitynt��. Jos ei, voit vallita \"Ei\". Jos valitset \"Kyll�\", tulee \n"
-"n�kyviin lista ajureista, josta voit valita sinulla olevan laitteen.\n"
 "\n"
+"Kun siirr�t hiiren osoittimen palvelun p��lle, pieni ohje tulee esiin\n"
+"ja kertoo palvelun tarkoituksen.\n"
+"0\n"
+"Ole varovainen n�iss� asetuksissa, jos aiot k�ytt�� konettasi palvelimena: "
+"et\n"
+"varmaankaan halua k�ynnist�� niit� palveluita, joita et tarvitse. Muista "
+"my�s,\n"
+"ett� jotkin palvelut voivat olla vaarallisia, jos ne ovat k�yt�ss� "
+"palvelimessa.\n"
+"Yleens� kannattaa valita vain ne palvelut, joita todella tarvitset."
+
+#: ../../help.pm_.c:188
+msgid ""
+"GNU/Linux manages time in GMT (Greenwich Manage Time) and translates it in\n"
+"local time according to the time zone you selected."
+msgstr ""
+"GNU/Linux hallitsee aikaa GMT:n (Greenwich Meridian Time) mukaan\n"
+"ja muuttaa sen paikalliseen aikaan valitsemasi aikavy�hykkeen mukaan."
+
+#: ../../help.pm_.c:192
+msgid ""
+"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
+"on which all the graphics environments (KDE, Gnome, AfterStep,\n"
+"WindowMaker...) bundled with Mandrake Linux rely. In this section, DrakX\n"
+"will try to configure X automatically.\n"
 "\n"
-"Jos sinun t�ytyy valita ajuri manuaalisesti, DrakX kysyy, haluaisitko "
-"m��ritt��\n"
-"sille lis�optioita. Sinun kannattaa antaa DrakX:n tutkia laitteistosi "
-"optioiden\n"
-"l�yt�miseksi, sill� yleens� kyseinen toiminto toimii hyvin.\n"
+"It is extremely rare for it to fail, unless the hardware is very old (or\n"
+"very new). If it succeeds, it will start X automatically with the best\n"
+"resolution possible depending on the size of the monitor. A window will\n"
+"then appear and ask you if you can see it.\n"
 "\n"
+"If you are doing an \"Expert\" install, you will enter the X configuration\n"
+"wizard. See the corresponding section of the manual for more information\n"
+"about this wizard.\n"
 "\n"
-"Jos ei, sinun pit�� itse antaa optiot kyseiselle ajurille. Katso lis�tietoja "
-"k�ytt�ohjeesta\n"
-"(luku 3, osa \"Collective informations on your hardware\"), jossa on "
-"vinkkej�\n"
-"miten n�m� tiedot l�ytyv�t laitteiston ohjekirjoista, "
-"laittteistovalmistajan\n"
-"webbisivuilta (jos sinulla on internetyhteys) tai Microsoft Windowsista "
-"(jos\n"
-"se on asennettu tietokoneeseesi)."
+"If you can see the message and answer \"Yes\", then DrakX will proceed to\n"
+"the next step. If you cannot see the message, it simply means that the\n"
+"configuration was wrong and the test will automatically end after 10\n"
+"seconds, restoring the screen."
+msgstr ""
 
-#: ../../help.pm_.c:108
+#: ../../help.pm_.c:212
 msgid ""
-"At this point, you need to choose where to install your\n"
-"Linux-Mandrake operating system on your hard drive. If it is empty or if an\n"
-"existing operating system uses all the space available on it, you need to\n"
-"partition it. Basically, partitioning a hard drive consists of logically\n"
-"dividing it to create space to install your new Linux-Mandrake system.\n"
+"The first time you try the X configuration, you may not be very satisfied\n"
+"with its display (screen is too small, shifted left or right...). Hence,\n"
+"even if X starts up correctly, DrakX then asks you if the configuration\n"
+"suits you. It will also propose to change it by displaying a list of valid\n"
+"modes it could find, asking you to select one.\n"
 "\n"
+"As a last resort, if you still cannot get X to work, choose \"Change\n"
+"graphics card\", select \"Unlisted card\", and when prompted on which\n"
+"server you want, choose \"FBDev\". This is a failsafe option which works\n"
+"with any modern graphics card. Then choose \"Test again\" to be sure."
+msgstr ""
+
+#: ../../help.pm_.c:224
+msgid ""
+"Finally, you will be asked whether you want to see the graphical interface\n"
+"at boot. Note this question will be asked even if you chose not to test the\n"
+"configuration. Obviously, you want to answer \"No\" if your machine is to\n"
+"act as a server, or if you were not successful in getting the display\n"
+"configured."
+msgstr ""
+
+#: ../../help.pm_.c:231
+msgid ""
+"The Mandrake Linux CDROM has a built-in rescue mode. You can access it by\n"
+"booting from the CDROM, press the >>F1<< key at boot and type >>rescue<< at\n"
+"the prompt. But in case your computer cannot boot from the CDROM, you\n"
+"should come back to this step for help in at least two situations:\n"
 "\n"
-"Because the effects of the partitioning process are usually irreversible,\n"
-"partitioning can be intimidating and stressful if you are an inexperienced "
-"user.\n"
-"This wizard simplifies this process. Before beginning, please consult the "
-"manual\n"
-"and take your time.\n"
+" * when installing the boot loader, DrakX will rewrite the boot sector "
+"(MBR)\n"
+"of your main disk (unless you are using another boot manager) so that you\n"
+"can start up with either Windows or GNU/Linux (assuming you have Windows in\n"
+"your system). If you need to reinstall Windows, the Microsoft install\n"
+"process will rewrite the boot sector, and then you will not be able to\n"
+"start GNU/Linux!\n"
 "\n"
+" * if a problem arises and you cannot start up GNU/Linux from the hard "
+"disk,\n"
+"this floppy disk will be the only means of starting up GNU/Linux. It\n"
+"contains a fair number of system tools for restoring a system, which has\n"
+"crashed due to a power failure, an unfortunate typing error, a typo in a\n"
+"password, or any other reason.\n"
 "\n"
-"You need at least two partitions. One is for the operating system itself and "
-"the\n"
-"other is for the virtual memory (also called Swap).\n"
+"When you click on this step, you will be asked to enter a disk inside the\n"
+"drive. The floppy disk you will insert must be empty or contain data which\n"
+"you do not need. You will not have to format it since DrakX will rewrite\n"
+"the whole disk."
+msgstr ""
+
+#: ../../help.pm_.c:255
+#, fuzzy
+msgid ""
+"At this point you need to choose where on your hard drive to install your\n"
+"Mandrake Linux operating system. If your hard drive is empty or if an\n"
+"existing operating system is using all the space available, you will need\n"
+"to partition it. Basically, partitioning a hard drive consists of logically\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
+"Because the effects of the partitioning process are usually irreversible,\n"
+"partitioning can be intimidating and stressful if you are an inexperienced\n"
+"user. Fortunately, there is a wizard which simplifies this process. Before\n"
+"beginning, please consult the manual and take your time.\n"
 "\n"
-"If partitions have been already defined (from a previous installation or "
-"from\n"
-"another partitioning tool), you just need choose those to use to install "
-"your\n"
-"Linux system.\n"
+"If you are running the install in Expert mode, you will enter DiskDrake,\n"
+"the Mandrake Linux partitioning tool, which allows you to fine-tune your\n"
+"partitions. See the DiskDrake chapter of the manual. From the installation\n"
+"interface, you can use the wizards as described here by clicking the\n"
+"\"Wizard\" button of the dialog.\n"
 "\n"
+"If partitions have already been defined, either from a previous\n"
+"installation or from another partitioning tool, simply select those to\n"
+"install your Linux system.\n"
 "\n"
-"If partitions haven't been already defined, you need to create them. \n"
-"To do that, use the wizard available above. Depending of your hard drive\n"
-"configuration, several solutions can be available:\n"
+"If partitions are not defined, you will need to create them using the\n"
+"wizard. Depending on your hard drive configuration, several options are\n"
+"available:\n"
 "\n"
-"\t* Use existing partition: the wizard has detected one or more existing "
-"Linux partitions on your hard drive. If\n"
-"\t  you want to keep them, choose this option. \n"
+" * \"Use free space\": this option will simply lead to an automatic\n"
+"partitioning of your blank drive(s). You will not be prompted further.\n"
 "\n"
+" * \"Use existing partition\": the wizard has detected one or more existing\n"
+"Linux partitions on your hard drive. If you want to use them, choose this\n"
+"option.\n"
 "\n"
-"\t* Erase entire disk: if you want delete all data and all partitions "
-"present on your hard drive and replace them by\n"
-"\t  your new Linux-Mandrake system, you can choose this option. Be careful "
-"with this solution, you will not be\n"
-"\t  able to revert your choice after confirmation.\n"
+" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+"installed on your hard drive and takes all the space available on it, you\n"
+"have to create free space for Linux data. To do that, you can delete your\n"
+"Microsoft Windows partition and data (see \"Erase entire disk\" or \"Expert\n"
+"mode\" solutions) or resize your Microsoft Windows partition. Resizing can\n"
+"be performed without the loss of any data. This solution is recommended if\n"
+"you want to use both Mandrake Linux and Microsoft Windows on same computer.\n"
 "\n"
+"   Before choosing this option, please understand that after this "
+"procedure,\n"
+"the size of your Microsoft Windows partition will be smaller than at the\n"
+"present time. You will have less free space under Microsoft Windows to\n"
+"store your data or to install new software.\n"
 "\n"
-"\t* Use the free space on the Windows partition: if Microsoft Windows is "
-"installed on your hard drive and takes\n"
-"\t  all space available on it, you have to create free space for Linux data. "
-"To do that you can delete your\n"
-"\t  Microsoft Windows partition and data (see \"Erase entire disk\" or "
-"\"Expert mode\" solutions) or resize your\n"
-"\t  Microsoft Windows partition. Resizing can be performed without loss of "
-"any data. This solution is\n"
-"\t  recommended if you want use both Linux-Mandrake and Microsoft Windows on "
-"same computer.\n"
+" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
+"present on your hard drive and replace them with your new Mandrake Linux\n"
+"system, choose this option. Be careful with this solution because you will\n"
+"not be able to revert your choice after confirmation.\n"
 "\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"\t  Before choosing this solution, please understand that the size of your "
-"Microsoft\n"
-"\t  Windows partition will be smaller than at present time. It means that "
-"you will have less free space under\n"
-"\t  Microsoft Windows to store your data or install new software.\n"
+" * \"Remove Windows\": this will simply erase everything on the drive and\n"
+"begin fresh, partitioning everything from scratch. All data on your disk\n"
+"will be lost.\n"
 "\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"\t* Expert mode: if you want to partition manually your hard drive, you can "
-"choose this option. Be careful before\n"
-"\t  choosing this solution. It is powerful but it is very dangerous. You can "
-"lose all your data very easily. So,\n"
-"\t  don't choose this solution unless you know what you are doing."
+" * \"Expert mode\": choose this option if you want to manually partition\n"
+"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"can very easily lose all your data. Hence, do not choose this unless you\n"
+"know what you are doing."
 msgstr ""
-"T�ss� vaiheessa sinun pit�� valita mihin haluat asentaa Linux-Mandrake\n"
+"T�ss� vaiheessa sinun pit�� valita mihin haluat asentaa Mandrake Linux\n"
 "-k�ytt�j�rjestelm�n. Jos kiintolevysi on tyhj� tai olemassaoleva "
 "k�ytt�j�rjestelm�\n"
 "k�ytt�� kaiken siin� olevan tilan, sinun pit�� osioida kiintolevysi. "
 "Pohjimmiltaan\n"
 "kiintolevyn osiointi koostuu levytilan jakamisesta loogisiin osiin tilan "
 "saamiseksi\n"
-"Linux-Mandrake -j�rjestelm�lle.\n"
+"Mandrake Linux -j�rjestelm�lle.\n"
 "\n"
 "\n"
 "Koska osiointiprosessin vaikutukset ovat tavallisesti peruuttamattomia, voi\n"
@@ -2262,122 +2519,227 @@ msgstr ""
 "vaihtoehtoja:\n"
 "\n"
 "\n"
-"\t* Tyhjenn� koko lavy: jos haluat tuhota kaikki levyll� olevan tiedon sek� "
-"sill� olevat osiot ja asentaa Linux-Mandrake -j�rjestelm�n\n"
-"\t  n�iden tilalle, voit valita t�n�n option. Ole varovainen t�m�n "
-"vaihtoehdon kanssa, sill� et pysty en�� palauttamaan levyn sis�lt��\n"
-"\t  ennalleen sen j�lkeen, kun olet hyv�ksynyt toiminnon.\n"
+"* Tyhjenn� koko lavy: jos haluat tuhota kaikki levyll� olevan tiedon sek� "
+"sill� olevat osiot ja asentaa Mandrake Linux -j�rjestelm�n\n"
+"  n�iden tilalle, voit valita t�n�n option. Ole varovainen t�m�n vaihtoehdon "
+"kanssa, sill� et pysty en�� palauttamaan levyn sis�lt��\n"
+"  ennalleen sen j�lkeen, kun olet hyv�ksynyt toiminnon.\n"
 "\n"
 "\n"
-"\t* K�yt� tyhj�� tilaa Windows-osiossa: Jos Microsoft Windows on asennettuna "
+"* K�yt� tyhj�� tilaa Windows-osiossa: Jos Microsoft Windows on asennettuna "
 "kiintolevyllesi ja se k�ytt�� kaiken levyll�\n"
-"\t  olevan tilan, sinun t�ytyy tehd� vapaata tilaa asentaaksesi Linuxin. "
+"  olevan tilan, sinun t�ytyy tehd� vapaata tilaa asentaaksesi Linuxin. "
 "Tehd�ksesi sen, voit tuhota Microsoft Windowsin\n"
-"\t  k�ytt�m�n osion ja tiedot (katso kohta \"Tyhjenn� koko lavy\" tai "
+"  k�ytt�m�n osion ja tiedot (katso kohta \"Tyhjenn� koko lavy\" tai "
 "\"Asiantuntijatila\") tai voit muuttaa Microsoft Windowsin\n"
-"\t  k�ytt�m�n osion kokoa. Koon muuttaminen voidaan tehd� h�vitt�m�tt� "
-"mit��n levyll� olevista tiedoista.\n"
-"\t  T�m� vaihtoehto on suositeltu, mik�li haluat k�ytt�� sek� Linux-"
-"Mandrakea ett� Microsoft Windowsia samalla tietokoneella.\n"
+"  k�ytt�m�n osion kokoa. Koon muuttaminen voidaan tehd� h�vitt�m�tt� mit��n "
+"levyll� olevista tiedoista.\n"
+"  T�m� vaihtoehto on suositeltu, mik�li haluat k�ytt�� sek� Mandrake Linuxa "
+"ett� Microsoft Windowsia samalla tietokoneella.\n"
 "\n"
 "\n"
-"\t* Ennen kuin valitset edellisen vaihtoehdon, sinun tulee tiet��, ett� "
+"* Ennen kuin valitset edellisen vaihtoehdon, sinun tulee tiet��, ett� "
 "Microsoft Windowsin k�ytt�m�n osion\n"
-"\t  koko tulee olemaan pienempi kuin nyky��n. Sinulla tulee siis olemaan "
+"  koko tulee olemaan pienempi kuin nyky��n. Sinulla tulee siis olemaan "
 "v�hemm�n tilaa uusien ohjelmien\n"
-"\t  asentamiseen ja tietojen tallentamiseen Microsoft Windowsin alla.\n"
+"  asentamiseen ja tietojen tallentamiseen Microsoft Windowsin alla.\n"
 "\n"
 "\n"
-"\t* Asiantuntijatila: jos haluat osioida kiintolevysi itse, voit valita "
-"t�m�n vaihtoehdon. �l� valitse t�t� ratkaisua,\n"
-"\t  ellet tied�, mit� olet tekem�ss�. Tehokkuutensa lis�ksi vaihtoehto on "
-"my�s vaarallinen: voit helposti\n"
-"\t  menett�� kaiken levyll�si olevan tiedon."
+"* Asiantuntijatila: jos haluat osioida kiintolevysi itse, voit valita t�m�n "
+"vaihtoehdon. �l� valitse t�t� ratkaisua,\n"
+"  ellet tied�, mit� olet tekem�ss�. Tehokkuutensa lis�ksi vaihtoehto on my�s "
+"vaarallinen: voit helposti\n"
+"  menett�� kaiken levyll�si olevan tiedon."
 
-#: ../../help.pm_.c:160
+#: ../../help.pm_.c:319
 msgid ""
-"At this point, you need to choose what\n"
-"partition(s) to use to install your new Linux-Mandrake system. If "
-"partitions\n"
-"have been already defined (from a previous installation of GNU/Linux or "
-"from\n"
-"another partitioning tool), you can use existing partitions. In other "
-"cases,\n"
-"hard drive partitions must be defined.\n"
+"There you are. Installation is now complete and your GNU/Linux system is\n"
+"ready to use. Just click \"OK\" to reboot the system. You can start\n"
+"GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
+"soon as the computer has booted up again.\n"
 "\n"
+"The \"Advanced\" button (in Expert mode only) shows two more buttons to:\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select "
-"the\n"
-"disk for partitioning by clicking on \"hda\" for the first IDE drive, \"hdb"
-"\" for\n"
-"the second or \"sda\" for the first SCSI drive and so on.\n"
+" * \"generate auto-install floppy\": to create an installation floppy disk\n"
+"which will automatically perform a whole installation without the help of\n"
+"an operator, similar to the installation you just configured.\n"
 "\n"
+"   Note that two different options are available after clicking the button:\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"    * \"Replay\". This is a partially automated install as the partitioning\n"
+"step (and only this one) remains interactive.\n"
+"\n"
+"    * \"Automated\". Fully automated install: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
+"\n"
+"   This feature is very handy when installing a great number of similar\n"
+"machines. See the Auto install section at our web site.\n"
 "\n"
-"   * Clear all: this option deletes all partitions available on the selected "
-"hard drive.\n"
+" * \"Save packages selection\"(*): saves the packages selection as made\n"
+"previously. Then, when doing another installation, insert the floppy inside\n"
+"the driver and run the installation going to the help screen by pressing on\n"
+"the [F1] key, and by issuing >>linux defcfg=\"floppy\"<<.\n"
 "\n"
+"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
+"\"mformat a:\")"
+msgstr ""
+
+#: ../../help.pm_.c:350
+#, fuzzy
+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"
+"any of them.\n"
+"\n"
+"Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
-"   * Auto allocate: this option allows you to automatically create Ext2 and "
-"swap partitions in free space of your\n"
-"     hard drive.\n"
+"Click on \"Cancel\" if you want to choose another partition for your new\n"
+"Mandrake Linux operating system installation.\n"
 "\n"
+"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
+"for bad blocks on the disc."
+msgstr ""
+"Kaikki uudet osiot t�ytyy alustaa k�ytt�� varten (jossa alustaminen \n"
+"tarkoittaa tiedostoj�rjestelm�n luontia).\n"
+"\n"
+"\n"
+"Samalla voit haluta alustaa uudelleen my�s olemassaolevia osioita\n"
+"poistaaksesi niiss� jo olevat tiedot. Jos haluat haluat tehd� niin,\n"
+"valitse ne osiot, jotka haluat alustaa.\n"
+"\n"
+"\n"
+"Huomaa, ett� sinun ei ole pakko alustaa kaikkia jo olemassa olevia \n"
+"osioita. Mutta sinun olisi syyt� alustaa ne osiot, joilla "
+"k�ytt�j�rjestelm� \n"
+"sijaitsee (kuten \"/\", \"/usr\" ja \"/var\"). Voit s�ilytt�� ne osiot, \n"
+"joilla henkil�kohtaiset tiedostosi sijaitsevat (tavallisesti /home).\n"
+"\n"
+"\n"
+"Ole huolellinen, mitk� osiot valitset alustettavaksi, sill� alustamisen\n"
+"j�lkeen kaikki niill� oleva tieto on poissa etk� voi en�� palauttaa niit�.\n"
+"\n"
+"\n"
+"Valitse \"Ok\", kun olet valmis alustamaan osiot.\n"
+"\n"
+"\n"
+"Valitse \"Peruuta\", jos haluat valita eri osiot Mandrake Linuxn\n"
+"asentamiseen."
+
+#: ../../help.pm_.c:376
+#, fuzzy
+msgid ""
+"Your new Mandrake Linux operating system is currently being installed.\n"
+"Depending on the number of packages you will be installing and the speed of\n"
+"your computer, this operation could take from a few minutes to a\n"
+"significant amount of time.\n"
 "\n"
-"   * Rescue partition table: if your partition table is damaged, you can try "
-"to recover it using this option. Please\n"
-"     be careful and remember that it can fail.\n"
+"Please be patient."
+msgstr ""
+"Uutta Mandrake Linux -k�ytt�j�rjestelm��si asennetaan parasta aikaa.\n"
+"T�m� vaihe vie kymmeni� minuutteja (riippuen asennuksesi koosta\n"
+"ja tietokoneesi nopeudesta).\n"
 "\n"
 "\n"
-"   * Undo: you can use this option to cancel your changes.\n"
+"K�rsiv�llisyytt�."
+
+#: ../../help.pm_.c:384
+msgid ""
+"Before continuing you should read carefully the terms of the license. It\n"
+"covers the whole Mandrake Linux distribution, and if you do not agree with\n"
+"all the terms in it, click on the \"Refuse\" button which will immediately\n"
+"terminate the installation. To continue with the installation, click the\n"
+"\"Accept\" button."
+msgstr ""
+
+#: ../../help.pm_.c:391
+msgid ""
+"At this point, it is time to choose the security level desired for the\n"
+"machine. As a rule of thumb, the more exposed the machine is, and the more\n"
+"the data stored in it is crucial, the higher the security level should be.\n"
+"However, a higher security level is generally obtained at the expenses of\n"
+"easiness of use. Refer to the MSEC chapter of the ``Reference Manual'' to\n"
+"get more information about the meaning of these levels.\n"
 "\n"
+"If you do not know what to choose, keep the default option."
+msgstr ""
+
+#: ../../help.pm_.c:401
+#, fuzzy
+msgid ""
+"At this point, you need to choose what partition(s) will be used for the\n"
+"installation of your Mandrake Linux system. If partitions have been already\n"
+"defined, either from a previous installation of GNU/Linux or from another\n"
+"partitioning tool, you can use existing partitions. Otherwise hard drive\n"
+"partitions must be defined.\n"
 "\n"
-"   * Reload: you can use this option if you wish to undo all changes and "
-"load your initial partitions table\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"
-"   * Wizard: If you wish to use a wizard to partition your hard drive, you "
-"can use this option. It is recommended if\n"
-"     you do not have a good knowledge in partitioning.\n"
+" * \"Clear all\": this option deletes all partitions on the selected hard\n"
+"drive.\n"
 "\n"
+" * \"Auto allocate\": this option allows you to automatically create Ext2\n"
+"and swap partitions in free space of your hard drive.\n"
 "\n"
-"   * Restore from floppy: if you have saved your partition table on a floppy "
-"during a previous installation, you can\n"
-"     recover it using this option.\n"
+" * \"Rescue partition table\": if your partition table is damaged, you can\n"
+"try to recover it using this option. Please be careful and remember that it\n"
+"can fail.\n"
 "\n"
+" * \"Undo\": use this option to cancel your changes.\n"
 "\n"
-"   * Save on floppy: if you wish to save your partition table on a floppy to "
-"be able to recover it, you can use this\n"
-"     option. It is strongly recommended to use this option\n"
+" * \"Reload\": you can use this option if you wish to undo all changes and\n"
+"load your initial partitions table.\n"
 "\n"
+" * \"Wizard\": 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 knowledge of\n"
+"partitioning.\n"
 "\n"
-"   * Done: when you have finished partitioning your hard drive, use this "
-"option to save your changes.\n"
+" * \"Restore from floppy\": this option will allow you to restore a\n"
+"previously saved partition table from floppy disk.\n"
 "\n"
+" * \"Save to floppy\": saves the partition table to a floppy. Useful for\n"
+"later partition-table recovery if necessary. It is strongly recommended to\n"
+"perform this step.\n"
 "\n"
-"For information, you can reach any option using the keyboard: navigate "
-"trough the partitions using Tab and Up/Down arrows.\n"
+" * \"Done\": when you have finished partitioning your hard drive, this will\n"
+"save your changes back to disc.\n"
 "\n"
+"Note: you can reach any option using the keyboard. Navigate through the\n"
+"partitions using [Tab] and [Up/Down] arrows.\n"
 "\n"
 "When a partition is selected, you can use:\n"
 "\n"
-"           * Ctrl-c to create a new partition (when a empty partition is "
-"selected)\n"
+" * Ctrl-c to create a new partition (when an empty partition is selected);\n"
 "\n"
-"           * Ctrl-d to delete a partition\n"
+" * Ctrl-d to delete a partition;\n"
 "\n"
-"           * Ctrl-m to set the mount point\n"
-"           \n"
+" * Ctrl-m to set the mount point.\n"
 "\n"
-"           \n"
-"If you are installing on a PPC Machine, you will want to create a small HFS "
-"'bootstrap' partition of at least 1MB for use\n"
-"by the yaboot bootloader. If you opt to make the partition a bit larger, say "
-"50MB, you may find it a useful place to store \n"
-"a spare kernel and ramdisk image for emergency boot situations."
+"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"
+"boot loader. 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 ""
-"T�ss� vaiheessa sinun pit�� valita mille osioille haluat asentaa Linux-"
-"Mandrake\n"
+"T�ss� vaiheessa sinun pit�� valita mille osioille haluat asentaa Mandrake "
+"Linux\n"
 "-k�ytt�j�rjestelm�n. Jos osiot on jo m��ritelty (edellisess� asennuksessa \n"
 "tai jonkin toisen osiointiohjelman toimesta), voit k�ytt�� olemassaolevia "
 "osioita.\n"
@@ -2449,172 +2811,42 @@ msgstr ""
 "k�ytt��ksesi sit� varaytimen ja ramdisk-imagen tallentamiseksi j�rjestelm�n "
 "latauksen h�t�tilanteita varten."
 
-#: ../../help.pm_.c:224
+#: ../../help.pm_.c:460
+#, fuzzy
 msgid ""
-"Above are listed the existing Linux partitions detected on\n"
-"your hard drive. You can keep choices make by the wizard, they are good for "
-"a\n"
-"common usage. If you change these choices, you must at least define a root\n"
-"partition (\"/\"). Don't choose a too little partition or you will not be "
-"able\n"
-"to install enough software. If you want store your data on a separate "
-"partition,\n"
-"you need also to choose a \"/home\" (only possible if you have more than "
-"one\n"
-"Linux partition available).\n"
-"\n"
+"More than one Microsoft Windows partition has been detected on your hard\n"
+"drive. Please choose the one you want resize in order to install your new\n"
+"Mandrake Linux operating system.\n"
 "\n"
-"For information, each partition is listed as follows: \"Name\", \"Capacity"
-"\".\n"
+"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
+"\"Capacity\".\n"
 "\n"
-"\n"
-"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\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 type\" is \"hd\" if your hard drive is an IDE hard drive and "
-"\"sd\"\n"
-"if it is an SCSI hard drive.\n"
-"\n"
-"\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE "
+"\"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"
-"\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc..."
-msgstr ""
-"Yll� on lueteltu kiintolevyill� olevat Linux-osiot. Voit pit�� velhon "
-"tekem�t\n"
-"valinnat, jotka ovat sopivat tavalliseen k�ytt��n. Jos muutat n�it� "
-"valintoja,\n"
-"sinun t�ytyy m��ritell� v�hint��n juuriosio (\"/\").  �l� valitse liian "
-"pient� osiota\n"
-"sill� silloin kaikkia ohjelmia ei voida asentaa. Jos haluat tallettaa "
-"tietosi erilliselle\n"
-"osiolle, sinun t�ytyy valita my�s \"/home\" (mik� on mahdollista vain, jos \n"
-"sinulla on enemm�n kuin yksi Linux-osio).\n"
-"\n"
-"\n"
-"Tiedoksi: jokaisesta osiosta on listattu seuraavat tiedot: \"Nimi\", "
-"\"Kapasiteetti\".\n"
-"\n"
-"\n"
-"\"Nimi\" on koodattu seuraavalla tavalla: \"Kiintolevyn tyyppi\", "
-"\"Kiintolevyn numero\",\n"
-"\"Osion numero\" (esimerkiksi \"hda1\").\n"
-"\n"
-"\n"
-"\"Kiintolevyn tyyppi\" on \"hd\" jos kiintolevysi on IDE-levy ja \"sd\" jos "
-"se on\n"
-"SCSI-levy.\n"
-"\n"
-"\n"
-"\"Kiintolevyn kirjain\" on aina kirjain heti \"hd\":n tai \"sd\":n j�lkeen. "
-"IDE-asemilla:\n"
-"\n"
-"   * \"a\" tarkoittaa \"herraksi m��ritelty kiintolevy ensisijaisella IDE-"
-"laitteella\",\n"
-"\n"
-"   * \"b\" tarkoittaa \"orjaksi m��ritelty kiintolevy ensisijaisella IDE-"
-"laitteella\",\n"
-"\n"
-"   * \"c\" tarkoittaa \"herraksi m��ritelty kiintolevy toissijaisella IDE-"
-"laitteella\",\n"
-"\n"
-"   * \"d\" tarkoittaa \"orjaksi m��ritelty kiintolevy toissijaisella IDE-"
-"laitteella\",\n"
-"\n"
-"\n"
-"SCSI-levyill� \"a\" tarkoittaa \"ensisijainen kiintolevy\", \"b\" "
-"puolestaan\n"
-"\"toissijainen kiintolevy\", jne..."
-
-#: ../../help.pm_.c:258
-msgid ""
-"Choose the hard drive you want to erase to install your\n"
-"new Linux-Mandrake partition. Be careful, all data present on it will be "
-"lost\n"
-"and will not be recoverable."
-msgstr ""
-"Valitse levyasema, jolle haluat asentaa uuden Linux-Mandrake -osion.\n"
-"Ole varovainen, sill� kaikki tieto t�ll� asemalla tuhoutuu,\n"
-"eik� ole en�� palautettavissa."
-
-#: ../../help.pm_.c:263
-msgid ""
-"Click on \"OK\" if you want to delete all data and\n"
-"partitions present on this hard drive. Be careful, after clicking on \"OK\", "
-"you\n"
-"will not be able to recover any data and partitions present on this hard "
-"drive,\n"
-"including any Windows data.\n"
-"\n"
-"\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
-"partitions present on this hard drive."
-msgstr ""
-"Paina \"OK\", jos haluat tuhota kaiken tiedon ja osiot t�lt�\n"
-"kiintolevylt�. My�s levyll� olleet Windowsin tiedostot tuhoutuvat.\n"
-"Valittuasi \"OK\" et voi en�� palauttaa n�it� tietoja ennalleen,\n"
-"joten ole varovainen.\n"
-"\n"
-"\n"
-"Paina \"Peruuta\" peruuttaaksesi t�m�n toiminnon. Peruuttamalla\n"
-"toiminnon et menet� mit��n levyll� olevia tietoja tai osioita."
-
-#: ../../help.pm_.c:273
-msgid ""
-"More than one Microsoft Windows partition have been\n"
-"detected on your hard drive. Please choose the one you want resize to "
-"install\n"
-"your new Linux-Mandrake operating system.\n"
-"\n"
-"\n"
-"For information, each partition is listed as follow; \"Linux name\", "
-"\"Windows\n"
-"name\" \"Capacity\".\n"
-"\n"
-"\"Linux name\" is coded as follow: \"hard drive type\", \"hard drive number"
-"\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
-"\n"
-"\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and \"sd"
-"\"\n"
-"if it is an SCSI hard drive.\n"
-"\n"
-"\n"
-"\"Hard drive number\" is always a letter putted after \"hd\" or \"sd\". With "
-"IDE hard drives:\n"
-"\n"
-"   * \"a\" means \"master hard drive on the primary IDE controller\",\n"
+" * \"a\" means \"master hard drive on the primary IDE controller\",\n"
 "\n"
-"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
+" * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
-"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc.\n"
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first "
-"disk\n"
-"or partition is called \"C:\")."
+"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"disk or partition is called \"C:\")."
 msgstr ""
 "Kiintolevylt� on l�ytynyt useampia kuin yksi Microsoft Windows -osio.\n"
 "Valitse niist� se, jonka kokoa haluat muuttaa pysty�ksesi asentamaan\n"
-"Linux-Mandraken tietokoneeseesi.\n"
+"Mandrake Linuxn tietokoneeseesi.\n"
 "\n"
 "\n"
 "Tiedoksi: jokaisesta osiosta on listattu seuraavat tiedot: \"Nimi Linuxissa"
@@ -2656,791 +2888,233 @@ msgstr ""
 "levy\n"
 "tai osio on nimetty \"C:\":ksi)."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:491
 msgid "Please be patient. This operation can take several minutes."
 msgstr "K�rsiv�llisyytt�. T�m� toiminto voi kest�� useita minuutteja."
 
-#: ../../help.pm_.c:309
+#: ../../help.pm_.c:494
+#, fuzzy
 msgid ""
-"Any partitions that have been newly defined must be\n"
-"formatted for use (formatting meaning creating a filesystem).\n"
-"\n"
-"\n"
-"At this time, you may wish to reformat some already existing partitions to "
-"erase\n"
-"the data they contain. If you wish do that, please also select the "
-"partitions\n"
-"you want to format.\n"
-"\n"
-"\n"
-"Please note that it is not necessary to reformat all pre-existing "
-"partitions.\n"
-"You must reformat the partitions containing the operating system (such as \"/"
-"\",\n"
-"\"/usr\" or \"/var\") but do you no have to reformat partitions containing "
-"data\n"
-"that you wish to keep (typically /home).\n"
+"DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
+"installation or if you want to have greater control (\"Expert\"). You also\n"
+"have the choice of performing a new install or an upgrade of an existing\n"
+"Mandrake Linux system. Clicking \"Install\" will completely wipe out the\n"
+"old system. Select \"Upgrade\" if you are upgrading or repairing an\n"
+"existing system.\n"
 "\n"
+"Please choose \"Install\" if there are no previous version of Mandrake\n"
+"Linux installed or if you wish to boot between various operating systems.\n"
 "\n"
-"Please be careful selecting partitions, after formatting, all data will be\n"
-"deleted and you will not be able to recover any of them.\n"
+"Please choose \"Update\" if you wish to update or repair an already\n"
+"installed version of Mandrake Linux.\n"
 "\n"
+"Depending on your knowledge of GNU/Linux, please choose one of the\n"
+"following to install or update your Mandrake Linux operating system:\n"
 "\n"
-"Click on \"OK\" when you are ready to format partitions.\n"
-"\n"
+" * Recommended: choose this if you have never installed a GNU/Linux\n"
+"operating system. The installation will be very easy and you will only be\n"
+"asked a few questions.\n"
 "\n"
-"Click on \"Cancel\" if you want to choose other partitions to install your "
-"new\n"
-"Linux-Mandrake operating system."
+" * Expert: if you have a good knowledge of GNU/Linux, you can choose this\n"
+"installation class. The expert installation will allow you to perform a\n"
+"highly customized installation. Answering some of the questions can be\n"
+"difficult if you do not have a good knowledge of GNU/Linux so do not choose\n"
+"this unless you know what you are doing."
 msgstr ""
-"Kaikki uudet osiot t�ytyy alustaa k�ytt�� varten (jossa alustaminen \n"
-"tarkoittaa tiedostoj�rjestelm�n luontia).\n"
+"Valitse \"Asenna\", jos sinulla ei ole aikaisempaa versiota Mandrake "
+"Linuxsta\n"
+"asennettuna tai haluat k�ytt�� useaa k�ytt�j�rjestelm��.\n"
 "\n"
 "\n"
-"Samalla voit haluta alustaa uudelleen my�s olemassaolevia osioita\n"
-"poistaaksesi niiss� jo olevat tiedot. Jos haluat haluat tehd� niin,\n"
-"valitse ne osiot, jotka haluat alustaa.\n"
+"Valitse \"P�ivit�\", jos haluat p�ivitt�� olemassaolevan version Mandrake "
+"Linuxsta.\n"
 "\n"
 "\n"
-"Huomaa, ett� sinun ei ole pakko alustaa kaikkia jo olemassa olevia \n"
-"osioita. Mutta sinun olisi syyt� alustaa ne osiot, joilla "
-"k�ytt�j�rjestelm� \n"
-"sijaitsee (kuten \"/\", \"/usr\" ja \"/var\"). Voit s�ilytt�� ne osiot, \n"
-"joilla henkil�kohtaiset tiedostosi sijaitsevat (tavallisesti /home).\n"
+"Riippuen osaamisestasi GNU/Linux-j�rjestelmiss�, voit valita jonkin "
+"seuraavista tasoista Mandrake Linux -k�ytt�j�rjestelm�n asentamiseen tai "
+"p�ivitt�miseen:\n"
 "\n"
 "\n"
-"Ole huolellinen, mitk� osiot valitset alustettavaksi, sill� alustamisen\n"
-"j�lkeen kaikki niill� oleva tieto on poissa etk� voi en�� palauttaa niit�.\n"
+"* Suositeltu: jos et ole ikin� asentanut GNU/Linux-k�ytt�j�rjestelm��, "
+"valitse t�m� vaihtoehto.\n"
+"  Asennus tulee olemaan helppo ja sinulta tullaan kysym��n vain muutama "
+"kysymys.\n"
 "\n"
 "\n"
-"Valitse \"Ok\", kun olet valmis alustamaan osiot.\n"
+"* Mukautettu: jos tunnet GNU/Linuxin tarpeeksi hyvin, voit valita "
+"j�rjestelm�n tyypin k�yt�n mukaan\n"
+"  (ty�asema, palvelin, kehitys). Sinun tarvitsee vastata useampaan "
+"kysymykseen, kuin \"Suositellussa\" asennuksessa,\n"
+"  joten sinun t�ytyy tiet�� miten GNU/Linux toimii, jos haluat valita t�m�n "
+"asennusluokan.\n"
 "\n"
 "\n"
-"Valitse \"Peruuta\", jos haluat valita eri osiot Linux-Mandraken\n"
-"asentamiseen."
+"* Asiantuntija: jos tunnet GNU/Linux-j�rjestelm�n hyvin, voit valita t�m�n "
+"asennusluokan. Kuten\n"
+"  \"Mukautetussa\" asennuksessa, sinun t�ytyy valita ensisijainen "
+"k�ytt�kohde (ty�asema,\n"
+"  palvelin, kehitys). T�m� asennusluokka tarjoaa joustavimman asennuksen, "
+"mutta jotkin kysymykset\n"
+"  voivat osoittautua eritt�in vaikeiksi niille, jotka eiv�t tunne GNU/"
+"Linuxia riitt�v�n hyvin.\n"
+"  �l� valitse t�t� asennusluokkaa, ellet ole aivan varma, mit� olet "
+"tekem�ss�."
 
-#: ../../help.pm_.c:335
+#: ../../help.pm_.c:521
 msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
+"Normally, DrakX selects the right keyboard for you (depending on the\n"
+"language you have chosen) and you will not even see this step. However, you\n"
+"might not have a keyboard that corresponds exactly to your language: for\n"
+"example, if you are an English speaking Swiss person, you may still want\n"
+"your keyboard to be a Swiss keyboard. Or if you speak English but are\n"
+"located in Quebec, you may find yourself in the same situation. In both\n"
+"cases, you will have to go back to this installation step and select an\n"
+"appropriate keyboard from the list.\n"
 "\n"
-"\n"
-"DrakX will then check whether you have enough room to install them all. If "
-"not,\n"
-"it will warn you about it. If you want to go on anyway, it will proceed onto "
-"the\n"
-"installation of all selected groups but will drop some packages of lesser\n"
-"interest. At the bottom of the list you can select the option \n"
-"\"Individual package selection\"; in this case you will have to browse "
-"through\n"
-"more than 1000 packages..."
+"Click on the \"More\" button to be presented with the complete list of\n"
+"supported keyboards."
 msgstr ""
-"Voit nyt valita ne ohjelmistoryhm�t, jotka haluat asentaa tai p�ivitt��.\n"
-"\n"
-"\n"
-"T�m�n vaiheen j�lkeen DrakX tarkistaa, onko sinulla tarpeeksi vapaata tilaa\n"
-"niiden kaikkien asentamiseksi. Jos ei, niin ohjelma varoittaa sinua siit�. "
-"Jos\n"
-"haluat siit� huolimatta jatkaa, DrakX jatkaa asennusvaiheeseen, mutta "
-"j�tt��\n"
-"asentamatta joitakin v�hemm�n t�rkeit� paketteja. Listan lopusta voit "
-"valita\n"
-"my�s vaihtoehdon \"Yksitt�isten pakettien valinta\", mink� j�lkeen voit\n"
-"asentaa haluamasi yksitt�iset ohjelmistopaketit yli tuhannesta vaihtoehdosta."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:534
 msgid ""
-"You can now choose individually all the packages you\n"
-"wish to install.\n"
-"\n"
+"Please choose your preferred language for installation and system usage.\n"
 "\n"
-"You can expand or collapse the tree by clicking on options in the left "
-"corner of\n"
-"the packages window.\n"
+"Clicking on the \"Advanced\" button will allow you to select other\n"
+"languages to be installed on your workstation. Selecting other languages\n"
+"will install the language-specific files for system documentation and\n"
+"applications. For example, if you will host users from Spain on your\n"
+"machine, select English as the main language in the tree view and in the\n"
+"Advanced section click on the grey star corresponding to \"Spanish|Spain\".\n"
 "\n"
-"\n"
-"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
-"\"Toggle flat and group sorted\".\n"
-"\n"
-"\n"
-"If you want not to be warned on dependencies, click on \"Automatic\n"
-"dependencies\". If you do this, note that unselecting one package may "
-"silently\n"
-"unselect several other packages which depend on it."
+"Note that multiple languages may be installed. Once you have selected any\n"
+"additional locales click the \"OK\" button to continue."
 msgstr ""
-"Voit nyt valita yksitt�in kaikki ne paketit, jotka haluat asentaa.\n"
-"\n"
-"\n"
-"Voit laajentaa tai pienent�� puuta painamalla valintanappia paketti-"
-"ikkunan \n"
-"vasemmasta kulmasta.\n"
-"\n"
-"\n"
-"Jos haluat mieluummin valita paketit aakkosj�rjestyksess� olevasta \n"
-"listasta, paina ikonia \"Vaihda tasaisen ja ryhm�j�rjestyksen v�lill�\".\n"
-"\n"
-"\n"
-"Jos et halua, ett� sinua varoitetaan pakettien riippuvuussuhteista, "
-"valitse \n"
-"\"N�yt� automaattisesti valitut paketit\". Huomaa, ett� t�ll�in poistamalla "
-"yhden \n"
-"paketin voit huomaamattasi poistaa useita muitakin paketteja, jotka \n"
-"ovat riippuvaisia poistetusta paketista."
 
-#: ../../help.pm_.c:364
+#: ../../help.pm_.c:547
 msgid ""
-"If you have all the CDs in the list above, click Ok. If you have\n"
-"none of those CDs, click Cancel. If only some CDs are missing, unselect "
-"them,\n"
-"then click Ok."
-msgstr ""
-"Jos sinulla on kaikki yll�olevan listan CD:t, paina Ok.\n"
-"Jos sinulla ei ole yht��n em. levyist�, paina Peruuta.\n"
-"Jos vain jotkin levyist� puuttuvat, poista niiden valinnat, ja paina Ok"
-
-#: ../../help.pm_.c:369
-msgid ""
-"Your new Linux-Mandrake operating system is currently being\n"
-"installed. This operation should take a few minutes (it depends on size you\n"
-"choose to install and the speed of your computer).\n"
+"By default, DrakX assumes you have a two-button mouse and will set it up\n"
+"for third-button emulation. DrakX will automatically know whether it is a\n"
+"PS/2, serial or USB mouse.\n"
 "\n"
+"If you wish to specify a different type of mouse select the appropriate\n"
+"type from the list provided.\n"
 "\n"
-"Please be patient."
-msgstr ""
-"Uutta Linux-Mandrake -k�ytt�j�rjestelm��si asennetaan parasta aikaa.\n"
-"T�m� vaihe vie kymmeni� minuutteja (riippuen asennuksesi koosta\n"
-"ja tietokoneesi nopeudesta).\n"
-"\n"
-"\n"
-"K�rsiv�llisyytt�."
-
-#: ../../help.pm_.c:377
-msgid ""
-"You can now test your mouse. Use buttons and wheel to verify\n"
-"if settings are good. If not, you can click on \"Cancel\" to choose another\n"
-"driver."
+"If you choose a mouse other than the default you will be presented with a\n"
+"mouse test screen. Use the buttons and wheel to verify that the settings\n"
+"are good. If the mouse is not working correctly press the space bar or\n"
+"RETURN to \"Cancel\" and choose again."
 msgstr ""
-"Voit nyt testata hiirt�si. K�yt� hiiren painikkeita ja rullaa "
-"varmistaaksesi\n"
-"ett� asetukset ovat kunnossa. Jos eiv�t ole, voit painaa \"Peruuta\"\n"
-"valitaksesi toisen ajurin."
 
-#: ../../help.pm_.c:382
+#: ../../help.pm_.c:560
+#, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1\n"
-"port under MS Windows is named ttyS0 under GNU/Linux."
+"Please select the correct port. For example, the COM1 port under MS Windows\n"
+"is named ttyS0 under GNU/Linux."
 msgstr ""
 "Valitse oikea portti. Esimerkiksi MS Windowsin portti COM1\n"
 "on nimetty ttyS0:ksi GNU/Linuxissa."
 
-#: ../../help.pm_.c:386
-msgid ""
-"If you wish to connect your computer to the Internet or\n"
-"to a local network please choose the correct option. Please turn on your "
-"device\n"
-"before choosing the correct option to let DrakX detect it automatically.\n"
-"\n"
-"\n"
-"If you do not have any connection to the Internet or a local network, "
-"choose\n"
-"\"Disable networking\".\n"
-"\n"
-"\n"
-"If you wish to configure the network later after installation or if you "
-"have\n"
-"finished to configure your network connection, choose \"Done\"."
-msgstr ""
-"Jos haluat yhdist�� tietokoneesi internettiin tai paikalliseen "
-"l�hiverkkoon,\n"
-"valitse haluamasi optio. Kytke kuitenkin kyseinen laite p��lle, ennen kuin\n"
-"valitset, sill� t�ll�in DrakX voi tunnistaa laitteen automaattisesti.\n"
-"\n"
-"\n"
-"Jos sinulla ei ole internetliittym�� tai l�hiverkkoa, valitse \"Kytke pois\n"
-"verkkoyhteydet\".\n"
-"\n"
+#: ../../help.pm_.c:564
+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 one authorized to make updates, add users,\n"
+"change the overall system configuration, and so on. In short, \"root\" can\n"
+"do everything! That is why you must choose a password that is difficult to\n"
+"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
+"choose not to enter a password, but we strongly advise you against this if\n"
+"only for one reason: do not think that because you booted GNU/Linux that\n"
+"your other operating systems are safe from mistakes. Since \"root\" can\n"
+"overcome all limitations and unintentionally erase all data on partitions\n"
+"by carelessly accessing the partitions themselves, it is important for it\n"
+"to be difficult to become \"root\".\n"
 "\n"
-"Jos haluat asettaa verkkoyhteydet my�hemmin tai olet jo asettanut\n"
-"koneesi verkkoasetukset, valitse \"Valmis\"."
-
-#: ../../help.pm_.c:399
-msgid ""
-"No modem has been detected. Please select the serial port on which it is "
-"plugged.\n"
+"The password should be a mixture of alphanumeric characters and at least 8\n"
+"characters long. Never write down the \"root\" password - it makes it too\n"
+"easy to compromise a system.\n"
 "\n"
+"However, please do not make the password too long or complicated because\n"
+"you must be able to remember it without too much effort.\n"
 "\n"
-"For information, the first serial port (called \"COM1\" under Microsoft\n"
-"Windows) is called \"ttyS0\" under Linux."
-msgstr ""
-"Modeemia ei l�ydetty. Valitse sarjaportti, johon modeemi on kytketty.\n"
+"The password will not be displayed on screen as you type it in. Hence, you\n"
+"will have to type the password twice to reduce the chance of a typing\n"
+"error. If you do happen to make the same typing error twice, this\n"
+"\"incorrect\" password will have to be used the first time you connect.\n"
 "\n"
+"In expert mode, you will be asked if you will be connecting to an\n"
+"authentication server, like NIS or LDAP.\n"
 "\n"
-"Tiedoksi: ensimm�inen sarjaportti (\"COM1\" Microsoft Windowsissa)\n"
-"on \"ttyS0\" Linuxissa."
-
-#: ../../help.pm_.c:406
-msgid ""
-"You may now enter dialup options. If you don't know\n"
-"or are not sure what to enter, the correct informations can be obtained "
-"from\n"
-"your Internet Service Provider. If you do not enter the DNS (name server)\n"
-"information here, this information will be obtained from your Internet "
-"Service\n"
-"Provider at connection time."
-msgstr ""
-"Voit nyt antaa soiton asetukset. Jos et tied� tai et ole varma, mit�\n"
-"sinun pit�isi kirjoittaa t�h�n, saat oikeat tiedot internetyhteyden\n"
-"palveluntarjoajaltasi. Jos et anna DNS (nimipalvelu) -tiedoja,\n"
-"ne haetaan internetyhteyden tarjoajaltasi yhteytt� muodostettaessa."
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-"Jos modeemisi on ulkoinen, kytke se p��lle nyt, jotta DrakX tunnistaisisen "
-"automaattisesti."
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "Kytke modeemisi p��lle ja valitse oikea vaihtoehto."
-
-#: ../../help.pm_.c:419
-msgid ""
-"If you are not sure if informations above are\n"
-"correct or if you don't know or are not sure what to enter, the correct\n"
-"informations can be obtained from your Internet Service Provider. If you do "
-"not\n"
-"enter the DNS (name server) information here, this information will be "
-"obtained\n"
-"from your Internet Service Provider at connection time."
-msgstr ""
-"Jos et ole varma, ett� yll� olevat tiedot ovat\n"
-"oikeita tai jos et ole varma, mit� sinun pit�isi kirjoittaa,\n"
-"saat oikeat tiedot omalta internet-palveluntarjoajaltasi.\n"
-"Jos et sy�t� DNS-tietoja (nimipalvelin) t�nne, tuo tieto\n"
-"saadaan palveluntarjoajalta yhteydenoton aikana."
-
-#: ../../help.pm_.c:426
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, the correct informations can be\n"
-"obtained from your Internet Service Provider."
-msgstr ""
-"Voit antaa nyt koneesi nimen, jos haluat. Jos et ole\n"
-"varma, mit� sinun pit�isi kirjoittaa t�h�n, oikeat tiedot saat\n"
-"omalta internet-palveluntarjoajaltasi."
-
-#: ../../help.pm_.c:431
-msgid ""
-"You may now configure your network device.\n"
-"\n"
-"   * IP address: if you don't know or are not sure what to enter, ask your "
+"If your network uses LDAP (or NIS) protocol for authentication, select\n"
+"\"LDAP\" (or \"NIS\") as authentication. If you do not know, ask your\n"
 "network administrator.\n"
-"     You should not enter an IP address if you select the option \"Automatic "
-"IP\" below.\n"
-"\n"
-"   * Netmask: \"255.255.255.0\" is generally a good choice. If you don't "
-"know or are not sure what to enter,\n"
-"     ask your network administrator.\n"
-"\n"
-"   * Automatic IP: if your network uses BOOTP or DHCP protocol, select this "
-"option. If selected, no value is needed in\n"
-"    \"IP address\". If you don't know or are not sure if you need to select "
-"this option, ask your network administrator."
-msgstr ""
-"Voit nyt asettaa verkkokorttisi.\n"
-"\n"
-"   - IP-osoite: jos et tied� osoitetta, voit kysy� sit� "
-"verkkoyll�pit�j�lt�si.\n"
-"     Sinun ei pid� sy�tt�� IP-osoitetta, jos valitset \"Automaattinen IP\" "
-"alta.\n"
-"\n"
-"  - Verkkopeite: \"255.255.255.0\" on yleens� hyv� valinta. Jos et ole "
-"t�ysin\n"
-"     varma verkkopeitteest�, voit kysy� sit� verkkoyll�pit�j�lt�si.\n"
 "\n"
-"  - Automaattinen IP: Jos verkkosi k�ytt�� BOOTP- tai DHCP-protokollaa,\n"
-"     valitse t�m� optio. Jos valitset t�m�n, kohtaa \"IP-osoite\" ei "
-"tarvitse t�ytt��.\n"
-"     Jos et ole varma, pit�isik� sinun valita t�m� vaihtoehto, kysy "
-"verkkoyll�pit�j�lt�si."
-
-#: ../../help.pm_.c:443
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, ask your network administrator."
-msgstr ""
-"Voit nyt kirjoittaa koneesi nimen. Jos et tied�, mit�\n"
-"sinun pit�isi kirjoittaa, kysy lis�� verkkoyll�pit�j�lt�si."
-
-#: ../../help.pm_.c:447
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, leave blank."
-msgstr ""
-"Voit nyt kirjoittaa koneesi nimen. Jos et ole varma,\n"
-"mit� sinun pit�isi kirjoittaa, j�t� t�m� kohta tyhj�ksi."
-
-#: ../../help.pm_.c:451
-msgid ""
-"You may now enter dialup options. If you're not sure what to enter, the\n"
-"correct information can be obtained from your ISP."
-msgstr ""
-"Voit antaa nyt soittoyhteyden asetukset. Jos et ole varma mit� kenttiin\n"
-"kirjotetaan oikeat tiedot saat Internet palveluntarjoajaltasi."
-
-#: ../../help.pm_.c:455
-msgid ""
-"If you will use proxies, please configure them now. If you don't know if\n"
-"you should use proxies, ask your network administrator or your ISP."
-msgstr ""
-"Jos k�yt�t v�lityspalvelimia aseta ne nyt. Jos et tied� k�yt�tk�\n"
-"v�lityspalvelimia kysy verkkoyll�pit�j�lt�si tai Internet\n"
-"palveluntarjoajaltasi."
-
-#: ../../help.pm_.c:459
-msgid ""
-"You can install cryptographic package if your internet connection has been\n"
-"set up correctly. First choose a mirror where you wish to download packages "
-"and\n"
-"after that select the packages to install.\n"
-"\n"
-"\n"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
-msgstr ""
-"Voit asentaa kryptograafiset ohjelmistot jos internetyhteytesi on luotu\n"
-"oikein. Valitse ensiksi peilij�rjestelm�, jota haluat k�ytt�� ja valitse "
-"sitten\n"
-"ne paketit, jotka haluat asentaa.\n"
-"\n"
-"\n"
-"Huomaa ett� sinun tulee valita peilij�rjestelm� ja paketit oman maasi\n"
-"lains��d�nn�n mukaan."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "Voit nyt asentaa aikavy�hykkeen sen mukaan, miss� p�in asut."
-
-#: ../../help.pm_.c:471
-msgid ""
-"GNU/Linux manages time in GMT (Greenwich Manage\n"
-"Time) and translates it in local time according to the time zone you have\n"
-"selected.\n"
-"\n"
-"\n"
-"If you use Microsoft Windows on this computer, choose \"No\"."
-msgstr ""
-"GNU/Linux hallitsee aikaa GMT:n (Greenwich Meridian Time) mukaan\n"
-"ja muuttaa sen paikalliseen aikaan valitsemasi aikavy�hykkeen mukaan.\n"
-"\n"
-"\n"
-"Jos koneellasi on my�s Microsoft Windows, valitse \"Ei\"."
-
-#: ../../help.pm_.c:479
-msgid ""
-"You may now choose which services you want to start at boot time.\n"
-"\n"
-"\n"
-"When your mouse comes over an item, a small balloon help will popup which\n"
-"describes the role of the service.\n"
-"\n"
-"\n"
-"Be very careful in this step if you intend to use your machine as a server: "
-"you\n"
-"will probably want not to start any services that you don't need. Please\n"
-"remember that several services can be dangerous if they are enable on a "
-"server.\n"
-"In general, select only the services that you really need."
-msgstr ""
-"Voit nyt valita mit� palveluita haluat k�ynnist�� koneen k�ynnistyess�.\n"
-"\n"
-"\n"
-"Kun siirr�t hiiren osoittimen palvelun p��lle, pieni ohje tulee esiin\n"
-"ja kertoo palvelun tarkoituksen.\n"
-"0\n"
-"Ole varovainen n�iss� asetuksissa, jos aiot k�ytt�� konettasi palvelimena: "
-"et\n"
-"varmaankaan halua k�ynnist�� niit� palveluita, joita et tarvitse. Muista "
-"my�s,\n"
-"ett� jotkin palvelut voivat olla vaarallisia, jos ne ovat k�yt�ss� "
-"palvelimessa.\n"
-"Yleens� kannattaa valita vain ne palvelut, joita todella tarvitset."
-
-#: ../../help.pm_.c:492
-msgid ""
-"You can configure a local printer (connected to your computer) or remote\n"
-"printer (accessible via a Unix, Netware or Microsoft Windows network)."
-msgstr ""
-"Voit asettaa paikallisen kirjoittimen (liitetty omaan koneeseesi) tai "
-"ulkoisen\n"
-"kirjoittimen (k�ytett�viss� Unix-, Netware- tai MS Windows -verkon yli)."
-
-#: ../../help.pm_.c:496
-msgid ""
-"If you wish to be able to print, please choose one printing system between\n"
-"CUPS and LPR.\n"
-"\n"
-"\n"
-"CUPS is a new, powerful and flexible printing system for Unix systems (CUPS\n"
-"means \"Common Unix Printing System\"). It is the default printing system "
-"in\n"
-"Linux-Mandrake.\n"
-"\n"
-"\n"
-"LPR is the old printing system used in previous Linux-Mandrake "
-"distributions.\n"
-"\n"
-"\n"
-"If you don't have printer, click on \"None\"."
-msgstr ""
-"Jos haluat mahdollistaa paperille tulostamisen, valitse toinen seuraavista \n"
-"tulostusj�rjestelmist�: CUPS tai LPR.\n"
-"\n"
-"\n"
-"CUPS on uusi, tehokas ja joustava tulostusj�rjestelm� Unix-koneissa \n"
-"(CUPS tulee sanoista: \"Common Unix Printing System\"). Se on Linux-\n"
-"Mandraken k�ytt�m� oletusj�rjestelm�.\n"
-"\n"
-"\n"
-"LPR on Linux-Mandraken aikaisempien versioiden k�ytt�m� vanha \n"
-"tulostusj�rjestelm�.\n"
-"\n"
-"\n"
-"Jos sinulla ei ole kirjoitinta, valitse \"Ei kumpaakaan\"."
-
-#: ../../help.pm_.c:511
-msgid ""
-"GNU/Linux can deal with many types of printer. Each of these types requires\n"
-"a different setup.\n"
-"\n"
-"\n"
-"If your printer is physically connected to your computer, select \"Local\n"
-"printer\".\n"
-"\n"
-"\n"
-"If you want to access a printer located on a remote Unix machine, select\n"
-"\"Remote printer\".\n"
-"\n"
-"\n"
-"If you want to access a printer located on a remote Microsoft Windows "
-"machine\n"
-"(or on Unix machine using SMB protocol), select \"SMB/Windows 95/98/NT\"."
-msgstr ""
-"GNU/Linux voi k�ytt�� useaa eri tyyppist� kirjoitinta. Jokainen n�ist� \n"
-"tarvitsee erilaiset asetukset.\n"
-"\n"
-"\n"
-"Jos kirjoittimesi on fyysisesti kiinni tietokoneessasi, valitse "
-"\"Paikallinen \n"
-"kirjoitin\".\n"
-"\n"
-"\n"
-"Jos haluat k�ytt�� kirjoitinta, joka on toisella Unix-koneella, valitse\n"
-"\"Ulkoinen kirjoitin\".\n"
-"\n"
-"\n"
-"Jos haluat k�ytt�� kirjoitinta, joka sijaitsee ulkoisella Microsoft Windows\n"
-"-koneella, (tai Unix-koneessa, joka k�ytt�� SMB-protokollaa),\n"
-"valitse \"SMB/Windows 95/98/NT\"."
-
-#: ../../help.pm_.c:527
-msgid ""
-"Please turn on your printer before continuing to let DrakX detect it.\n"
-"\n"
-"You have to enter some informations here.\n"
-"\n"
-"\n"
-"   * Name of printer: the print spooler uses \"lp\" as default printer name. "
-"So, you must have a printer named \"lp\".\n"
-"     If you have only one printer, you can use several names for it. You "
-"just need to separate them by a pipe\n"
-"     character (a \"|\"). So, if you prefer a more meaningful name, you have "
-"to put it first, eg: \"My printer|lp\".\n"
-"     The printer having \"lp\" in its name(s) will be the default printer.\n"
-"\n"
-"\n"
-"   * Description: this is optional but can be useful if several printers are "
-"connected to your computer or if you allow\n"
-"     other computers to access to this printer.\n"
-"\n"
-"\n"
-"   * Location: if you want to put some information on your\n"
-"     printer location, put it here (you are free to write what\n"
-"     you want, for example \"2nd floor\").\n"
-msgstr ""
-"Kytke kirjoittimesi p��lle ennen kuin jatkat seuraavaan vaiheeseen.\n"
-"T�m� antaa DrakX:lle mahdollisuuden havaita sen.\n"
-"\n"
-"Sinun t�ytyy antaa joitakin tietoja t�h�n.\n"
-"\n"
-"\n"
-"   * Kirjoittimen nimi: tulostusjono k�ytt�� \"lp\":t� kirjoittimen "
-"oletusnimen�, joten sinulla t�ytyy olla kirjoitin, jonka nimi on \"lp\".\n"
-"     Jos sinulla on vain yksi kirjoitin, voit nimet� sen useaan kertaan. "
-"Sinun t�ytyy vain erottaa nimet putki-merkill� (\"|\"). \n"
-"     Joten jos pid�t enemm�n merkityksellisemm�st� nimest�, sinun t�ytyy "
-"laittaa se ensimm�iseksi, esim: \"Minun kirjoitin|lp\".\n"
-"     Kirjoitin, jonka jokin nimi on \"lp\" toimii oletuskirjoittimena.\n"
-"\n"
-"\n"
-"   * Kuvaus: t�m� on vapaaehtoinen, mutta k�ytt�kelpoinen, jos tiekoneellasi "
-"on useampia kirjoittimia tai \n"
-"     jos haluat jakaa kirjoittimen muille tietokoneille.\n"
-"\n"
-"\n"
-"   * Sijainti: Jos haluat antaa tietoa kirjoittimesi sijainnista, \n"
-"     kirjoita se t�h�n (voit kirjoittaa t�h�n mit� tahansa, kuten \n"
-"     esimerkiksi \"2. kerros\").\n"
-
-#: ../../help.pm_.c:548
-msgid ""
-"You need to enter some informations here.\n"
-"\n"
-"\n"
-"   * Name of queue: the print spooler uses \"lp\" as default printer name. "
-"So, you need have a printer named \"lp\".\n"
-"    If you have only one printer, you can use several names for it. You just "
-"need to separate them by a pipe\n"
-"    character (a \"|\"). So, if you prefer to have a more meaningful name, "
-"you have to put it first, eg: \"My printer|lp\".\n"
-"    The printer having \"lp\" in its name(s) will be the default printer.\n"
-"\n"
-"  \n"
-"   * Spool directory: it is in this directory that printing jobs are stored. "
-"Keep the default choice\n"
-"     if you don't know what to use\n"
-"\n"
-"\n"
-"   * Printer Connection: If your printer is physically connected to your "
-"computer, select \"Local printer\".\n"
-"     If you want to access a printer located on a remote Unix machine, "
-"select \"Remote lpd printer\".\n"
-"\n"
-"\n"
-"     If you want to access a printer located on a remote Microsoft Windows "
-"machine (or on Unix machine using SMB\n"
-"     protocol), select \"SMB/Windows 95/98/NT\".\n"
-"\n"
-"\n"
-"     If you want to acces a printer located on NetWare network, select "
-"\"NetWare\".\n"
-msgstr ""
-"Sinun t�ytyy antaa joitakin tietoja t�h�n.\n"
-"\n"
-"\n"
-"   * Kirjoittimen nimi: tulostusjono k�ytt�� \"lp\":t� kirjoittimen "
-"oletusnimen�, joten sinulla t�ytyy olla kirjoitin, jonka nimi on \"lp\".\n"
-"     Jos sinulla on vain yksi kirjoitin, voit nimet� sen useaan kertaan. "
-"Sinun t�ytyy vain erottaa nimet putki-merkill� (\"|\"). \n"
-"     Joten jos pid�t enemm�n merkityksellisemm�st� nimest�, sinun t�ytyy "
-"laittaa se ensimm�iseksi, esim: \"Minun kirjoitin|lp\".\n"
-"     Kirjoitin, jonka jokin nimi on \"lp\" toimii oletuskirjoittimena.\n"
-"\n"
-"\n"
-"   * Kirjoittimen yhteystapa: jos kirjoittimesi on fyysisesti liitetty "
-"tietokoneeseesi, valitse \"Paikallinen kirjoitin\".\n"
-"     Jos haluat k�ytt�� kirjoitinta, joka on kiinni toisessa Unix-koneessa, "
-"valitse \"Ulkoinen lpd-kirjoitin\".\n"
-"\n"
-"\n"
-"     Jos haluat k�ytt�� kirjoitinta, joka sijaitsee ulkoisella Microsoft "
-"Windows -koneella, (tai Unix-koneessa, \n"
-"joka k�ytt�� SMB-protokollaa), valitse \"SMB/Windows 95/98/NT\".\n"
-"\n"
-"\n"
-"     Jos haluat k�ytt�� kirjoitinta, joka sijaitsee NetWare-verkossa, "
-"valitse \"NetWare\".\n"
-
-#: ../../help.pm_.c:573
-msgid ""
-"Your printer has not been detected. Please enter the name of the device on\n"
-"which it is connected.\n"
-"\n"
-"\n"
-"For information, most printers are connected on the first parallel port. "
-"This\n"
-"one is called \"/dev/lp0\" under GNU/Linux and \"LPT1\" under Microsoft "
-"Windows."
-msgstr ""
-"Kirjoitintasi ei voitu tunnistaa. Valitse mihin laitteeseen kirjoitin on "
-"kytketty.\n"
-"\n"
-"\n"
-"Lis�tietoja: suurin osa kirjoittimista on kytketty tietokoneen ensimm�iseen\n"
-"rinnakkaisporttiin. Sen nimi Linuxissa on \"/dev/lp0\" ja \"LPT1\" "
-"Microsoft\n"
-"Windowsissa."
-
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "Valitse kirjoitin yll� olevasta listasta."
-
-#: ../../help.pm_.c:584
-msgid ""
-"Please select the right options according to your printer.\n"
-"Please see its documentation if you don't know what choose here.\n"
-"\n"
-"\n"
-"You will be able to test your configuration in next step and you will be "
-"able to modify it if it doesn't work as you want."
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"Valitse oikeat optiot kirjoittimellesi.\n"
-"Lue kirjoittimesi dokumentaatio, jos haluat tiet��, mit� valita t��ll�.\n"
-"\n"
-"\n"
-"Sinulla on mahdollisuus testata asetuksia seuraavassa vaiheessa ja korjata "
-"niit�, jos kirjoitin ei toimi haluamallasi tavalla."
 
-#: ../../help.pm_.c:591
+#: ../../help.pm_.c:600
 msgid ""
-"You can now enter the root password for your Linux-Mandrake system.\n"
-"The password must be entered twice to verify that both password entries are "
-"identical.\n"
-"\n"
-"\n"
-"Root is the system's administrator and is the only user allowed to modify "
-"the\n"
-"system configuration. Therefore, choose this password carefully. \n"
-"Unauthorized use of the root account can be extemely dangerous to the "
-"integrity\n"
-"of the system, its data and other system connected to it.\n"
+"LILO and GRUB are boot loaders for GNU/Linux. This stage, normally, is\n"
+"totally automated. In fact, DrakX analyzes the disk boot sector and acts\n"
+"accordingly, depending on what it finds here:\n"
 "\n"
+" * if Windows boot sector is found, it will replace it with a GRUB/LILO "
+"boot\n"
+"sector. Hence, you will be able to load either GNU/Linux or another OS;\n"
 "\n"
-"The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. It should never be written down.\n"
-"\n"
-"\n"
-"Do not make the password too long or complicated, though: you must be able "
-"to\n"
-"remember it without too much effort."
-msgstr ""
-"Voit antaa nyt yll�pit�j�n (root) salasanan Linux-Mandrake "
-"j�rjestelm�llesi. \n"
-"Kirjoitusvirheiden est�miseksi salasana tulee antaa kaksi kertaa. \n"
-"\n"
+" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
+"one;\n"
 "\n"
-"Root on j�rjestelm�n yll�pit�j� ja samalla ainoa k�ytt�j�, jolla on "
-"oikeudet \n"
-"muuttaa j�rjestelm�n asetuksia. T�m�n vuoksi valitse salasana "
-"huolellisesti! \n"
-"Root-tunnuksen huolimaton k�ytt� voi olla hyvin vaarallista "
-"j�rjestelm�lle, \n"
-"sille tallennetuille tiedoille sek� muille siihen kytketyille "
-"j�rjestelmille. \n"
-"Salasanan tulee olla sekoitus kirjaimia ja numeroita sek� v�hint��n 8 "
-"merkki� pitk�. \n"
-"Salasanaa ei saa koskaan kirjoittaa paperille. \n"
+"If in doubt, DrakX will display a dialog with various options.\n"
 "\n"
+" * \"Boot loader to use\": you have three choices:\n"
 "\n"
-"�l� tee salasanastasi liian pitk�� tai monimutkaista, sill� sinun t�ytyy "
-"muistaa \n"
-"se ilman turhia ponnistuksia."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"Tehd�ksesi j�rjestelm�st�si turvallisemman valitse \"K�yt� shadow-tiedostoa"
-"\" ja\n"
-"\"K�yt� MD5-salasanoja\"."
-
-#: ../../help.pm_.c:613
-msgid ""
-"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
-"network administrator."
-msgstr ""
-"Jos verkkosi k�ytt�� NIS:�, valita \"K�yt� NIS:i�\". Jos et ole varma "
-"asiasta\n"
-"kysy verkkoyll�pit�j�lt�si."
-
-#: ../../help.pm_.c:617
-msgid ""
-"You may now create one or more \"regular\" user account(s), as\n"
-"opposed to the \"privileged\" user account, root. You can create\n"
-"one or more account(s) for each person you want to allow to use\n"
-"the computer. Note that each user account will have its own\n"
-"preferences (graphical environment, program settings, etc.)\n"
-"and its own \"home directory\", in which these preferences are\n"
-"stored.\n"
+"    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
+"interface.\n"
 "\n"
+"    * \"GRUB\": if you prefer GRUB (text menu).\n"
 "\n"
-"First of all, create an account for yourself! Even if you will be the only "
-"user\n"
-"of the machine, you may NOT connect as root for daily use of the system: "
-"it's a\n"
-"very high security risk. Making the system unusable is very often a typo "
-"away.\n"
+"    * \"LILO with text menu\": if you prefer LILO with its text menu "
+"interface.\n"
 "\n"
+" * \"Boot device\": in most cases, you will not change the default\n"
+"(\"/dev/hda\"), but if you prefer, the boot loader can be installed on the\n"
+"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\").\n"
 "\n"
-"Therefore, you should connect to the system using the user account\n"
-"you will have created here, and login as root only for administration\n"
-"and maintenance purposes."
-msgstr ""
-"Voit nyt luoda yhden tai useamman \"tavallisen\" k�ytt�j�tunnuksen,\n"
-"joiden vastakohtana on \"p��k�ytt�j�\" k�ytt�j�tunnus, root. Voit\n"
-"luoda yhden tai useampia tunnuksia jokaiselle henkil�lle jolle annat\n"
-"oikeuden k�ytt�� j�rjestelm��. Huomaa ett� jokaisella k�ytt�j�tunnuksella\n"
-"on omat asetuksensa (graafinen k�ytt�liittym�, ohjelmien asetukset jne.)\n"
-"ja oma \"kotihakemisto\" jonne asetukset talletetaan.\n"
+" * \"Delay before booting the default image\": when rebooting the computer,\n"
+"this is the delay granted to the user to choose - in the boot loader menu,\n"
+"another boot entry than the default one.\n"
 "\n"
+"!! Beware that if you choose not to install a boot loader (by selecting\n"
+"\"Cancel\" here), you must ensure that you have a way to boot your Mandrake\n"
+"Linux system! Also be sure you know what you do before changing any of the\n"
+"options. !!\n"
 "\n"
-"Luo ensin tunnus itsellesi! Vaikka olisit ainoa k�ytt�j� sinun ei tule\n"
-"k�ytt�� root tunnusta p�ivitt�in, se on eritt�in suuri tietoturvariski.\n"
-"P��k�ytt�j� voi sekoittaa j�rjestelm�n eritt�in helpolla.\n"
+"Clicking the \"Advanced\" button in this dialog will offer many advanced\n"
+"options, which are reserved to the expert user.\n"
 "\n"
+"Mandrake Linux installs its own boot loader, which will let you boot either\n"
+"GNU/Linux or any other operating systems which you have on your system.\n"
 "\n"
-"Eli sinun tulee kirjautua j�rjestelm��n tunnuksella jonka luot t��ll� ja\n"
-"k�ytt�� root tunnusta vain j�rjestelm�n yll�pitoon."
-
-#: ../../help.pm_.c:636
-msgid ""
-"Creating a boot disk is strongly recommended. If you can't\n"
-"boot your computer, it's the only way to rescue your system without\n"
-"reinstalling it."
+"If there is another operating system installed on your machine, it will be\n"
+"automatically added to the boot menu. Here, you can choose to fine-tune the\n"
+"existing options. Double-clicking on an existing entry allows you to change\n"
+"its parameters or remove it; \"Add\" creates a new entry; and \"Done\" goes\n"
+"on to the next installation step."
 msgstr ""
-"K�ynnistyslevykkeen luominen on suositeltavaa. Jos kone ei jostain\n"
-"syyst� k�ynnistyk��n, t�m� on ainoa keino pelastaa j�rjestelm�\n"
-"ilman hankalaa uudelleenasennusta."
 
-#: ../../help.pm_.c:641
-msgid ""
-"You need to indicate where you wish\n"
-"to place the information required to boot to GNU/Linux.\n"
-"\n"
-"\n"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"Sinun tulee kertoa minne haluat\n"
-"sijoittaa tarvittavat tiedot GNU/Linuxin k�ynnist�miseksi.\n"
-"\n"
-"\n"
-"Jos et todella tied� mit� teet, valitse \"Levyn ensimm�inen\n"
-"sektori (MBR)\"."
-
-#: ../../help.pm_.c:649
-msgid ""
-"Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
-" (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
-msgstr ""
-"Jos et tied� tarkemmin, niin yleinen valinta on \"/dev/hda\"\n"
-"(prim��rinen master IDE-levyn ).tai \"/dev/sda\" (ensimm�inen SCSI-levy)."
-
-#: ../../help.pm_.c:653
+#: ../../help.pm_.c:647
+#, fuzzy
 msgid ""
-"LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
+"LILO (the LInux LOader) and GRUB are boot loaders: they are able to boot\n"
 "either GNU/Linux or any other operating system present on your computer.\n"
 "Normally, these other operating systems are correctly detected and\n"
 "installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
+"screen. Be careful to choose the correct parameters.\n"
 "\n"
-"\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
+"You may also not want to give access to these other operating systems to\n"
+"anyone. In which case, you can delete the corresponding entries. But then,\n"
+"you will need a boot disk in order to boot those other operating systems!"
 msgstr ""
 "LILO (the Linux LOader) ja Grup ovat j�rjestelm�lataajia: niiden avulla voit "
 "k�ynnist��\n"
@@ -3457,408 +3131,266 @@ msgstr ""
 "tuhoa kyseinen kohta. Mutta huomaa, ett� siin� tapauksessa tarvitset itse\n"
 "k�ynnistyslevykett� p��st�ksesi kyseiseen k�ytt�j�rjestelm��n!"
 
-#: ../../help.pm_.c:665
+#: ../../help.pm_.c:658
 #, fuzzy
 msgid ""
-"LILO and grub main options are:\n"
-"  - Boot device: Sets the name of the device (e.g. a hard disk\n"
-"partition) that contains the boot sector. Unless you know specifically\n"
-"otherwise, choose \"/dev/hda\".\n"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\n"
 "\n"
-"\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero.\n"
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
+msgstr ""
+"Sinun tulee kertoa minne haluat\n"
+"sijoittaa tarvittavat tiedot GNU/Linuxin k�ynnist�miseksi.\n"
 "\n"
 "\n"
-"  - Video mode: This specifies the VGA text mode that should be selected\n"
-"when booting. The following values are available: \n"
+"Jos et todella tied� mit� teet, valitse \"Levyn ensimm�inen\n"
+"sektori (MBR)\"."
+
+#: ../../help.pm_.c:665
+msgid ""
+"Here we select a printing system for your computer to use. Other OSes may\n"
+"offer you one, but Mandrake offers three.\n"
 "\n"
-"    * normal: select normal 80x25 text mode.\n"
+" * \"pdq\" - which means ``print, don't queue'', is the choice if you have "
+"a\n"
+"direct connection to your printer and you want to be able to panic out of\n"
+"printer jams, and you do not have any networked printers. It will handle\n"
+"only very simple network cases and is somewhat slow for networks. Pick\n"
+"\"pdq\" if this is your maiden voyage to GNU/Linux. You can change your\n"
+"choices after install by running PrinterDrake from the Mandrake Control\n"
+"Center and clicking the expert button.\n"
+"\n"
+" * \"CUPS\" - ``Common Unix Printing System'' is excellent at printing to\n"
+"your local printer and also halfway round the planet. It is simple and can\n"
+"act like a server or a client for the ancient \"lpd\" printing system, so\n"
+"it is compatible with the systems that went before. It can do many tricks,\n"
+"but the basic setup is almost as easy as \"pdq\". If you need this to\n"
+"emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
+"graphical front-ends for printing or choosing printer options.\n"
+"\n"
+" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
+"approximately the same things the others can do, but it will print to\n"
+"printers mounted on a Novell Network, because it supports IPX protocol, and\n"
+"it can print directly to shell commands. If you have need of Novell or\n"
+"printing to commands without using a separate pipe construct, use lprNG.\n"
+"Otherwise, CUPS is preferable as it is simpler and better at working over\n"
+"networks."
+msgstr ""
+
+#: ../../help.pm_.c:693
+#, fuzzy
+msgid ""
+"DrakX is now detecting any IDE devices present in your computer. It will\n"
+"also scan for one or more PCI SCSI card(s) on your system. If a SCSI card\n"
+"is found DrakX will automatically install the appropriate driver.\n"
 "\n"
-"    * <number>:  use the corresponding text mode.\n"
+"Because hardware detection will sometimes not detect a piece of hardware\n"
+"DrakX will ask you to confirm if a PCI SCSI card is present. Click \"Yes\"\n"
+"if you know that there is a SCSI card installed in your machine. You will\n"
+"be presented a list of SCSI cards to choose from. Click \"No\" if you have\n"
+"no SCSI hardware. If you are unsure you can check the list of hardware\n"
+"detected in your machine by selecting \"See hardware info\" and clicking\n"
+"\"OK\". Examine the list of hardware and then click on the \"OK\" button to\n"
+"return to the SCSI interface question.\n"
 "\n"
+"If you have to manually specify your adapter, DrakX will ask if you want to\n"
+"specify options for it. You should allow DrakX to probe the hardware for\n"
+"the card-specific options that the hardware needs to initialize. This\n"
+"usually works well.\n"
+"\n"
+"If DrakX is not able to probe for the options that need to be passed, you\n"
+"will need to manually provide options to the driver. Please review the\n"
+"``User Guide'' (chapter 3, section \"Collecting information on your\n"
+"hardware\") for hints on retrieving the parameters required from hardware\n"
+"documentation, from the manufacturer's web site (if you have Internet\n"
+"access) or from Microsoft Windows (if you used this hardware with Windows\n"
+"on your system)."
+msgstr ""
+"DrakX hakee koneeseen asennettuja PCI-v�yl�isi� SCSI-laitteita. \n"
+"Jos SCSI-laite l�ytyy ja DrakX tiet�� mit� ajuria k�ytt��, laite otetaan \n"
+"automaattisesti k�ytt��n.\n"
 "\n"
-"  - Clean \"/tmp\" at each boot: if you want delete all files and "
-"directories\n"
-"stored in \"/tmp\" when you boot your system, select this option.\n"
 "\n"
+"Jos tietokoneessasi ei ole SCSI-laitetta tai DrakX ei tunnista sinulla \n"
+"olevaa ISA- tai PCI-v�yl�ist� SCSI-laitetta, DrakX kysyy onko koneessasi\n"
+"SCSI-liitynt��. Jos ei, voit vallita \"Ei\". Jos valitset \"Kyll�\", tulee \n"
+"n�kyviin lista ajureista, josta voit valita sinulla olevan laitteen.\n"
 "\n"
-"  - Precise RAM if needed: unfortunately, there is no standard method to ask "
-"the\n"
-"BIOS about the amount of RAM present in your computer. As consequence, Linux "
-"may\n"
-"fail to detect your amount of RAM correctly. If this is the case, you can\n"
-"specify the correct amount or RAM here. Please note that a difference of 2 "
-"or 4\n"
-"MB between detected memory and memory present in your system is normal."
-msgstr ""
-"LILOn ja grubin p��asetukset ovat:\n"
-"  - K�ynnistyslaite: Asettaa laitteen (esim. kiintolevyn osion)\n"
-"joka sis�lt�� k�ynnistyslohkon. Ellet aivan erityisesti halua jotakin\n"
-"muuta, valitse \"/dev/hda\".\n"
-"\n"
-"\n"
-"  - Viive ennen oletusj�rjestelm�n k�ynnist�mist�: M��rittelee sekunnin\n"
-"kymmenyksin� ajan, jonka j�rjestelm�nlataaja odottaa ennen "
-"oletusj�rjestelm�n\n"
-"k�ynnist�mist�. T�m� on hy�dyllinen niiss� j�rjestelmiss�, joissa "
-"k�ynnistyksen\n"
-"halutaan tapahtuvan heti, kun n�pp�imist� on k�ytett�viss�. Lataaja ei "
-"odota,\n"
-"jos \"viive\" puuttuu tai on nolla.\n"
-"\n"
-"  - N�ytt�tila: T�m� m��ritt�� VGA-tekstitilan, joka valitaan koneen\n"
-"k�ynnist�misen yhteydess�. Seuraavat arvot ovat mahdollisia:\n"
-"    * normaali: valitse normaali 80x25 tekstitila.\n"
-"\n"
-"    * <numero>:  k�yt� numeroa vastaavaa tekstitilaa."
-
-#: ../../help.pm_.c:697
-msgid ""
-"Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able\n"
-"to boot either GNU/Linux, MacOS, or MacOSX, if present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
 "\n"
+"Jos sinun t�ytyy valita ajuri manuaalisesti, DrakX kysyy, haluaisitko "
+"m��ritt��\n"
+"sille lis�optioita. Sinun kannattaa antaa DrakX:n tutkia laitteistosi "
+"optioiden\n"
+"l�yt�miseksi, sill� yleens� kyseinen toiminto toimii hyvin.\n"
 "\n"
-"Yaboot main options are:\n"
 "\n"
+"Jos ei, sinun pit�� itse antaa optiot kyseiselle ajurille. Katso lis�tietoja "
+"k�ytt�ohjeesta\n"
+"(luku 3, osa \"Collective informations on your hardware\"), jossa on "
+"vinkkej�\n"
+"miten n�m� tiedot l�ytyv�t laitteiston ohjekirjoista, "
+"laittteistovalmistajan\n"
+"webbisivuilta (jos sinulla on internetyhteys) tai Microsoft Windowsista "
+"(jos\n"
+"se on asennettu tietokoneeseesi)."
+
+#: ../../help.pm_.c:720
+msgid ""
+"You can add additional entries for yaboot, either for other operating\n"
+"systems, alternate kernels, or for an emergency boot image.\n"
 "\n"
-"  - Init Message: A simple text message that is displayed before the boot\n"
-"prompt.\n"
+"For other OS's, the entry consists only of a label and the root partition.\n"
 "\n"
+"For Linux, there are a few possible options:\n"
 "\n"
-"  - Boot Device: Indicate where you want to place the information required "
-"to \n"
-"boot to GNU/Linux. Generally, you will have setup a bootstrap partition "
-"earlier \n"
-"to hold this information.\n"
+" * Label: this is simply the name you will have to type at the yaboot "
+"prompt\n"
+"to select this boot option.\n"
 "\n"
+" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
+"or a variation of vmlinux with an extension.\n"
 "\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"
+" * Root: the \"root\" device or \"/\" for your Linux installation.\n"
 "\n"
+" * Append: on Apple hardware, the kernel append option is used quite often\n"
+"to assist in initializing video hardware, or to enable keyboard mouse\n"
+"button emulation for the often lacking 2nd and 3rd mouse buttons on a stock\n"
+"Apple mouse. The following are some examples:\n"
 "\n"
-"  - Kernel Boot Timeout: This timeout is similar to the LILO boot delay.  "
-"After \n"
-"selecting Linux, you will have this delay in 0.1 seconds before your "
-"default\n"
-"kernel description is selected.\n"
+"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"hda=autotune\n"
 "\n"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-"  - Enable CD Boot?: Checking this option will allow you to choose 'C' for "
-"CD at\n"
-"the first boot prompt.\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 4,096 bytes. If you\n"
+"need to allocate a large ramdisk, this option can be used.\n"
 "\n"
-"  - Enable OF Boot?: Checking this option will allow you to choose 'N' for "
-"Open\n"
-"Firmware at the first boot prompt.\n"
+" * Read-write: normally the \"root\" partition is initially brought up in\n"
+"read-only, to allow a file system check before the system becomes \"live\".\n"
+"Here, you can override 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 OS: You can select which OS will boot by default when the Open "
-"Firmware \n"
-"Delay expires."
+" * Default: selects this entry as being the default Linux selection,\n"
+"selectable by just pressing ENTER at the yaboot prompt. This entry will\n"
+"also be highlighted with a \"*\", if you press [Tab] to see the boot\n"
+"selections."
 msgstr ""
 
-#: ../../help.pm_.c:738
+#: ../../help.pm_.c:765
 msgid ""
-"You can add additional entries for yaboot, either for other operating "
-"systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"\n"
-"For other OS's - the entry consists only of a label and the root partition.\n"
-"\n"
-"\n"
-"For Linux, there are a few possible options: \n"
-"\n"
+"Yaboot is a boot loader for NewWorld MacIntosh hardware. It is able to boot\n"
+"either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
+"these other operating systems are correctly detected and installed. If this\n"
+"is not the case, you can add an entry by hand in this screen. Be careful as\n"
+"to choose the correct parameters.\n"
 "\n"
-"  - Label: This is simply the name will type at the yaboot prompt to select "
-"this \n"
-"boot option.\n"
-"\n"
-"\n"
-"  - Image: This would be the name of the kernel to boot.  Typically vmlinux "
-"or\n"
-"a variation of vmlinux with an extension.\n"
-"\n"
-"\n"
-"  - Root: The root device or '/' for your Linux installation.\n"
+"Yaboot's main options are:\n"
 "\n"
+" * Init Message: a simple text message that is displayed before the boot\n"
+"prompt.\n"
 "\n"
-"  \n"
-"  - Append: On Apple hardware, the kernel append option is used quite often "
+" * Boot Device: indicate where you want to place the information required "
 "to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button "
-"emulation\n"
-"for the often lacking 2nd and 3rd mouse buttons on a stock Apple mouse.  The "
-"following \n"
-"are some examples:\n"
-"\n"
-"\n"
-"\t\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
-"hda=autotune\n"
-"\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
-"\n"
-"\n"
-" \n"
-"  - Initrd: This option can be used either to load initial modules, before "
-"the boot \n"
-"device is available, or to load a ramdisk image for an emergency boot "
-"situation.\n"
-"\n"
-"\n"
-"  - Initrd-size: The default ramdisk size is generally 4096 bytes.  If you "
-"should need\n"
-"to allocate a large ramdisk, this option can be used.\n"
+"boot to GNU/Linux. Generally, you setup a bootstrap partition earlier to\n"
+"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"
-"  - Read-write: Normally the 'root' partition is initially brought up read-"
-"only, to allow\n"
-"a filesystem check before the system becomes 'live'.  You can override this "
-"option here.\n"
+" * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
+"After selecting Linux, you will have this delay in 0.1 second before your\n"
+"default kernel description is selected.\n"
 "\n"
+" * Enable CD Boot?: checking this option allows you to choose \"C\" for CD\n"
+"at the first boot prompt.\n"
 "\n"
-"  - NoVideo: Should the Apple video hardware prove to be exceptionally "
-"problematic, you can\n"
-"select this option to boot in 'novideo' mode, with native framebuffer "
-"support.\n"
-"\n"
-"\n"
-"  - Default: Selects this entry as being the default Linux selection, "
-"selectable by just\n"
-"pressing ENTER at the yaboot prompt.  This entry will also be highlighted "
-"with a '*', if you\n"
-"press TAB to see the boot selections."
-msgstr ""
-
-#: ../../help.pm_.c:793
-msgid ""
-"SILO is a bootloader for SPARC: it is able to boot\n"
-"either GNU/Linux or any other operating system present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
-"\n"
+" * Enable OF Boot?: checking this option allows you to choose \"N\" for "
+"Open\n"
+"Firmware at the first boot prompt.\n"
 "\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
+" * Default OS: you can select which OS will boot by default when the Open\n"
+"Firmware Delay expires."
 msgstr ""
-"SILO on SPARCin j�rjestelm�lataaja: se pystyy k�ynnist�m��n jokoGNU/Linuxin\n"
-"tai�mik�tahansa�k�ytt�j�rjestelm�n,�joka�on�tietokoneellasi. "
-"Tavallisesti�kaikki\n"
-"k�ytt�j�rjestelm�t�tunnistuvat�ja�asentuvat�oikein.�Jos�jokin "
-"k�ytt�j�rjestelmist�\n"
-"j��kuitenkin�asentamatta,�voit�lis�t�kyseisen�j�rjestelm�n�itse. "
-"Ole�kuitenkinnhuolellinen,�ett�tulet�valinneeksi�oikeat�parametrit.\n"
-"\n"
-"\n"
-"Jos�et�halua�kenenk��n�saavan�oikeuksia�johonkin�k�ytt�j�rjestelmist�,\n"
-"tuhoa�kyseinen�kohta.�Mutta�huomaa,�ett�siin�tapauksessa�tarvitset�itse\n"
-"k�ynnistyslevykett�p��st�ksesi�kyseiseen�k�ytt�j�rjestelm��n!"
 
-#: ../../help.pm_.c:805
+#: ../../help.pm_.c:798
 msgid ""
-"SILO main options are:\n"
-"  - Bootloader installation: Indicate where you want to place the\n"
-"information required to boot to GNU/Linux. Unless you know exactly\n"
-"what you are doing, choose \"First sector of drive (MBR)\".\n"
+"Here are presented various parameters concerning your machine. Depending on\n"
+"your installed hardware, you may - or not, see the following entries:\n"
 "\n"
+" * \"Mouse\": mouse check the current mouse configuration and click on the\n"
+"button to change it if necessary.\n"
 "\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero."
-msgstr ""
-"SILOn p��asetukset ovat:\n"
-"  - J�rjestelm�lataajan asennus: Osoita, minne haluat tallentaa tiedot\n"
-"GNU/Linuxin k�ynnist�miseksi. Jos et ole varma, mit� teet, valitse:\n"
-"\"Levyn ensimm�inen sektori (MBR)\"\n"
-"\n"
+" * \"Keyboard\": keyboard check the current keyboard map configuration and\n"
+"click on the button to change that if necessary.\n"
 "\n"
-"    - Viive ennen oletusj�rjestelm�n k�ynnist�mist�: M��rittelee sekunnin\n"
-"    kymmenyksin� ajan, jonka j�rjestelm�nlataaja odottaa ennen "
-"oletusj�rjestelm�n\n"
-"k�ynnist�mist�. T�m� on hy�dyllinen niiss� j�rjestelmiss�, joissa "
-"k�ynnistyksen\n"
-"halutaan tapahtuvan heti, kun n�pp�imist� on k�ytett�viss�. Lataaja ei "
-"odota,\n"
-"jos \"viive\" puuttuu tai on nolla."
-
-#: ../../help.pm_.c:818
-msgid ""
-"Now it's time to configure the X Window System, which is the\n"
-"core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
-"you must configure your video card and monitor. Most of these\n"
-"steps are automated, though, therefore your work may only consist\n"
-"of verifying what has been done and accept the settings :)\n"
+" * \"Timezone\": time zoneDrakX, by default, guesses your time zone from "
+"the\n"
+"language you have chosen. But here again, as for the choice of a keyboard,\n"
+"you may not be in the country for which the chosen language should\n"
+"correspond. Hence, you may need to click on the \"Timezone\" button in\n"
+"order to configure the clock according to the time zone you are in.\n"
 "\n"
+" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
+"configuration wizard.\n"
 "\n"
-"When the configuration is over, X will be started (unless you\n"
-"ask DrakX not to) so that you can check and see if the\n"
-"settings suit you. If they don't, you can come back and\n"
-"change them, as many times as necessary."
-msgstr ""
-"Nyt on X Window -j�rjestelm�n asetusten vuoro. X Window on Linuxin\n"
-"graafisen k�ytt�liittym�n ydin. T�m�n vuoksi sinun tulee asettaa sek�\n"
-"n�yt�nohjain ett� n�ytt�. Suurin osa vaiheista on automatisoituja\n"
-"ja sinun tulee l�hinn� varmistaa mit� on tehty ja hyv�ksy� valmiit\n"
-"asetukset. :)\n"
+" * \"Sound card\": if a sound card is detected on your system, it is\n"
+"displayed here. No modification possible at installation time.\n"
 "\n"
+" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
+"here. No modification possible at installation time.\n"
 "\n"
-"Kun asetukset on tehty, X k�ynnistet��n (ellet k�skenyt\n"
-"DrakX:�� tekem��n toisin), jotta voit tarkistaa ett� asetukset\n"
-"ovat kunnossa. Jos ne eiv�t ole, voit palata takaisin ja muuttaa\n"
-"niit� niin monta kertaa kuin on tarpeen."
-
-#: ../../help.pm_.c:831
-msgid ""
-"If something is wrong in X configuration, use these options to correctly\n"
-"configure the X Window System."
-msgstr ""
-"Jos jotain meni vikaan X:n asetuksissa, k�yt� n�it� valintoja X:n "
-"asettamiseksi\n"
-"oikein."
-
-#: ../../help.pm_.c:835
-msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
+" * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
+"displayed here. You can click on the button to change the parameters\n"
+"associated to it."
 msgstr ""
-"Jos haluat k�ytt�� graafista sis��nkirjoittautumista valitse \"Kyll�\".\n"
-"Muuten valitse \"Ei\"."
 
-#: ../../help.pm_.c:839
+#: ../../help.pm_.c:827
+#, fuzzy
 msgid ""
-"You can choose a security level for your system. Please refer to the manual "
-"for complete\n"
-"  information. Basically, if you don't know what to choose, keep the default "
-"option.\n"
+"Choose the hard drive you want to erase to install your new Mandrake Linux\n"
+"partition. Be careful, all data present on it will be lost and will not be\n"
+"recoverable!"
 msgstr ""
-"Voit valita j�rjestelm�si turvatason. Katso ohjekirjasta "
-"yksityiskohtaisempia \n"
-"tietoja turvatasojen vaikutuksesta. Tavallisesti jos et tied�, mit� valita, "
-"k�yt� \n"
-"oletusvalintaa.\n"
+"Valitse levyasema, jolle haluat asentaa uuden Mandrake Linux -osion.\n"
+"Ole varovainen, sill� kaikki tieto t�ll� asemalla tuhoutuu,\n"
+"eik� ole en�� palautettavissa."
 
-#: ../../help.pm_.c:844
+#: ../../help.pm_.c:832
+#, fuzzy
 msgid ""
-"Your system is going to reboot.\n"
+"Click on \"OK\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
 "\n"
-"After rebooting, your new Linux Mandrake system will load automatically.\n"
-"If you want to boot into another existing operating system, please read\n"
-"the additional instructions."
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
-"J�rjestelm�si k�ynnistet��n nyt uudelleen.\n"
+"Paina \"OK\", jos haluat tuhota kaiken tiedon ja osiot t�lt�\n"
+"kiintolevylt�. My�s levyll� olleet Windowsin tiedostot tuhoutuvat.\n"
+"Valittuasi \"OK\" et voi en�� palauttaa n�it� tietoja ennalleen,\n"
+"joten ole varovainen.\n"
 "\n"
 "\n"
-"Koneen p��llekytkemisen j�lkeen Linux-Mandrake k�ynnistet��n "
-"automaattisesti.\n"
-"Jos haluat k�ytt�� my�s muita koneessa olevia k�ytt�j�rjestelmi�, katso "
-"asianomaisia\n"
-"lis�ohjeita."
-
-# Asennuksen sivuvalikko
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Kieliasetukset"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Asennuksen luokka"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Kiintolevyjen tunnistus"
-
-# Asennuksen sivuvalikko
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Hiiren m��rittely"
-
-# Asennuksen sivuvalikko
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "N�pp�imist�n valinta"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
-msgstr "Tietoturva"
-
-# Asennuksen sivuvalikko
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Tiedostoj�rjestelm�t"
-
-# Asennuksen sivuvalikko
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Levyjen osiointi"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Asennettavat paketit"
-
-# Asennuksen sivuvalikko
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Asenna j�rjestelm�"
-
-# Asennuksen sivuvalikko
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "Yll�pit�j�n salasana"
-
-# Asennuksen sivuvalikko
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "K�ytt�jien lis��minen"
-
-# Asennuksen sivuvalikko
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Verkkoasetukset"
-
-# Asennuksen sivuvalikko
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-msgstr "Johtop��t�s"
-
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Palvelujen asettaminen"
-
-# Asennuksen sivuvalikko
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "K�ynnistyslevyke"
-
-# Asennuksen sivuvalikko
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Lataajan asetus"
-
-# Asennuksen sivuvalikko
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "X:n asentaminen"
+"Paina \"Peruuta\" peruuttaaksesi t�m�n toiminnon. Peruuttamalla\n"
+"toiminnon et menet� mit��n levyll� olevia tietoja tai osioita."
 
-# Asennuksen sivuvalikko
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Lopeta asennus"
+#: ../../install2.pm_.c:114
+#, c-format
+msgid ""
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
+msgstr ""
 
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3883,20 +3415,20 @@ msgstr ""
 "\n"
 "Haluatko todella asentaa n�m� palvelimet?\n"
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
 msgstr ""
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Aseta tyhj� FAT-alustettu levyke levyasemaan %s"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
 msgstr "T�m� levyke ei ole FAT-alustettu"
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -3904,30 +3436,20 @@ msgstr ""
 "K�ytt��ksesi t�t� \"tallennetut paketit\" valintaa, k�ynnist� asennus "
 "optiolla \"linux defcfg=floppy\""
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "virhe luettaessa tiedostoa $f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "Virhe lukiessa tiedostoa %s"
 
-#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:310
-#: ../../interactive.pm_.c:99 ../../interactive.pm_.c:114
-#: ../../interactive.pm_.c:269 ../../interactive_newt.pm_.c:166
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:356
-#: ../../my_gtk.pm_.c:617 ../../my_gtk.pm_.c:640
+#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:325
+#: ../../interactive.pm_.c:107 ../../interactive.pm_.c:122
+#: ../../interactive.pm_.c:286 ../../interactive.pm_.c:308
+#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:170
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:415
+#: ../../my_gtk.pm_.c:716 ../../my_gtk.pm_.c:738
 msgid "Ok"
 msgstr "Ok"
 
-#: ../../install_gtk.pm_.c:423
-msgid "Please test the mouse"
-msgstr "Testaa hiiri"
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "Aktivoidaksesi hiiren,"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "PY�RIT� HIIREN RULLAA!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -3938,7 +3460,7 @@ msgstr ""
 "kunnolla.\n"
 "Voit l�yt�� lis�tietoja edell�mainituista t��lt�: %s"
 
-#: ../../install_interactive.pm_.c:41
+#: ../../install_interactive.pm_.c:44
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -3948,11 +3470,11 @@ msgstr ""
 "T�t� varten luo osio (tai klikkaa olemassaolevaa).\n"
 "Valitse sitten toiminto ``Liitospaikka'' ja aseta se arvoon `/'"
 
-#: ../../install_interactive.pm_.c:46 ../../install_steps_graphical.pm_.c:259
+#: ../../install_interactive.pm_.c:49 ../../install_steps_graphical.pm_.c:259
 msgid "You must have a swap partition"
 msgstr "Sinulla tulee olla heittovaihtotiedosto"
 
-#: ../../install_interactive.pm_.c:47 ../../install_steps_graphical.pm_.c:261
+#: ../../install_interactive.pm_.c:50 ../../install_steps_graphical.pm_.c:261
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -3962,55 +3484,60 @@ msgstr ""
 "\n"
 "Jatka kuitenkin?"
 
-#: ../../install_interactive.pm_.c:68
+#: ../../install_interactive.pm_.c:53 ../../install_steps.pm_.c:165
+#, fuzzy
+msgid "You must have a FAT partition mounted in /boot/efi"
+msgstr "Sinulla tulee olla heittovaihtotiedosto"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "K�yt� tyhj�� tilaa"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "Ei tarpeeksi tilaa uusien osioiden luomiseksi"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "K�yt� olemassa olevia osioita"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "Ei ole olemassa olevaa osiota k�ytett�v�ksi"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "K�yt� Windows-osiota loopback-tiedostona"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Mille osiolle haluat laittaa Linux4Win:in?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "Valitse koot"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "Juuriosion koko Mt: "
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "Sivutusosion koko Mt: "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "K�yt� tyhj�� tilaa Windows-osiolla"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "Mink� osion kokoa haluat muuttaa?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "Lasken Windows-tiedostoj�rjestelm�n rajoja"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -4019,12 +3546,12 @@ msgstr ""
 "FAT-j�rjestelm�n koon muuttaja ei osaa k�sitell� osiotasi,\n"
 "saatiin seuraava virhe: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "Windows-osiosi on liian pirstoutunut, mene Windowsiin ja aja \"defrag\" ensin"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -4045,21 +3572,21 @@ msgstr ""
 "k�ynnist��\n"
 "asennusohjelman uudelleen, edet� t�h�n kohtaan ja painaa Ok."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "Kuinka paljon tilaa haluat s�ilytt�� Windowsilla"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "osio %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "FAT-tiedostoj�rjestelm�n koon muuttaminen ep�onnistui: %s"
 
-#: ../../install_interactive.pm_.c:145
+#: ../../install_interactive.pm_.c:154
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
@@ -4067,33 +3594,33 @@ msgstr ""
 "Ei ole FAT-osioita, joiden kokoa voisi muuttaa tai k�ytt�� loopback-"
 "tiedostoina (tai osiot ovat t�ynn�)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "Tyhjenn� koko levy"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "Poista Windows(TM)"
 
-#: ../../install_interactive.pm_.c:154
+#: ../../install_interactive.pm_.c:163
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "Sinulla on enemm�n kuin yksi kiintolevy. Mille haluat asentaa Linuxin?"
 
 # mat
-#: ../../install_interactive.pm_.c:157
+#: ../../install_interactive.pm_.c:166
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "KAIKKI olemassaolevat osiot ja niiss� oleva tieto tuhoutuu asemalta %s"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 msgstr "Mukautettu levyn osiointi"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "K�yt� fdiski�"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -4102,29 +3629,29 @@ msgstr ""
 "Voit nyt osioda kiintolevysi %s\n"
 "Kun olet valmis, �l� unohda tallettaa asetuksia komennolla `w'"
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
 msgstr "Sinulla ei ole tarpeeksi tilaa Windows-osiollasi"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
 msgstr "Ei ole tarpeeksi tilaa asentamiseen"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX-Osiointivelho l�ysi seuraavat ratkaisut:"
 
 # mat
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Osiointi ep�onnistui: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "K�ynnist�n verkkoa"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "Ajan alas verkkoa"
 
@@ -4136,12 +3663,12 @@ msgstr ""
 "Tapahtui virhe, sit� ei voida k�sitell� kunnolla.\n"
 "Jatka omalla riskill�si."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Kahdentunut liitospaikka %s"
 
-#: ../../install_steps.pm_.c:385
+#: ../../install_steps.pm_.c:384
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
@@ -4153,16 +3680,16 @@ msgstr ""
 "Tarkista cdrom Linux-koneessa k�ytt�m�ll� \"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
 
 # mat
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "Tervetuloa %s:n"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "Ei levykeasemaa k�ytett�viss�"
 
-#: ../../install_steps_auto_install.pm_.c:51
+#: ../../install_steps_auto_install.pm_.c:77
 #: ../../install_steps_stdio.pm_.c:23
 #, c-format
 msgid "Entering step `%s'\n"
@@ -4176,32 +3703,32 @@ msgstr "Valitse asennuksen koko"
 msgid "Total size: "
 msgstr "Kokonaiskoko: "
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:437
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:387
 #, c-format
 msgid "Version: %s\n"
 msgstr "Versio: %s\n"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:438
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:388
 #, c-format
 msgid "Size: %d KB\n"
 msgstr "Koko: %d Kt\n"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:337
-#: ../../install_steps_interactive.pm_.c:520
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:509
 msgid "Choose the packages you want to install"
 msgstr "Valitse asennettavat paketit"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:340
+#: ../../install_steps_graphical.pm_.c:465 ../../interactive_gtk.pm_.c:571
 msgid "Info"
 msgstr "Tietoja"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:345
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:457
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Install"
 msgstr "Asenna"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:558
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:497
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Installing"
 msgstr "Asennan"
 
@@ -4209,7 +3736,7 @@ msgstr "Asennan"
 msgid "Please wait, "
 msgstr "Odota hetki, "
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:570
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:510
 msgid "Time remaining "
 msgstr "J�ljell� "
 
@@ -4218,21 +3745,21 @@ msgid "Total time "
 msgstr "Kokonaisaika "
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "Valmistelen asennusta"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:618
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:558
 #, c-format
 msgid "Installing package %s"
 msgstr "Asennan pakettia %s"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
+#: ../../install_steps_gtk.pm_.c:646
 msgid "Go on anyway?"
 msgstr "Jatka kuitenkin?"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:695
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
 msgid "There was an error ordering packages:"
 msgstr "Tapahtu virhe j�rjestett�ess� paketteja:"
 
@@ -4240,30 +3767,34 @@ msgstr "Tapahtu virhe j�rjestett�ess� paketteja:"
 msgid "Use existing configuration for X11?"
 msgstr "K�yt� olemassaolevia asetuksia X11:ta?"
 
-#: ../../install_steps_gtk.pm_.c:142
+#: ../../install_steps_gtk.pm_.c:148
 msgid ""
 "Your system is low on resource. You may have some problem installing\n"
-"Linux-Mandrake. If that occurs, you can try a text install instead. For "
+"Mandrake Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"J�rjestelm�si resurssit ovat lopussa. Voit kohdata ongelmia Linux-Mandrakea "
+"J�rjestelm�si resurssit ovat lopussa. Voit kohdata ongelmia Mandrake Linuxa "
 "asentaessasi.\n"
 "Jos n�in tapahtuu, voit kokeilla tekstipohjaista asennusta. Tehd�ksesi niin "
 "paina `F1' kun\n"
 "k�ynnist�t asennusohjelmaa CDROM-asemasta. T�m�n j�lkeen kirjoita `text'."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Asennusluokka"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "Valitse yksi seuraavista asennusluokista:"
 
-#: ../../install_steps_gtk.pm_.c:222
+#: ../../install_steps_gtk.pm_.c:228
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr "Valitsemiesi ryhmien kokonaiskoko on suunnilleen %d Mt.\n"
 
-#: ../../install_steps_gtk.pm_.c:224
+#: ../../install_steps_gtk.pm_.c:230
 #, c-format
 msgid ""
 "If you wish to install less than this size,\n"
@@ -4278,7 +3809,7 @@ msgstr ""
 "Pieni prosenttiosuus asentaa vain t�rkeimm�t paketit,\n"
 "100%% osuus asentaa kaikki paketit."
 
-#: ../../install_steps_gtk.pm_.c:229
+#: ../../install_steps_gtk.pm_.c:235
 #, c-format
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
@@ -4294,86 +3825,70 @@ msgstr ""
 "Pieni prosentti asentaa vain t�rkeimm�t paketit, %d%%\n"
 " prosenttiosuus asentaa niin monta pakettia kuin on mahdollista."
 
-#: ../../install_steps_gtk.pm_.c:235
+#: ../../install_steps_gtk.pm_.c:241
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "Voit valita paketit tarkemmin seuraavassa vaiheessa"
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "Prosenttiosuus asennettavista paketeista"
 
-#: ../../install_steps_gtk.pm_.c:285 ../../install_steps_interactive.pm_.c:599
+#: ../../install_steps_gtk.pm_.c:291 ../../install_steps_interactive.pm_.c:619
 msgid "Package Group Selection"
 msgstr "Pakettiryhmien valinta"
 
-#: ../../install_steps_gtk.pm_.c:305 ../../install_steps_interactive.pm_.c:614
+#: ../../install_steps_gtk.pm_.c:320 ../../install_steps_interactive.pm_.c:634
 msgid "Individual package selection"
 msgstr "Yksitt�isten pakettien valinta"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr "N�yt� automaattisesti valitut paketit"
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "Laajenna puu"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Sulje puu"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Vaihda tasaisen ja ryhm�j�rjestyksen v�lill�"
+# mat
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Koko yhteens�: %d / %d Mt"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Viallinen paketti"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nimi: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "T�rkeys: %s\n"
 
-# mat
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Koko yhteens�: %d / %d Mt"
-
-#: ../../install_steps_gtk.pm_.c:467
+#: ../../install_steps_gtk.pm_.c:411
 msgid ""
 "You can't select this package as there is not enough space left to install it"
 msgstr ""
 "Et voi asentaa t�t� pakettia, koska levyll� ei ole tarpeeksi tilaa sen "
 "asentamiseksi"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "Seuraavat paketit asennetaan"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "Seuraavat paketit poistetaan"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "Et voi valita/poistaa t�t� pakettia"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "T�m� on pakollinen paketti, sit� ei voida poistaa valinnoista"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
 msgstr "Et voi poistaa t�m�n paketin valintaa. Se on jo asennettu"
 
-#: ../../install_steps_gtk.pm_.c:507
+#: ../../install_steps_gtk.pm_.c:447
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -4381,24 +3896,44 @@ msgstr ""
 "T�m� paketti tulee p�ivitt��\n"
 "Oletko varma ett� haluat poistaa valinnan?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Et voi poistaa t�m�n paketin valintaa. Paketti pit�� p�ivitt��."
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr "N�yt� automaattisesti valitut paketit"
+
+#: ../../install_steps_gtk.pm_.c:460
+#, fuzzy
+msgid "Load/Save on floppy"
+msgstr "Tallenna levykkeelle"
+
+#: ../../install_steps_gtk.pm_.c:461
+#, fuzzy
+msgid "Updating package selection"
+msgstr "Yksitt�isten pakettien valinta"
+
+# Asennuksen sivuvalikko
+#: ../../install_steps_gtk.pm_.c:466
+#, fuzzy
+msgid "Minimal install"
+msgstr "Lopeta asennus"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "Arvioin aikaa"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
 msgstr "Valmistelen asennusta"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d pakettia"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -4461,15 +3996,15 @@ msgstr ""
 "asianomaisille tekij�ille ja ne on suojattu yksityisen omaisuuden ja \n"
 "ohjelmiston tekij�noikeuslakien avulla.\n"
 
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Accept"
 msgstr "Hyv�ksy"
 
-#: ../../install_steps_gtk.pm_.c:680 ../../install_steps_interactive.pm_.c:163
+#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
 msgid "Refuse"
 msgstr "Hylk��"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4484,7 +4019,7 @@ msgstr ""
 "Jos sinulla ei ole levy�, paina Peruuta v�ltt��ksesi asennukset t�lt� "
 "levylt�."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "Tapahtu virhe asennettaessa paketteja:"
 
@@ -4492,34 +4027,21 @@ msgstr "Tapahtu virhe asennettaessa paketteja:"
 msgid "An error occurred"
 msgstr "Tapahtui virhe"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "Valitse k�ytett�v� kieli."
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr "Voit valita kielet jotka ovat k�ytett�viss� asennuksen j�lkeen"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "Kaikki"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "Lisenssin hyv�ksyminen"
 
-#: ../../install_steps_interactive.pm_.c:87
+#: ../../install_steps_interactive.pm_.c:72
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Linux-"
-"Mandrake distribution \n"
+"The operating system and the different components available in the Mandrake "
+"Linux 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 Linux-Mandrake distribution.\n"
+"system and the different components of the Mandrake Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4573,7 +4095,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 Linux-Mandrake sites  which are prohibited or restricted in some "
+"from one of Mandrake Linux 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"
@@ -4610,7 +4132,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\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
 "MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -4630,103 +4152,99 @@ msgid ""
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:182
-#: ../../install_steps_interactive.pm_.c:822
+#: ../../install_steps_interactive.pm_.c:168
+#: ../../install_steps_interactive.pm_.c:871
 #: ../../standalone/keyboarddrake_.c:28
 msgid "Keyboard"
 msgstr "N�pp�imist�"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "Valitse n�pp�imist�si asettelu."
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
 msgstr "T�ss� on koko lista olemassa olevista n�pp�imist�ist�"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Asennusluokka"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "Valitse asennuksen luokka?"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
 msgstr "Asenna/P�ivit�"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
 msgstr "Onko t�m� asennus vai p�ivitys?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Suositeltu"
 
-#: ../../install_steps_interactive.pm_.c:215
-#: ../../install_steps_interactive.pm_.c:218
+#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:204
 msgid "Expert"
 msgstr "Asiantuntija"
 
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Update"
 msgstr "P�ivit�"
 
-#: ../../install_steps_interactive.pm_.c:238 ../../standalone/mousedrake_.c:41
+#: ../../install_steps_interactive.pm_.c:224 ../../standalone/mousedrake_.c:48
 msgid "Please, choose the type of your mouse."
 msgstr "Valitse hiiren tyyppi."
 
-#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:57
+#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
 msgid "Mouse Port"
 msgstr "Hiiren portti"
 
-#: ../../install_steps_interactive.pm_.c:245 ../../standalone/mousedrake_.c:58
+#: ../../install_steps_interactive.pm_.c:231 ../../standalone/mousedrake_.c:65
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Mihin sarjaporttiin hiiresi on liitetty."
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
 msgstr "N�pp�inemulaatio"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
 msgstr "2. n�pp�imen emulaatio"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
 msgstr "3. n�pp�imen emulaatio"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "Asetan PCMCIA kortteja...."
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "Configuring IDE"
 msgstr "Asetan IDE-levy�"
 
-#: ../../install_steps_interactive.pm_.c:280
+#: ../../install_steps_interactive.pm_.c:266
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:295
+#: ../../install_steps_interactive.pm_.c:281
 msgid "no available partitions"
 msgstr "ei vapaita osioita"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
 msgstr "Tarkistan osioita l�yt��kseni liitoskohdat"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "Valitse liitospaikat"
 
-#: ../../install_steps_interactive.pm_.c:323
+#: ../../install_steps_interactive.pm_.c:311
 #, c-format
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
@@ -4743,7 +4261,7 @@ msgstr ""
 "\n"
 "Hyv�ksytk� kaikkien osioiden menett�misen?\n"
 
-#: ../../install_steps_interactive.pm_.c:336
+#: ../../install_steps_interactive.pm_.c:324
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
@@ -4751,49 +4269,60 @@ msgstr ""
 "DiskDrake ei pystynyt lukemaan osiotaulua oikein.\n"
 "Jatka omalla vastuullasi!"
 
-#: ../../install_steps_interactive.pm_.c:361
+#: ../../install_steps_interactive.pm_.c:340
+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_.c:349
+#, fuzzy
+msgid "No root partition found to perform an upgrade"
+msgstr "Valitse alustettavat osiot"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "Juuriosio"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
 msgstr "Mik� on j�rjestelm�si juuriosio (/) ?"
 
-#: ../../install_steps_interactive.pm_.c:376
+#: ../../install_steps_interactive.pm_.c:365
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 "Sinun tulee k�ynnist�� j�rjestelm� uudelleen jotta muutokset tulevat voimaan"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "Valitse alustettavat osiot"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "Tarkista vialliset lohkot?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "Alustan osioita"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Luon ja alustan tiedostoa %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Heittovaihtotiedosto ei ole riitt�v�n suuri, suurenna sit�"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "Etsin saatavilla olevia paketteja"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "Etsin p�ivitett�vi� paketteja"
 
-#: ../../install_steps_interactive.pm_.c:461
+#: ../../install_steps_interactive.pm_.c:450
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
@@ -4801,30 +4330,60 @@ msgstr ""
 "J�rjestelm�ss�si ei ole riitt�v�sti tilaa asennukseen tai p�ivitykseen (%d > "
 "%d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "T�ydellinen (%dMt)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "Minimi (%dMt)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Suositeltu (%dMt)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "Mukautettu"
 
-#: ../../install_steps_interactive.pm_.c:585
+#: ../../install_steps_interactive.pm_.c:522
+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_.c:525
+#, fuzzy
+msgid "Load from floppy"
+msgstr "Palauta levykkeelt�"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Loading from floppy"
+msgstr "Palauta levykkeelt�"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Package selection"
+msgstr "Pakettiryhmien valinta"
+
+#: ../../install_steps_interactive.pm_.c:532
+#, fuzzy
+msgid "Insert a floppy containing package selection"
+msgstr "Aseta tyhj� levyke levyasemaan %s"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Tallenna levykkeelle"
+
+#: ../../install_steps_interactive.pm_.c:605
 msgid "Selected size is larger than available space"
 msgstr "Valittu koko on suurempi kuin olemassa oleva levytila"
 
-#: ../../install_steps_interactive.pm_.c:650
+#: ../../install_steps_interactive.pm_.c:670
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -4834,12 +4393,12 @@ msgstr ""
 "Jos sinulla ei ole mit��n levyist�, paina Peruuta.\n"
 "Jos jotkut levyist� puuttuvat, poista niiden valinnat, ja paina OK."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom nimelt��n \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -4848,11 +4407,22 @@ msgstr ""
 "Asennan pakettia %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "Asennuksen j�lkeiset toiminnot"
 
-#: ../../install_steps_interactive.pm_.c:718
+#: ../../install_steps_interactive.pm_.c:719
+#, fuzzy, c-format
+msgid "Please insert the Boot floppy used in drive %s"
+msgstr "Aseta tyhj� levyke levyasemaan %s"
+
+# mat
+#: ../../install_steps_interactive.pm_.c:725
+#, fuzzy, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "Aseta tyhj� levyke levyasemaan %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -4928,94 +4498,143 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:750
+#: ../../install_steps_interactive.pm_.c:782
 msgid "Choose a mirror from which to get the packages"
 msgstr "Valitse peilij�rjestelm� josta paketit haetaan"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Yhdist�n peilij�rjestelm��n hakeakseni uusimman pakettilistan"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "Valitse asennettavat paketit."
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "Mik� on j�rjestelm�si aikavy�hyke?"
 
-#: ../../install_steps_interactive.pm_.c:778
-msgid "Is your hardware clock set to GMT?"
+#: ../../install_steps_interactive.pm_.c:813
+#, fuzzy
+msgid "Hardware clock set to GMT"
 msgstr "Onko koneen kello asetettu GMT aikaan?"
 
-#: ../../install_steps_interactive.pm_.c:806 ../../printer.pm_.c:22
-#: ../../printerdrake.pm_.c:415
+#: ../../install_steps_interactive.pm_.c:814
+msgid "Automatic time synchronization (using NTP)"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:821
+#, fuzzy
+msgid "NTP Server"
+msgstr "NIS-palvelin"
+
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
 msgstr "Ulkoinen CUPS-palvelin"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "Ei kirjoitinta"
 
-#: ../../install_steps_interactive.pm_.c:821
+# Asennuksen sivuvalikko
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Johtop��t�s"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
 msgstr "Hiiri"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr "Aikavy�hyke"
 
-#: ../../install_steps_interactive.pm_.c:824 ../../printerdrake.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:873 ../../printerdrake.pm_.c:1773
+#: ../../printerdrake.pm_.c:1844
 msgid "Printer"
 msgstr "Kirjoitin"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:875
 msgid "ISDN card"
 msgstr "ISDN-kortti"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
 msgstr "��nikortti"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr "TV-kortti"
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "Mit� tulostusj�rjestelm�� haluat k�ytt��?"
+#: ../../install_steps_interactive.pm_.c:917
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:945
+msgid "LDAP"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:918
+#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:954
+#, fuzzy
+msgid "NIS"
+msgstr "K�yt� NIS:i�"
+
+#: ../../install_steps_interactive.pm_.c:919
+#: ../../install_steps_interactive.pm_.c:941
+#, fuzzy
+msgid "Local files"
+msgstr "Paikallinen kirjoitin"
+
+# Asennuksen sivuvalikko
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "Yll�pit�j�n salasana"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Ei salasanaa"
 
-#: ../../install_steps_interactive.pm_.c:901
+#: ../../install_steps_interactive.pm_.c:935
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr ""
 "Salasana on liian yksinkertainen (sen tulee olla ainakin %d merkki� pitk�)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "K�yt� NIS:i�"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Tunnistustapa"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "keltaiset sivut"
+#: ../../install_steps_interactive.pm_.c:949
+#, fuzzy
+msgid "Authentication LDAP"
+msgstr "Tunnistustapa"
+
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:951
+#, fuzzy
+msgid "LDAP Server"
+msgstr "NIS-palvelin"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
+#: ../../install_steps_interactive.pm_.c:957
+#, fuzzy
+msgid "Authentication NIS"
 msgstr "Tunnistus NIS"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "NIS-alue"
 
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:959
 msgid "NIS Server"
 msgstr "NIS-palvelin"
 
-#: ../../install_steps_interactive.pm_.c:951
+#: ../../install_steps_interactive.pm_.c:994
 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 "
@@ -5042,19 +4661,19 @@ msgstr ""
 "Jos haluat luoda k�ynnistyslevykkeen j�rjestelm��si, aseta levyke\n"
 "ensimm�iseen asemaan ja paina \"Ok\","
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Ensimm�inen levyasema"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Toinen levyasema"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "Ohita"
 
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:1017
 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 "
@@ -5076,32 +4695,40 @@ msgstr ""
 "j�rjestelm�n virhetilanteista on helpompi toipua.\n"
 "Haluatko luoda k�ynnistyslevykkeen j�rjestelm��si?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "Levyajuria ei ole saatavilla"
 
-#: ../../install_steps_interactive.pm_.c:987
+#: ../../install_steps_interactive.pm_.c:1030
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Valitse levyasema jolla luot k�ynnistyslevykkeen"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Aseta tyhj� levyke levyasemaan %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "Luon k�ynnistyslevykett�"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "Valmistelen k�ytt�j�rjestelm�n lataajaa"
 
-#: ../../install_steps_interactive.pm_.c:1010
+#: ../../install_steps_interactive.pm_.c:1055
+msgid ""
+"You appear to have an OldWorld or Unknown\n"
+" machine, the yaboot bootloader will not work for you.\n"
+"The install will continue, but you'll\n"
+" need to use BootX to boot your machine"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:1060
 msgid "Do you want to use aboot?"
 msgstr "Haluatko k�ytt�� aboot:ia?"
 
-#: ../../install_steps_interactive.pm_.c:1013
+#: ../../install_steps_interactive.pm_.c:1063
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -5109,16 +4736,23 @@ msgstr ""
 "Virhe asennettaessa aboot:a,\n"
 "yrit� pakkoasennusta vaikka se tuhoaa ensimm�isen osion?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+# Asennuksen sivuvalikko
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "Lataajan asetus"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "J�rjestelm�lataajan asennus ep�onnistu. Seuraava virhe tapahtui:"
 
-#: ../../install_steps_interactive.pm_.c:1030
+#: ../../install_steps_interactive.pm_.c:1084
+#, fuzzy, 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 $of_boot,\\\\:tbxi\n"
+" setenv boot-device %s,\\\\:tbxi\n"
 " Then type: shut-down\n"
 "At your next boot you should see the bootloader prompt."
 msgstr ""
@@ -5130,38 +4764,35 @@ msgstr ""
 "Seuraavalla k�ynnistyskerralla sinun pit�isi n�hd� k�ynnistyslataajan\n"
 "komentokehoite."
 
-#: ../../install_steps_interactive.pm_.c:1038 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1092 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "Matala"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Keski"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Korkea"
 
-#: ../../install_steps_interactive.pm_.c:1044 ../../standalone/draksec_.c:49
+#: ../../install_steps_interactive.pm_.c:1098 ../../standalone/draksec_.c:62
 msgid "Choose security level"
 msgstr "Valitse turvataso"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr "Haluatko luoda automaattisen asennuslevyn linuxin monistamiseksi?"
-
 # mat
-#: ../../install_steps_interactive.pm_.c:1082
+#: ../../install_steps_interactive.pm_.c:1134
+#: ../../standalone/drakautoinst_.c:80
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Aseta tyhj� levyke levyasemaan %s"
 
-#: ../../install_steps_interactive.pm_.c:1096
-#: ../../install_steps_interactive.pm_.c:1128
+#: ../../install_steps_interactive.pm_.c:1138
+#: ../../standalone/drakautoinst_.c:82
 msgid "Creating auto install floppy"
 msgstr "Valmistelen automaattiasennuslevykett�"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5171,33 +4802,33 @@ msgstr ""
 "\n"
 "Haluatko todella lopettaa?"
 
-#: ../../install_steps_interactive.pm_.c:1167
+#: ../../install_steps_interactive.pm_.c:1160
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
-"For information on fixes which are available for this release of Linux-"
-"Mandrake,\n"
-"consult the Errata available from http://www.linux-mandrake.com/.\n"
+"For information on fixes which are available for this release of Mandrake "
+"Linux,\n"
+"consult the Errata available from http://www.mandrakelinux.com/.\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Linux-Mandrake User's Guide."
+"install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
 "Onnittelut, asennus on valmis.\n"
 "Poista levyke asemasta ja paina Enter k�ynnist��ksesi koneen uudelleen.\n"
 "\n"
-"L�yd�t t�h�n Linux-Mandraken versioon olemassaolevat korjaukset ja\n"
-"korjattujen virheiden listan osoitteesta http://www.linux-mandrake.com.\n"
+"L�yd�t t�h�n Mandrake Linuxn versioon olemassaolevat korjaukset ja\n"
+"korjattujen virheiden listan osoitteesta http://www.mandrakelinux.com.\n"
 "\n"
-"J�rjestelm�n asetusten muuttamisesta saat tietoja virallisen Linux-"
-"Mandraken \n"
+"J�rjestelm�n asetusten muuttamisesta saat tietoja virallisen Mandrake "
+"Linuxn\n"
 "oppaan luvusta \"Asennuksen j�lkeinen konfigurointi\""
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
 msgstr "Valmistelen automaattista asennuslevykett�"
 
-#: ../../install_steps_interactive.pm_.c:1181
+#: ../../install_steps_interactive.pm_.c:1174
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -5211,41 +4842,58 @@ msgstr ""
 "\n"
 "Ehk� haluat mieluummin toistaa asennuksen.\n"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "Automaattinen"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
 msgstr "Toista"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 msgstr "Yksitt�isten pakettien valinta"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Linux-Mandrake Asennus %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "Mandrake Linux Asennus %s"
 
-#: ../../install_steps_newt.pm_.c:33
+#: ../../install_steps_newt.pm_.c:34
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> vaihtaa elementti�  | <Space> valitsee | <F12> seuraava "
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
 msgstr "kdesu puuttuu"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "Valitse toiminta"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr "Lis�asetukset"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "Odota hetki"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Laajenna puu"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Sulje puu"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Vaihda tasaisen ja ryhm�j�rjestyksen v�lill�"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -5271,267 +4919,291 @@ msgstr "Valintasi? (oletus %s) "
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Valintasi? (oletus %s anna `ei mik��n' jos et halua mit��n) "
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "Tsekki (QWERTZ)"
 
-#: ../../keyboard.pm_.c:125 ../../keyboard.pm_.c:138 ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:141 ../../keyboard.pm_.c:155 ../../keyboard.pm_.c:180
 msgid "German"
 msgstr "Saksa"
 
-#: ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:142
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:127 ../../keyboard.pm_.c:164
+#: ../../keyboard.pm_.c:143 ../../keyboard.pm_.c:186
 msgid "Spanish"
 msgstr "Espanja"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ../../keyboard.pm_.c:129 ../../keyboard.pm_.c:139 ../../keyboard.pm_.c:166
+#: ../../keyboard.pm_.c:145 ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:188
 msgid "French"
 msgstr "Ranska"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
 msgstr "Norja"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "Puola"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "Ven�j�"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "Ruotsi"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "UK n�pp�imist�"
 
-#: ../../keyboard.pm_.c:134 ../../keyboard.pm_.c:137 ../../keyboard.pm_.c:204
+#: ../../keyboard.pm_.c:152 ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:237
 msgid "US keyboard"
 msgstr "US n�pp�imist�"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+#, fuzzy
+msgid "Albanian"
+msgstr "Iran"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "Armeenia (vanha)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "Armeenia (kirjoituskone)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "Armeenia (foneettinen)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr ""
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr ""
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "Belgia"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "Bulgaria"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "Brasilia"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Valkoven�j�"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "Sveitsi (Saksalainen j�rjestys)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "Sveitsi (Ranskalainen j�rjestys)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "Tsekki (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr "Tsekki (ohjelmoijat)"
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "Saksa (ei kuolleita n�pp�imi�)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "Tanska"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:183
 msgid "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:184
 msgid "Dvorak (Norwegian)"
 msgstr "Norja (Dvorak)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgia (\"Ven�l�inen\"-j�rjestys)"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgia (\"Latin\"-j�rjestys)"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "Kreikka"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "Unkari"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Kroatia"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "Israeli"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "Israeli (Foneettinen)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Iran"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "Islanti"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "Italia"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "Japani 106-n�pp�iminen"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
 msgstr "Korealainen n�pp�imist�"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "Latinalainen amerikka"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr "Makedonia"
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "Hollanti"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Liettua AZERTY (vanha)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Liettua AZERTY (uusi)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Liettua \"numerorivi\" QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Liettua \"foneettinen\" QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "Paikka"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Makedonia"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "Hollanti"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Puola (qwerty j�rjestys)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Puola (qwertz j�rjestys)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "Portugali"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "Kanada (Quebec)"
 
-#: ../../keyboard.pm_.c:193
-msgid "Russian (Yawerty)"
+#: ../../keyboard.pm_.c:217
+#, fuzzy
+msgid "Romanian (qwertz)"
 msgstr "Ven�j� (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "Ruotsi"
+#: ../../keyboard.pm_.c:218
+#, fuzzy
+msgid "Romanian (qwerty)"
+msgstr "Ven�j� (Yawerty)"
 
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:220
+msgid "Russian (Yawerty)"
+msgstr "Ven�j� (Yawerty)"
+
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "Slovenia"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "Slovakia (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "Slovakia (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr "Slovakia (Ohjelmoijat)"
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "Jugoslavia (latin/cyrillic)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Thai-n�pp�imist�"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "Thai-n�pp�imist�"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turkki (perinteinen \"F\"-malli)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turkki (perinteinen \"Q\"-malli)"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ukraina"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "US n�pp�imist� (kansainv�linen)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamilainen \"numerorivi\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
+#: ../../keyboard.pm_.c:240
+#, fuzzy
+msgid "Yugoslavian (latin)"
 msgstr "Jugoslavia (latin/cyrillic)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Rengasmaisia liitoksia %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr "Poista loogiset osiot ensin\n"
 
@@ -5643,170 +5315,219 @@ msgstr "ei mik��n"
 msgid "No mouse"
 msgstr "Ei hiirt�"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Testaa hiiri"
+
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "Aktivoidaksesi hiiren,"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "PY�RIT� HIIREN RULLAA!"
+
+#: ../../my_gtk.pm_.c:380
+msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgstr ""
+
+#: ../../my_gtk.pm_.c:415
 msgid "Finish"
 msgstr "Loppu"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "Seuraava ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
 msgstr "<- Edellinen"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "Onko t�m� oikein?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Internetin asetukset"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Ota yhteys internettiin"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "Haluatko kokeilla internetyhteytt� nyt?"
+#: ../../network/adsl.pm_.c:20
+msgid ""
+"The most common way to connect with adsl is pppoe.\n"
+"Some connections use pptp, a few ones use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"Yleisin tapa liitty� asdl-verkkoon on k�ytt�� pppoe:a.\n"
+"Jotkin yhteydet k�ytt�v�t pptp:t�, muutamat dhcp:t�.\n"
+"Jos et tied�, mit� valita, valitse 'k�yt� pppoe:a'"
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "Testaan yhteytt�si..."
+#: ../../network/adsl.pm_.c:22
+msgid "Alcatel speedtouch usb"
+msgstr ""
 
-#: ../../netconnect.pm_.c:154 ../../standalone/draknet_.c:196
-msgid "The system is now connected to Internet."
-msgstr "J�rjestelm� on nyt internetiss�."
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "k�yt� dhpc:t�"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr "Turvallisuussyist� yhteys suljetaan nyt."
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "k�yt� pppoe:a"
+
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "k�yt� pptp:t�"
 
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
+#: ../../network/ethernet.pm_.c:37
 msgid ""
-"The system doesn't seem to be connected to internet.\n"
-"Try to reconfigure your connection."
+"Which dhcp client do you want to use?\n"
+"Default is dhcpcd"
 msgstr ""
-"J�rjestelm� ei n�yt� olevan internetiss�.\n"
-"Yrit� muuttaa internet-asetuksia."
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "Verkon asetukset"
-
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
-msgid "ISDN Configuration"
-msgstr "ISDN:n asetus"
+"Mit� dhcp-asiakasohjelmaa haluat k�ytt��?\n"
+"Oletus on dhcpcd"
 
-#: ../../netconnect.pm_.c:222
+#: ../../network/ethernet.pm_.c:88
 msgid ""
-"Select your provider.\n"
-" If it's not in the list, choose Unlisted"
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
 msgstr ""
-"Valitse palveluntarjoajasi.\n"
-" Jos se ei ole listassa, valitse `Ei listattu'"
+"Ethernet-verkkokorttia ei l�ytynyt j�rjestelm�st�.\n"
+"Ei voida asentaa t�m�n tyyppist� yhteytt�."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Yhteyden asetus"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Valitse verkkoliittym�"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Valitse alla olevista kohdista"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "Valitse mit� verkkokorteista haluat k�ytt�� internetiin liittymiseen"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "Kortin IRQ"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "verkkokorttia ei l�ytynyt"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "Kortin muisti (DMA)"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "Asetan verkkoa"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "Kortin IO"
+#: ../../network/ethernet.pm_.c:203
+msgid ""
+"Please enter your host name if you know it.\n"
+"Some DHCP servers require the hostname to work.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''."
+msgstr ""
+"Sy�t� koneesi nimi, jos tied�t sen.\n"
+"Jotkin DHCP-palvelimet tarvitsevat koneen nimen toimiakseen.\n"
+"Koneesi nimen pit�isi olla t�ysin laillinen nimi, kuten\n"
+"\" minunkone.omapaikka.net\"."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "Kortin IO_0"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "Koneen nimi"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "Kortin IO_1"
+#: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
+#: ../../network/netconnect.pm_.c:91 ../../network/netconnect.pm_.c:105
+#: ../../network/netconnect.pm_.c:154 ../../network/netconnect.pm_.c:164
+#: ../../network/netconnect.pm_.c:190 ../../network/netconnect.pm_.c:213
+#: ../../network/netconnect.pm_.c:221
+msgid "Network Configuration Wizard"
+msgstr "Verkkoasetusten velho"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "Henkil�kohtainen puhelinnumerosi"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "Ulkoinen ISDN-modeemi"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Palveluntarjoajan nimi (esim: tarjoaja.net)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Sis�inen ISDN-kortti"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "Palveluntarjoajan puhelinnumero"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "Mink�lainen ISND-yhteytesi on?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "Palveluntarjoajan dns 1"
+#: ../../network/isdn.pm_.c:45
+msgid ""
+"Which ISDN configuration do you prefer?\n"
+"\n"
+"* The Old configuration uses isdn4net. It contains powerfull\n"
+"  tools, but is tricky to configure, and not standard.\n"
+"\n"
+"* The New configuration is easier to understand, more\n"
+"  standard, but with less tools.\n"
+"\n"
+"We recommand the light configuration.\n"
+msgstr ""
 
-#: ../../netconnect.pm_.c:248
-msgid "Provider dns 2"
-msgstr "Palveluntarjoajan dns 2"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "New configuration (isdn-light)"
+msgstr "Palomuuri l�ydetty!"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "Soittotila"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "Old configuration (isdn4net)"
+msgstr "Palomuuri l�ydetty!"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "K�ytt�j�tunnus (k�ytt�j�n nimi)"
+#: ../../network/isdn.pm_.c:169 ../../network/isdn.pm_.c:187
+#: ../../network/isdn.pm_.c:197 ../../network/isdn.pm_.c:204
+#: ../../network/isdn.pm_.c:214
+msgid "ISDN Configuration"
+msgstr "ISDN:n asetus"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Salasana"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Valitse palveluntarjoajasi.\n"
+" Jos se ei ole listassa, valitse `Ei listattu'"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Eurooppa"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "K�ynnistysprotokolla"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol (EDSS1)"
 msgstr "Eurooppa (EDSS1)"
 
-#: ../../netconnect.pm_.c:263
-msgid "Rest of the world"
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
+msgid "Protocol for the rest of the world"
 msgstr "Muu maailma"
 
-#: ../../netconnect.pm_.c:263
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
 msgid ""
-"Rest of the world \n"
+"Protocol for the rest of the world \n"
 " no D-Channel (leased lines)"
 msgstr ""
 "Muu maailma \n"
 " ei D-kanavaa (leased lines)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Mit� protokollaa haluat k�ytt��?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Millainen kortti sinulla on?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "En tied�"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../netconnect.pm_.c:284
+#: ../../network/isdn.pm_.c:205
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -5818,19 +5539,19 @@ msgstr ""
 "\n"
 "Jos sinulla on PCMIA-kortti sinun t�ytyy tiet�� korttisi IRQ ja IO.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "Hylk��"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "Jatka"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "Mik� ISDN-kortti sinulla on?"
 
-#: ../../netconnect.pm_.c:314
+#: ../../network/isdn.pm_.c:234
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
@@ -5838,106 +5559,59 @@ msgstr ""
 "Olen havainnut ISDN PCI-kortin, mutta en tunnista tyyppi�. Valitseyksi "
 "seuraavassa ruudussa olevista korteista."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "ISDN PCI-korttia ei l�ydetty. Valitse yksi seuraavasta ruudusta."
 
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Ethernet-verkkokorttia ei l�ytynyt j�rjestelm�st�.\n"
-"Ei voida asentaa t�m�n tyyppist� yhteytt�."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "Valitse verkkoliittym�"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr "Valitse mit� verkkokorteista haluat k�ytt�� internetiin liittymiseen"
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "Verkkoliittym�"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"Hyv�ksytk�?"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "Uudelleenk�ynnistet��n verkkokorttia:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "ASDL-asetukset"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "Haluatko ottaa yhteyden koneen k�ynnistyksen yhteydess�?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Valitse sarjaportti, johon modeemisi on kytketty."
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Soittoasetukset"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "Yhteyden nimi"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "Puhelinnumero"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "K�ytt�j� ID"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "Tunnistustapa"
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
+msgid "CHAP"
+msgstr ""
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Script-based"
 msgstr "Script-pohjainen"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Terminaalipohjainen"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Verkkoalueen nimi"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
 msgstr "Ensimm�inen nimipalvelin (ei pakollinen)"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 msgid "Second DNS Server (optional)"
 msgstr "Toinen nimipalvelin (ei pakollinen)"
 
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr "Uudelleenk�ynnistet��n verkkokortti $netc->{NET_DEVICE}. Hyv�ksytk�?"
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -5945,7 +5619,7 @@ msgstr ""
 "\n"
 "Voit joko katkaista yhteyden tai asettaa sen uudelleen."
 
-#: ../../netconnect.pm_.c:745 ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:33 ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can reconfigure your connection."
@@ -5953,11 +5627,11 @@ msgstr ""
 "\n"
 "Voit asettaa yhteytesi uudelleen."
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "Olet parasta aikaa yhteydess� internettiin."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -5965,102 +5639,53 @@ msgstr ""
 "\n"
 "Voit joko ottaa yhteyden internettiin tai asettaa yhteyden uudelleen."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "Et ole juuri nyt yhteydess� internettiin."
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "Ota yhteys internettiin"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "Katkaise internetyhteys"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Aseta verkkoasetukset (l�hiverkko tai internet)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Internetyhteyden muodostus ja asetukset"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "Verkkoasetusten velho"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "Ulkoinen ISDN-modeemi"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Sis�inen ISDN-kortti"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "Mink�lainen ISND-yhteytesi on?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Ota yhteys internettiin"
-
-#: ../../netconnect.pm_.c:834
-msgid ""
-"The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few ones use dhcp.\n"
-"If you don't know, choose 'use pppoe'"
-msgstr ""
-"Yleisin tapa liitty� asdl-verkkoon on k�ytt�� pppoe:a.\n"
-"Jotkin yhteydet k�ytt�v�t pptp:t�, muutamat dhcp:t�.\n"
-"Jos et tied�, mit� valita, valitse 'k�yt� pppoe:a'"
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "k�yt� dhpc:t�"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "k�yt� pppoe:a"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "k�yt� pptp:t�"
-
-#: ../../netconnect.pm_.c:846
-#, c-format
-msgid "I'm about to restart the network device %s. Do you agree?"
-msgstr "K�ynnist�n verkkolaitteen %s uudelleen. Haluatko jatkaa?"
-
-#: ../../netconnect.pm_.c:883
-msgid ""
-"Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
+#: ../../network/netconnect.pm_.c:96
+#, fuzzy, c-format
+msgid "We are now going to configure the %s connection."
 msgstr ""
-"Mit� dhcp-asiakasohjelmaa haluat k�ytt��?\n"
-"Oletus on dhcpcd"
-
-#: ../../netconnect.pm_.c:900
-msgid "Network configuration"
-msgstr "Verkon asetukset"
-
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "Haluatko k�ynnist�� verkon uudelleen"
+"\n"
+"Voit joko katkaista yhteyden tai asettaa sen uudelleen."
 
-#: ../../netconnect.pm_.c:904
-#, c-format
+#: ../../network/netconnect.pm_.c:105
+#, fuzzy, c-format
 msgid ""
-"A problem occured while restarting the network: \n"
 "\n"
-"%s"
+"\n"
+"\n"
+"We are now going to configure the %s connection.\n"
+"\n"
+"\n"
+"Press OK to continue."
 msgstr ""
-"Ongelma k�ynnistett�ess� verkkoa uudelleen: \n"
 "\n"
-"%s"
+"Voit joko katkaista yhteyden tai asettaa sen uudelleen."
+
+#: ../../network/netconnect.pm_.c:129 ../../network/netconnect.pm_.c:243
+#: ../../network/netconnect.pm_.c:255 ../../network/tools.pm_.c:56
+msgid "Network Configuration"
+msgstr "Verkon asetukset"
 
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6072,7 +5697,7 @@ msgstr ""
 "Paina Ok s�ilytt��ksesi nykyiset asetukset tai peruuta asettaaksesi "
 "internet- ja verkkoasetukset uudelleen.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -6084,72 +5709,114 @@ msgstr ""
 "Seuraavassa vaiheessa m��ritell��n sinun internet- / verkkoasetukset.\n"
 "Jos et halua k�ytt�� automaattista tunnistusta, poista kyseinen valinta.\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "Valitse uusi asetusprofiili"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
 msgstr "K�yt� automaattista tunnistusta"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "Etsin laitteita...."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr "Tavallinen modeemiyhteys"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
 msgstr "l�ydetty portista %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
 msgstr "ISDN-yhteys"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr "l�ydetty %s:sta"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "DSL (tai ASDL) -yhteys"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+#, fuzzy
+msgid "ADSL connection"
+msgstr "L�hiverkko"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
 msgstr "l�ydetty seuraavasta liit�nn�st�: %s"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "Kaapeliyhteys"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+#, fuzzy
+msgid "cable connection detected"
+msgstr "Kaapeliyhteys"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
 msgstr "L�hiverkko"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr "seuraavat ethernet-verkkokortit l�ydetty"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "Miten haluat liitty� internettiin?"
+#: ../../network/netconnect.pm_.c:190
+#, fuzzy
+msgid "Choose the connection you want to configure"
+msgstr "Valitse haluamasi ty�kalu"
+
+#: ../../network/netconnect.pm_.c:214
+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_.c:215
+#, fuzzy
+msgid "Internet connection"
+msgstr "Internetyhteyden jakaminen"
+
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "Haluatko ottaa yhteyden koneen k�ynnistyksen yhteydess�?"
+
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "Verkon asetukset"
+
+#: ../../network/netconnect.pm_.c:240
+msgid "The network needs to be restarted"
+msgstr ""
 
-#: ../../netconnect.pm_.c:1004
+#: ../../network/netconnect.pm_.c:243
+#, c-format
 msgid ""
-"Congratulation, The network and internet configuration is finished.\n"
+"A problem occured while restarting the network: \n"
 "\n"
-"The configuration will now be applied to your system."
+"%s"
+msgstr ""
+"Ongelma k�ynnistett�ess� verkkoa uudelleen: \n"
+"\n"
+"%s"
+
+#: ../../network/netconnect.pm_.c:247
+msgid ""
+"Congratulations, the network and internet configuration is finished.\n"
+"\n"
+"The configuration will now be applied to your system.\n"
 msgstr ""
 "Onnittelut, verkko- ja internetyhteyksien asetus valmis.\n"
 "\n"
-"Asetukset tulevat k�ytt��n my�s itse j�rjestelm�ss�."
+"Asetukset tulevat k�ytt��n my�s itse j�rjestelm�ss�.\n"
 
-#: ../../netconnect.pm_.c:1007
+#: ../../network/netconnect.pm_.c:250
 msgid ""
 "After that is done, we recommend you to restart your X\n"
 "environnement to avoid hostname changing problem."
@@ -6157,31 +5824,7 @@ msgstr ""
 "Kun t�m� on tehty, suosittelemme k�ynnist�m��n X-ymp�rist�n\n"
 "uudelleen v�ltt��ksesi j�rjestelm�n nimen vaihdoksesta tulevat ongelmat."
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "verkkokorttia ei l�ytynyt"
-
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "Asetan verkkoa"
-
-#: ../../network.pm_.c:278
-msgid ""
-"Please enter your host name if you know it.\n"
-"Some DHCP servers require the hostname to work.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''."
-msgstr ""
-"Sy�t� koneesi nimi, jos tied�t sen.\n"
-"Jotkin DHCP-palvelimet tarvitsevat koneen nimen toimiakseen.\n"
-"Koneesi nimen pit�isi olla t�ysin laillinen nimi, kuten\n"
-"\" minunkone.omapaikka.net\"."
-
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "Koneen nimi"
-
-#: ../../network.pm_.c:319
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -6192,7 +5835,7 @@ msgstr ""
 "Hyv�ksy, jos haluat pit�� laitteen asetukset sellaisina, kun ne olivat.\n"
 "Alla olevien kohtien muokkaaminen korvaa voimassa olevat asetukset."
 
-#: ../../network.pm_.c:324
+#: ../../network/network.pm_.c:288
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
@@ -6201,38 +5844,38 @@ msgstr ""
 "Anna koneen IP-asetukset. Kukin kohta tulee sy�tt�� IP-osoitteena,\n"
 "pisteill� eroteltuna nelinumeroisena lukuna (esim. 1.2.3.4)."
 
-#: ../../network.pm_.c:333 ../../network.pm_.c:334
+#: ../../network/network.pm_.c:297 ../../network/network.pm_.c:298
 #, c-format
 msgid "Configuring network device %s"
 msgstr "Asetan verkkolaitetta %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr " (ajuri $module)"
+#: ../../network/network.pm_.c:298
+#, c-format
+msgid " (driver %s)"
+msgstr " (ajuri %s)"
 
-#: ../../network.pm_.c:336 ../../standalone/draknet_.c:231
-#: ../../standalone/draknet_.c:427
+#: ../../network/network.pm_.c:300 ../../standalone/draknet_.c:255
+#: ../../standalone/draknet_.c:461
 msgid "IP address"
 msgstr "IP-osoite"
 
-#: ../../network.pm_.c:337 ../../standalone/draknet_.c:428
+#: ../../network/network.pm_.c:301 ../../standalone/draknet_.c:462
 msgid "Netmask"
 msgstr "Verkkopeite"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "(bootp/dhcp)"
 msgstr "(bootp/dhcp)"
 
-#: ../../network.pm_.c:338
+#: ../../network/network.pm_.c:302
 msgid "Automatic IP"
 msgstr "Automaattinen IP"
 
-#: ../../network.pm_.c:359 ../../printerdrake.pm_.c:102
-#: ../../printerdrake.pm_.c:425
+#: ../../network/network.pm_.c:323 ../../printerdrake.pm_.c:406
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-osoitteen tullee olla muotoa 1.2.3.4"
 
-#: ../../network.pm_.c:388
+#: ../../network/network.pm_.c:351
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -6243,43 +5886,151 @@ msgstr ""
 "Koneesi nimen pit�isi olla t�ydellinen, kuten ``minunkone.yritys.fi''.\n"
 "Voit antaa my�s yhdysk�yt�v�n IP.osoitten jos sinulla on sellainen."
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "Nimipalvelin"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
 msgstr "Yhdysk�yt�v�"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "Yhdysk�yt�v�n laite"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Proxyjen asettaminen"
 
-#: ../../network.pm_.c:408
+#: ../../network/network.pm_.c:372
 msgid "HTTP proxy"
 msgstr "HTTP-v�lityspalvelin:"
 
-#: ../../network.pm_.c:409
+#: ../../network/network.pm_.c:373
 msgid "FTP proxy"
 msgstr "FTP-v�lityspalvelin:"
 
-#: ../../network.pm_.c:412
+#: ../../network/network.pm_.c:374
+msgid "Track network card id (usefull for laptops)"
+msgstr ""
+
+#: ../../network/network.pm_.c:377
 msgid "Proxy should be http://..."
 msgstr "V�lityspalvelimen tulee olla muotoa http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "V�lityspalvelimen tulee olla muotoa ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Internetin asetukset"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Haluatko kokeilla internetyhteytt� nyt?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "Testaan yhteytt�si..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "J�rjestelm� on nyt internetiss�."
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr "Turvallisuussyist� yhteys suljetaan nyt."
+
+#: ../../network/tools.pm_.c:51 ../../standalone/draknet_.c:220
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr ""
+"J�rjestelm� ei n�yt� olevan internetiss�.\n"
+"Yrit� muuttaa internet-asetuksia."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Yhteyden asetus"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Valitse alla olevista kohdista"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "Kortin IRQ"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "Kortin muisti (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "Kortin IO"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "Kortin IO_0"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "Kortin IO_1"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "Henkil�kohtainen puhelinnumerosi"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Palveluntarjoajan nimi (esim: tarjoaja.net)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "Palveluntarjoajan puhelinnumero"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "Yhteydentarjoajan dns 1 (vapaaehtoinen)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "Yhteydentarjoajan�dns�2�(vapaaehtoinen)"
+
+# Asennuksen sivuvalikko
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "N�pp�imist�n valinta"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "Soittotila"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+#, fuzzy
+msgid "Connection speed"
+msgstr "Yhteyden nimi: "
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "Yhteyden nimi: "
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "K�ytt�j�tunnus (k�ytt�j�n nimi)"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Salasana"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
 msgstr "Laajennettua osiotyyppi� ei ole tuettu t�ss� ymp�rist�ss�"
 
-#: ../../partition_table.pm_.c:581
+#: ../../partition_table.pm_.c:640
 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 "
@@ -6289,26 +6040,21 @@ msgstr ""
 "Ainoa ratkaisu on siirt�� prim��riosioita siten ett� reik� on ennen "
 "laajennettuja osioita"
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "Virhe lukiessa tiedostoa %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Palautus tiedostosta %s ep�onnistui: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "Huono varmuuskopiotiedosto"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Virhe kirjoitettaessa tiedostoon %s"
 
-#: ../../partition_table_raw.pm_.c:161
+#: ../../partition_table_raw.pm_.c:154
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
@@ -6338,49 +6084,213 @@ msgstr "hyv�"
 msgid "maybe"
 msgstr "ehk�"
 
-#: ../../printer.pm_.c:20
+#: ../../printer.pm_.c:23
+msgid "CUPS - Common Unix Printing System"
+msgstr ""
+
+#: ../../printer.pm_.c:24
+msgid "LPRng - LPR New Generation"
+msgstr ""
+
+#: ../../printer.pm_.c:25
+msgid "LPD - Line Printer Daemon"
+msgstr ""
+
+#: ../../printer.pm_.c:26
+msgid "PDQ - Print, Don't Queue"
+msgstr ""
+
+#: ../../printer.pm_.c:32
+msgid "CUPS"
+msgstr ""
+
+#: ../../printer.pm_.c:33
+msgid "LPRng"
+msgstr ""
+
+#: ../../printer.pm_.c:34
+msgid "LPD"
+msgstr ""
+
+#: ../../printer.pm_.c:35
+msgid "PDQ"
+msgstr ""
+
+#: ../../printer.pm_.c:40
 msgid "Local printer"
 msgstr "Paikallinen kirjoitin"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "Ulkoinen kirjoitin"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
+#: ../../printer.pm_.c:42
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "Ulkoinen CUPS-palvelin"
+
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "Ulkoinen lpd-palvelin"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "Verkkokirjoitin (socket)"
 
-#: ../../printer.pm_.c:25
-msgid "SMB/Windows 95/98/NT"
+#: ../../printer.pm_.c:45
+#, fuzzy
+msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:26
-msgid "NetWare"
-msgstr "NetWare"
+#: ../../printer.pm_.c:46
+#, fuzzy
+msgid "Printer on NetWare server"
+msgstr "Tulostuspalvelin"
 
-#: ../../printer.pm_.c:27 ../../printerdrake.pm_.c:158
-#: ../../printerdrake.pm_.c:160
-msgid "Printer Device URI"
+#: ../../printer.pm_.c:47
+#, fuzzy
+msgid "Enter a printer device URI"
 msgstr "Kirjoitinlaitteen osoite (URI)"
 
-#: ../../printerdrake.pm_.c:19
+#: ../../printer.pm_.c:48
+msgid "Pipe job into a command"
+msgstr ""
+
+#: ../../printer.pm_.c:418 ../../printer.pm_.c:839
+#: ../../printerdrake.pm_.c:1227 ../../printerdrake.pm_.c:2023
+msgid "Unknown model"
+msgstr ""
+
+#: ../../printer.pm_.c:546 ../../printerdrake.pm_.c:790
+msgid "Raw printer (No driver)"
+msgstr ""
+
+#: ../../printer.pm_.c:693
+#, fuzzy, c-format
+msgid "(on %s)"
+msgstr "(moduli %s)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "Valitse kirjoitinyhteys"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "Miten kirjoitin on liitetty?"
+
+#: ../../printerdrake.pm_.c:25
+#, fuzzy
+msgid ""
+"\n"
+"Printers on remote CUPS servers you do not have to configure\n"
+"here; these printers will be automatically detected. Please\n"
+"select \"Printer on remote CUPS server\" in this case."
+msgstr ""
+"Ulkoisella CUPS-palvelimella sinun ei tarvitse m��ritt��\n"
+"kirjoittimen tyyppi�; kaikki kirjoittimet tunnistuvat automaattisesti.\n"
+"Jos ep�ilet, valitse \"Ulkoinen CUPS-palvelin\"."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+#, fuzzy
+msgid "None"
+msgstr "Valmis"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Valitse oletusk�ytt�j�:"
+
+#: ../../printerdrake.pm_.c:105
+msgid ""
+"With remote CUPS servers, you do not have to configure any \n"
+"printer here; CUPS servers inform your machine automatically\n"
+"about their printers. All printers known to your machine\n"
+"currently are listed in the \"Default printer\" field. Choose\n"
+"the default printer for your machine there and click the\n"
+"\"Apply/Re-read printers\" button. Click the same button to\n"
+"refresh the list (it can take up to 30 seconds after the start\n"
+"of CUPS until all remote printers are visible).\n"
+"When your CUPS server is in a different network, you have to \n"
+"give the CUPS server IP address and optionally the port number\n"
+"to get the printer information from the server, otherwise leave\n"
+"these fields blank."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:117
+msgid ""
+"\n"
+"Normally, CUPS is automatically configured according to your\n"
+"network environment, so that you can access the printers on the\n"
+"CUPS servers in your local network. If this does not work \n"
+"correctly, turn off \"Automatic CUPS configuration\" and edit\n"
+"your file /etc/cups/cupsd.conf manually. Do not forget to restart\n"
+"CUPS afterwards (command: \"service cups restart\")."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:124 ../../printerdrake.pm_.c:1290
+#: ../../printerdrake.pm_.c:1294 ../../printerdrake.pm_.c:1295
+#: ../../printerdrake.pm_.c:1296 ../../printerdrake.pm_.c:2011
+msgid "Close"
+msgstr "Sulje"
+
+#: ../../printerdrake.pm_.c:125
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "Ulkoinen kirjoitin"
+
+#: ../../printerdrake.pm_.c:129
+#, fuzzy
+msgid "The IP address should look like 192.168.1.20"
+msgstr "IP-osoitteen tullee olla muotoa 1.2.3.4"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "Portin numeron pit�isi olla numeerinen"
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+#, fuzzy
+msgid "Default printer"
+msgstr "Paikallinen kirjoitin"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "CUPS-palvelimen IP"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Portti"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "K�ynnistyksen tavan asetus"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "Etsin laitteita...."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "Kokeile portteja"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Mallia \"%s\" oleva kirjoitin l�ydettiin "
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Paikallinen kirjoitin"
 
-#: ../../printerdrake.pm_.c:53
+#: ../../printerdrake.pm_.c:256
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -6388,37 +6298,60 @@ msgstr ""
 "Mihin laitteeseen kirjoitin on kytketty  \n"
 "(huomaa, ett� /dev/lp0 vastaa LPT1:t�)?\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Kirjoitinlaite"
 
-#: ../../printerdrake.pm_.c:74
+#: ../../printerdrake.pm_.c:261
+msgid "Device/file name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:274 ../../printerdrake.pm_.c:698
+#: ../../printerdrake.pm_.c:786
+#, fuzzy
+msgid "Reading printer database ..."
+msgstr "Luetaan CUPS-ajurien tietokantaa..."
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "Ulkoisen lpd-palvelimen kirjoittimen parametrit"
 
-#: ../../printerdrake.pm_.c:75
+#: ../../printerdrake.pm_.c:313
+#, fuzzy
 msgid ""
-"To use a remote lpd print queue, you need to supply\n"
-"the hostname of the printer server and the queue name\n"
-"on that server which jobs should be placed in."
+"To use a remote lpd printer, you need to supply\n"
+"the hostname of the printer server and the printer name\n"
+"on that server."
 msgstr ""
 "Jotta voisit k�ytt�� palvelimen lpd-tulostusjonoja, sinun\n"
 "tulee sy�tt�� tulostuspalvelimen ja jonon nimi jolle ty�t\n"
 "siirret��n."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
 msgstr "Palvelimen nimi"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Et�jonon nimi:"
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "Ulkoinen kirjoitin"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:320
+#, fuzzy
+msgid "Remote host name missing!"
+msgstr "Palvelimen nimi"
+
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "Palvelimen nimi"
+
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) -kirjoittimen parametrit"
 
-#: ../../printerdrake.pm_.c:89
+#: ../../printerdrake.pm_.c:393
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -6431,29 +6364,37 @@ msgstr ""
 "ja mahdollisesti tulostuspalvelimen IP-osoite, kirjoittimen jakonimi\n"
 "sek� soveltuva k�ytt�j�tunnus, salasana ja ty�ryhm�-tieto."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "SMB-palvelimen nimi"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "SMB-palvelimen IP"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "Jakonimi"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "Ty�ryhm�"
 
-#: ../../printerdrake.pm_.c:124
+#: ../../printerdrake.pm_.c:410
+msgid "Either the server name or the server's IP must be given!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:414
+msgid "Samba share name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:473
 msgid "NetWare Printer Options"
 msgstr "NetWare-palvelimen kirjoittimen parametrit"
 
-#: ../../printerdrake.pm_.c:125
+#: ../../printerdrake.pm_.c:474
 msgid ""
-"To print to a NetWare printer, you need to provide the\n"
+"To print on a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
 "TCP/IP hostname!) as well as the print queue name for the printer you\n"
 "wish to access and any applicable user name and password."
@@ -6463,59 +6404,228 @@ msgstr ""
 "ja mahdollisesti tulostusjonon nimi sille kirjoittimelle, jota haluat\n"
 "k�ytt��, sek� soveltuva k�ytt�j�tunnus ja salasana."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Tulostuspalvelin"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "Tulostusjonon nimi"
 
-#: ../../printerdrake.pm_.c:142
+#: ../../printerdrake.pm_.c:484
+msgid "NCP server name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:488
+msgid "NCP queue name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:527
 msgid "Socket Printer Options"
 msgstr "Verkkokirjoittimen optiot (socket)"
 
-#: ../../printerdrake.pm_.c:143
+#: ../../printerdrake.pm_.c:528
+#, fuzzy
 msgid ""
 "To print to a socket printer, you need to provide the\n"
-"hostname of the printer and optionally the port number."
+"host name of the printer and optionally the port number.\n"
+"On HP JetDirect servers the port number is usually 9100,\n"
+"on other servers it can vary. See the manual of your\n"
+"hardware."
 msgstr ""
 "Tulostaaksesi verkkokirjoittimella (socket), sinun t�ytyy\n"
 "antaa kirjoittimen verkkonimi ja mahdollisesti portin numero."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
 msgstr "Kirjoitinlaitteen verkkonimi"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Portti"
+#: ../../printerdrake.pm_.c:537
+#, fuzzy
+msgid "Printer host name missing!"
+msgstr "Kirjoitinlaitteen verkkonimi"
+
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "Kirjoitinlaitteen osoite (URI)"
+
+#: ../../printerdrake.pm_.c:567
+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 ""
+
+#: ../../printerdrake.pm_.c:582
+msgid "A valid URI must be entered!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:682
+msgid ""
+"Every printer needs a name (for example lp).\n"
+"The Description and Location fields do not need \n"
+"to be filled in. They are comments for the users."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:685
+msgid "Name of printer"
+msgstr "Kirjoittimen nimi"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Kuvaus"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "Voit antaa suoraan URIn k�ytt��ksesi kirjoitinta CUPS:in kanssa."
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Paikka"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "Luetaan CUPS-ajurien tietokantaa..."
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
+#: ../../printerdrake.pm_.c:793
+#, fuzzy
+msgid "Printer model selection"
+msgstr "Kirjoitinyhteys"
+
+#: ../../printerdrake.pm_.c:794
+#, fuzzy
+msgid "Which printer model do you have?"
 msgstr "Mik� kirjoitin sinulla on?"
 
-#: ../../printerdrake.pm_.c:204 ../../printerdrake.pm_.c:305
-msgid "Do you want to test printing?"
+#: ../../printerdrake.pm_.c:866
+#, fuzzy
+msgid "OKI winprinter configuration"
+msgstr "Internetin asetukset"
+
+#: ../../printerdrake.pm_.c:867
+msgid ""
+"You are configuring an OKI laser winprinter. These printers\n"
+"use a very special communication protocol and therefore they\n"
+"work only when connected to the first parallel port. When\n"
+"your printer is connected to another port or to a print\n"
+"server box please connect the printer to the first parallel\n"
+"port before you print a test page. Otherwise the printer\n"
+"will not work. Your connection type setting will be ignored\n"
+"by the driver."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:916 ../../printerdrake.pm_.c:946
+#, fuzzy
+msgid "Lexmark inkjet configuration"
+msgstr "Internetin asetukset"
+
+#: ../../printerdrake.pm_.c:917
+msgid ""
+"The inkjet printer drivers provided by Lexmark only support\n"
+"local printers, no printers on remote machines or print server\n"
+"boxes. Please connect your printer to a local port or\n"
+"configure it on the machine where it is connected to."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:947
+msgid ""
+"To be able to print with your Lexmark inkjet and this\n"
+"configuration, you need the inkjet printer drivers\n"
+"provided by Lexmark (http://www.lexmark.com/). Go to\n"
+"the US site and click on the \"Drivers\" button. Then\n"
+"choose your model and afterwards \"Linux\" as\n"
+"operating system. The drivers come as RPM packages\n"
+"or shell scripts with interactive graphical installation.\n"
+"You do not need to do this configuration by the\n"
+"graphical frontends. Cancel directly after the license\n"
+"agreement. Then print printhead alignment pages with\n"
+"\"lexmarkmaintain\" and adjust the head alignment\n"
+"settings with this program."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1079
+msgid ""
+"Printer default settings\n"
+"You should make sure that the page size and the\n"
+"ink type (if available) are set correctly. Note\n"
+"that with a very high printout quality printing\n"
+"can get substantially slower."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1090
+#, c-format
+msgid "Option %s must be an integer number!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1094
+#, c-format
+msgid "Option %s must be a number!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1099
+#, c-format
+msgid "Option %s out of range!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1136
+#, fuzzy, c-format
+msgid ""
+"Do you want to set this printer (\"%s\")\n"
+"as the default printer?"
 msgstr "Haluatko kokeilla tulostusta?"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "Kokeile portteja"
+
+#: ../../printerdrake.pm_.c:1153
+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\n"
+"and on laser printers with too low memory it can even not come out.\n"
+"In most cases it is enough to print the standard test page."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1158
+#, fuzzy
+msgid "No test pages"
+msgstr "Kyll�, tulosta molemmat sivut"
+
+#: ../../printerdrake.pm_.c:1159
+#, fuzzy
+msgid "Print"
+msgstr "Kirjoitin"
+
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "Standardi"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "Tulostan testisivua..."
+
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "Tulostan testisivua..."
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "Tulostan testisivua..."
 
-#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:324
-#, c-format
+#: ../../printerdrake.pm_.c:1200
+#, fuzzy, c-format
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
+"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"
-"Does it work properly?"
 msgstr ""
 "Testisivu on l�hetetty tulostuspalvelimelle.\n"
 "Voi kest�� hetken ennenkuin tulostus alkaa.\n"
@@ -6524,237 +6634,604 @@ msgstr ""
 "\n"
 "Toimiko tulostus oikein?"
 
-#: ../../printerdrake.pm_.c:218 ../../printerdrake.pm_.c:328
+#: ../../printerdrake.pm_.c:1204
+#, fuzzy
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
-"This may take a little time before printer start.\n"
-"Does it work properly?"
+"Test page(s) have been sent to the printer.\n"
+"It may take some time before the printer starts.\n"
 msgstr ""
 "Testisivu on l�hetetty tulostuspalvelimelle.\n"
 "Voi kest�� hetken ennenkuin tulostus alkaa.\n"
 "Toimiko tulostus oikein?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "Kyll�, tulosta ASCII-testisivu"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "Kyll�, tulosta PostScript-testisivu"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Ei kirjoitinta"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "Kyll�, tulosta molemmat sivut"
+#: ../../printerdrake.pm_.c:1237
+#, 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 "
+"\"qtcups <file>\". The graphical tools allow you to choose the printer and "
+"to modify the option settings easily.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:243
-msgid "Configure Printer"
-msgstr "Aseta kirjoitin"
+#: ../../printerdrake.pm_.c:1239
+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 ""
 
-#: ../../printerdrake.pm_.c:273
-msgid "Printer options"
+#: ../../printerdrake.pm_.c:1242 ../../printerdrake.pm_.c:1254
+#: ../../printerdrake.pm_.c:1266
+#, 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 ""
+
+#: ../../printerdrake.pm_.c:1244 ../../printerdrake.pm_.c:1284
+msgid ""
+"To get a list of the options available for the current printer read either "
+"the list shown below or click on the \"Print option list\" button.\n"
+"\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1249 ../../printerdrake.pm_.c:1261
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\".\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1251 ../../printerdrake.pm_.c:1263
+#: ../../printerdrake.pm_.c:1275
+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 ""
+
+#: ../../printerdrake.pm_.c:1256 ../../printerdrake.pm_.c:1268
+msgid ""
+"To get a list of the options available for the current printer click on the "
+"\"Print option list\" button.\n"
+"\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1273
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\" or \"%s <file>\".\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1277
+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 ""
+
+#: ../../printerdrake.pm_.c:1281
+#, 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 ""
+
+#: ../../printerdrake.pm_.c:1292
+#, fuzzy, c-format
+msgid "Printing on the printer \"%s\""
+msgstr "Ajan alas verkkoa"
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
 msgstr "Kirjoittimen asetukset"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Paperikoko"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+#, fuzzy
+msgid "Reading printer data ..."
+msgstr "Luetaan CUPS-ajurien tietokantaa..."
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "Poista sivu ty�n j�lkeen?"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "Internetin asetukset"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Uniprint ajurin asetukset"
+#: ../../printerdrake.pm_.c:1339
+#, c-format
+msgid ""
+"You can copy the printer configuration which you have done \n"
+"for the spooler %s to %s, your current spooler. All the\n"
+"configuration data (printer name, description, location, \n"
+"connection type, and default option settings) is overtaken,\n"
+"but jobs will not be transferred.\n"
+"Not all queues can be transferred due to the following \n"
+"reasons:\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:281
-msgid "Color depth options"
-msgstr "V�risyvyysasetukset"
+#: ../../printerdrake.pm_.c:1347
+msgid ""
+"CUPS does not support printers on Novell servers or printers\n"
+"sending the data into a free-formed command.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:283
-msgid "Print text as PostScript?"
-msgstr "Tulosta teksti postscript muodossa?"
+#: ../../printerdrake.pm_.c:1350
+msgid ""
+"PDQ only supports local printers, remote LPD printers, and\n"
+"Socket/TCP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:285
-msgid "Fix stair-stepping text?"
-msgstr "Korjaa askelmainen rivinvaihto?"
+#: ../../printerdrake.pm_.c:1353
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:287
-msgid "Number of pages per output pages"
-msgstr "Sivujen m��r� tulostettavalla sivulla"
+#: ../../printerdrake.pm_.c:1355
+msgid ""
+"In addition, queues not created with this program or\n"
+"\"foomatic-configure\" cannot be transferred."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:288
-msgid "Right/Left margins in points (1/72 of inch)"
-msgstr "Vasen/Oikea mariginaali pistein� (1/72 tuuma)"
+#: ../../printerdrake.pm_.c:1357
+msgid ""
+"\n"
+"Also printers configured with the PPD files provided by\n"
+"their manufacturers or with native CUPS drivers can not be\n"
+"transferred."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:289
-msgid "Top/Bottom margins in points (1/72 of inch)"
-msgstr "Yl�/Ala-mariginaalit pistein� (1/72 tuumina)"
+#: ../../printerdrake.pm_.c:1360
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:291
-msgid "Extra GhostScript options"
-msgstr "Lis�asetukset GhostScriptille"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "Lis�tekstiasetukset"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "K��nteinen sivuj�rjestys"
+#: ../../printerdrake.pm_.c:1377
+#, 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 ""
 
-#: ../../printerdrake.pm_.c:345
-msgid "Would you like to configure a printer?"
-msgstr "Haluatko asettaa kirjoittimen?"
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr "Tulostimen nimi saa sis�lt�� vain kirjaimia, numeroita ja alaviivan"
 
-#: ../../printerdrake.pm_.c:351
+#: ../../printerdrake.pm_.c:1390
+#, c-format
 msgid ""
-"Here are the following print queues.\n"
-"You can add some more or change the existing ones."
+"The printer \"%s\" already exists,\n"
+"do you really want to overwrite its configuration?"
 msgstr ""
-"T�ss� ovat tulostusjonot.\n"
-"Voit lis�t� uusia tai muuttaa olemassaolevia."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "CUPS k�ynnistyy"
+#: ../../printerdrake.pm_.c:1398
+#, fuzzy
+msgid "New printer name"
+msgstr "Ei kirjoitinta"
 
-#: ../../printerdrake.pm_.c:370
-msgid "Reading CUPS drivers database..."
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1412
+#, c-format
+msgid ""
+"You have transferred your former default printer (\"%s\"),\n"
+"Should it be also the default printer under the\n"
+"new printing system %s?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1423
+#, fuzzy
+msgid "Refreshing printer data ..."
 msgstr "Luetaan CUPS-ajurien tietokantaa..."
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "Valitse kirjoitinyhteys"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+msgid "Configuration of a remote printer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "Miten kirjoitin on liitetty?"
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "K�ynnist�n yhteytt�..."
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "Valitse ulkoinen kirjoitinyhteys"
+# Asennuksen sivuvalikko
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "Verkkoasetukset"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "N�ytt�� ei ole asetettu"
+
+#: ../../printerdrake.pm_.c:1456
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected.\n"
-"In case of doubt, select \"Remote CUPS server\"."
+"You are going to configure a remote printer. This needs working\n"
+"network access, but your network is not configured yet. If you\n"
+"go on without network configuration, you will not be able to use\n"
+"the printer which you are configuring now. How do you want \n"
+"to proceed?"
 msgstr ""
-"Ulkoisella CUPS-palvelimella sinun ei tarvitse m��ritt��\n"
-"kirjoittimen tyyppi�; kaikki kirjoittimet tunnistuvat automaattisesti.\n"
-"Jos ep�ilet, valitse \"Ulkoinen CUPS-palvelin\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "Asetan verkkoa"
+
+#: ../../printerdrake.pm_.c:1496
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected\n"
-"unless you have a server on a different network; in the\n"
-"latter case, you have to give the CUPS server IP address\n"
-"and optionally the port number."
+"The network configuration done during the installation \n"
+"cannot be started now. Please check whether the network\n"
+"gets accessable after booting your system and correct the\n"
+"configuration using the Mandrake Control Center, section\n"
+"\"Network & Internet\"/\"Connection\", and afterwards set\n"
+"up the printer, also using the Mandrake Control Center,\n"
+"section \"Hardware\"/\"Printer\""
 msgstr ""
-"Ulkoisella�CUPS-palvelimella�sinun�ei�tarvitse�m��ritt��\n"
-"kirjoittimen�tyyppi�;�kaikki�kirjoittimet�tunnistuvat�automaattisesti\n"
-"paitsi jos tulostusserveri sijaitsee eri verkossa. J�lkimm�isess�\n"
-"tapauksessa sinun t�ytyy antaa CUPS-palvelimen IP-osoite\n"
-"ja mahdollisesti portin numero."
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "CUPS-palvelimen IP"
+#: ../../printerdrake.pm_.c:1503
+msgid ""
+"The network access was not running and could not be \n"
+"started. Please check your configuration and your \n"
+"hardware. Then try to configure your remote printer\n"
+"again."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:429
-msgid "Port number should be numeric"
-msgstr "Portin numeron pit�isi olla numeerinen"
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
+msgstr "Mit� tulostusj�rjestelm�� haluat k�ytt��?"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "Poista jono"
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "Korkea"
 
-#: ../../printerdrake.pm_.c:454
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Paranoidi"
+
+#: ../../printerdrake.pm_.c:1549
+#, c-format
+msgid "Installing a printing system in the %s security level"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1550
+#, c-format
 msgid ""
-"Name of printer should contains only letters, numbers and the underscore"
-msgstr "Tulostimen nimi saa sis�lt�� vain kirjaimia, numeroita ja alaviivan"
+"You are about to install the printing system %s on\n"
+"a system running in the %s security level.\n"
+"\n"
+"This printing system runs a daemon (background process)\n"
+"which waits for print jobs and handles them. This daemon\n"
+"is also accessable by remote machines through the network\n"
+"and so it is a possible point for attacks. Therefore only\n"
+"a few selected daemons are started by default in this\n"
+"security level.\n"
+"\n"
+"Do you really want to configure printing on this\n"
+"machine?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1584
+#, fuzzy
+msgid "Starting the printing system at boot time"
+msgstr "Mit� tulostusj�rjestelm�� haluat k�ytt��?"
 
-#: ../../printerdrake.pm_.c:461
+#: ../../printerdrake.pm_.c:1585
+#, c-format
 msgid ""
-"Every printer need a name (for example lp).\n"
-"Other parameters such as the description of the printer or its location\n"
-"can be defined. What name should be used for this printer and\n"
-"how is the printer connected?"
+"The printing system (%s) will not be started automatically\n"
+"when the machine is booted.\n"
+"\n"
+"It is possible that the automatic starting was turned off \n"
+"by changing to a higher security level, because the printing\n"
+"system is a potential point for attacks.\n"
+"\n"
+"Do you want to have the automatic starting of the printing\n"
+"system turned on again?"
 msgstr ""
-"Jokainen kirjoitin tarvitsee nimen (usein lp). My�s muita parametreja,\n"
-"kuten kirjoittimen kuvaus tai sen sijainti, voidaan m��ritt��.\n"
-"Mit� nime� haluat k�ytt�� t�lle kirjoittimelle ja miten se on liitetty\n"
-"koneeseen?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Kirjoittimen nimi"
+#: ../../printerdrake.pm_.c:1612 ../../printerdrake.pm_.c:1644
+#: ../../printerdrake.pm_.c:1671 ../../printerdrake.pm_.c:1701
+#: ../../printerdrake.pm_.c:1778
+msgid "Checking installed software..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:466
-msgid "Description"
-msgstr "Kuvaus"
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Paikka"
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1727
+#, fuzzy
+msgid "Select Printer Spooler"
+msgstr "Valitse kirjoitinyhteys"
+
+#: ../../printerdrake.pm_.c:1728
+#, fuzzy
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Mit� tulostusj�rjestelm�� haluat k�ytt��?"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Aseta kirjoitin"
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Kirjoittimen asetukset"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../printerdrake.pm_.c:1815
+#, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "Luetaan CUPS-ajurien tietokantaa..."
+
+#: ../../printerdrake.pm_.c:1845
+#, fuzzy
+msgid "Would you like to configure printing?"
+msgstr "Haluatko asettaa kirjoittimen?"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1879
 msgid ""
-"Every print queue (which print jobs are directed to) needs a\n"
-"name (often lp) and a spool directory associated with it. What\n"
-"name and directory should be used for this queue and how is the printer "
-"connected?"
+"The following printers are configured.\n"
+"Click on one of them to modify it or\n"
+"to get information about it or on \n"
+"\"Add Printer\" to add a new printer."
 msgstr ""
-"Jokainen tulostusjono (johon tulostust�it� ohjataan) tarvitsee\n"
-"nimen (usein lp) ja jonohakemiston joka liittyy nimeen. Mit�\n"
-"nime� ja hakemistoa k�ytet��n t�lle jonolle ja miten kirjoitin\n"
-"on liitetty?"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "Jonon nimi"
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "Perustila"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "Jonohakemisto"
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Oletus)"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "Ulkoinen CUPS-palvelin"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "Ulkoinen CUPS-palvelin"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+#, fuzzy
+msgid "Add printer"
+msgstr "Ei kirjoitinta"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "Haluatko kokeilla asetuksia?"
+
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "Internetin asetukset"
+
+#: ../../printerdrake.pm_.c:2004
+#, c-format
+msgid ""
+"Printer %s: %s %s\n"
+"What do you want to modify on this printer?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2012
+msgid "Do it!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+#, fuzzy
+msgid "Printer connection type"
+msgstr "Internetyhteyden jakaminen"
+
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
 msgstr "Kirjoitinyhteys"
 
-#: ../../raid.pm_.c:33
+#: ../../printerdrake.pm_.c:2018 ../../printerdrake.pm_.c:2081
+msgid "Printer manufacturer, model, driver"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2019 ../../printerdrake.pm_.c:2082
+msgid "Printer manufacturer, model"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2028 ../../printerdrake.pm_.c:2092
+msgid "Set this printer as the default"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2029 ../../printerdrake.pm_.c:2097
+#, fuzzy
+msgid "Print test pages"
+msgstr "Tulostan testisivua..."
+
+#: ../../printerdrake.pm_.c:2030 ../../printerdrake.pm_.c:2099
+msgid "Know how to print with this printer"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2031 ../../printerdrake.pm_.c:2101
+#, fuzzy
+msgid "Remove printer"
+msgstr "Ulkoinen kirjoitin"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "Luetaan CUPS-ajurien tietokantaa..."
+
+#: ../../printerdrake.pm_.c:2096
+#, c-format
+msgid "The printer \"%s\" is set as the default printer now."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2103
+#, fuzzy, c-format
+msgid "Do you really want to remove the printer \"%s\"?"
+msgstr "Haluatko k�ynnist�� verkon uudelleen"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "Luetaan CUPS-ajurien tietokantaa..."
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+#, fuzzy
+msgid "Proxy configuration"
+msgstr "Proxyjen asettaminen"
+
+#: ../../proxy.pm_.c:30
+msgid ""
+"Welcome to the proxy configuration utility.\n"
+"\n"
+"Here, you'll be able to set up your http and ftp proxies\n"
+"with or without login and password\n"
+msgstr ""
+
+#: ../../proxy.pm_.c:38
+msgid ""
+"Please fill in the http proxy informations\n"
+"Leave it blank if you don't want an http proxy"
+msgstr ""
+
+#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
+msgid "URL"
+msgstr ""
+
+#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
+#, fuzzy
+msgid "port"
+msgstr "Portti"
+
+#: ../../proxy.pm_.c:44
+#, fuzzy
+msgid "Url should begin with 'http:'"
+msgstr "V�lityspalvelimen tulee olla muotoa http://..."
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+#, fuzzy
+msgid "The port part should be numeric"
+msgstr "Portin numeron pit�isi olla numeerinen"
+
+#: ../../proxy.pm_.c:59
+msgid ""
+"Please fill in the ftp proxy informations\n"
+"Leave it blank if you don't want an ftp proxy"
+msgstr ""
+
+#: ../../proxy.pm_.c:65
+#, fuzzy
+msgid "Url should begin with 'ftp:'"
+msgstr "V�lityspalvelimen tulee olla muotoa ftp://..."
+
+#: ../../proxy.pm_.c:79
+msgid ""
+"Please enter proxy login and password, if any.\n"
+"Leave it blank if you don't want login/passwd"
+msgstr ""
+
+#: ../../proxy.pm_.c:80
+#, fuzzy
+msgid "login"
+msgstr "Automaattinen kirjautuminen"
+
+#: ../../proxy.pm_.c:82
+#, fuzzy
+msgid "password"
+msgstr "Salasana"
+
+#: ../../proxy.pm_.c:84
+#, fuzzy
+msgid "re-type password"
+msgstr "Ei salasanaa"
+
+#: ../../proxy.pm_.c:88
+#, fuzzy
+msgid "The passwords don't match. Try again!"
+msgstr "Salasanat poikkeavat toisistaan"
+
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "En voi lis�t� osiota _alustetulle_ RAID:lle md%d"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "En voi kirjoittaa tiedostoa $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "En voi kirjoittaa tiedostoa %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid ep�onnistui"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid ep�onnistui (ehk� raid-ty�kalut puuttuvat?)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Ei riitt�v�sti osioita RAID tasolle %d\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
 msgstr "K�ynnist� ALSA (Advanced Linux Sound Architecture) ��nij�rjestelm�"
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron on jaksottainen komentojen ajastaja."
 
-#: ../../services.pm_.c:18
+#: ../../services.pm_.c:17
 msgid ""
 "apmd is used for monitoring batery status and logging it via syslog.\n"
 "It can also be used for shutting down the machine when the battery is low."
@@ -6762,7 +7239,7 @@ msgstr ""
 "apmd:ta k�ytet��n valvomaan paristojen tilaa ja raportoimaan siit� syslogin\n"
 "kautta. apmd:t� voidaan my�s k�ytt�� sulkemaan kone patterien ollessa tyhji�."
 
-#: ../../services.pm_.c:20
+#: ../../services.pm_.c:19
 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."
@@ -6770,7 +7247,7 @@ msgstr ""
 "Ajaa komentoja m��r�tyill� ajanhetkill�, jotka on m��ritelty at-komennolla.\n"
 "Ajaa my�s er�ajoja, kun j�rjestelm�n kuormitus on riitt�v�n matala."
 
-#: ../../services.pm_.c:22
+#: ../../services.pm_.c:21
 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 "
@@ -6781,7 +7258,7 @@ msgstr ""
 "ajanhetkill�. vixie cron lis�� monia omianisuuksia verrattuna normaaliin\n"
 "UNIX:n cron ohjelmaan, kuten paremman turvallisuuden ja laajemmat asetukset."
 
-#: ../../services.pm_.c:25
+#: ../../services.pm_.c:24
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -6792,13 +7269,13 @@ msgstr ""
 "Commander. GPM mahdollistaa my�s leikkaa/liimaa toiminnot hiirell�,\n"
 "ja sis�lt�� tuen valikoille konsolissa."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr ""
 
-#: ../../services.pm_.c:30
+#: ../../services.pm_.c:29
 msgid ""
 "Apache is a World Wide Web server.  It is used to serve HTML files\n"
 "and CGI."
@@ -6806,7 +7283,7 @@ msgstr ""
 "Apache on WWW-palvelin. Palvelinta k�ytet��n jakamaan HTML-\n"
 "tiedostoja ja ajamaan CGI-ohjelmia."
 
-#: ../../services.pm_.c:32
+#: ../../services.pm_.c:31
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -6820,13 +7297,13 @@ msgstr ""
 "palveluita, kuten telnet, ftp, rsh ja rlogin. inetd:n poistaminen\n"
 "poistaa my�s n�m� palvelut k�yt�st�."
 
-#: ../../services.pm_.c:36
+#: ../../services.pm_.c:35
 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_.c:38
+#: ../../services.pm_.c:37
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -6837,23 +7314,23 @@ msgstr ""
 "ty�kalulla.\n"
 "T�m� tulisi ottaa k�ytt��n l�hes kaikissa j�rjestelmiss�."
 
-#: ../../services.pm_.c:41
+#: ../../services.pm_.c:40
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
 msgstr ""
 
-#: ../../services.pm_.c:43
+#: ../../services.pm_.c:42
 msgid "Automatic detection and configuration of hardware at boot."
 msgstr ""
 
-#: ../../services.pm_.c:44
+#: ../../services.pm_.c:43
 msgid ""
 "Linuxconf will sometimes arrange to perform various tasks\n"
 "at boot-time to maintain the system configuration."
 msgstr ""
 
-#: ../../services.pm_.c:46
+#: ../../services.pm_.c:45
 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)."
@@ -6861,13 +7338,13 @@ msgstr ""
 "lpd on tulostuspalvelin, jonka lpr ohjelma vaatii toimiakseen.\n"
 "lpd on palvelin joka jakaa tulostust�it� kirjoittimille."
 
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:47
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
 msgstr ""
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:49
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
 "host names to IP addresses."
@@ -6875,7 +7352,7 @@ msgstr ""
 "named (BIND) on nimipalvelin (DNS) jota k�ytet��n selvitt�m��n\n"
 "koneen nimi� sek� IP-osoitteita."
 
-#: ../../services.pm_.c:52
+#: ../../services.pm_.c:51
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -6883,7 +7360,7 @@ msgstr ""
 "Liitt�� ja irroittaa NFS (Network File System), SMB (Lan\n"
 "Manager/Windows) ja NCP (NetWare) liitospaikat."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -6891,7 +7368,7 @@ msgstr ""
 "Aktivoi/Poistaa kaikki verkkoliittym�t jotka on asetettu\n"
 "k�ynnistyksess�."
 
-#: ../../services.pm_.c:56
+#: ../../services.pm_.c:55
 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"
@@ -6901,7 +7378,7 @@ msgstr ""
 "verkoissa. T�m� palvelu mahdollistaa NFS-palvelimen\n"
 "k�ynnistyksen, jakoa ohjataan tiedostosta /etc/exports."
 
-#: ../../services.pm_.c:59
+#: ../../services.pm_.c:58
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -6909,17 +7386,17 @@ msgstr ""
 "NFS on yleinen protokolla tiedostojen jakoon TCP/IP-\n"
 "verkoissa. T�m� palvelu mahdollistaa NSF-tiedostolukot."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
 msgstr ""
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
 msgstr ""
 
-#: ../../services.pm_.c:64
+#: ../../services.pm_.c:63
 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 "
@@ -6930,7 +7407,7 @@ msgstr ""
 "korttien tukemiseen. Palvelu ei k�ynnisty ellei sit� ole asetettu, joten\n"
 "sen voi asentaa my�s koneisiin jotka eiv�t sit� tarvitse."
 
-#: ../../services.pm_.c:67
+#: ../../services.pm_.c:66
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -6941,7 +7418,7 @@ msgstr ""
 "NFS ja NIS-protokollat. portmap-palvelin on oltava k�ynniss�\n"
 "j�rjestelmiss� jotka haluavat tarjota n�it� protokollia."
 
-#: ../../services.pm_.c:70
+#: ../../services.pm_.c:69
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that\n"
 "moves mail from one machine to another."
@@ -6949,7 +7426,7 @@ msgstr ""
 "Postfix on s�hk�postinv�litysohjelma, eli ohjelma joka\n"
 "v�litt�� postia koneelta toiselle."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -6957,13 +7434,13 @@ msgstr ""
 "Tallentaa ja palauttaa j�rjestelm�n satunnaislukualtaan, t�m� parantaa\n"
 "satunnaislukujen laatua."
 
-#: ../../services.pm_.c:74
+#: ../../services.pm_.c:73
 msgid ""
 "Assign raw devices to block devices (such as hard drive\n"
 "partitions), for the use of applications such as Oracle"
 msgstr ""
 
-#: ../../services.pm_.c:76
+#: ../../services.pm_.c:75
 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"
@@ -6974,7 +7451,7 @@ msgstr ""
 "verkoissa,\n"
 "monimutkaisemmat verkot vaativat parempia reititysprotokollia."
 
-#: ../../services.pm_.c:79
+#: ../../services.pm_.c:78
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -6982,7 +7459,7 @@ msgstr ""
 "rstart-protokolla mahdollistaa verkkok�ytt�jille\n"
 "eri koneiden tilatietojen haun."
 
-#: ../../services.pm_.c:81
+#: ../../services.pm_.c:80
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -6990,7 +7467,7 @@ msgstr ""
 "rusers-protokolla verkon k�ytt�jille mahdollisuuden tunnistaa, ketk�\n"
 "ovat sis�ll� eri koneissa."
 
-#: ../../services.pm_.c:83
+#: ../../services.pm_.c:82
 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)."
@@ -6998,11 +7475,11 @@ msgstr ""
 "rwho-protokollalla et�k�ytt�j�t voivat listata kaikki koneella\n"
 "olevat k�ytt�j�t (vastaa fingeri�)."
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:84
 msgid "Launch the sound system on your machine"
 msgstr "K�ynnist� ��nij�rjestelm� tietokoneessasi"
 
-#: ../../services.pm_.c:86
+#: ../../services.pm_.c:85
 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."
@@ -7010,33 +7487,72 @@ msgstr ""
 "Syslog on tapa jolla monet palvelimet kirjottavat viestins� talteen\n"
 "useisiin lokitiedostoihin.  On j�rkev�� k�ytt�� syslog-ohjelmaa."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
 msgstr ""
 
-#: ../../services.pm_.c:89
+#: ../../services.pm_.c:88
 #, fuzzy
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
 msgstr ""
 "K�ynnist�� ja pys�ytt�� X kirjasinpalvelimen k�ynnistyksess� ja lopetuksessa"
 
-#: ../../services.pm_.c:118
+#: ../../services.pm_.c:114 ../../services.pm_.c:156
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Valitse mitk� palvelut k�ynnistet��n automaattisesti"
 
+#: ../../services.pm_.c:126
+#, fuzzy
+msgid "Printing"
+msgstr "Kirjoitin"
+
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "Internet"
+
+#: ../../services.pm_.c:130
+msgid "File sharing"
+msgstr ""
+
+#: ../../services.pm_.c:132
+#, fuzzy
+msgid "System"
+msgstr "J�rjestelm�n tila"
+
 #: ../../services.pm_.c:137
+#, fuzzy
+msgid "Remote Administration"
+msgstr "Ulkoisen lpd-palvelimen kirjoittimen parametrit"
+
+# ../../share/compssUsers
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Tietokanta"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+#, fuzzy
+msgid "Services"
+msgstr "laite"
+
+#: ../../services.pm_.c:198
 msgid "running"
 msgstr "k�ynniss�"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 msgid "stopped"
 msgstr "pys�htynyt"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr "Palvelut ja demonit"
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
@@ -7044,11 +7560,16 @@ msgstr ""
 "Ei lis�tietoja\n"
 "t�lle palvelulle."
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 msgid "On boot"
 msgstr "K�ynnistyksen yhteydess�"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "Asennan pakettia %s"
+
+#: ../../standalone/diskdrake_.c:63
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
 "I'll try to go on blanking bad partitions"
@@ -7056,15 +7577,66 @@ msgstr ""
 "Osiotaulua ei voida lukea, siin� on liikaa virheit� :(\n"
 "Taulu yritet��n korjata nollaamalla se"
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+#, fuzzy
+msgid "Error!"
+msgstr "Virhe"
+
+#: ../../standalone/drakautoinst_.c:45
+#, c-format
+msgid "I can't find needed image file `%s'."
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:47
+#, fuzzy
+msgid "Auto Install Configurator"
+msgstr "Asennuksen j�lkeiset toiminnot"
+
+#: ../../standalone/drakautoinst_.c:48
+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"
+"Do you want to continue?"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:70
+#, fuzzy
+msgid "Automatic Steps Configuration"
+msgstr "K�ynnistyksen tavan asetus"
+
+#: ../../standalone/drakautoinst_.c:71
+msgid ""
+"Please choose for each step whether it will replay like your install, or it "
+"will be manual"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:112 ../../standalone/drakgw_.c:599
+msgid "Congratulations!"
+msgstr "Onnittelut!"
+
+#: ../../standalone/drakautoinst_.c:113
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:36 ../../standalone/drakgw_.c:181
 msgid "Internet Connection Sharing"
 msgstr "Internetyhteyden jakaminen"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Internetyhteyden jakaminen on k�yt�ss�"
 
-#: ../../standalone/drakgw_.c:119
+#: ../../standalone/drakgw_.c:120
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
@@ -7076,31 +7648,31 @@ msgstr ""
 "\n"
 "Mit� haluat tehd�?"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "poista k�yt�st�"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr "lopeta"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
 msgstr "aseta uudelleen"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
 msgstr "Poistan palvelut k�yt�st�..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "Internetyhteyden jakaminen ei ole en�� k�yt�ss�."
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Internetyhteyden jakaminen ei ole k�yt�ss�"
 
-#: ../../standalone/drakgw_.c:144
+#: ../../standalone/drakgw_.c:145
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -7112,27 +7684,19 @@ msgstr ""
 "\n"
 "Mit� haluat tehd�?"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "ota k�ytt��n"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
 msgstr "Otan palvelut k�ytt��n.."
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "Internetyhteyden jakaminen on nyt k�yt�ss�."
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "Asetustiedoston sis�lt�� ei voida tulkita."
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr "Tunnistamaton asetustiedosto"
-
-#: ../../standalone/drakgw_.c:181
+#: ../../standalone/drakgw_.c:182
 #, fuzzy
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -7146,21 +7710,21 @@ msgstr ""
 "\n"
 "Huomaa: tarvitset verkkokortin asettaaksesi paikallisverkon."
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Liittym� %s (k�ytt�en moduulia %s)"
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:209
 #, c-format
 msgid "Interface %s"
 msgstr "Liittym� %s"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:217
 msgid "No network adapter on your system!"
 msgstr "Koneessasi ei ole verkkokorttia!"
 
-#: ../../standalone/drakgw_.c:217
+#: ../../standalone/drakgw_.c:218
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
@@ -7168,6 +7732,10 @@ msgstr ""
 "Koneestasi ei l�ytynyt yht��n verkkokorttia. Aja laitteistonhakuty�kalu."
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "Verkkoliittym�"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7182,28 +7750,29 @@ msgstr ""
 "\n"
 "Valmistaudun asettamaan l�hiverkkosi asetukset kyseiselle laitteelle."
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "Valitse verkkokortti, joka on kytketty paikallisverkkoon."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
 "Varoitus. Verkkokortti on jo asetettu. Uudet asetukset korvaavat vanhat."
 
-#: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
+#: ../../standalone/drakgw_.c:254
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
-"Mahdollinen l�hiverkon osoitet�rm�ys l�ydetty nykyisill� asetuksilla $_!\n"
+"Mahdollinen l�hiverkon osoitet�rm�ys l�ydetty nykyisill� asetuksilla %s!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "Palomuuri l�ydetty!"
 
-#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:263 ../../standalone/drakgw_.c:269
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
@@ -7211,24 +7780,21 @@ msgstr ""
 "Varoitus! Olemassaoleva palomuuri l�ydetty. Tarvitset mahdollisesti k�sin "
 "teht�vi�korjauksia asennuksen j�lkeen."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "M��rittelen..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 "M��rittelen komentotiedostot, asennan ohjelmistot, k�ynnist�n palvelimet..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "Asennan pakettia $_"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "Onnittelut!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Asennan pakettia %s"
 
-#: ../../standalone/drakgw_.c:591
+#: ../../standalone/drakgw_.c:600
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
@@ -7238,24 +7804,24 @@ msgstr ""
 "Voit nyt jakaa internetyhteyden muiden l�hiverkon koneiden kanssak�ytt�m�ll� "
 "automaattista l�hiverkon m��rittely� (DHCP)."
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
 msgstr ""
 "Asetukset on jo tehty, mutta ne ovat t�ll� hetkell� poistettu k�yt�st�."
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
 msgstr "Asetukset on jo tehty ja ne ovat k�yt�ss�."
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "Internetyhteyden jakamista ei ole koskaan asetettu."
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
 msgstr "Internetyhteyden jakamisen asetukset"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, fuzzy, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -7270,83 +7836,82 @@ msgstr ""
 "\n"
 "Paina \"Ok\", jos haluat k�ynnist�� asennusohjelman."
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Verkon asetukset (%d-laitteille)"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:539
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 msgid "Profile: "
 msgstr "Profiili: "
 
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:94
 msgid "Del profile..."
 msgstr "Poista profiili..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr "Valitse poistettava profiili:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "Uusi profiili..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "Luotavan profiilin nimi:"
+#: ../../standalone/draknet_.c:134
+msgid ""
+"Name of the profile to create (the new profile is created as a copy of the "
+"current one) :"
+msgstr ""
 
-#: ../../standalone/draknet_.c:140
+#: ../../standalone/draknet_.c:160
 msgid "Hostname: "
 msgstr "Koneen nimi:"
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "Internetyhteys"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "Yhdysk�yt�v�:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Interface:"
 msgstr "Liit�nt�:"
 
-#: ../../standalone/draknet_.c:168
+#: ../../standalone/draknet_.c:192
 msgid "Status:"
 msgstr "Tila:"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:122 ../../standalone/net_monitor_.c:224
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 msgid "Connected"
 msgstr "Yhteys muodostettu"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:357
-#: ../../standalone/net_monitor_.c:83 ../../standalone/net_monitor_.c:122
-#: ../../standalone/net_monitor_.c:224
+#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
 msgid "Not connected"
 msgstr "Ei yhteytt�"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
 msgstr "Yhdist�..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
author	Yuri Chornoivan <yurchor@ukr.net>	2017-11-19 22:01:31 +0200
committer	Yuri Chornoivan <yurchor@ukr.net>	2017-11-19 22:01:31 +0200
commit	dc2a2728bca504f383bbf3e69870b5709e881fb9 (patch)
tree	060252703a238ee0f54eaf8e0727c01db7d01c18 /perl-install/common.pm
parent	7a306d9a68fc9db3c526fd0769a40632b82f08db (diff)
download	drakx-dc2a2728bca504f383bbf3e69870b5709e881fb9.tar drakx-dc2a2728bca504f383bbf3e69870b5709e881fb9.tar.gz drakx-dc2a2728bca504f383bbf3e69870b5709e881fb9.tar.bz2 drakx-dc2a2728bca504f383bbf3e69870b5709e881fb9.tar.xz drakx-dc2a2728bca504f383bbf3e69870b5709e881fb9.zip